n20-common-lib 2.3.17 → 2.3.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.3.17",
+  "version": "2.3.19",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-layout-header.scss

@@ -115,6 +115,9 @@ $--header-color: #3d4a57;
     line-height: 37px;
   }
 }
+.user-info-drop-menu-new.user-info-drop_height {
+  height: 522px;
+}
 
 .uif-user-w {
   box-sizing: border-box;

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -104,7 +104,7 @@
     >
       <img v-popover:by_popover class="user-info-btn header-color" :src="headerUserUrl" />
 
-      <el-dropdown-menu slot="dropdown" class="user-info-drop-menu-new">
+      <el-dropdown-menu slot="dropdown" :class="{ 'user-info-drop_height': !inBack }" class="user-info-drop-menu-new">
         <div class="uif-user-w" :style="{ backgroundImage: headerUserInfoBg ? `url(${headerUserInfoBg})` : undefined }">
           <div class="uif-img-w">
             <img class="_img" :src="headerUserUrl" />
@@ -262,7 +262,7 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration)
 
-import { siteTree2menus, siteTree2RelaNos } from '../../LoginTemporary/utils'
+import { siteTree2menus } from '../../LoginTemporary/utils'
 
 const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 
@@ -338,7 +338,7 @@ export default {
       byLabel: '',
       byEV: false,
       headerUserInfoBg: realUrl('/server-assets/userInfoBg.png'),
-      inBack: !window.localStorage.getItem('pageInSystemNo') && window.localStorage.getItem('pageInType') === 'inBack'
+      inBack: window.localStorage.getItem('pageInType') === 'inBack'
     }
   },
   computed: {
@@ -409,23 +409,21 @@ export default {
       this.systemList = data
     },
     async getTreeList(item) {
-      let { data } = await axios.get('/bems/1.0/menuTree/tree', {
+      let { data } = await axios.get(`/bems/1.0/menuTree/tree?t=${Date.now()}`, {
         resType: 1,
         systemNo: item.systemCode
       })
-      data || (data = [])
-      let layoutMenus = siteTree2menus(data)
+      let layoutMenus = siteTree2menus(data || [])
       sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
     },
     async clickSystem(item) {
       await this.getTreeList(item)
-      if (item.systemCode === 'CSYWGL') {
-        window.localStorage.setItem('pageInType', 'toBack')
-      } else {
-        window.localStorage.setItem('pageInType', 'toFront')
-      }
+      localStorage.setItem('pageInType', 'inFront')
       window.localStorage.setItem('pageInSystemNo', item.systemCode)
-      window.location.reload()
+      let { base = '/' } = this.$router.options
+      if (!/\/$/.test(base)) base += '/'
+
+      window.location.href = window.location.origin + base + 'dashboard/workplace'
     },
 
     // 跳转打主数据人员页面

package/src/components/LoginTemporary/indexN.vue

@@ -516,6 +516,7 @@ export default {
     },
     selSystem(item) {
       localStorage.setItem('pageInSystemNo', item.NO)
+      localStorage.setItem('pageInType', 'inFront')
       this.sltSys = item
     }
   }