消息中心更改

package-lock.json

@@ -1724,6 +1724,14 @@
       "integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=",
       "dev": true
     },
+    "aes-decrypter": {
+      "version": "1.0.3",
+      "resolved": "https://registry.nlark.com/aes-decrypter/download/aes-decrypter-1.0.3.tgz",
+      "integrity": "sha1-nAa4pUNaWtCduTP4oBSvzxhMw04=",
+      "requires": {
+        "pkcs7": "^0.2.3"
+      }
+    },
     "aggregate-error": {
       "version": "3.0.1",
       "resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.0.1.tgz?cache=0&sync_timestamp=1570167911603&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.0.1.tgz",
@@ -4140,6 +4148,11 @@
         }
       }
     },
+    "dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npm.taobao.org/dom-walk/download/dom-walk-0.1.2.tgz",
+      "integrity": "sha1-DFSL7wSPTR8qlySQAiNgYNqj/YQ="
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz?cache=0&sync_timestamp=1575171286896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomain-browser%2Fdownload%2Fdomain-browser-1.2.0.tgz",
@@ -4369,6 +4382,11 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "es5-shim": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmmirror.com/es5-shim/download/es5-shim-4.6.2.tgz",
+      "integrity": "sha1-gnzdDG+1vrJv02jWVDDoterrqUI="
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz",
@@ -5961,6 +5979,22 @@
       "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
       "dev": true
     },
+    "global": {
+      "version": "4.3.2",
+      "resolved": "https://registry.nlark.com/global/download/global-4.3.2.tgz",
+      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "requires": {
+        "min-document": "^2.19.0",
+        "process": "~0.5.1"
+      },
+      "dependencies": {
+        "process": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npm.taobao.org/process/download/process-0.5.2.tgz",
+          "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
+        }
+      }
+    },
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz",
@@ -6473,6 +6507,11 @@
       "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
       "dev": true
     },
+    "individual": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/individual/download/individual-2.0.0.tgz",
+      "integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c="
+    },
     "infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npm.taobao.org/infer-owner/download/infer-owner-1.0.4.tgz",
@@ -6731,6 +6770,11 @@
       "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
       "dev": true
     },
+    "is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/is-function/download/is-function-1.0.2.tgz",
+      "integrity": "sha1-Twl/MKv2762smDOxfKXcA/gUTgg="
+    },
     "is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz",
@@ -7367,6 +7411,11 @@
         "yallist": "^3.0.2"
       }
     },
+    "m3u8-parser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.nlark.com/m3u8-parser/download/m3u8-parser-2.1.0.tgz",
+      "integrity": "sha1-yBcDKewc1RXQ1Yu4t2LamJbLA2g="
+    },
     "make-dir": {
       "version": "2.1.0",
       "resolved": "http://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz",
@@ -7556,6 +7605,14 @@
       "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
       "dev": true
     },
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npm.taobao.org/min-document/download/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "requires": {
+        "dom-walk": "^0.1.0"
+      }
+    },
     "mini-css-extract-plugin": {
       "version": "0.8.0",
       "resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.8.0.tgz",
@@ -7760,6 +7817,11 @@
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
       "dev": true
     },
+    "mux.js": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmmirror.com/mux.js/download/mux.js-4.3.2.tgz",
+      "integrity": "sha1-V21TffA33F7DXsExa5SNgV01whA="
+    },
     "mz": {
       "version": "2.7.0",
       "resolved": "http://registry.npm.taobao.org/mz/download/mz-2.7.0.tgz",
@@ -7976,8 +8038,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -8334,6 +8395,11 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "parse-headers": {
+      "version": "2.0.4",
+      "resolved": "https://registry.nlark.com/parse-headers/download/parse-headers-2.0.4.tgz?cache=0&sync_timestamp=1628092214952&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fparse-headers%2Fdownload%2Fparse-headers-2.0.4.tgz",
+      "integrity": "sha1-nq8tAr7S0e/0lDMc498215JHYL8="
+    },
     "parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npm.taobao.org/parse-json/download/parse-json-4.0.0.tgz",
@@ -8474,6 +8540,11 @@
         "pinkie": "^2.0.0"
       }
     },
+    "pkcs7": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npm.taobao.org/pkcs7/download/pkcs7-0.2.3.tgz",
+      "integrity": "sha1-ItYGZtAQZcXyRDkJjkpIMEUic74="
+    },
     "pkg-dir": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
@@ -9194,8 +9265,7 @@
     "process": {
       "version": "0.11.10",
       "resolved": "http://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
       "version": "2.0.1",
@@ -10057,6 +10127,14 @@
         "aproba": "^1.1.1"
       }
     },
+    "rust-result": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/rust-result/download/rust-result-1.0.0.tgz",
+      "integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
+      "requires": {
+        "individual": "^2.0.0"
+      }
+    },
     "rxjs": {
       "version": "6.5.3",
       "resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.3.tgz?cache=0&sync_timestamp=1568815796923&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frxjs%2Fdownload%2Frxjs-6.5.3.tgz",
@@ -10076,6 +10154,14 @@
       "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz",
       "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
     },
+    "safe-json-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.nlark.com/safe-json-parse/download/safe-json-parse-4.0.0.tgz",
+      "integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
+      "requires": {
+        "rust-result": "^1.0.0"
+      }
+    },
     "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz?cache=0&sync_timestamp=1571687334026&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsafe-regex%2Fdownload%2Fsafe-regex-1.1.0.tgz",
@@ -11253,6 +11339,11 @@
       "integrity": "sha1-w8GflZc/sKYpc/sJ2Q2WHuQ+XIo=",
       "dev": true
     },
+    "tsml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/tsml/download/tsml-1.0.1.tgz",
+      "integrity": "sha1-ifghi52eJX9H1/a1bQHFpNLGj8M="
+    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz",
@@ -11521,6 +11612,11 @@
         "requires-port": "^1.0.0"
       }
     },
+    "url-toolkit": {
+      "version": "2.2.3",
+      "resolved": "https://registry.nlark.com/url-toolkit/download/url-toolkit-2.2.3.tgz",
+      "integrity": "sha1-ePqQEhWrusNBggZpMiICebgEUis="
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npm.taobao.org/use/download/use-3.1.1.tgz",
@@ -11621,6 +11717,99 @@
         "extsprintf": "^1.2.0"
       }
     },
+    "video.js": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmmirror.com/video.js/download/video.js-6.13.0.tgz",
+      "integrity": "sha1-+Uh9RjJzQPpI7NUTcqKYHbts3kw=",
+      "requires": {
+        "babel-runtime": "^6.9.2",
+        "global": "4.3.2",
+        "safe-json-parse": "4.0.0",
+        "tsml": "1.0.1",
+        "videojs-font": "2.1.0",
+        "videojs-ie8": "1.1.2",
+        "videojs-vtt.js": "0.12.6",
+        "xhr": "2.4.0"
+      }
+    },
+    "videojs-contrib-hls": {
+      "version": "5.15.0",
+      "resolved": "https://registry.nlark.com/videojs-contrib-hls/download/videojs-contrib-hls-5.15.0.tgz",
+      "integrity": "sha1-/klXNn5daLfSP3jtMuN6ndiSoKg=",
+      "requires": {
+        "aes-decrypter": "1.0.3",
+        "global": "^4.3.0",
+        "m3u8-parser": "2.1.0",
+        "mux.js": "4.3.2",
+        "url-toolkit": "^2.1.3",
+        "video.js": "^5.19.1 || ^6.2.0",
+        "videojs-contrib-media-sources": "4.7.2",
+        "webwackify": "0.1.6"
+      }
+    },
+    "videojs-contrib-media-sources": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npm.taobao.org/videojs-contrib-media-sources/download/videojs-contrib-media-sources-4.7.2.tgz",
+      "integrity": "sha1-Ct+SkQfVt0zyyKuygkyCF35DhY4=",
+      "requires": {
+        "global": "^4.3.0",
+        "mux.js": "4.3.2",
+        "video.js": "^5.17.0 || ^6.2.0",
+        "webwackify": "0.1.6"
+      }
+    },
+    "videojs-flash": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npm.taobao.org/videojs-flash/download/videojs-flash-2.2.1.tgz",
+      "integrity": "sha1-GiJduxztIArpu/FeAf5KYQhtkPE=",
+      "requires": {
+        "global": "^4.4.0",
+        "video.js": "^6 || ^7",
+        "videojs-swf": "5.4.2"
+      },
+      "dependencies": {
+        "global": {
+          "version": "4.4.0",
+          "resolved": "https://registry.nlark.com/global/download/global-4.4.0.tgz",
+          "integrity": "sha1-PnsQUXkAajI+1xqvyj6cV6XMZAY=",
+          "requires": {
+            "min-document": "^2.19.0",
+            "process": "^0.11.10"
+          }
+        }
+      }
+    },
+    "videojs-font": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/videojs-font/download/videojs-font-2.1.0.tgz",
+      "integrity": "sha1-olkwpn9snPvyu4jay4xrRR8JM3k="
+    },
+    "videojs-hotkeys": {
+      "version": "0.2.27",
+      "resolved": "https://registry.nlark.com/videojs-hotkeys/download/videojs-hotkeys-0.2.27.tgz",
+      "integrity": "sha1-Dfl5Urnf8ObMHPikOf7X6snHPwE="
+    },
+    "videojs-ie8": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/videojs-ie8/download/videojs-ie8-1.1.2.tgz",
+      "integrity": "sha1-oj09hgitcZK2nGB3/E64SJmNNdk=",
+      "requires": {
+        "es5-shim": "^4.5.1"
+      }
+    },
+    "videojs-swf": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npm.taobao.org/videojs-swf/download/videojs-swf-5.4.2.tgz",
+      "integrity": "sha1-aWSpv/kDtzLz5GUxSuR4oCoX6Ks="
+    },
+    "videojs-vtt.js": {
+      "version": "0.12.6",
+      "resolved": "https://registry.npm.taobao.org/videojs-vtt.js/download/videojs-vtt.js-0.12.6.tgz",
+      "integrity": "sha1-4HhgC9qJnqpvnDMHE0zQyBGUe44=",
+      "requires": {
+        "global": "^4.3.1"
+      }
+    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz?cache=0&sync_timestamp=1572870776965&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvm-browserify%2Fdownload%2Fvm-browserify-1.1.2.tgz",
@@ -11722,6 +11911,18 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "vue-video-player": {
+      "version": "5.0.2",
+      "resolved": "https://registry.nlark.com/vue-video-player/download/vue-video-player-5.0.2.tgz",
+      "integrity": "sha1-NKQiOf8wTvx2mNogpBZQUddmweY=",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "video.js": "^6.6.0",
+        "videojs-contrib-hls": "^5.12.2",
+        "videojs-flash": "^2.1.0",
+        "videojs-hotkeys": "^0.2.20"
+      }
+    },
     "vue2-verify": {
       "version": "1.1.5",
       "resolved": "https://registry.npm.taobao.org/vue2-verify/download/vue2-verify-1.1.5.tgz",
@@ -12098,6 +12299,11 @@
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
       "dev": true
     },
+    "webwackify": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npm.taobao.org/webwackify/download/webwackify-0.1.6.tgz",
+      "integrity": "sha1-HUKhKsYYI9fjRaveCE6qpipKles="
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz",
@@ -12206,11 +12412,21 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xhr": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npm.taobao.org/xhr/download/xhr-2.4.0.tgz",
+      "integrity": "sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=",
+      "requires": {
+        "global": "~4.3.0",
+        "is-function": "^1.0.1",
+        "parse-headers": "^2.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",
-      "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=",
-      "dev": true
+      "integrity": "sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q="
     },
     "y18n": {
       "version": "4.0.0",

src/views/messageCenter/index.vue

@@ -28,14 +28,20 @@
           name="消息信息"
           :badge="messageNewsNum.消息信息 > 0 ? messageNewsNum.消息信息 : ''"
         >
-          <message-news :actives="activeName"></message-news>
+          <message-news
+            :actives="activeName"
+            :messageNewsNum="messageNewsNum"
+          ></message-news>
         </van-tab>
         <van-tab
           title="通知公告"
           name="通知公告"
           :badge="messageNewsNum.通知公告 > 0 ? messageNewsNum.通知公告 : ''"
         >
-          <notice-info :actives="activeName"></notice-info>
+          <notice-info
+            :actives="activeName"
+            :messageNewsNum="messageNewsNum"
+          ></notice-info>
         </van-tab>
       </van-tabs>
     </div>

src/views/messageCenter/messageNews/index.vue

@@ -17,7 +17,12 @@
             >{{ item.category }}</span
           >
 
-          <span class="my-tag-style" @click="clearNo()">清除未读</span>
+          <span
+            class="my-tag-style"
+            v-if="messageNewsNum.消息信息 > 0"
+            @click="clearNo()"
+            >清除未读</span
+          >
         </div>
 
         <!-- 搜索 -->
@@ -63,6 +68,11 @@
               </div>
             </van-badge>
           </van-cell-group>
+          <van-image
+            v-if="messageList.length <= 0"
+            fit="contain"
+            :src="require('../../../assets/noMessage.png')"
+          />
         </div>
       </div>
     </van-pull-refresh>
@@ -78,8 +88,14 @@ import {
 } from "@/service/message";
 export default {
   props: {
-    actives: String,
-    default: () => "",
+    actives: {
+      type: String,
+      default: () => "",
+    },
+    messageNewsNum: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -198,10 +214,8 @@ export default {
     touchstart(index, item) {
       this.read(item);
       this.$router.push({
-        name: "message-details",
-        params: {
-          id: JSON.stringify(item),
-        },
+        path: item.appUrl,
+        query: {},
       });
     },
 

src/views/messageCenter/noticeInfo/index.vue

@@ -19,21 +19,26 @@
             @click="selectCategory(index, item.category)"
             >{{ item.category }}</span
           >
-          <span class="my-tag-style" @click="clearNo()">清除未读</span>
+          <span
+            class="my-tag-style"
+            v-if="messageNewsNum.通知公告 > 0"
+            @click="clearNo()"
+            >清除未读</span
+          >
         </div>
 
         <!-- 搜索 -->
         <div class="search-wrap">
-          <!-- <van-search
-          v-model="searchVal"
-          show-action
-          placeholder="请输入检查名称"
-          @search="onSearch"
-        >
-          <template #action>
-            <div @click="onSearch">搜索</div>
-          </template>
-        </van-search> -->
+          <van-search
+            v-model="searchVal"
+            show-action
+            placeholder="请输入检查名称"
+            @search="onSearch"
+          >
+            <template #action>
+              <div @click="onSearch">搜索</div>
+            </template>
+          </van-search>
           <!-- <van-search
           v-model="searchVal"
           placeholder="搜索"
@@ -65,6 +70,11 @@
               </div>
             </van-badge>
           </van-cell-group>
+          <van-image
+            v-if="notificationList.length <= 0"
+            fit="contain"
+            :src="require('../../../assets/noMessage.png')"
+          />
         </div>
       </div>
     </van-pull-refresh>
@@ -81,8 +91,14 @@ import {
 } from "@/service/message";
 export default {
   props: {
-    actives: String,
-    default: () => "",
+    actives: {
+      type: String,
+      default: () => "",
+    },
+    messageNewsNum: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {

src/views/messageCenter/waitEvent/index.vue

@@ -49,13 +49,20 @@
                   <span>{{ item.title }}</span>
                   <span>{{ item.createTime }}</span>
                 </div>
-                <div class="message-content">{{ item.content }}</div>
+                <div class="message-content">
+                  {{ item.content }},{{ item.createBy }}
+                </div>
                 <div class="bot_but">
                   <van-button color="#33CCFF" size="mini">立即处理</van-button>
                 </div>
               </div>
             </van-badge>
           </van-cell-group>
+          <van-image
+            v-if="waitList.length <= 0"
+            fit="contain"
+            :src="require('../../../assets/noMessage.png')"
+          />
         </div>
       </div>
     </van-pull-refresh>