n20-common-lib 2.2.18 → 2.2.20

package/package.json

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

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

@@ -66,7 +66,7 @@
       </el-dropdown-menu>
     </el-dropdown>
 
-    <el-badge :hidden="noticeNum === 0" :value="noticeNum" class="m-l-m">
+    <el-badge :hidden="noticeNum + afficheNum === 0" :value="noticeNum + afficheNum">
       <span v-popover:noticePop class="news-btn el-icon-bell header-color"></span>
     </el-badge>
 
@@ -158,7 +158,7 @@
     </dialogWrap>
     <!-- 消息/通知 -->
     <el-popover ref="noticePop" trigger="click" width="400" @after-enter="$refs.noticeContent.show()">
-      <noticePop ref="noticeContent" />
+      <noticePop ref="noticeContent" :notice-num="noticeNum" :affiche-num="afficheNum" />
     </el-popover>
     <el-dialog :visible.sync="scV" :title="'切换用户' | $lc" append-to-body width="600px">
       <switchUser :visible.sync="scV" :user-no="userNo" />
@@ -242,6 +242,7 @@ export default {
       themeList,
       themeVal: window.localStorage.getItem('pageTheme') || 'default',
       noticeNum: 0,
+      afficheNum: 0,
       rolesList: [],
       scV: false,
       underway: false
@@ -444,14 +445,14 @@ export default {
     getNNum() {
       clearTimeout(this.getNNumTimeOut)
       if (!document.hidden) {
-        Promise.all([
-          axios.get('/bems/wkb/messageCenter/getUnReadTotal/' + this.userNo, null, { loading: false, noMsg: true }),
-          axios.get('/bems/1.0/notice/notReadCount', null, {
-            loading: false,
-            noMsg: true
+        axios
+          .get('/bems/wkb/messageCenter/getUnReadTotal/' + this.userNo, null, { loading: false, noMsg: true })
+          .then((res) => {
+            this.noticeNum = res.data.data || 0
           })
-        ]).then(([res_1, res_2]) => {
-          this.noticeNum = (res_1.data.data || 0) + (res_2.data || 0)
+
+        axios.get('/bems/1.0/notice/notReadCount', null, { loading: false, noMsg: true }).then((res) => {
+          this.afficheNum = res.data || 0
         })
 
         this.getNNumTimeOut = setTimeout(this.loopGetNNum, 1000 * 60 * 3)

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

@@ -75,7 +75,7 @@
       <span class="set-user-btn iconfont icon-kehuduanxiazai header-color m-l-lg" @click="dowApp"></span>
     </el-tooltip>
 
-    <el-badge :hidden="noticeNum === 0" :value="noticeNum">
+    <el-badge :hidden="noticeNum + afficheNum === 0" :value="noticeNum + afficheNum">
       <span v-if="!noticeDrw" v-popover:noticePop class="news-btn iconfont icon-xiaoxi header-color"></span>
       <span v-else class="news-btn iconfont icon-xiaoxi header-color" @click="customOpt.noticeDrawer"></span>
     </el-badge>
@@ -220,7 +220,7 @@
     </dialogWrap>
     <!-- 消息/通知 -->
     <el-popover v-if="!noticeDrw" ref="noticePop" trigger="click" width="400" @after-enter="$refs.noticeContent.show()">
-      <noticePop ref="noticeContent" />
+      <noticePop ref="noticeContent" :notice-num="noticeNum" :affiche-num="afficheNum" />
     </el-popover>
     <el-dialog :visible.sync="scV" :title="'切换用户' | $lc" append-to-body width="600px">
       <switchUser :visible.sync="scV" :user-no="userNo" />
@@ -304,6 +304,7 @@ export default {
       themeList,
       themeVal: window.localStorage.getItem('pageTheme') || 'default',
       noticeNum: 0,
+      afficheNum: 0,
       rolesList: [],
       scV: false,
       underway: false,
@@ -543,7 +544,7 @@ export default {
       let { base = '/' } = this.$router.options
       if (!/\/$/.test(base)) base += '/'
 
-      window.location.href = window.location.origin + base
+      window.location.href = window.location.origin + base + 'dashboard/workplace'
     },
     toSystem() {
       window.localStorage.setItem('pageInType', 'toFront')
@@ -551,7 +552,7 @@ export default {
       let { base = '/' } = this.$router.options
       if (!/\/$/.test(base)) base += '/'
 
-      window.location.href = window.location.origin + base
+      window.location.href = window.location.origin + base + 'dashboard/workplace'
     },
     getUserImg() {
       return this.$axios
@@ -602,14 +603,14 @@ export default {
     getNNum() {
       clearTimeout(this.getNNumTimeOut)
       if (!document.hidden) {
-        Promise.all([
-          axios.get('/bems/wkb/messageCenter/getUnReadTotal/' + this.userNo, null, { loading: false, noMsg: true }),
-          axios.get('/bems/1.0/notice/notReadCount', null, {
-            loading: false,
-            noMsg: true
+        axios
+          .get('/bems/wkb/messageCenter/getUnReadTotal/' + this.userNo, null, { loading: false, noMsg: true })
+          .then((res) => {
+            this.noticeNum = res.data.data || 0
           })
-        ]).then(([res_1, res_2]) => {
-          this.noticeNum = (res_1.data.data || 0) + (res_2.data || 0)
+
+        axios.get('/bems/1.0/notice/notReadCount', null, { loading: false, noMsg: true }).then((res) => {
+          this.afficheNum = res.data || 0
         })
 
         this.getNNumTimeOut = setTimeout(this.loopGetNNum, 1000 * 60 * 3)

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

@@ -81,6 +81,10 @@ export default {
       return `【${msgT}】${item.title}`
     }
   },
+  props: {
+    noticeNum: { type: Number, default: 0 },
+    afficheNum: { type: Number, default: 0 }
+  },
   data() {
     return {
       showKey: 0,
@@ -88,8 +92,6 @@ export default {
       username: sessionStorage.getItem('userNo'),
       nLd: false,
       aLd: false,
-      noticeNum: 0,
-      afficheNum: 0,
       noticeList: [],
       noticeTotal: 0,
       afficheList: [],
@@ -171,7 +173,6 @@ export default {
           .put(`/bems/wkb/messageCenter/batchUpdate`, { ids: [item.id], type: '1' }, { loading: false, noMsg: true })
           .then(() => {
             item.readState = '1'
-            this.noticeNum = this.noticeNum - 1
             window.postMessage('NstcUpdateNotice')
           })
       }

package/src/utils/asyncGetRelaNos.js

@@ -40,14 +40,17 @@ async function asyncGetRelaNos(appNo, rns) {
   oRelaNos = [...new Set(oRelaNos)]
   rnObj.relaNos = oRelaNos
 
+  let syncArr = window._keep_syncStorageAppNos
+  let isSync = appNo && syncArr && syncArr.includes(appNo)
+
   // sessionStorage.setItem('relaNos', JSON.stringify(ssRelaNos))
-  setItem('relaNos', ssRelaNos)
+  setItem('relaNos', ssRelaNos, isSync)
   // sessionStorage.setItem('cltrelaNos', JSON.stringify(ssCltrelaNos))
-  setItem('cltrelaNos', ssCltrelaNos)
+  setItem('cltrelaNos', ssCltrelaNos, isSync)
 
   let ssRelaNosG = getItem('relaNosGlobal')
   ssRelaNosG.push(...oRelaNos)
-  setItem('relaNosGlobal', ssRelaNosG)
+  setItem('relaNosGlobal', ssRelaNosG, isSync)
 }
 
 export default asyncGetRelaNos

package/src/utils/storageEdit.js

@@ -1,19 +1,24 @@
-export function setItem(key, obj) {
+export function setItem(key, obj, sync) {
   window['_keep_' + key] = obj
-  setTimeout(function () {
+  if (sync) {
     sessionStorage.setItem(key, JSON.stringify(obj))
-  }, 100)
+  } else {
+    setTimeout(function () {
+      sessionStorage.setItem(key, JSON.stringify(obj))
+    }, 100)
+  }
 }
 
 export function getItem(key) {
   let obj = window['_keep_' + key]
   if (!obj) {
-    if (key === 'relaNosGlobal') {
+    obj = JSON.parse(sessionStorage.getItem(key))
+
+    if (key === 'relaNosGlobal' && !obj) {
       let relaNos = getItem('relaNos') || []
       obj = relaNos.map((item) => item.relaNos).flat()
-    } else {
-      obj = JSON.parse(sessionStorage.getItem(key))
     }
+
     window['_keep_' + key] = obj
   }
   return obj