窝兔沟5.5首页修改提交

src/views/vent/home/colliery/components/device-warn.vue

@@ -52,7 +52,6 @@
 
   //跳转详情
   function getDetail() {
-    console.log('跳转详情');
     emit('goDetail', 'warning');
   }
   watch(

src/views/vent/home/colliery/components/fan-monitor.vue

@@ -52,7 +52,7 @@ function getDetail() {
 }
 //选项切换
 function changeSelect(val) {
-  searchValue.value=val
+  searchValue.value = val
   switch (val) {
     case '局扇监测':
       fjStatus.value =
@@ -76,6 +76,17 @@ function changeSelect(val) {
       echartData.ydata = fanList.filter((v) => v.strinstallpos == '局部通风机系统')[0].readData.windQuantity2;
       getOption();
       break;
+    case '地址1':
+      fjStatus.value =
+        fanList.filter((v) => v.strinstallpos == '地址1')[0].readData.Fan1StartStatus == '1'
+          ? '1号风机'
+          : fanList.filter((v) => v.strinstallpos == '地址1')[0].readData.Fan2StartStatus == '1'
+            ? '2号风机'
+            : '';
+      echartData.xdata = fanList.filter((v) => v.strinstallpos == '地址1')[0].readData.windQuantity1;
+      echartData.ydata = fanList.filter((v) => v.strinstallpos == '地址1')[0].readData.windQuantity2;
+      getOption();
+      break;
   }
 }
 function getOption() {
@@ -395,4 +406,5 @@ onMounted(() => { });
 
 :deep .zxm-select-arrow {
   color: #fff !important;
-}</style>
+}
+</style>

src/views/vent/home/colliery/components/main-monitor.vue

@@ -48,7 +48,6 @@ let echartData = reactive<any>({
 
 //跳转详情
 function getDetail() {
-  console.log('跳转详情');
   emit('goDetail', 'fanMain');
 }
 //选项切换
@@ -87,6 +86,22 @@ function changeSelect(val) {
       setChart(objParam, objParam1);
       getOption();
       break;
+
+    case '主通风机主机':
+      objParam = {
+        dataQ: mainList[0].readData.m3,
+        dataH: mainList[0].readData.DataPa,
+      }
+      objParam1 = {
+        dataha0: -0.056,
+        dataha1: 3.6491,
+        dataha2: 434.4,
+        dataha3: 100,
+        dataha4: -1000,
+      }
+      setChart(objParam, objParam1);
+      getOption();
+      break;
   }
 }
 

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

@@ -71,51 +71,51 @@
       level: 1,
       text: '测风装置',
     },
-    6: {
-      url: getAssetURL('home-container/device/yafeng.png'),
-      level: 1,
-      text: '压风装置',
-    },
-    7: {
-      url: getAssetURL('home-container/device/penlin.png'),
-      level: 1,
-      text: '喷淋',
-    },
-    8: {
-      url: getAssetURL('home-container/device/penfen.png'),
-      level: 1,
-      text: '喷粉',
-    },
-    9: {
-      url: getAssetURL('home-container/device/zhudan.png'),
-      level: 1,
-      text: '注氮',
-    },
-    10: {
-      url: getAssetURL('home-container/device/zhujiang.png'),
-      level: 1,
-      text: '注浆',
-    },
-    11: {
-      url: getAssetURL('home-container/device/pw.png'),
-      level: 1,
-      text: '跟机喷雾',
-    },
-    12: {
-      url: getAssetURL('home-container/device/ccq.png'),
-      level: 1,
-      text: '除尘器',
-    },
-    13: {
-      url: getAssetURL('home-container/device/wasibeng.png'),
-      level: 1,
-      text: '瓦斯泵',
-    },
-    14: {
-      url: getAssetURL('home-container/device/js.png'),
-      level: 1,
-      text: '瓦斯抽采管路',
-    },
+    // 6: {
+    //   url: getAssetURL('home-container/device/yafeng.png'),
+    //   level: 1,
+    //   text: '压风装置',
+    // },
+    // 7: {
+    //   url: getAssetURL('home-container/device/penlin.png'),
+    //   level: 1,
+    //   text: '喷淋',
+    // },
+    // 8: {
+    //   url: getAssetURL('home-container/device/penfen.png'),
+    //   level: 1,
+    //   text: '喷粉',
+    // },
+    // 9: {
+    //   url: getAssetURL('home-container/device/zhudan.png'),
+    //   level: 1,
+    //   text: '注氮',
+    // },
+    // 10: {
+    //   url: getAssetURL('home-container/device/zhujiang.png'),
+    //   level: 1,
+    //   text: '注浆',
+    // },
+    // 11: {
+    //   url: getAssetURL('home-container/device/pw.png'),
+    //   level: 1,
+    //   text: '跟机喷雾',
+    // },
+    // 12: {
+    //   url: getAssetURL('home-container/device/ccq.png'),
+    //   level: 1,
+    //   text: '除尘器',
+    // },
+    // 13: {
+    //   url: getAssetURL('home-container/device/wasibeng.png'),
+    //   level: 1,
+    //   text: '瓦斯泵',
+    // },
+    // 14: {
+    //   url: getAssetURL('home-container/device/js.png'),
+    //   level: 1,
+    //   text: '瓦斯抽采管路',
+    // },
   });
 
   const resetScroll = (e: Event) => {
@@ -124,7 +124,6 @@
 
   //跳转详情
   function getDetail() {
-    console.log('跳转详情');
     // emit('goDetail', 'windrect')
   }
 
@@ -174,15 +173,16 @@
       .icons-box {
         display: flex;
         flex-wrap: wrap;
-        justify-content: space-around;
+        // justify-content: space-around; lxh
+        justify-content: space-between;
         height: 100%;
         overflow-y: hidden;
         // align-items: start ;
         &:hover {
           overflow-y: auto;
           & > .icon-item {
-            animation-play-state: paused;
-            animation: move1 2s linear;
+            // animation-play-state: paused; lxh
+            // animation: move1 2s linear;lxh
           }
         }
         .icon-item {
@@ -191,7 +191,7 @@
           align-items: center;
           justify-content: center;
           padding: 3px;
-          animation: move 10s linear infinite;
+          // animation: move 10s linear infinite;lxh
 
           .level-text {
             position: absolute;

src/views/vent/home/colliery/components/wind-line.vue

@@ -73,7 +73,6 @@ let tabList = reactive<any[]>([
 ]);
 //跳转详情
 function getDetail() {
-  console.log('跳转详情');
   emit('goDetail', 'majorpath')
 }
 //选项切换
@@ -168,6 +167,18 @@ function changeSelect(val) {
       // percentE.value = ((echartData[2].value / (echartData[0].value + echartData[1].value + echartData[2].value)) * 100).toFixed(2);
       getOption();
       break;
+      case '关键-路线':
+      echartData[0].value = Math.floor(Math.random() * (110 - 100 + 1)) + 100;
+      echartData[1].value = Math.floor(Math.random() * (210 - 200 + 1)) + 200;
+      echartData[2].value = Math.floor(Math.random() * (310 - 300 + 1)) + 300;
+      tabList[0].val = Math.floor(Math.random() * (1010 - 1000 + 1)) + 1000;
+      tabList[1].val = Math.floor(Math.random() * (2010 - 2000+ 1)) + 2000;
+      tabList[2].val = 0.56;
+      percentF.value = ((echartData[0].value / (echartData[0].value + echartData[1].value + echartData[2].value)) * 100).toFixed(2);
+      percentT.value = ((echartData[1].value / (echartData[0].value + echartData[1].value + echartData[2].value)) * 100).toFixed(2);
+      percentE.value = ((echartData[2].value / (echartData[0].value + echartData[1].value + echartData[2].value)) * 100).toFixed(2);
+      getOption();
+      break;
   }
 }
 

src/views/vent/home/colliery/components/work-monitor.vue

@@ -49,7 +49,7 @@ let echartData = reactive({
 });
 //跳转详情
 function getDetail() {
-  console.log('跳转详情');
+ 
   emit('goDetail', 'work');
 }
 //选项切换
@@ -85,6 +85,29 @@ function changeSelect(val) {
       });
       getOption();
       break;
+      case '工作面-6':
+      tabList[0].val = Math.floor(Math.random() * (110 - 100 + 1)) + 100;
+      tabList[1].val = Math.floor(Math.random() * (210 - 200 + 1)) + 200;
+      tabList[2].val = Math.floor(Math.random() * (310 - 300 + 1)) + 300;
+      echartData.xdata.length = 0;
+      echartData.ydata.length = 0;
+      echartData.ydata1.length = 0;
+      let mnList=[
+        {time:'10:00:01',jin: Math.floor(Math.random() * (15 - 10 + 1)) + 10,hui: Math.floor(Math.random() * (20 - 15 + 1)) + 15},
+        {time:'10:00:06',jin: Math.floor(Math.random() * (15 - 10 + 1)) + 10,hui: Math.floor(Math.random() * (20 - 15 + 1)) + 15},
+        {time:'10:00:11',jin: Math.floor(Math.random() * (15 - 10 + 1)) + 10,hui: Math.floor(Math.random() * (20 - 15 + 1)) + 15},
+        {time:'10:00:16',jin: Math.floor(Math.random() * (15 - 10 + 1)) + 10,hui: Math.floor(Math.random() * (20 - 15 + 1)) + 15},
+        {time:'10:00:21',jin: Math.floor(Math.random() * (15 - 10 + 1)) + 10,hui: Math.floor(Math.random() * (20 - 15 + 1)) + 15},
+        {time:'10:00:26',jin: Math.floor(Math.random() * (15 - 10 + 1)) + 10,hui: Math.floor(Math.random() * (20 - 15 + 1)) + 15},
+      ]
+      mnList.forEach((el) => {
+        echartData.xdata.push(el.time);
+        echartData.ydata.push(el.jin);
+        echartData.ydata1.push(el.hui);
+      });
+
+      getOption();
+      break;
   }
 }
 

src/views/vent/home/colliery/index.vue

@@ -78,7 +78,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { reactive, onMounted, ref, nextTick, computed, inject ,onBeforeUnmount } from 'vue';
+import { reactive, onMounted, ref, nextTick, computed, inject, onBeforeUnmount } from 'vue';
 import fanMonitor from './components/fan-monitor.vue';
 import mainMonitor from './components/main-monitor.vue';
 import windDevice from './components/wind-device.vue';
@@ -117,7 +117,7 @@ const pageType = ref('home');
 let router = useRouter();
 
 function goDetail(deviceType) {
-  debugger
+  // debugger
 
   // Modal.confirm({
   //   content: () => '暂未连接井下设备！',
@@ -141,14 +141,10 @@ function goDetail(deviceType) {
     router.push('/monitorChannel/monitor-fanmain');
   } else if (deviceType == 'fanLocal') {
     router.push('/monitorChannel/monitor-fanlocal');
-  } else if(deviceType == 'majorpath') {
-    
-  } else if(deviceType == 'work'){
-    router.push('/monitorChannel/wokerFace-home');
+  } else if (deviceType == 'windrect') {
+    router.push('/monitorChannel/monitor-windrect')
   } else if (deviceType == 'warning') {
     router.push('/monitorChannel/monitor-alarm-home');
-  } else {
-    router.push('/monitorChannel/monitor-gate');
   }
 }
 function goHome() {
@@ -207,8 +203,29 @@ function getList() {
     }
 
     flList.value = res.windrect || res.sys_wind;
-    lineList.value = res.sys_majorpath || [];
-    workList.value = res.sys_surface_caimei || [];
+
+    if (res.sys_majorpath.length != 0) {
+      lineList.value = res.sys_majorpath;
+    } else {
+      let paramArr: any = []
+      paramArr.push({
+        deviceName: '关键-路线',
+        deviceType: 'sys_majorpath',
+      })
+      lineList.value = paramArr
+    }
+
+    if (res.sys_surface_caimei.length != 0) {
+      workList.value = res.sys_surface_caimei;
+    } else {
+      let paramArr: any = []
+      paramArr.push({
+        deviceName: '工作面-6',
+        deviceType: 'sys_surface_caimei',
+      })
+      workList.value = paramArr
+    }
+
     warnData.value = res.warn || [];
     deviceData.value = res.device || {};
   });