Browse Source

视频墙更新

lxh 1 month ago
parent
commit
d7233079e2

+ 7 - 7
src/views/vent/monitorManager/alarmMonitor/warn/ventilateWarn.vue

@@ -350,8 +350,8 @@
             value: el.netStatus == '0' ? '断开' : '连接',
             listR: [
               { id: 0, label: '安装位置', dw: '', value: el.strinstallpos },
-              { id: 1, label: '风量', dw: '(m³/min)', value: el.m3 },
-              { id: 2, label: '风速', dw: '(m/s)', value: el.va },
+              { id: 1, label: '风量', dw: '(m³/min)', value: el.m3 || '--' },
+              { id: 2, label: '风速', dw: '(m/s)', value: el.va || '--' },
               { id: 4, label: '时间', dw: '', value: el.readTime },
               {
                 id: 3,
@@ -457,7 +457,7 @@
 
       .alarm-menu {
         height: 100%;
-        // width: 200px;
+        width: 332px;
         padding: 10px;
         box-sizing: border-box;
 
@@ -497,7 +497,7 @@
         }
 
         .card-btn {
-          width: 240px;
+          width: 100%;
           height: calc(100% - 50px);
           overflow-y: auto;
 
@@ -526,7 +526,7 @@
               width: 100%;
               position: absolute;
               left: 50%;
-              bottom: 11px;
+              bottom: 8px;
               font-size: 12px;
               color: var(--vent-font-color);
               text-align: center;
@@ -559,7 +559,7 @@
               width: 100%;
               position: absolute;
               left: 50%;
-              bottom: 11px;
+              bottom: 8px;
               font-size: 14px;
               color: var(--vent-font-color);
               text-align: center;
@@ -598,7 +598,7 @@
 
       .ventilate-content {
         height: 100%;
-        width: 100%;
+        width: calc(100% - 332px);
         padding: 10px 0px;
         box-sizing: border-box;
         margin-right: 10px;

+ 4 - 5
src/views/vent/monitorManager/camera/index.vue

@@ -90,7 +90,7 @@
       });
       res.forEach((el) => {
         el.pid = 0;
-        (el.isFolder = true), (el.expanded = false), (el.title = el.itemText);
+        el.isFolder = true; el.expanded = false; el.title = el.itemText;
         el.id = el.subDictId;
         el.children = [];
         listArr[0].children.push(el);
@@ -421,10 +421,9 @@
   }
 
   onMounted(async () => {
-    await getCameraDevKindList();
-    await getVideoAddrs();
-    // getTreeList()
-    getVideo();
+     await getCameraDevKindList();
+    // await getVideoAddrs();  
+    // getVideo();
   });
 
   onUnmounted(() => {