n20-common-lib 2.3.10 → 2.3.13

package/package.json

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

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

@@ -105,7 +105,7 @@ $--header-color: #3d4a57;
 
 .user-info-drop-menu-new {
   width: 302px;
-  height: 462px;
+  height: 492px;
   padding: 0;
   background: #ffffff;
   border: none;

package/src/components/ApprovalButtons/index.vue

@@ -150,6 +150,7 @@ import axios from '../../utils/axios'
 import { linkGo } from '../../utils/urlToGo'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
 import ClDialog from '../Dialog'
+import ClUpload from '../Upload'
 import CarboncopyProp from './setCarboncopyProp.vue'
 import RejectToProp from './setRejectToProp.vue'
 import ShowAppOpi from './showAppOpi.vue'
@@ -164,6 +165,7 @@ export default {
   name: 'ApprovalButtons',
   components: {
     ClDialog,
+    ClUpload,
     CarboncopyProp,
     RejectToProp,
     ShowAppOpi,

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

@@ -179,6 +179,20 @@
             </el-dropdown-menu>
           </el-dropdown>
         </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>
+              <i class="el-icon-caret-right m-l-auto m-r-0"></i>
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item v-for="item in systemList" :key="item.id" @click.native="clickSystem(item)">
+                <span>{{ item.systemName | $lc }}</span>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-dropdown-item>
         <el-dropdown-item v-if="!inBack" command="toBack">
           <div class="flex-box flex-v">
             <span>{{ '后台管理' | $lc }}</span>
@@ -232,7 +246,7 @@
 import { $lc } from '../../../utils/i18n/index'
 import Cookies from 'js-cookie'
 import { themeList } from '../../../utils/theme.config.js'
-
+import { setItem } from '../../../utils/storageEdit'
 import operatingStatus from '../../operatingStatus/index.vue'
 import dialogWrap from '../../Dialog/index.vue'
 import changePwd from './changePwd.vue'
@@ -248,7 +262,7 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration)
 
-import { siteTree2menus } from '../../LoginTemporary/utils'
+import { siteTree2menus, siteTree2RelaNos } from '../../LoginTemporary/utils'
 
 const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 
@@ -265,6 +279,10 @@ export default {
       type: Function,
       default: undefined
     },
+    systemChange: {
+      type: Boolean,
+      default: false
+    },
     afterLogout: {
       type: Function,
       default: undefined
@@ -286,6 +304,7 @@ export default {
   },
   data() {
     return {
+      systemList: [],
       show: false,
       headerLogoUrl: undefined,
       headerLogoWidth: undefined,
@@ -362,7 +381,7 @@ export default {
         }
       })
     })
-
+    this.systemChange && this.getSystemList()
     this.getNNum()
     document.addEventListener('visibilitychange', this.getNNum)
     window.addEventListener('message', this.updateNotice)
@@ -382,6 +401,33 @@ export default {
     window.removeEventListener('message', this.updateNotice)
   },
   methods: {
+    /**
+     * 获取系统列表
+     */
+    async getSystemList() {
+      const { data } = await axios.post(`/bems/portal/portalWidgetSystem/getAll`)
+      this.systemList = data
+    },
+    async getTreeList(item) {
+      let { data } = await axios.get('/bems/1.0/menuTree/tree', {
+        resType: 1,
+        systemNo: item.systemCode
+      })
+      data || (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')
+      }
+      window.localStorage.setItem('pageInSystemNo', item.systemCode)
+      window.location.reload()
+    },
+
     // 跳转打主数据人员页面
     goMdmUser() {
       this.customOpt.userMd && linkPush('/mdm/personnel')

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() {