Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/home/infrastructurePage.vue

@@ -312,7 +312,7 @@
               <span>{{ statusText[record.status] || '' }}</span>
             </template>
             <template v-if="column.dataIndex === 'operation'">
-              <a @click="
+              <a :class="record.status != 1 ? 'disabled-text' : ''" @click="
                 openVideo(
                   record.channelCode ||
                     record.channelId ||
@@ -758,7 +758,8 @@ const openVideo = (id, item) => {
   rowClickData.value = item
   // 单个预览
   if (item && item.status != 1) {
-    return message.warning('当前设备离线, 不可预览！')
+    return
+    // return message.warning('当前设备离线, 不可预览！')
   }
   console.log('打开视频', id)
   const param = {
@@ -2367,4 +2368,13 @@ video::-webkit-media-controls {
   bottom: 30px;
   text-align: right;
 }
+
+.disabled-text {
+  cursor: not-allowed;
+  opacity: 0.5;
+  color: #666666;
+  &:hover {
+    color: #666666;
+  }
+}
 </style>

front/src/views/mynoticeView/components/NoticeList.vue

@@ -262,35 +262,27 @@ const goPage = (item) => {
     }
   }
 }
-let isQingDao = whoShow.itShowQingDao;
 
 // 更改消息状态
 const read = (item) => {
   if (selectData.value.length === 0 && !item) {
-    message.error('未选择消息！')
+    return message.error('未选择消息！')
-    return
   }
   console.log(selectData.value)
   if (item) {
-    // 已读状态
+    // 已读状态,跳转页面
     if (item.readStatus === 1) {
-      if(isQingDao) {
+      return goPage(item)
-        goPage(item)
-      }
-      // 跳转页面
-      return
     }
     mynoticeRead(item.id).then((res) => {
       if (res.data.code == 0) {
         message.success('通知已读！')
         mybus.emit('getMynotice')
         init()
-        if (isQingDao) {
+        // 页面跳转
-          // 页面跳转
+        setTimeout(() => {
-          setTimeout(() => {
+          goPage(item)
-            goPage(item)
+        }, 1500)
-          }, 1000)
-        }
       } else {
         message.error('操作失败！')
       }

front/src/views/personalCenter/components/asideMenu.vue

@@ -85,19 +85,15 @@ export default defineComponent({
     }
 
     onMounted(() => {
-      if (itShowXiHaiAn) {
+      if (type) {
-        handleClick(menuList[0])
+        console.log('type---------->', type)
+        let _obj = menuList.find(v => v.key == type)
+        handleClick(_obj)
       } else {
-        if (type) {
+        if (menuList[1]) {
-          console.log('type---------->', type)
+          handleClick(menuList[1])
-          let _obj = menuList.find(v => v.key == type)
-          handleClick(_obj)
         } else {
-          if (menuList[1]) {
+          handleClick(menuList[0])
-            handleClick(menuList[1])
-          }else {
-            handleClick(menuList[0])
-          }
         }
       }
     })