diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index 9832858cb..406e52999 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/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">
-      <span class="header-notice">
-         <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">
-          <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
-           </a-tooltip>
+    <!--    <div class="action" @click="Jumpflybook">-->
+    <!--      <span  class="header-notice">-->
+    <!--         <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"/>
       </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,281 +130,281 @@
 </template>
 
 <script>
-  import HeaderNotice from './HeaderNotice'
-  import UserPassword from './UserPassword'
-  import SettingDrawer from '@/components/setting/SettingDrawer'
-  import DepartSelect from './DepartSelect'
-  import { mapActions, mapGetters, mapState } from 'vuex'
-  import { mixinDevice } from '@/utils/mixin.js'
-  import { getFileAccessHttpUrl, getAction } from '@/api/manage'
-  import Vue from 'vue'
-  import { UI_CACHE_DB_DICT_DATA, ACCESS_TOKEN } from '@/store/mutation-types'
-  import moment from 'moment'
-  import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
-  import enUS from 'ant-design-vue/es/locale/en_US'
-  import 'moment/locale/zh-cn'
-  import { generateIndexRouter } from '@/utils/util'
-  import store from '../../store'
-  import router, { resetRouter } from '../../router'
+import HeaderNotice from './HeaderNotice'
+import UserPassword from './UserPassword'
+import SettingDrawer from '@/components/setting/SettingDrawer'
+import DepartSelect from './DepartSelect'
+import { mapActions, mapGetters, mapState } from 'vuex'
+import { mixinDevice } from '@/utils/mixin.js'
+import { getFileAccessHttpUrl, getAction } from '@/api/manage'
+import Vue from 'vue'
+import { UI_CACHE_DB_DICT_DATA, ACCESS_TOKEN } from '@/store/mutation-types'
+import moment from 'moment'
+import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
+import enUS from 'ant-design-vue/es/locale/en_US'
+import 'moment/locale/zh-cn'
+import { generateIndexRouter } from '@/utils/util'
+import store from '../../store'
+import router, { resetRouter } from '../../router'
 
-  moment.locale('zh-cn')
-  const EN = 'en-us'
-  const ZH = 'zh-cn'
+moment.locale('zh-cn')
+const EN = 'en-us'
+const ZH = 'zh-cn'
 
-  export default {
-    name: 'UserMenu',
-    mixins: [mixinDevice],
-    data() {
-      return {
-        // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
-        searchMenuOptions: [],
-        searchMenuComp: 'span',
-        searchMenuVisible: false,
-        isLoading: false,
-        locale: zhCN,
-        localeval: 'zh-cn'
-        // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
-      }
-    },
-    components: {
-      HeaderNotice,
-      UserPassword,
-      DepartSelect,
-      SettingDrawer
-    },
-    props: {
-      theme: {
-        type: String,
-        required: false,
-        default: 'dark'
-      }
-    },
-    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-    created() {
-      let lists = []
-      this.searchMenus(lists, this.permissionMenuList)
-      this.searchMenuOptions = [...lists]
-    },
-    mounted() {
-      //如果是单点登录模式
-      if (process.env.VUE_APP_SSO == 'true') {
-        let depart = this.userInfo().orgCode
-        if (!depart) {
-          this.updateCurrentDepart()
-        }
-      }
-      this.localeval = localStorage.getItem('language')
-      if (this.localeval == 'zh-cn') {
-        this.$i18n.locale = ZH
-        this.locale = zhCN
-        moment.locale('zh-cn')
-      } else if (this.localeval == 'en-us') {
-        this.locale = enUS
-        moment.locale('en-us')
-        this.$i18n.locale = EN
-      }
-    },
-    computed: {
-      ...mapState({
-        // 后台菜单
-        permissionMenuList: state => state.user.permissionList
-
-      })
-    },
-    /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-    watch: {
-      // update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
-      device: {
-        immediate: true,
-        handler() {
-          this.searchMenuVisible = false
-          this.searchMenuComp = this.isMobile() ? 'a-modal' : 'span'
-        }
-      }
-      // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
-    },
-    methods: {
-      /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      showClick() {
-        this.searchMenuVisible = true
-      },
-      hiddenClick() {
-        this.shows = false
-      },
-      Jumpflybook() {
-        window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank')
-      },
-      Jumpoperationguide(){
-        window.open('https://eicgyqr5mc.feishu.cn/docx/ZyhWdIz7EoMZ68xhI2bckcWWnMg', '_blank');
-      },
-      /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      ...mapActions(['Logout']),
-      ...mapGetters(['username', 'avatar', 'userInfo']),
-      getAvatar() {
-        return getFileAccessHttpUrl(this.avatar())
-      },
-      handleLogout() {
-        const that = this
-
-        this.$confirm({
-          title: '提示',
-          content: '真的要注销登录吗 ?',
-          onOk() {
-            return that.Logout({}).then(() => {
-              // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              //  TODO  在部署线上时注掉以下代码
-              that.$router.push({ path: '/user/login' })
-
-              // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' +
-              // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地
-              //  TODO  在部署线上时解开以下代码
-              // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
-              // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上
-
-              localStorage.removeItem('language')
-              // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              //window.location.reload()
-            }).catch(err => {
-              that.$message.error({
-                title: '错误',
-                description: err.message
-              })
-            })
-          },
-          onCancel() {
-          }
-        })
-      },
-      updatePassword() {
-        let username = this.userInfo().username
-        this.$refs.userPassword.show(username)
-      },
-      updateCurrentDepart() {
-        this.$refs.departSelect.show()
-      },
-      systemSetting() {
-        this.$refs.settingDrawer.showDrawer()
-      },
-      /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      searchMenus(arr, menus) {
-        for (let i of menus) {
-          if (!i.hidden && 'layouts/RouteView' !== i.component) {
-            arr.push(i)
-          }
-          if (i.children && i.children.length > 0) {
-            this.searchMenus(arr, i.children)
-          }
-        }
-      },
-      filterOption(input, option) {
-        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      },
-      // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
-      searchMethods(value) {
-        let route = this.searchMenuOptions.filter(item => item.id === value)[0]
-        if (route.meta.internalOrExternal === true || route.component.includes('layouts/IframePageView')) {
-          window.open(route.meta.url, '_blank')
-        } else {
-          this.$router.push({ path: route.path })
-        }
-        this.searchMenuVisible = false
-      },
-      // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
-      /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
-      clearCache() {
-        getAction('sys/dict/refleshCache').then((res) => {
-          if (res.success) {
-            //重新加载缓存
-            getAction('sys/dict/queryAllDictItems').then((res) => {
-              if (res.success) {
-                Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
-                Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
-              }
-            })
-            this.$message.success('刷新缓存完成！')
-          }
-        }).catch(e => {
-          this.$message.warn('刷新缓存失败！')
-          console.log('刷新失败', e)
-        })
-      },
-      /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
-      moment,
-      changeLocale(localeval) {
-        this.isLoading = true
-        switch (localeval) {
-          case 'zh-cn':
-            localStorage.setItem('language', 'zh-cn')
-            break
-          case 'en-us':
-            localStorage.setItem('language', 'en-us')
-            break
-        }
-        getAction('/sys/dict/queryAllDictItemsByCut', {}).then((res) => {
-          if (res.success) {
-            Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
-            Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
-            store.dispatch('GetPermissionList').then(res => {
-              const menuData = res.result.menu
-              resetRouter()
-              let constRoutes = []
-              constRoutes = generateIndexRouter(menuData)
-              router.addRoutes(constRoutes)
-              this.$root.Bus.$emit('switchLanguage', localeval)
-              this.isLoading = false
-              this.localeval = localeval
-              if (localeval === EN) {
-                moment.locale(EN)
-                this.$i18n.locale = EN
-                this.locale = enUS
-              } else {
-                moment.locale(ZH)
-                this.$i18n.locale = ZH
-                this.locale = zhCN
-              }
-            })
-          }
-        })
+export default {
+  name: 'UserMenu',
+  mixins: [mixinDevice],
+  data() {
+    return {
+      // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+      searchMenuOptions: [],
+      searchMenuComp: 'span',
+      searchMenuVisible: false,
+      isLoading: false,
+      locale: zhCN,
+      localeval: 'zh-cn'
+      // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+    }
+  },
+  components: {
+    HeaderNotice,
+    UserPassword,
+    DepartSelect,
+    SettingDrawer
+  },
+  props: {
+    theme: {
+      type: String,
+      required: false,
+      default: 'dark'
+    }
+  },
+  /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+  created() {
+    let lists = []
+    this.searchMenus(lists, this.permissionMenuList)
+    this.searchMenuOptions = [...lists]
+  },
+  mounted() {
+    //如果是单点登录模式
+    if (process.env.VUE_APP_SSO == 'true') {
+      let depart = this.userInfo().orgCode
+      if (!depart) {
+        this.updateCurrentDepart()
       }
     }
+    this.localeval = localStorage.getItem('language')
+    if (this.localeval == 'zh-cn') {
+      this.$i18n.locale = ZH
+      this.locale = zhCN
+      moment.locale('zh-cn')
+    } else if (this.localeval == 'en-us') {
+      this.locale = enUS
+      moment.locale('en-us')
+      this.$i18n.locale = EN
+    }
+  },
+  computed: {
+    ...mapState({
+      // 后台菜单
+      permissionMenuList: state => state.user.permissionList
+
+    })
+  },
+  /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+  watch: {
+    // update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+    device: {
+      immediate: true,
+      handler() {
+        this.searchMenuVisible = false
+        this.searchMenuComp = this.isMobile() ? 'a-modal' : 'span'
+      }
+    }
+    // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+  },
+  methods: {
+    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    showClick() {
+      this.searchMenuVisible = true
+    },
+    hiddenClick() {
+      this.shows = false
+    },
+    Jumpflybook(){
+      window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank');
+    },
+    Jumpoperationguide(){
+      window.open('https://eicgyqr5mc.feishu.cn/docx/ZyhWdIz7EoMZ68xhI2bckcWWnMg', '_blank');
+    },
+    /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    ...mapActions(['Logout']),
+    ...mapGetters(['username', 'avatar', 'userInfo']),
+    getAvatar() {
+      return getFileAccessHttpUrl(this.avatar())
+    },
+    handleLogout() {
+      const that = this
+
+      this.$confirm({
+        title: '提示',
+        content: '真的要注销登录吗 ?',
+        onOk() {
+          return that.Logout({}).then(() => {
+            // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
+            //  TODO  在部署线上时注掉以下代码
+            that.$router.push({ path: '/user/login' })
+
+            // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' +
+            // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地
+            //  TODO  在部署线上时解开以下代码
+            // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
+            // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上
+
+            localStorage.removeItem('language')
+            // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
+            //window.location.reload()
+          }).catch(err => {
+            that.$message.error({
+              title: '错误',
+              description: err.message
+            })
+          })
+        },
+        onCancel() {
+        }
+      })
+    },
+    updatePassword() {
+      let username = this.userInfo().username
+      this.$refs.userPassword.show(username)
+    },
+    updateCurrentDepart() {
+      this.$refs.departSelect.show()
+    },
+    systemSetting() {
+      this.$refs.settingDrawer.showDrawer()
+    },
+    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    searchMenus(arr, menus) {
+      for (let i of menus) {
+        if (!i.hidden && 'layouts/RouteView' !== i.component) {
+          arr.push(i)
+        }
+        if (i.children && i.children.length > 0) {
+          this.searchMenus(arr, i.children)
+        }
+      }
+    },
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
+    // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
+    searchMethods(value) {
+      let route = this.searchMenuOptions.filter(item => item.id === value)[0]
+      if (route.meta.internalOrExternal === true || route.component.includes('layouts/IframePageView')) {
+        window.open(route.meta.url, '_blank')
+      } else {
+        this.$router.push({ path: route.path })
+      }
+      this.searchMenuVisible = false
+    },
+    // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
+    /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
+    clearCache() {
+      getAction('sys/dict/refleshCache').then((res) => {
+        if (res.success) {
+          //重新加载缓存
+          getAction('sys/dict/queryAllDictItems').then((res) => {
+            if (res.success) {
+              Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+              Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
+            }
+          })
+          this.$message.success('刷新缓存完成！')
+        }
+      }).catch(e => {
+        this.$message.warn('刷新缓存失败！')
+        console.log('刷新失败', e)
+      })
+    },
+    /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
+    moment,
+    changeLocale(localeval) {
+      this.isLoading = true
+      switch (localeval) {
+        case 'zh-cn':
+          localStorage.setItem('language', 'zh-cn')
+          break
+        case 'en-us':
+          localStorage.setItem('language', 'en-us')
+          break
+      }
+      getAction('/sys/dict/queryAllDictItemsByCut', {}).then((res) => {
+        if (res.success) {
+          Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
+          Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
+          store.dispatch('GetPermissionList').then(res => {
+            const menuData = res.result.menu
+            resetRouter()
+            let constRoutes = []
+            constRoutes = generateIndexRouter(menuData)
+            router.addRoutes(constRoutes)
+            this.$root.Bus.$emit('switchLanguage', localeval)
+            this.isLoading = false
+            this.localeval = localeval
+            if (localeval === EN) {
+              moment.locale(EN)
+              this.$i18n.locale = EN
+              this.locale = enUS
+            } else {
+              moment.locale(ZH)
+              this.$i18n.locale = ZH
+              this.locale = zhCN
+            }
+          })
+        }
+      })
+    }
   }
+}
 </script>
 
 <style lang="less" scoped>
-  /* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
-  /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  .user-wrapper .search-input {
-    width: 180px;
-    color: inherit;
+/* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+.user-wrapper .search-input {
+  width: 180px;
+  color: inherit;
 
-    /deep/ .ant-select-selection {
-      background-color: inherit;
-      border: 0;
-      border-bottom: 1px solid white;
+  /deep/ .ant-select-selection {
+    background-color: inherit;
+    border: 0;
+    border-bottom: 1px solid white;
 
-      &__placeholder, &__field__placeholder {
-        color: inherit;
-      }
+    &__placeholder, &__field__placeholder {
+      color: inherit;
     }
   }
+}
 
-  /* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+/* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
 </style>
 
 <style scoped>
-  .logout_title {
-    color: inherit;
-    text-decoration: none;
-  }
+.logout_title {
+  color: inherit;
+  text-decoration: none;
+}
 
-  .action {
-    color: rgba(0, 0, 0, 0.65) !important;
-    font-size: 14px;
-  }
+.action {
+  color: rgba(0, 0, 0, 0.65) !important;
+  font-size: 14px;
+}
 
-  .action .avatar {
-    background: #ccc !important;
-  }
-</style>
\ No newline at end of file
+.action .avatar {
+  background: #ccc !important;
+}
+</style>