Merge branch 'dev' of http://192.168.2.236:10080/zhouna/ai-admin into dev

src/components/AHeader/index.js

@@ -64,13 +64,14 @@ function AHeader({ history, hideName }) {
     }
     //未读消息页面显示并带入未读筛选条件
     function showMyMsgPage(){
-        const item = panes.find((it) => it.key === 'ZNTZ-WDTZ');
+        const pageKey = 'ZNTZ-WDTZ&我的通知';
+        const item = panes.find((it) => it.key === pageKey);
         if (item) {   //已存在当前tab，则定位即可不增加
-            dispatch(active({idName:'ZNTZ-WDTZ',isUnRead:true}));
+            dispatch(active({idName:pageKey,isUnRead:true}));
             return;
         }
         dispatch(
-            add({ title: '我的通知', content: <MyMessage />, key: 'ZNTZ-WDTZ&我的通知',isUnRead:true})
+            add({ title: '我的通知', content: <MyMessage />, key: pageKey,isUnRead:true})
         )
     }
     async function initWebsocket(num){