lxh пре 1 година
родитељ
комит
ade622eb4c

+ 1 - 1
src/views/vent/home/colliery/clique.api.ts

@@ -1,7 +1,7 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  list = '/ventanaly-device/safety/ventanalyDevice/homedata',
+  list = '/ventanaly-device/safety/ventanalyDevice/homedata2',
 }
 /**
  * 列表接口

+ 66 - 44
src/views/vent/home/colliery/components/wind-device.vue

@@ -12,24 +12,26 @@
           <div
             class="level-text"
             :class="{
-              'level-text-1': item.level == 1,
-              'level-text-2': item.level == 2,
-              'level-text-3': item.level == 3,
-              'level-text-4': item.level == 4,
-              'level-text-5': item.level == 5,
+                'level-text-0': item.level == 0,
+              'level-text-1': item.level == 101,
+              'level-text-2': item.level == 102,
+              'level-text-3': item.level == 103,
+              'level-text-4': item.level == 104,
+              'level-text-5': item.level == 201,
+              'level-text-6':item.level!=0 && item.level!=101 && item.level!=102 && item.level!=103 && item.level!=104 && item.level!=201
             }"
             >{{
-              item.level == 1
+              item.level == 0
                 ? '正常'
-                : item.level == 2
+                : item.level == 101
+                ? '较低风险'
+                : item.level == 102
                 ? '低风险'
-                : item.level == 3
+                : item.level ==103
                 ? '中风险'
-                : item.level == 4
+                : item.level == 104
                 ? '高风险'
-                : item.level == 5
-                ? '报警'
-                : ''
+                : item.level==201 ? '报警' : '未连接'
             }}</div
           >
         </div>
@@ -46,29 +48,29 @@
   });
   const emit = defineEmits(['goDetail'])
   let iconsMonitor = reactive({
-    1: {
+    'fanmain': {
       url: getAssetURL('home-container/device/zhushan.png'),
-      level: 1,
+      level: 0,
       text: '主风机',
     },
-    2: {
+    'fanlocal': {
       url: getAssetURL('home-container/device/js.png'),
-      level: 1,
+      level: 0,
       text: '局部风机',
     },
-    3: {
+    'gate': {
       url: getAssetURL('home-container/device/fm.png'),
-      level: 1,
+      level: 0,
       text: '风门',
     },
-    4: {
+    'window': {
       url: getAssetURL('home-container/device/fc.png'),
-      level: 1,
+      level: 0,
       text: '风窗',
     },
-    5: {
+    'windrect': {
       url: getAssetURL('home-container/device/cf.png'),
-      level: 1,
+      level: 0,
       text: '测风装置',
     },
     // 6: {
@@ -131,7 +133,10 @@
     () => props.devicedata,
     (val) => {
       console.log(val, '设备数据');
-     
+     Object.keys(iconsMonitor).forEach(el=>{
+      iconsMonitor[el].level=val[el].maxLevel
+     })
+     console.log(iconsMonitor,'icon---000')
     },
     {
       deep: true,
@@ -201,27 +206,44 @@
             font-family: 'douyuFont';
             font-size: 12px;
           }
-          .level-text-1 {
-            color: rgb(0, 242, 255);
-            text-shadow: 2px 2px 4px #001c22;
-          }
-          .level-text-2 {
-            color: #ffff35;
-            text-shadow: 2px 2px 4px #313100;
-          }
-          .level-text-3 {
-            color: #ffbe69;
-            text-shadow: 2px 2px 4px #271600;
-          }
-          .level-text-4 {
-            color: #ff6f00;
-            // color: #09caff;
-            text-shadow: 2px 2px 4px #060200;
-          }
-          .level-text-5 {
-            color: #ff0000;
-            text-shadow: 2px 2px 4px #200000;
-          }
+
+
+  .level-text-0 {
+          color: rgb(145, 230, 9);
+          text-shadow: 2px 2px 4px #001c22;
+        }
+
+        .level-text-1 {
+          color: rgb(0, 242, 255);
+          text-shadow: 2px 2px 4px #001c22;
+        }
+
+        .level-text-2 {
+          color: #ffff35;
+          text-shadow: 2px 2px 4px #313100;
+        }
+
+        .level-text-3 {
+          color: #ffbe69;
+          text-shadow: 2px 2px 4px #271600;
+        }
+
+        .level-text-4 {
+          color: #ff6f00;
+          // color: #09caff;
+          text-shadow: 2px 2px 4px #060200;
+        }
+
+        .level-text-5 {
+          color: #ff0000;
+          text-shadow: 2px 2px 4px #200000;
+        }
+
+        .level-text-6 {
+          color: #bbb;
+          text-shadow: 2px 2px 4px #001c22;
+        }
+
           img {
             width: 208px;
             height: 69px;

+ 2 - 2
src/views/vent/monitorManager/windrectMonitor/index.vue

@@ -7,9 +7,9 @@
     <div class="top-box">
       <div class="top-center row">
         <!-- <div class="button-box" @click="start(0)">复位</div> -->
-        <div class="button-box" @click="testPlay('')">模拟动画</div>
+        <!-- <div class="button-box" @click="testPlay('')">模拟动画</div>
         <div class="button-box" @click="clearPlay()">自动清洁</div>
-        <div class="button-box" @click="startRun()">启动测风</div>
+        <div class="button-box" @click="startRun()">启动测风</div> -->
         <!-- <div class="button-box" @click="testPlay('up')">上</div>
         <div class="button-box" @click="testPlay('center')">中</div>
         <div class="button-box" @click="testPlay('down')">下</div>

+ 1 - 1
src/views/vent/monitorManager/windrectMonitor/windrect.threejs.ts

@@ -6,7 +6,7 @@ import zdWindRect from './zhedie.threejs';
 import dsWindRect from './duishe.threejs';
 import ddWindRect from './dantou.threejs';
 import lmWindRectSide from './longmenSide.threejs';
-// import fixedWindRect from './duisheFixed.threejs';
+import fixedWindRect from './duisheFixed.threejs';
 import useEvent from '../../../../utils/threejs/useEvent';
 import gsap from 'gsap';
 // import * as dat from 'dat.gui';