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

front/src/views/home/infrastructurePage.vue

@@ -505,6 +505,9 @@
           }"
         >
           <template #bodyCell="{ column, record }">
+            <template v-if="isXiHaiAn && column.dataIndex === 'status'">
+              <span>{{ statusText[record.status] || '' }}</span>
+            </template>
             <template v-if="column.dataIndex === 'operation'">
               <a
                 v-if="isXiHaiAn"
@@ -550,6 +553,7 @@
           @change="handleTableChange"
         >
           <template #bodyCell="{ column, record }">
+           
             <template v-if="column.dataIndex === 'operation'">
               <a-button
                 @click="goToApply(record)"
@@ -1023,8 +1027,10 @@
   const rowClickData = ref(null)
   // 打开视频预览
   const openVideo = (id, item) => {
-    if (item) {
+    // 单个预览
-      rowClickData.value = item
+    if (item && item.status != 1) {
+      rowClickData.value = item;
+      return message.warning('当前设备离线！')
     }
     console.log('打开视频', id)
     const param = {
@@ -1903,6 +1909,10 @@
   // 表格
   const dataSource = ref([])
   const dataSource2 = ref([])
+  const statusText = ref({
+    0: '离线',
+    1: '在线',
+  })
   const columns = ref([
     {
       title: '名称',
@@ -1915,6 +1925,12 @@
       width: '60%',
       key: 'nodeName',
     },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: '10%',
+      key: 'status',
+    },
     {
       title: '操作',
       dataIndex: 'operation',