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

front/src/views/home/components/header.vue

@@ -1,11 +1,8 @@
 <template>
-  <div
-    class="home-header"
-    :class="[
+  <div class="home-header" :class="[
     select !== 'home' || scrollTop > 500 ? 'white' : '',
     props.showView === 'algorithm-details' ? '' : '',
-    ]"
-  >
+  ]">
     <div class="name" @click="goToHome">
       <div class="name-bg" v-if="!itShowXiHaiAn"></div>
       <div class="name-bg-xihaian" v-else></div>
@@ -14,52 +11,26 @@
         <p>(United Capacity System)</p>
       </div>
     </div>
-    <div
-      v-for="item in navList"
-      :key="item.key"
-      @click="jumpPage(item)"
-      class="nav"
-      :class="item.key == select ? 'select' : ''"
-    >
+    <div v-for="item in navList" :key="item.key" @click="jumpPage(item)" class="nav"
+      :class="item.key == select ? 'select' : ''">
       {{ item.name }}
     </div>
     <!-- 购物车 -->
     <a-badge :count="sgcNum">
-      <svg
-        t="1650455446850"
-        class="icon"
-        viewBox="0 0 1024 1024"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg"
-        p-id="2069"
-        width="0.4rem"
-        height="0.4rem"
-        @click="goToSgc"
-      >
+      <svg t="1650455446850" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+        p-id="2069" width="0.4rem" height="0.4rem" @click="goToSgc">
         <path
           d="M384 832v85.333333h-85.333333v-85.333333h85.333333z m405.333333 0v85.333333h-85.333333v-85.333333h85.333333zM240.32 185.002667l24.149333 140.928h633.173334L835.285333 746.666667h-563.626666l-85.333334-497.685334H94.485333v-64h145.834667z m583.104 204.928H275.434667L325.632 682.666667h454.464l43.328-292.736z"
-          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'"
-          p-id="2070"
-        ></path>
+          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'" p-id="2070"></path>
       </svg>
     </a-badge>
     <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
       <!-- 消息提醒 -->
-      <svg
-        t="1654051054113"
-        class="icon2"
-        viewBox="0 0 1024 1024"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg"
-        p-id="2187"
-        width="0.35rem"
-        height="0.35rem"
-      >
+      <svg t="1654051054113" class="icon2" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+        p-id="2187" width="0.35rem" height="0.35rem">
         <path
           d="M544 161.536a330.666667 330.666667 0 0 1 298.666667 329.130667h-0.341334c0.213333 1.493333 0.341333 2.986667 0.341334 4.565333v219.434667h39.68a32 32 0 0 1 0 64h-212.053334a160 160 0 0 1-316.586666 0H141.909333a32 32 0 1 1 0-64h39.424v-219.434667c0-1.578667 0.128-3.072 0.341334-4.565333H181.333333a330.666667 330.666667 0 0 1 298.666667-329.130667V128a32 32 0 1 1 64 0v33.536z m-298.666667 553.130667h533.333334v-219.434667c0-1.578667 0.128-3.072 0.341333-4.565333h-0.341333a266.666667 266.666667 0 1 0-533.333334 0h-0.341333c0.213333 1.493333 0.341333 2.986667 0.341333 4.565333v219.434667z m359.765334 64H418.901333a96 96 0 0 0 186.197334 0z"
-          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'"
-          p-id="2188"
-        ></path>
+          :fill="props.showView === 'algorithm-details' ? '#1296db' : '#1296db'" p-id="2188"></path>
       </svg>
       <!-- <a-avatar shape="square" size="large" /> -->
     </a-badge>
@@ -88,10 +59,7 @@
         <template #title>
           <span>{{ user.realName }}</span>
         </template>
-        <span
-          class="name"
-          @click="jumpPage({ name: '个人中心', key: 'personalCenter' })"
-        >
+        <span class="name" @click="jumpPage({ name: '个人中心', key: 'personalCenter' })">
           {{ user.realName }}
         </span>
       </a-tooltip>
@@ -114,11 +82,7 @@
           fill="#bfbfbf"
         ></path>
       </svg> -->
-      <i
-        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })"
-        class="iconTo"
-        v-show="backFlag"
-      ></i>
+      <i @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' })" class="iconTo" v-show="backFlag"></i>
     </div>
   </div>
 </template>
@@ -180,6 +144,14 @@
 }
 // 返回首页
 const goToHome = () => {
+  // 西海岸
+  if (itShowXiHaiAn.value) {
+    if (
+      !xhaHasPermissionUser.list.includes(user.value.username)
+    ) {
+      return message.warn('暂无权限')
+    }
+  }
   router.push({
     path: '/home',
   })
@@ -397,8 +369,7 @@
     .name-bg-xihaian {
       height: 0.6rem;
       width: 0.6rem;
-        background: url('~@/assets/newHome/newHome-title-bg-xihaian.png')
-          no-repeat;
+      background: url('~@/assets/newHome/newHome-title-bg-xihaian.png') no-repeat;
       background-size: 100%;
       margin-right: 0.15rem;
     }
@@ -517,11 +488,9 @@
 
 .blue {
   position: absolute;
-    background: linear-gradient(
-      to right,
+  background: linear-gradient(to right,
       rgba(15, 90, 253, 0.8),
-      rgba(36, 25, 248, 0.8)
-    );
+      rgba(36, 25, 248, 0.8));
 
   .name {
     color: #fff;
@@ -572,6 +541,7 @@
 }
 
 :deep(.ant-list-item-meta-title) {
+
   // display: flex;
   // justify-content: space-around;
   // align-items: center;

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
+    return message.error('未选择消息！')
   }
   console.log(selectData.value)
   if (item) {
-    // 已读状态
+    // 已读状态,跳转页面
     if (item.readStatus === 1) {
-      if(isQingDao) {
-        goPage(item)
-      }
-      // 跳转页面
-      return
+      return goPage(item)
     }
     mynoticeRead(item.id).then((res) => {
       if (res.data.code == 0) {
         message.success('通知已读！')
         mybus.emit('getMynotice')
         init()
-        if (isQingDao) {
         // 页面跳转
         setTimeout(() => {
           goPage(item)
-          }, 1000)
-        }
+        }, 1500)
       } else {
         message.error('操作失败！')
       }

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

@@ -85,9 +85,6 @@ export default defineComponent({
     }
 
     onMounted(() => {
-      if (itShowXiHaiAn) {
-        handleClick(menuList[0])
-      } else {
       if (type) {
         console.log('type---------->', type)
         let _obj = menuList.find(v => v.key == type)
@@ -99,7 +96,6 @@ export default defineComponent({
           handleClick(menuList[0])
         }
       }
-      }
     })
 
     return {