n20-common-lib 2.3.11 → 2.3.13

package/package.json

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

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

@@ -180,7 +180,7 @@
           </el-dropdown>
         </el-dropdown-item>
         <!-- 系统切换 -->
-        <el-dropdown-item>
+        <el-dropdown-item v-if="systemChange">
           <el-dropdown trigger="hover" size="medium" placement="left-start" style="width: 100%">
             <div class="flex-box flex-v">
               <span>{{ '系统切换' | $lc }}</span>
@@ -279,6 +279,10 @@ export default {
       type: Function,
       default: undefined
     },
+    systemChange: {
+      type: Boolean,
+      default: false
+    },
     afterLogout: {
       type: Function,
       default: undefined
@@ -377,7 +381,7 @@ export default {
         }
       })
     })
-    this.getSystemList()
+    this.systemChange && this.getSystemList()
     this.getNNum()
     document.addEventListener('visibilitychange', this.getNNum)
     window.addEventListener('message', this.updateNotice)
@@ -404,35 +408,24 @@ export default {
       const { data } = await axios.post(`/bems/portal/portalWidgetSystem/getAll`)
       this.systemList = data
     },
-    async clickSystem(item) {
+    async getTreeList(item) {
       let { data } = await axios.get('/bems/1.0/menuTree/tree', {
-        resType: this.asyncRelaNos ? '1' : undefined,
+        resType: 1,
         systemNo: item.systemCode
       })
       data || (data = [])
-
       let layoutMenus = siteTree2menus(data)
       sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
-
-      let relaNos = siteTree2RelaNos(data)
-      // sessionStorage.setItem('relaNos', JSON.stringify(relaNos))
-      setItem('relaNos', relaNos)
-
-      let relaNosG = []
-      for (let i = 0; i < relaNos.length; i++) {
-        let item = relaNos[i]
-        relaNosG.push(...item.relaNos)
+    },
+    async clickSystem(item) {
+      await this.getTreeList(item)
+      if (item.systemCode === 'CSYWGL') {
+        window.localStorage.setItem('pageInType', 'toBack')
+      } else {
+        window.localStorage.setItem('pageInType', 'toFront')
       }
-      setItem('relaNosGlobal', relaNosG)
-
-      // XXX: 兼容旧版resources
-      // sessionStorage.setItem('resources', JSON.stringify(data))
-      setItem('resources', data)
-
-      let { base = '/' } = this.$router.options
-      if (!/\/$/.test(base)) base += '/'
-
-      window.location.href = window.location.origin + base + 'dashboard/workplace'
+      window.localStorage.setItem('pageInSystemNo', item.systemCode)
+      window.location.reload()
     },
 
     // 跳转打主数据人员页面

package/src/components/Layout/indexN.vue

@@ -3,6 +3,7 @@
     <headerWrap
       class="header-wrap"
       :ectad="ectad"
+      :system-change="systemChange"
       :operation-status="operationStatus"
       :before-logout="beforeLogout"
       :after-logout="afterLogout"
@@ -80,6 +81,10 @@ export default {
       type: Boolean,
       default: false
     },
+    systemChange: {
+      type: Boolean,
+      default: false
+    },
     afterLogout: {
       type: Function,
       default: undefined
@@ -228,7 +233,7 @@ export default {
         window.sessionStorage.removeItem('tab-list')
         window.localStorage.setItem('pageInType', 'inBack')
       } else {
-        window.sessionStorage.setItem('tab-list', JSON.stringify(this.tabList))
+        window.sessionStorage.removeItem('tab-list')
       }
     },
     getActiveNav() {