Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

.env.development

@@ -6,8 +6,8 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 #VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-# VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"], ["/python", "http://127.0.0.1:8008"], ["/tun2D", "http://127.0.0.1:8088/micro-vent-2dModal/tun2D"]]
-VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
+VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"], ["/python", "http://127.0.0.1:8008"], ["/tun2D", "http://127.0.0.1:8088/micro-vent-2dModal/tun2D"]]
+# VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
 # VITE_PROXY = [["/jeecgsystem","http://10.10.150.72:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
 #VITE_PROXY = [["/jeecgsystem","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
 
@@ -29,7 +29,7 @@ VITE_GLOB_API_URL_PREFIX=
 
 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 #VITE_APP_SUB_APP = [["micro-need-air", "//10.10.150.72:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
-VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
+# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
-# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"],["micro-vent-2dModal", "//localhost:8088/", "micro-vent-2dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
+VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"],["micro-vent-2dModal", "//localhost:8088/", "micro-vent-2dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]

src/views/vent/home/configurable/components/detail/ComplexList.vue

@@ -63,6 +63,9 @@
       --image-img-8: url(/@/assets/images/home-container/configurable/firehome/img-8.png);
       --image-img-9: url(/@/assets/images/home-container/configurable/firehome/img-9.png);
       --image-list_bg_1: url(/@/assets/images/home-container/configurable/dusthome/list_bg_1.png);
+      --image-linear-gradient-1: linear-gradient(to right, #39a3ff50, #39a3ff00);
+      --image-linear-gradient-2: linear-gradient(to right, #3df6ff40, #3df6ff00);
+      --image-linear-gradient-3: linear-gradient(to right, #39deff15, #3977e500);
       padding: 5px 20px;
       position: relative;
       width: 100%;
@@ -401,7 +404,45 @@
       .list-item__info {
         display: none;
       }
-    }
+  }
+
+  .list-item_G {
+      // height: 155px;
+      // background-repeat: no-repeat;
+      // background-size: 100% 100%;
+      // background-position: center;
+      // justify-content: space-between;
+      // text-align: center;
+      margin-top: 5px;
+
+      .list-item__title_G {
+        position: relative;
+        width: 100%;
+        height: 16px;
+        margin-top: 10px;
+        margin-bottom: 5px;
+        padding-left: 8px;
+        top: -2px;
+        background-image: var(--image-linear-gradient-1);
+        &::before{
+          position: absolute;
+          content: '';
+          width: 100%;
+          height: 100%;
+          top: 4px;
+          left: 0;
+          background-image: var(--image-linear-gradient-2);
+        }
+      }
+      .list-item__content_G {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 4px;
+        margin: 8px 0;
+        background-image: var(--image-linear-gradient-3);
+      }
+  }
 
     // .list-item__title_B_O2 {
     //   background-image: url(/@/assets/images/home-container/configurable/firehome/O₂.png);

src/views/vent/home/configurable/components/header.vue

@@ -67,7 +67,9 @@
     () => props.data,
     (d) => {
       init(d);
+      // if (!selectedDeviceID.value) {
       selectHandler({ key: options.value[0]?.value });
+      // }
     },
     {
       immediate: true,

src/views/vent/home/configurable/hooks/useInit.ts

@@ -211,10 +211,10 @@ export function useInitConfigs() {
 
 /**
  * 根据模块的配置初始化基准 Module 组件需要的数据，包括选择框、设备等信息
- * @param data api 返回的数据
- * @param config 本模块的配置
+ * @param deviceType 本模块的设备类型
+ * @param moduleData 本模块的配置项
  */
-export function useInitModule(deviceType: string, moduleData: Config['moduleData']) {
+export function useInitModule(deviceType: Config['deviceType'], moduleData: Config['moduleData']) {
   const { header, mock } = moduleData;
   const devices = ref<Record<string, any>[]>([]);
   const options = ref<{ label: string; value: string }[]>([]);

src/views/vent/monitorManager/alarmMonitor/common/closeWall.copy.vue

@@ -1,290 +1,290 @@
 <template>
     <div class="closeWall">
-      <div class="top-area">
+      <!-- <div class="top-area">
         <internalFireTop1 :internalFireTopData="internalFireTopData" :temperatureData="temperatureData">
         </internalFireTop1>
       </div>
       <div class="content">
         <internalFireBot1 :internalFireBotData="internalFireBotData"></internalFireBot1>
-      </div>
+      </div> -->
     </div>
   </template>
   
   <script lang="ts" setup>
-  import { ref, reactive, watch, defineProps, inject, h } from 'vue';
-  import echartLine1 from './echartLine1.vue';
-  import warnZb from './warnZb.vue';
-  import PredictionCurve from './predictionCurve.vue';
-  import internalFireBot1 from './internal-fire-bot1.vue';
-  import { getMaxY, getMinY } from '../common.data'
-  // import { deviceControlApi } from '/@/api/vent/index';
-  import internalFireTop1 from './internal-fire-top1.vue'
-  
-  let props = defineProps({
-    listData: Object,
-  });
-  
-  const globalConfig = inject('globalConfig');
-  const shownChart = ref('default');
-  let maxY = ref<any>(0);
-  let minY = ref<any>(0)
-  // let selectSj = ref<any[]>([]);
-  
-  let internalFireTopData = ref<any[]>([])
-  let temperatureData = ref(0)
-  let internalFireBotData = ref<any[]>([])
-  // let selectList = reactive<any[]>([]);
-  let widthV = ref('75%');
-  let heightV = ref('80%');
-  let coordDw = ref<any[]>([31, 62, 110]);
-  let widthCanvas = ref(562);
-  let heightCanvas = ref(316);
-  //设备连接状态
-  let netStatus = ref(0);
-  
-  
-  
-  
-  //当前激活密闭参数类型
-  let type = ref('O₂');
-  
-  let echartDataSg1 = reactive({
-    xData: [],
-    yData: [],
-    lengedData: 'O₂',
-    lengedDataName: '(%)',
-  });
-  let echartDataSgList = reactive<any[]>([]);
-  
-  function getmax() {
-    getMaxY(echartDataSg1.yData)
-    getMinY(echartDataSg1.yData)
-    // maxY.value = echartDataSg1.yData.reduce((acr, cur) => {
-    //   return acr > cur ? acr : cur;
-    // });
-    // maxY.value =
-    //   maxY.value.toString().indexOf('.') == -1 ? maxY.value.toString() : maxY.value.toString().substring(0, maxY.value.toString().indexOf('.'));
-    // if (maxY.value.length < 2 && Number(maxY.value) < 1) {
-    //   maxY.value = 1;
-    // } else if (maxY.value.length < 2 && Number(maxY.value) >= 1) {
-    //   maxY.value = 10;
-    // } else if (maxY.value.length < 3) {
-    //   maxY.value = (Number(maxY.value[0]) + 1) * 10;
-    // } else if (maxY.value.length < 4) {
-    //   maxY.value = (Number(maxY.value[0]) + 1) * 100;
-    // } else if (maxY.value.length < 5) {
-    //   maxY.value = (Number(maxY.value[0]) + 1) * 1000;
-    // } else if (maxY.value.length < 6) {
-    //   maxY.value = (Number(maxY.value[0]) + 1) * 10000;
-    // }
-  }
-  //密闭参数选项切换
-  function btnClick(item, ind) {
-    // debugger;
-    activeIndex.value = ind;
-    type.value = item.label;
-    echartDataSg1.xData.length = 0;
-    echartDataSg1.yData.length = 0;
-    echartDataSg1.lengedData = type.value;
-    echartDataSg1.lengedDataName = item.dw;
-  
-    const data = selectSj.value.filter((v) => v.strinstallpos == selectData.value)[0];
-    switch (type.value) {
-      case 'O₂':
-        echartDataSgList.forEach((el) => {
-          echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.o2val);
-        });
-  
-        curveConfig.value = {
-          id: 'o2',
-          label: 'O₂',
-          time: echartDataSg1.xData,
-          data: [
-            // 氧气预测曲线
-            data.avgParam?.avg_o2_value || 0,
-            data.avgParam?.max_o2_value || 0,
-            data.avgParam?.min_o2_value || 0,
-            // data.readData?.o2val,
-          ],
-          monitorData: echartDataSg1.yData,
-        };
-        getmax();
-        break;
-      case 'C₂H₄':
-        echartDataSgList.forEach((el) => {
-          echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.ch2val);
-        });
-        curveConfig.value = {
-          id: 'ch2',
-          label: 'C₂H₄',
-          time: echartDataSg1.xData,
-          data: [
-            // 预测曲线
-            data.avgParam?.avg_c2h4_value || 0,
-            data.avgParam?.max_c2h4_value || 0,
-            data.avgParam?.min_c2h4_value || 0,
-            // data.readData?.ch2val,
-          ],
-          monitorData: echartDataSg1.yData,
-        };
-        getmax();
-        break;
-      case 'CO':
-        echartDataSgList.forEach((el) => {
-          echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.coval);
-        });
-        curveConfig.value = {
-          id: 'co',
-          label: 'CO',
-          time: echartDataSg1.xData,
-          data: [
-            // 预测曲线
-            data.avgParam?.avg_co_value || 0,
-            data.avgParam?.max_co_value || 0,
-            data.avgParam?.min_co_value || 0,
-            // data.readData?.coval,
-          ],
-          monitorData: echartDataSg1.yData,
-        };
-        getmax();
-        break;
-      case 'CH₄':
-        echartDataSgList.forEach((el) => {
-          echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.gasval);
-        });
-        curveConfig.value = {
-          id: 'ch',
-          label: 'CH₄',
-          time: echartDataSg1.xData,
-          data: [
-            // 预测曲线
-            data.avgParam?.avg_ch4_value || 0,
-            data.avgParam?.max_ch4_value || 0,
-            data.avgParam?.min_ch4_value || 0,
-            // data.readData?.chval,
-          ],
-          monitorData: echartDataSg1.yData,
-        };
-        getmax();
-        break;
-      case 'CO₂':
-        echartDataSgList.forEach((el) => {
-          echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.co2val);
-        });
-        curveConfig.value = {
-          id: 'co2',
-          label: 'CO₂',
-          time: echartDataSg1.xData,
-          data: [
-            // 预测曲线
-            data.avgParam?.avg_co2_value || 0,
-            data.avgParam?.max_co2_value || 0,
-            data.avgParam?.min_co2_value || 0,
-            // data.readData?.co2val,
-          ],
-          monitorData: echartDataSg1.yData,
-        };
-        getmax();
-        break;
-      case 'C₂H₂':
-        echartDataSgList.forEach((el) => {
-          echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.chval);
-        });
-        curveConfig.value = {
-          id: 'gas',
-          label: 'C₂H₂',
-          time: echartDataSg1.xData,
-          data: [
-            // 预测曲线
-            data.avgParam?.avg_c2h2_value || 0,
-            data.avgParam?.max_c2h2_value || 0,
-            data.avgParam?.min_c2h2_value || 0,
-            // data.readData?.gasval,
-          ],
-          monitorData: echartDataSg1.yData,
-        };
-        getmax();
-        break;
-    }
-  }
-  
-  
-  
-  
-  
-  /** 预测曲线的配置，数据分别为平均、最大、最小、当前值 */
-  const curveConfig = ref<any>({ id: '0', label: '', time: new Date(), data: [0, 0, 0, 0] });
-  
-  watch(
-    () => props.listData,
-    (val: any) => {
-      echartDataSg1.xData.length = 0;
-      echartDataSg1.yData.length = 0;
-      echartDataSgList.length = 0;
-      // selectList.length = 0;
-  
-      if (JSON.stringify(val) === '{}') return;
-      internalFireTopData.value = val.bundletube
-      temperatureData.value = val.temperature[0] ? val.temperature[0].readData.temperature : '--'
-      internalFireBotData.value=val.bundletube
-  
-      if (val.bundletube.length != 0) {
-        // selectSj.value = val.bundletube;
+  // import { ref, reactive, watch, defineProps, inject, h } from 'vue';
+  // import echartLine1 from './echartLine1.vue';
+  // import warnZb from './warnZb.vue';
+  // import PredictionCurve from './predictionCurve.vue';
+  // import internalFireBot1 from './internal-fire-bot1.vue';
+  // import { getMaxY, getMinY } from '../common.data'
+  // // import { deviceControlApi } from '/@/api/vent/index';
+  // import internalFireTop1 from './internal-fire-top1.vue'
+  
+  // let props = defineProps({
+  //   listData: Object,
+  // });
+  
+  // const globalConfig = inject('globalConfig');
+  // const shownChart = ref('default');
+  // let maxY = ref<any>(0);
+  // let minY = ref<any>(0)
+  // // let selectSj = ref<any[]>([]);
+  
+  // let internalFireTopData = ref<any[]>([])
+  // let temperatureData = ref(0)
+  // let internalFireBotData = ref<any[]>([])
+  // // let selectList = reactive<any[]>([]);
+  // let widthV = ref('75%');
+  // let heightV = ref('80%');
+  // let coordDw = ref<any[]>([31, 62, 110]);
+  // let widthCanvas = ref(562);
+  // let heightCanvas = ref(316);
+  // //设备连接状态
+  // let netStatus = ref(0);
+  
+  
+  
+  
+  // //当前激活密闭参数类型
+  // let type = ref('O₂');
+  
+  // let echartDataSg1 = reactive({
+  //   xData: [],
+  //   yData: [],
+  //   lengedData: 'O₂',
+  //   lengedDataName: '(%)',
+  // });
+  // let echartDataSgList = reactive<any[]>([]);
+  
+  // function getmax() {
+  //   getMaxY(echartDataSg1.yData)
+  //   getMinY(echartDataSg1.yData)
+  //   // maxY.value = echartDataSg1.yData.reduce((acr, cur) => {
+  //   //   return acr > cur ? acr : cur;
+  //   // });
+  //   // maxY.value =
+  //   //   maxY.value.toString().indexOf('.') == -1 ? maxY.value.toString() : maxY.value.toString().substring(0, maxY.value.toString().indexOf('.'));
+  //   // if (maxY.value.length < 2 && Number(maxY.value) < 1) {
+  //   //   maxY.value = 1;
+  //   // } else if (maxY.value.length < 2 && Number(maxY.value) >= 1) {
+  //   //   maxY.value = 10;
+  //   // } else if (maxY.value.length < 3) {
+  //   //   maxY.value = (Number(maxY.value[0]) + 1) * 10;
+  //   // } else if (maxY.value.length < 4) {
+  //   //   maxY.value = (Number(maxY.value[0]) + 1) * 100;
+  //   // } else if (maxY.value.length < 5) {
+  //   //   maxY.value = (Number(maxY.value[0]) + 1) * 1000;
+  //   // } else if (maxY.value.length < 6) {
+  //   //   maxY.value = (Number(maxY.value[0]) + 1) * 10000;
+  //   // }
+  // }
+  // //密闭参数选项切换
+  // function btnClick(item, ind) {
+  //   // debugger;
+  //   activeIndex.value = ind;
+  //   type.value = item.label;
+  //   echartDataSg1.xData.length = 0;
+  //   echartDataSg1.yData.length = 0;
+  //   echartDataSg1.lengedData = type.value;
+  //   echartDataSg1.lengedDataName = item.dw;
+  
+  //   const data = selectSj.value.filter((v) => v.strinstallpos == selectData.value)[0];
+  //   switch (type.value) {
+  //     case 'O₂':
+  //       echartDataSgList.forEach((el) => {
+  //         echartDataSg1.xData.push(el.time);
+  //         echartDataSg1.yData.push(el.o2val);
+  //       });
+  
+  //       curveConfig.value = {
+  //         id: 'o2',
+  //         label: 'O₂',
+  //         time: echartDataSg1.xData,
+  //         data: [
+  //           // 氧气预测曲线
+  //           data.avgParam?.avg_o2_value || 0,
+  //           data.avgParam?.max_o2_value || 0,
+  //           data.avgParam?.min_o2_value || 0,
+  //           // data.readData?.o2val,
+  //         ],
+  //         monitorData: echartDataSg1.yData,
+  //       };
+  //       getmax();
+  //       break;
+  //     case 'C₂H₄':
+  //       echartDataSgList.forEach((el) => {
+  //         echartDataSg1.xData.push(el.time);
+  //         echartDataSg1.yData.push(el.ch2val);
+  //       });
+  //       curveConfig.value = {
+  //         id: 'ch2',
+  //         label: 'C₂H₄',
+  //         time: echartDataSg1.xData,
+  //         data: [
+  //           // 预测曲线
+  //           data.avgParam?.avg_c2h4_value || 0,
+  //           data.avgParam?.max_c2h4_value || 0,
+  //           data.avgParam?.min_c2h4_value || 0,
+  //           // data.readData?.ch2val,
+  //         ],
+  //         monitorData: echartDataSg1.yData,
+  //       };
+  //       getmax();
+  //       break;
+  //     case 'CO':
+  //       echartDataSgList.forEach((el) => {
+  //         echartDataSg1.xData.push(el.time);
+  //         echartDataSg1.yData.push(el.coval);
+  //       });
+  //       curveConfig.value = {
+  //         id: 'co',
+  //         label: 'CO',
+  //         time: echartDataSg1.xData,
+  //         data: [
+  //           // 预测曲线
+  //           data.avgParam?.avg_co_value || 0,
+  //           data.avgParam?.max_co_value || 0,
+  //           data.avgParam?.min_co_value || 0,
+  //           // data.readData?.coval,
+  //         ],
+  //         monitorData: echartDataSg1.yData,
+  //       };
+  //       getmax();
+  //       break;
+  //     case 'CH₄':
+  //       echartDataSgList.forEach((el) => {
+  //         echartDataSg1.xData.push(el.time);
+  //         echartDataSg1.yData.push(el.gasval);
+  //       });
+  //       curveConfig.value = {
+  //         id: 'ch',
+  //         label: 'CH₄',
+  //         time: echartDataSg1.xData,
+  //         data: [
+  //           // 预测曲线
+  //           data.avgParam?.avg_ch4_value || 0,
+  //           data.avgParam?.max_ch4_value || 0,
+  //           data.avgParam?.min_ch4_value || 0,
+  //           // data.readData?.chval,
+  //         ],
+  //         monitorData: echartDataSg1.yData,
+  //       };
+  //       getmax();
+  //       break;
+  //     case 'CO₂':
+  //       echartDataSgList.forEach((el) => {
+  //         echartDataSg1.xData.push(el.time);
+  //         echartDataSg1.yData.push(el.co2val);
+  //       });
+  //       curveConfig.value = {
+  //         id: 'co2',
+  //         label: 'CO₂',
+  //         time: echartDataSg1.xData,
+  //         data: [
+  //           // 预测曲线
+  //           data.avgParam?.avg_co2_value || 0,
+  //           data.avgParam?.max_co2_value || 0,
+  //           data.avgParam?.min_co2_value || 0,
+  //           // data.readData?.co2val,
+  //         ],
+  //         monitorData: echartDataSg1.yData,
+  //       };
+  //       getmax();
+  //       break;
+  //     case 'C₂H₂':
+  //       echartDataSgList.forEach((el) => {
+  //         echartDataSg1.xData.push(el.time);
+  //         echartDataSg1.yData.push(el.chval);
+  //       });
+  //       curveConfig.value = {
+  //         id: 'gas',
+  //         label: 'C₂H₂',
+  //         time: echartDataSg1.xData,
+  //         data: [
+  //           // 预测曲线
+  //           data.avgParam?.avg_c2h2_value || 0,
+  //           data.avgParam?.max_c2h2_value || 0,
+  //           data.avgParam?.min_c2h2_value || 0,
+  //           // data.readData?.gasval,
+  //         ],
+  //         monitorData: echartDataSg1.yData,
+  //       };
+  //       getmax();
+  //       break;
+  //   }
+  // }
+  
+  
+  
+  
+  
+  // /** 预测曲线的配置，数据分别为平均、最大、最小、当前值 */
+  // const curveConfig = ref<any>({ id: '0', label: '', time: new Date(), data: [0, 0, 0, 0] });
+  
+  // watch(
+  //   () => props.listData,
+  //   (val: any) => {
+  //     echartDataSg1.xData.length = 0;
+  //     echartDataSg1.yData.length = 0;
+  //     echartDataSgList.length = 0;
+  //     // selectList.length = 0;
+  
+  //     if (JSON.stringify(val) === '{}') return;
+  //     internalFireTopData.value = val.bundletube
+  //     temperatureData.value = val.temperature[0] ? val.temperature[0].readData.temperature : '--'
+  //     internalFireBotData.value=val.bundletube
+  
+  //     if (val.bundletube.length != 0) {
+  //       // selectSj.value = val.bundletube;
   
   
   
   
   
       
-        netStatus.value = dataVal['netStatus'];
-        echartDataSgList = dataVal.history;
-        btnClick(
-          {
-            label: type.value,
-            dw: echartDataSg1.lengedDataName,
-          },
-          activeIndex.value
-        );
-        // dataVal.history.forEach((v) => {
-        //   echartDataSg1.xData.push(v.time);
-        //   if (echartDataSg1.lengedData == 'O₂') {
-        //     echartDataSg1.yData.push(v.o2val);
-        //   } else if (echartDataSg1.lengedData == 'C₂H₄') {
-        //     echartDataSg1.yData.push(v.ch2val);
-        //   } else if (echartDataSg1.lengedData == 'CO') {
-        //     echartDataSg1.yData.push(v.coval);
-        //   } else if (echartDataSg1.lengedData == 'CH₄') {
-        //     echartDataSg1.yData.push(v.chval);
-        //   } else if (echartDataSg1.lengedData == 'CO₂') {
-        //     echartDataSg1.yData.push(v.co2val);
-        //   } else if (echartDataSg1.lengedData == 'C₂H₂') {
-        //     echartDataSg1.yData.push(v.gasval);
-        //   }
-        //   echartDataSgList.push(v);
-        // });
-        getmax();
-      } else {
-  
-        mbList[0].nd = '--';
-        mbList[1].nd = '--';
-        mbList[2].nd = '--';
-        mbList[3].nd = '--';
-        mbList[4].nd = '--';
-        mbList[5].nd = '--';
-        mbList.forEach((el) => {
-          el.time1 = '--';
-          el.address = '--';
-        });
-      }
-    },
-    { immediate: true, deep: true }
-  );
+  //       netStatus.value = dataVal['netStatus'];
+  //       echartDataSgList = dataVal.history;
+  //       btnClick(
+  //         {
+  //           label: type.value,
+  //           dw: echartDataSg1.lengedDataName,
+  //         },
+  //         activeIndex.value
+  //       );
+  //       // dataVal.history.forEach((v) => {
+  //       //   echartDataSg1.xData.push(v.time);
+  //       //   if (echartDataSg1.lengedData == 'O₂') {
+  //       //     echartDataSg1.yData.push(v.o2val);
+  //       //   } else if (echartDataSg1.lengedData == 'C₂H₄') {
+  //       //     echartDataSg1.yData.push(v.ch2val);
+  //       //   } else if (echartDataSg1.lengedData == 'CO') {
+  //       //     echartDataSg1.yData.push(v.coval);
+  //       //   } else if (echartDataSg1.lengedData == 'CH₄') {
+  //       //     echartDataSg1.yData.push(v.chval);
+  //       //   } else if (echartDataSg1.lengedData == 'CO₂') {
+  //       //     echartDataSg1.yData.push(v.co2val);
+  //       //   } else if (echartDataSg1.lengedData == 'C₂H₂') {
+  //       //     echartDataSg1.yData.push(v.gasval);
+  //       //   }
+  //       //   echartDataSgList.push(v);
+  //       // });
+  //       getmax();
+  //     } else {
+  
+  //       mbList[0].nd = '--';
+  //       mbList[1].nd = '--';
+  //       mbList[2].nd = '--';
+  //       mbList[3].nd = '--';
+  //       mbList[4].nd = '--';
+  //       mbList[5].nd = '--';
+  //       mbList.forEach((el) => {
+  //         el.time1 = '--';
+  //         el.address = '--';
+  //       });
+  //     }
+  //   },
+  //   { immediate: true, deep: true }
+  // );
   </script>
   
   <style lang="less" scoped>

src/views/vent/monitorManager/alarmMonitor/common/internal-fire-bot1.vue

@@ -1,27 +1,7 @@
 <template>
     <div class="internal-fire-bot1">
-        <div class="title-b">采空区密闭参数</div>
+        <!-- <div class="title-b">采空区密闭参数</div>
         <div class="card-btn">
-            <!-- <div :class="activeIndex == index ? 'box-container1' : 'box-container'" v-for="(item, index) in mbList"
-                :key="index" @click="btnClick(item, index)">
-                <div class="box-label">
-                    <span> {{ item.label }}</span>
-                    <span>{{ item.dw }}</span>
-                </div>
-                <div class="box-item box-item1">
-                    <span class="text-t">{{ `${item.label1}:` }}</span>
-                    <span class="text-v">{{ item.nd }}</span>
-                </div>
-                <div class="box-item box-item2">
-                    <span class="text-t">{{ `${item.label2}:` }}</span>
-                    <span class="text-v">{{ item.time1 }}</span>
-                </div>
-                <div class="box-item box-item3">
-                    <span class="text-t">{{ `${item.label3}:` }}</span>
-                    <span class="text-v">{{ item.address }}</span>
-                </div>
-            </div> -->
-
             <div :class="activeIndex == index ? 'box-container1' : 'box-container'" @click="btnClick(item, index)">
                 <div class="box-label">
                     <span> O₂</span>
@@ -137,15 +117,6 @@
                     <div class="title-text">
                         {{ `${type}趋势` }}&nbsp; <span style="color: red">{{ netStatus != 1 ? '(设备未连接)' : '' }}</span>
                     </div>
-
-                    <!-- <BaseTab
-              style="width: 180px; color: var(--vent-font-color)"
-              :tabs="[
-                { name: '实时监测', id: 'default' },
-                { name: '预测曲线', id: 'predict' },
-              ]"
-              v-model:id="shownChart"
-            /> -->
                 </div>
                 <div class="echarts-box">
                     <PredictionCurve v-if="shownChart === 'default'" :chart="curveConfig" />
@@ -157,79 +128,79 @@
                 <warnZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas"
                     :heightCanvas="heightCanvas" :warnLevel="topContent.warnLevel" />
             </div>
-        </div>
+        </div> -->
     </div>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive,watch } from 'vue'
 
-let props=defineProps({
-    internalFireBotData:{
-        type:Array,
-        default:()=>{
-            return []
-        }
-    }
-})
-
-//当前密闭参数激活选项
-let activeIndex = ref(0);
-//密闭参数列表
-let bundleD=reactive({
-    o2:'',
-    o2time:'',
-    o2address:'',
-    co:'',
-    cotime:'',
-    coaddress:'',
-    co2:'',
-    co2time:'',
-    co2address:'',
-    ch4:'',
-    ch4time:'',
-    ch4address:'',
-    c2h2:'',
-    c2h2time:'',
-    c2h2address:'',
-    c2h4:'',
-    c2h4time:'',
-    c2h4address:'',
-})
-
-mbList[0].nd = dataVal.readData.o2val || '--';
-      mbList[1].nd = dataVal.readData.coval || '--';
-      mbList[2].nd = dataVal.readData.co2val || '--';
-      mbList[3].nd = dataVal.readData.gasval || '--';
-      mbList[4].nd = dataVal.readData.chval || '--';
-      mbList[5].nd = dataVal.readData.ch2val || '--';
-      mbList.forEach((el) => {
-        el.time1 = dataVal ? dataVal.readTime.substring(0, dataVal.readTime.lastIndexOf(':')) : '--';
-        el.address = dataVal ? dataVal.strinstallpos : '--';
-      });
-
-      watch(()=>props.internalFireBotData,(newV,oldV)=>{
-        if(newV.length!=0){
-            bundleD.  o2=
-            bundleD.  o2time=
-            bundleD.  o2address=
-            bundleD.  co=
-            bundleD.   cotime=
-            bundleD.  coaddress=
-            bundleD.  co2=
-            bundleD.  co2time=
-            bundleD.  co2address=
-            bundleD.  ch4=
-            bundleD.   ch4time=
-            bundleD.   ch4address=
-            bundleD.  c2h2=
-            bundleD.   c2h2time=
-            bundleD.  c2h2address=
-            bundleD.  c2h4=
-            bundleD.  c2h4time=
-            bundleD.  c2h4address=
-        }
-      },{immediate:true})
+// let props=defineProps({
+//     internalFireBotData:{
+//         type:Array,
+//         default:()=>{
+//             return []
+//         }
+//     }
+// })
+
+// //当前密闭参数激活选项
+// let activeIndex = ref(0);
+// //密闭参数列表
+// let bundleD=reactive({
+//     o2:'',
+//     o2time:'',
+//     o2address:'',
+//     co:'',
+//     cotime:'',
+//     coaddress:'',
+//     co2:'',
+//     co2time:'',
+//     co2address:'',
+//     ch4:'',
+//     ch4time:'',
+//     ch4address:'',
+//     c2h2:'',
+//     c2h2time:'',
+//     c2h2address:'',
+//     c2h4:'',
+//     c2h4time:'',
+//     c2h4address:'',
+// })
+
+// mbList[0].nd = dataVal.readData.o2val || '--';
+//       mbList[1].nd = dataVal.readData.coval || '--';
+//       mbList[2].nd = dataVal.readData.co2val || '--';
+//       mbList[3].nd = dataVal.readData.gasval || '--';
+//       mbList[4].nd = dataVal.readData.chval || '--';
+//       mbList[5].nd = dataVal.readData.ch2val || '--';
+//       mbList.forEach((el) => {
+//         el.time1 = dataVal ? dataVal.readTime.substring(0, dataVal.readTime.lastIndexOf(':')) : '--';
+//         el.address = dataVal ? dataVal.strinstallpos : '--';
+//       });
+
+//       watch(()=>props.internalFireBotData,(newV,oldV)=>{
+//         if(newV.length!=0){
+//             bundleD.  o2=
+//             bundleD.  o2time=
+//             bundleD.  o2address=
+//             bundleD.  co=
+//             bundleD.   cotime=
+//             bundleD.  coaddress=
+//             bundleD.  co2=
+//             bundleD.  co2time=
+//             bundleD.  co2address=
+//             bundleD.  ch4=
+//             bundleD.   ch4time=
+//             bundleD.   ch4address=
+//             bundleD.  c2h2=
+//             bundleD.   c2h2time=
+//             bundleD.  c2h2address=
+//             bundleD.  c2h4=
+//             bundleD.  c2h4time=
+//             bundleD.  c2h4address=
+//         }
+//       },{immediate:true})
 
 </script>
 
@@ -263,7 +234,7 @@ mbList[0].nd = dataVal.readData.o2val || '--';
         font-family: 'douyuFont';
         font-size: 14px;
         color: #fff;
-        // color: var(--vent-table-action-link);
+      
     }
 
     .card-btn {

src/views/vent/monitorManager/alarmMonitor/common/internal-fire-top1.vue

@@ -1,11 +1,9 @@
 <template>
     <div class="internal-fire-top1">
-
-        <div class="box-container">
+        <!-- <div class="box-container">
             <div class="contents">
                 <div class="text">
                     <div class="text-label">位置: </div>
-                    <!-- <div class="text-value">{{ topContent.position }}</div> -->
                     <div class="text-value">
                         <a-select v-model:value="selectData" style="width: 360px" @change="changeSelect">
                             <a-select-option v-for="file in selectList" :key="file.label" :value="file.value">{{
@@ -47,130 +45,129 @@
             <div>
                 <AButton class="w-full" type="primary" @click="controlDevice('dianwei', 'zhi')">应急关闭</AButton>
             </div>
-        </div>
-
+        </div> -->
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, watch,h } from 'vue'
-import { Modal, Input } from 'ant-design-vue';
-
-let props = defineProps({
-    internalFireTopData: {
-        type: Array,
-        default: () => {
-            return []
-        }
-    },
-    temperatureData: {
-        type: Number,
-        default: ''
-    }
-})
-
-let selectData = ref('');//下拉默认选中
-let selectList = ref<any[]>([]);//下拉列表
-
-
-let topContent = reactive({
-    temperature: 0,
-    position: '',
-    time: '',
-    warnLevel: '',
-    smokeJd: '',
-});
-
-let bundletube = ref<any[]>([])
-
-
-//选项切换
-function changeSelect(val) {
-  selectData.value = val;
-  let data = bundletube.value.filter((v) => v.strinstallpos == selectData.value)[0];
-  topContent.time = data.readTime || '--';
-  topContent.warnLevel = data.syswarnLevel_str;
-  topContent.smokeJd = data.syswarnLevel_des;
-
-//   mbList[0].nd = data.readData.o2val || '--';
-//   mbList[1].nd = data.readData.coval || '--';
-//   mbList[2].nd = data.readData.co2val || '--';
-//   mbList[3].nd = data.readData.gasval || '--';
-//   mbList[4].nd = data.readData.chval || '--';
-//   mbList[5].nd = data.readData.ch2val || '--';
-//   mbList.forEach((el) => {
-//     el.time1 = data ? data.readTime.substring(0, data.readTime.lastIndexOf(':')) : '--';
-//     el.address = data ? data.strinstallpos : '--';
-//   });
-//   netStatus.value = data['netStatus'];
-}
-// 设备控制
-function controlDevice(code, value?) {
-    const passWord = ref('');
-    Modal.confirm({
-        title: '是否确认执行该操作？',
-        maskClosable: true,
-        content: () => {
-            return h(Input, {
-                placeholder: '请输入密码',
-                type: 'password',
-                modelValue: passWord.value,
-                'onUpdate:value'(val) {
-                    passWord.value = val;
-                },
-            });
-        },
-        onOk() {
-            console.log('OK', passWord);
-        },
-    });
-    // Promise.all(
-    //   [].map(({ deviceID, deviceType }) => {
-    //     return deviceControlApi({
-    //       deviceid: deviceID,
-    //       devicetype: deviceType,
-    //       paramcode: code,
-    //       value,
-    //       // password: passWord || globalConfig?.simulatedPassword,
-    //     });
-    //   })
-    // ).then((res) => {
-    //   // 模拟时开启
-    //   if (res.success) {
-    //     if (globalConfig.History_Type == 'remote') {
-    //       message.success('指令已下发至生产管控平台成功！');
-    //     } else {
-    //       message.success('指令已下发成功！');
-    //     }
-    //   } else {
-    //     message.error(res.message);
-    //   }
-    // });
-}
-
-watch(() => props.internalFireTopData, (newV, oldV) => {
-    if (newV.length != 0) {
-        bundletube.value = newV
-        //下拉列表
-        selectList.value = bundletube.value.map((el) => {
-            return { label: el.strinstallpos, value: el.strinstallpos }
-        });
-        //下拉默认选中
-        selectData.value = selectData.value ? selectData.value : selectList[0].value;
-
-        let dataVal = selectData.value ? bundletube.value.filter((v) => v.strinstallpos == selectData.value)[0] : bundletube.value[0];
-        topContent.temperature = props.temperatureData;
-        topContent.time = dataVal.readTime || '--';
-        topContent.warnLevel = dataVal.syswarnLevel_str;
-        topContent.smokeJd = dataVal.syswarnLevel_des;
-    } else {
-        topContent.temperature = 0;
-        // topContent.position = '--';
-        topContent.time = '--';
-        topContent.warnLevel = '--';
-        topContent.smokeJd = '--';
-    }
-}, { immediate: true })
+// import { ref, reactive, watch,h } from 'vue'
+// import { Modal, Input } from 'ant-design-vue';
+
+// let props = defineProps({
+//     internalFireTopData: {
+//         type: Array,
+//         default: () => {
+//             return []
+//         }
+//     },
+//     temperatureData: {
+//         type: Number,
+//         default: ''
+//     }
+// })
+
+// let selectData = ref('');//下拉默认选中
+// let selectList = ref<any[]>([]);//下拉列表
+
+
+// let topContent = reactive({
+//     temperature: 0,
+//     position: '',
+//     time: '',
+//     warnLevel: '',
+//     smokeJd: '',
+// });
+
+// let bundletube = ref<any[]>([])
+
+
+// //选项切换
+// function changeSelect(val) {
+//   selectData.value = val;
+//   let data = bundletube.value.filter((v) => v.strinstallpos == selectData.value)[0];
+//   topContent.time = data.readTime || '--';
+//   topContent.warnLevel = data.syswarnLevel_str;
+//   topContent.smokeJd = data.syswarnLevel_des;
+
+// //   mbList[0].nd = data.readData.o2val || '--';
+// //   mbList[1].nd = data.readData.coval || '--';
+// //   mbList[2].nd = data.readData.co2val || '--';
+// //   mbList[3].nd = data.readData.gasval || '--';
+// //   mbList[4].nd = data.readData.chval || '--';
+// //   mbList[5].nd = data.readData.ch2val || '--';
+// //   mbList.forEach((el) => {
+// //     el.time1 = data ? data.readTime.substring(0, data.readTime.lastIndexOf(':')) : '--';
+// //     el.address = data ? data.strinstallpos : '--';
+// //   });
+// //   netStatus.value = data['netStatus'];
+// }
+// // 设备控制
+// function controlDevice(code, value?) {
+//     const passWord = ref('');
+//     Modal.confirm({
+//         title: '是否确认执行该操作？',
+//         maskClosable: true,
+//         content: () => {
+//             return h(Input, {
+//                 placeholder: '请输入密码',
+//                 type: 'password',
+//                 modelValue: passWord.value,
+//                 'onUpdate:value'(val) {
+//                     passWord.value = val;
+//                 },
+//             });
+//         },
+//         onOk() {
+//             console.log('OK', passWord);
+//         },
+//     });
+//     // Promise.all(
+//     //   [].map(({ deviceID, deviceType }) => {
+//     //     return deviceControlApi({
+//     //       deviceid: deviceID,
+//     //       devicetype: deviceType,
+//     //       paramcode: code,
+//     //       value,
+//     //       // password: passWord || globalConfig?.simulatedPassword,
+//     //     });
+//     //   })
+//     // ).then((res) => {
+//     //   // 模拟时开启
+//     //   if (res.success) {
+//     //     if (globalConfig.History_Type == 'remote') {
+//     //       message.success('指令已下发至生产管控平台成功！');
+//     //     } else {
+//     //       message.success('指令已下发成功！');
+//     //     }
+//     //   } else {
+//     //     message.error(res.message);
+//     //   }
+//     // });
+// }
+
+// watch(() => props.internalFireTopData, (newV, oldV) => {
+//     if (newV.length != 0) {
+//         bundletube.value = newV
+//         //下拉列表
+//         selectList.value = bundletube.value.map((el) => {
+//             return { label: el.strinstallpos, value: el.strinstallpos }
+//         });
+//         //下拉默认选中
+//         selectData.value = selectData.value ? selectData.value : selectList[0].value;
+
+//         let dataVal = selectData.value ? bundletube.value.filter((v) => v.strinstallpos == selectData.value)[0] : bundletube.value[0];
+//         topContent.temperature = props.temperatureData;
+//         topContent.time = dataVal.readTime || '--';
+//         topContent.warnLevel = dataVal.syswarnLevel_str;
+//         topContent.smokeJd = dataVal.syswarnLevel_des;
+//     } else {
+//         topContent.temperature = 0;
+//         // topContent.position = '--';
+//         topContent.time = '--';
+//         topContent.warnLevel = '--';
+//         topContent.smokeJd = '--';
+//     }
+// }, { immediate: true })
 
 </script>
 
@@ -330,6 +327,5 @@ watch(() => props.internalFireTopData, (newV, oldV) => {
             }
         }
     }
-
 }
 </style>

src/views/vent/monitorManager/balancePressMonitor/components/balancePressHome2.vue

@@ -0,0 +1,177 @@
+<template>
+  <a-spin tip="Loading..." :spinning="loading">
+    <div class="monitor-container">
+      <ModuleCommon
+        v-for="cfg in configs"
+        :key="cfg.deviceType"
+        :show-style="cfg.showStyle"
+        :module-data="cfg.moduleData"
+        :module-name="cfg.moduleName"
+        :device-type="cfg.deviceType"
+        :data="selectData"
+        :visible="true"
+      />
+    </div>
+  </a-spin>
+</template>
+<script setup lang="ts">
+  import { ref, onMounted, onUnmounted, defineProps } from 'vue';
+  import { mountedThree, destroy, setModelType, updateText, play } from '../balancePress.threejs';
+  import { list } from '../balancePress.api';
+  import ModuleCommon from '../../../home/configurable/components/ModuleCommon.vue';
+  import { useInitConfigs } from '../../../home/configurable/hooks/useInit';
+
+  const props = defineProps({
+    deviceId: {
+      type: String,
+      require: true,
+    },
+  });
+
+  const loading = ref(false);
+
+  // 监测数据
+  const selectData = ref();
+
+  // https获取监测数据
+  let timer: any = null;
+  function getMonitor(flag?) {
+    if (Object.prototype.toString.call(timer) === '[object Null]') {
+      timer = setTimeout(
+        async () => {
+          if (props.deviceId) {
+            const data = await getDataSource(props.deviceId);
+            // Object.assign(selectData, data);
+            updateText(selectData);
+            selectData.value = data;
+          }
+          if (timer) {
+            timer = null;
+          }
+          await getMonitor();
+          loading.value = false;
+        },
+        flag ? 0 : 1000
+      );
+    }
+  }
+
+  async function getDataSource(systemID) {
+    const res = await list({ devicetype: 'sys', systemID });
+    const result = Array.from(res.msgTxt).reduce((obj: any, e: any) => {
+      obj[e.type] = e;
+      return obj;
+    }, {});
+
+    console.log('debug', result);
+
+    return result;
+  }
+
+  // const configs: Config[] = [
+  //   {
+  //     deviceType: '',
+  //     moduleName: 'CO与O2监测',
+  //     pageType: '',
+  //     moduleData: {
+  //       header: {
+  //         show: false,
+  //         readFrom: '',
+  //         selector: {
+  //           show: false,
+  //           value: '${strinstallpos}',
+  //         },
+  //         slot: {
+  //           show: false,
+  //           value: '',
+  //         },
+  //       },
+  //       background: {
+  //         show: false,
+  //         type: 'image',
+  //         link: '',
+  //       },
+  //       layout: {
+  //         direction: 'column',
+  //         items: [
+  //           {
+  //             name: 'complex_list',
+  //             basis: '100%',
+  //           },
+  //         ],
+  //       },
+  //       complex_list: [
+  //         {
+  //           type: 'G',
+  //           readFrom: 'fanlocal_steml_zj.datalist',
+  //           mapFromData: true,
+  //           items: [
+  //             {
+  //               title: 'datalist细则',
+  //               contents: [
+  //                 {
+  //                   label: '阀门2开度',
+  //                   value: '${readData.Fan1fI}',
+  //                   color: 'blue',
+  //                 },
+  //                 {
+  //                   label: '阀门3开度',
+  //                   value: '${readData.Fan1fI}',
+  //                   color: 'blue',
+  //                 },
+  //                 {
+  //                   label: '阀门1开度',
+  //                   value: '${readData.Fan1fI}',
+  //                   color: 'blue',
+  //                 },
+  //               ],
+  //             },
+  //           ],
+  //         },
+  //       ],
+  //       chart: [],
+  //       table: [],
+  //       gallery: [],
+  //       list: [],
+  //       gallery_list: [],
+  //       preset: [],
+  //       to: '',
+  //     },
+  //     showStyle: {
+  //       size: 'width:344px;height:490px;',
+  //       version: '原版',
+  //       position: 'top:80px;right:10px;',
+  //     },
+  //   },
+  // ];
+
+  const { configs, fetchConfigs } = useInitConfigs();
+
+  onMounted(() => {
+    // getMonitor()
+    fetchConfigs('balancePressHome');
+    loading.value = true;
+    mountedThree().then(async () => {
+      await setModelType('balancePressBase'); //balancePressBase
+      loading.value = false;
+      timer = null;
+      await getMonitor(true);
+      play('startSmoke', 'top', 30, 'open', 0);
+    });
+  });
+
+  onUnmounted(() => {
+    destroy();
+    if (timer) {
+      clearTimeout(timer);
+    }
+  });
+</script>
+<style lang="less" scoped>
+  @import '/@/design/vent/modal.less';
+  @import '../../comment/less/workFace.less';
+  @ventSpace: zxm;
+  .monitor-container {
+    margin-top: 60px;
+  }
+</style>

src/views/vent/monitorManager/comment/safetyWarnAnalysis.vue

@@ -167,7 +167,7 @@ onMounted(() => {
             position: relative;
             width: 215px;
             height: 128px;
-            margin:0px 120px
+            margin:0px 120px;
             background: url('../../../../assets/images/choice-N.png') no-repeat center;
             background-size: 100%;
         }
@@ -176,7 +176,7 @@ onMounted(() => {
             position: relative;
             width: 215px;
             height: 128px;
-            margin:0px 120px
+            margin:0px 120px;
             background: url('../../../../assets/images/choice-Y.png') no-repeat center;
             background-size: 100%;
         }