Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

layouts/basic-layout/header-notice/index.vue

@@ -6,16 +6,33 @@
                 class="i-layout-header-notice"
                 :class="{ 'i-layout-header-notice-mobile': isMobile }">
             <Icon slot="icon" custom="i-icon i-icon-notification" />
-            <NotificationTab title="通知">
-
-            </NotificationTab>
+            
             <NotificationTab title="消息">
-
+fdsafafafsafafd
             </NotificationTab>
-            <NotificationTab title="待办">
+            <!-- <NotificationTab title="待办">
 
             </NotificationTab>
+            <NotificationTab title="通知">
+
+            </NotificationTab> -->
         </Notification>
+        <Modal
+            v-model="modal"
+            title="msg.title"
+            >
+<div>
+<Row>
+    <Col :span="12">
+    发送时间：{{msg.time}}
+    </Col>
+    
+</Row>
+<div class="content">
+    {{msg.content}}
+</div>
+</div>            
+        </Modal>
     </span>
 </template>
 <script>
@@ -27,13 +44,20 @@
             return {
                 badgeProps: {
                     offset: [20, 0]
-                }
+                },
+                modal:false,
+                msg:{}
             }
         },
         computed: {
             ...mapState('admin/layout', [
                 'isMobile'
             ])
+        },
+        mounted(){             
+             setInterval(()=>{
+                 this.$store.dispatch("loadMessages");
+             },30*1000)
         }
     }
 </script>

package-lock.json

@@ -4688,7 +4688,7 @@
       "dependencies": {
         "commander": {
           "version": "2.14.1",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
+          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
           "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
         }
       }
@@ -5216,7 +5216,7 @@
     },
     "crc-32": {
       "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
+      "resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
       "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
       "requires": {
         "exit-on-epipe": "~1.0.1",
@@ -6908,7 +6908,7 @@
     },
     "exit-on-epipe": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
+      "resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
       "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
     },
     "expand-brackets": {
@@ -7555,7 +7555,7 @@
     },
     "frac": {
       "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
+      "resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
       "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
     },
     "fragment-cache": {
@@ -14590,7 +14590,7 @@
     },
     "printj": {
       "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
+      "resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
       "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
     },
     "private": {
@@ -20051,7 +20051,7 @@
     },
     "script-loader": {
       "version": "0.7.2",
-      "resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz",
+      "resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
       "integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
       "dev": true,
       "requires": {
@@ -20638,7 +20638,7 @@
     },
     "ssf": {
       "version": "0.10.3",
-      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
+      "resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
       "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
       "requires": {
         "frac": "~1.1.2"
@@ -23294,7 +23294,7 @@
     },
     "wmf": {
       "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
+      "resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
       "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
     },
     "word-wrap": {
@@ -23450,7 +23450,7 @@
     },
     "xlsx": {
       "version": "0.15.6",
-      "resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
+      "resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
       "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
       "requires": {
         "adler-32": "~1.2.0",
@@ -23465,7 +23465,7 @@
       "dependencies": {
         "commander": {
           "version": "2.17.1",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
+          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
           "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
         }
       }

store/index.js

 import createVuexAlong from 'vuex-along'
 import Api from '@/plugins/request'
+import Mock from 'mockjs'
 export const state = () => ({
   counter: 0,
   dictionary: new Map(), //所有字典项
@@ -9,6 +10,7 @@ export const state = () => ({
     userId: 0,
     userName: ""
   },
+  messages:[],
   departments:{},//部门列表
   cart: [],
   collect:[],//用户收藏
@@ -94,10 +96,25 @@ export const mutations = {
   setDepartments(state,departmentsMap)
   {
     state.departmentsMap = departmentsMap;
+  },
+  setMessages(state,list){
+    state.messages=list;
   }
 }
 
 export const actions = {
+  async loadMessages({commit}){
+    let data=Mock.mock({
+      "result|1-30":[{
+        id:"@guid",
+        title:"@csentence",
+        content:"@cparagraph(2,8)",
+        read:"@boolean",
+        time:"@datetime"
+      }]
+    })
+    commit("setMessages", data.result);
+  },
   async collectList({
     commit
   }) {