修改合并问题

jero-web/src/components/tools/UserMenu.vue

@@ -31,19 +31,26 @@
     <!--        <a-icon type="question-circle-o"></a-icon>-->
     <!--      </a>-->
     <!--    </span>-->
-    <div class="action" @click="Jumpflybook">
+    <!--    <div class="action" @click="Jumpflybook">-->
-      <span class="header-notice">
+    <!--      <span  class="header-notice">-->
-         <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">
+    <!--         <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">-->
+    <!--          <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>-->
+    <!--           </a-tooltip>-->
+    <!--      </span>-->
+    <!--    </div>-->
+    <a-dropdown>
+      <span class="action action-full ant-dropdown-link user-dropdown-menu">
+<!--        <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
+        <!--                <span v-if="isDesktop()">welcome,{{ userInfo().username }}</span>-->
         <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
-           </a-tooltip>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
         <a-menu-item key="5" @click="Jumpflybook">
-<!--          <a-icon type="logout"/>-->
+          <!--          <a-icon type="logout"/>-->
           <span>{{$t('userManual')}}</span>
         </a-menu-item>
         <a-menu-item key="6" @click="Jumpoperationguide">
-<!--          <a-icon type="logout"/>-->
+          <!--          <a-icon type="logout"/>-->
           <span>{{$t('operationguide')}}</span>
         </a-menu-item>
       </a-menu>
@@ -123,28 +130,28 @@
 </template>
 
 <script>
-  import HeaderNotice from './HeaderNotice'
+import HeaderNotice from './HeaderNotice'
-  import UserPassword from './UserPassword'
+import UserPassword from './UserPassword'
-  import SettingDrawer from '@/components/setting/SettingDrawer'
+import SettingDrawer from '@/components/setting/SettingDrawer'
-  import DepartSelect from './DepartSelect'
+import DepartSelect from './DepartSelect'
-  import { mapActions, mapGetters, mapState } from 'vuex'
+import { mapActions, mapGetters, mapState } from 'vuex'
-  import { mixinDevice } from '@/utils/mixin.js'
+import { mixinDevice } from '@/utils/mixin.js'
-  import { getFileAccessHttpUrl, getAction } from '@/api/manage'
+import { getFileAccessHttpUrl, getAction } from '@/api/manage'
-  import Vue from 'vue'
+import Vue from 'vue'
-  import { UI_CACHE_DB_DICT_DATA, ACCESS_TOKEN } from '@/store/mutation-types'
+import { UI_CACHE_DB_DICT_DATA, ACCESS_TOKEN } from '@/store/mutation-types'
-  import moment from 'moment'
+import moment from 'moment'
-  import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
+import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
-  import enUS from 'ant-design-vue/es/locale/en_US'
+import enUS from 'ant-design-vue/es/locale/en_US'
-  import 'moment/locale/zh-cn'
+import 'moment/locale/zh-cn'
-  import { generateIndexRouter } from '@/utils/util'
+import { generateIndexRouter } from '@/utils/util'
-  import store from '../../store'
+import store from '../../store'
-  import router, { resetRouter } from '../../router'
+import router, { resetRouter } from '../../router'
 
-  moment.locale('zh-cn')
+moment.locale('zh-cn')
-  const EN = 'en-us'
+const EN = 'en-us'
-  const ZH = 'zh-cn'
+const ZH = 'zh-cn'
 
-  export default {
+export default {
   name: 'UserMenu',
   mixins: [mixinDevice],
   data() {
@@ -224,8 +231,8 @@
     hiddenClick() {
       this.shows = false
     },
-      Jumpflybook() {
+    Jumpflybook(){
-        window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank')
+      window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank');
     },
     Jumpoperationguide(){
       window.open('https://eicgyqr5mc.feishu.cn/docx/ZyhWdIz7EoMZ68xhI2bckcWWnMg', '_blank');
@@ -361,13 +368,13 @@
       })
     }
   }
-  }
+}
 </script>
 
 <style lang="less" scoped>
-  /* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
-  /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+/* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  .user-wrapper .search-input {
+.user-wrapper .search-input {
   width: 180px;
   color: inherit;
 
@@ -380,24 +387,24 @@
       color: inherit;
     }
   }
-  }
+}
 
-  /* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+/* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
 </style>
 
 <style scoped>
-  .logout_title {
+.logout_title {
   color: inherit;
   text-decoration: none;
-  }
+}
 
-  .action {
+.action {
   color: rgba(0, 0, 0, 0.65) !important;
   font-size: 14px;
-  }
+}
 
-  .action .avatar {
+.action .avatar {
   background: #ccc !important;
-  }
+}
 </style>