1. 修改通风预测曲线、束管预测曲线监测字段

src/views/vent/bundle/bundleMonitorTable/index.vue

@@ -22,11 +22,11 @@
           <div class="data-content">
             <div class="title">煤自燃阶段统计分析</div>
             <div class="explain">测点共计{{ combustionCount + selfHeatingCount + latentCount }}个</div>
-            <div class="progress-label">剧烈氧化阶段(燃烧期)：</div>
+            <div class="progress-label">剧烈氧化阶段(燃烧期)：{{ combustionCount }}</div>
             <Progress :percent="combustionPercent" size="default" strokeColor="red" :show-info="true" :format="() => combustionCount" />
-            <div class="progress-label">加速氧化阶段(自热期)：</div>
+            <div class="progress-label">加速氧化阶段(自热期)：{{ selfHeatingCount }}</div>
             <Progress :percent="selfHeatingPercent" size="default" strokeColor="yellow" :show-info="true" :format="() => selfHeatingCount" />
-            <div class="progress-label">缓慢氧化阶段(潜伏期)：</div>
+            <div class="progress-label">缓慢氧化阶段(潜伏期)：{{ latentCount }}</div>
             <Progress :percent="latentPercent" size="default" strokeColor="green" :show-info="true" :format="() => latentCount" />
           </div>
         </div>

src/views/vent/bundleSpy/bundleSpyTable/index.vue

@@ -22,11 +22,11 @@
           <div class="data-content">
             <div class="title">煤自燃阶段统计分析</div>
             <div class="explain">测点共计{{ combustionCount + selfHeatingCount + latentCount }}个</div>
-            <div class="progress-label">剧烈氧化阶段(燃烧期)：</div>
+            <div class="progress-label">剧烈氧化阶段(燃烧期)：{{ combustionCount }}</div>
             <Progress :percent="combustionPercent" size="default" strokeColor="red" :show-info="true" :format="() => combustionCount" />
-            <div class="progress-label">加速氧化阶段(自热期)：</div>
+            <div class="progress-label">加速氧化阶段(自热期)：{{ selfHeatingCount }}</div>
             <Progress :percent="selfHeatingPercent" size="default" strokeColor="yellow" :show-info="true" :format="() => selfHeatingCount" />
-            <div class="progress-label">缓慢氧化阶段(潜伏期)：</div>
+            <div class="progress-label">缓慢氧化阶段(潜伏期)：{{ latentCount }}</div>
             <Progress :percent="latentPercent" size="default" strokeColor="green" :show-info="true" :format="() => latentCount" />
           </div>
         </div>

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

@@ -234,6 +234,7 @@
   }
   //密闭参数选项切换
   function btnClick(item, ind) {
+    debugger;
     activeIndex.value = ind;
     type.value = item.label;
     echartDataSg1.xData.length = 0;
@@ -255,9 +256,9 @@
           time: echartDataSg1.xData,
           data: [
             // 氧气预测曲线
-            data.avgParams?.avg_o2_value || 0,
-            data.avgParams?.max_o2_value || 0,
-            data.avgParams?.min_o2_value || 0,
+            data.avgParam?.avg_o2_value || 0,
+            data.avgParam?.max_o2_value || 0,
+            data.avgParam?.min_o2_value || 0,
             // data.readData?.o2val,
           ],
           monitorData: echartDataSg1.yData,
@@ -275,9 +276,9 @@
           time: echartDataSg1.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_ch2_value || 0,
-            data.avgParams?.max_ch2_value || 0,
-            data.avgParams?.min_ch2_value || 0,
+            data.avgParam?.avg_c2h4_value || 0,
+            data.avgParam?.max_c2h4_value || 0,
+            data.avgParam?.min_c2h4_value || 0,
             // data.readData?.ch2val,
           ],
           monitorData: echartDataSg1.yData,
@@ -295,9 +296,9 @@
           time: echartDataSg1.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_co_value || 0,
-            data.avgParams?.max_co_value || 0,
-            data.avgParams?.min_co_value || 0,
+            data.avgParam?.avg_co_value || 0,
+            data.avgParam?.max_co_value || 0,
+            data.avgParam?.min_co_value || 0,
             // data.readData?.coval,
           ],
           monitorData: echartDataSg1.yData,
@@ -307,17 +308,17 @@
       case 'CH₄':
         echartDataSgList.forEach((el) => {
           echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.chval);
+          echartDataSg1.yData.push(el.gasval);
         });
         curveConfig.value = {
           id: 'ch',
           label: 'CH₄',
-          time: new Date(),
+          time: echartDataSg1.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_ch_value || 0,
-            data.avgParams?.max_ch_value || 0,
-            data.avgParams?.min_ch_value || 0,
+            data.avgParam?.avg_ch4_value || 0,
+            data.avgParam?.max_ch4_value || 0,
+            data.avgParam?.min_ch4_value || 0,
             // data.readData?.chval,
           ],
           monitorData: echartDataSg1.yData,
@@ -335,9 +336,9 @@
           time: echartDataSg1.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_co2_value || 0,
-            data.avgParams?.max_co2_value || 0,
-            data.avgParams?.min_co2_value || 0,
+            data.avgParam?.avg_co2_value || 0,
+            data.avgParam?.max_co2_value || 0,
+            data.avgParam?.min_co2_value || 0,
             // data.readData?.co2val,
           ],
           monitorData: echartDataSg1.yData,
@@ -347,17 +348,17 @@
       case 'C₂H₂':
         echartDataSgList.forEach((el) => {
           echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.gasval);
+          echartDataSg1.yData.push(el.chval);
         });
         curveConfig.value = {
           id: 'gas',
-          label: '',
+          label: 'C₂H₂',
           time: echartDataSg1.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_gas_value || 0,
-            data.avgParams?.max_gas_value || 0,
-            data.avgParams?.min_gas_value || 0,
+            data.avgParam?.avg_c2h2_value || 0,
+            data.avgParam?.max_c2h2_value || 0,
+            data.avgParam?.min_c2h2_value || 0,
             // data.readData?.gasval,
           ],
           monitorData: echartDataSg1.yData,

src/views/vent/monitorManager/alarmMonitor/common/fireWork.vue

@@ -162,7 +162,6 @@
   }
   //束管实时数据选项点击
   function getSgClick(items) {
-    debugger;
     echartDataSg.xData.length = 0;
     echartDataSg.yData.length = 0;
     echartDataSg.lengedData = items.title;
@@ -182,9 +181,9 @@
           time: echartDataSg.xData,
           data: [
             // 氧气预测曲线
-            data.avgParams?.avg_o2_value || 0,
-            data.avgParams?.max_o2_value || 0,
-            data.avgParams?.min_o2_value || 0,
+            data.avgParam?.avg_o2_value || 0,
+            data.avgParam?.max_o2_value || 0,
+            data.avgParam?.min_o2_value || 0,
             // data.readData?.o2val,
           ],
           monitorData: echartDataSg.yData,
@@ -202,9 +201,9 @@
           time: echartDataSg.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_ch2_value || 0,
-            data.avgParams?.max_ch2_value || 0,
-            data.avgParams?.min_ch2_value || 0,
+            data.avgParam?.avg_c2h4_value || 0,
+            data.avgParam?.max_c2h4_value || 0,
+            data.avgParam?.min_c2h4_value || 0,
             // data.readData?.ch2val,
           ],
           monitorData: echartDataSg.yData,
@@ -222,9 +221,9 @@
           time: echartDataSg.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_co_value || 0,
-            data.avgParams?.max_co_value || 0,
-            data.avgParams?.min_co_value || 0,
+            data.avgParam?.avg_co_value || 0,
+            data.avgParam?.max_co_value || 0,
+            data.avgParam?.min_co_value || 0,
             // data.readData?.coval,
           ],
           monitorData: echartDataSg.yData,
@@ -232,19 +231,20 @@
         getmaxY();
         break;
       case 'CH₄':
+        debugger;
         echartDataSgList.forEach((el) => {
           echartDataSg.xData.push(el.time);
-          echartDataSg.yData.push(el.chval);
+          echartDataSg.yData.push(el.gasval);
         });
         curveConfig.value = {
-          id: 'ch',
+          id: 'ch4',
           label: 'CH₄',
-          time: new Date(),
+          time: echartDataSg.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_ch_value || 0,
-            data.avgParams?.max_ch_value || 0,
-            data.avgParams?.min_ch_value || 0,
+            data.avgParam?.avg_ch4_value || 0,
+            data.avgParam?.max_ch4_value || 0,
+            data.avgParam?.min_ch4_value || 0,
             // data.readData?.chval,
           ],
           monitorData: echartDataSg.yData,
@@ -262,9 +262,9 @@
           time: echartDataSg.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_co2_value || 0,
-            data.avgParams?.max_co2_value || 0,
-            data.avgParams?.min_co2_value || 0,
+            data.avgParam?.avg_co2_value || 0,
+            data.avgParam?.max_co2_value || 0,
+            data.avgParam?.min_co2_value || 0,
             // data.readData?.co2val,
           ],
           monitorData: echartDataSg.yData,
@@ -274,17 +274,17 @@
       case 'C₂H₂':
         echartDataSgList.forEach((el) => {
           echartDataSg.xData.push(el.time);
-          echartDataSg.yData.push(el.gasval);
+          echartDataSg.yData.push(el.chval);
         });
         curveConfig.value = {
           id: 'gas',
-          label: '',
+          label: 'C₂H₂',
           time: echartDataSg.xData,
           data: [
             // 预测曲线
-            data.avgParams?.avg_gas_value || 0,
-            data.avgParams?.max_gas_value || 0,
-            data.avgParams?.min_gas_value || 0,
+            data.avgParam?.avg_c2h2_value || 0,
+            data.avgParam?.max_c2h2_value || 0,
+            data.avgParam?.min_c2h2_value || 0,
             // data.readData?.gasval,
           ],
           monitorData: echartDataSg.yData,
@@ -294,7 +294,6 @@
     }
   }
   function changeSelect(val) {
-    debugger;
     selectData.value = val;
     let data = selectSj.value.filter((v) => v.strinstallpos == selectData.value)[0];
     contentList[0].list[0].value = data.readData.o2val;
@@ -337,9 +336,9 @@
         arr.forEach((el) => {
           echartDataGq.xData.push(el.pos);
           echartDataGq.curData.data.push(el.value);
-          echartDataGq.maxData.data.push(fiber.avgParams?.max_temperature_value || 0);
-          echartDataGq.minData.data.push(fiber.avgParams?.min_temperature_value || 0);
-          echartDataGq.avgData.data.push(fiber.avgParams?.avg_temperature_value || 0);
+          echartDataGq.maxData.data.push(fiber.avgParam?.max_temperature_value || 0);
+          echartDataGq.minData.data.push(fiber.avgParam?.min_temperature_value || 0);
+          echartDataGq.avgData.data.push(fiber.avgParam?.avg_temperature_value || 0);
         });
       } else {
         topList[0].value = '--';

src/views/vent/monitorManager/alarmMonitor/common/mainWell.vue

@@ -385,7 +385,7 @@
       case 'CH₄':
         echartDataSgList.forEach((el) => {
           echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.chval);
+          echartDataSg1.yData.push(el.gasval);
         });
         break;
       case 'CO₂':
@@ -397,7 +397,7 @@
       case 'C₂H₂':
         echartDataSgList.forEach((el) => {
           echartDataSg1.xData.push(el.time);
-          echartDataSg1.yData.push(el.gasval);
+          echartDataSg1.yData.push(el.chval);
         });
         break;
     }
@@ -431,9 +431,9 @@
         arr.forEach((el) => {
           echartDataWd.xData.push(el.pos);
           echartDataWd.curData.data.push(el.value);
-          echartDataWd.maxData.data.push(fiber.avgParams?.max_temperature_value || 0);
-          echartDataWd.minData.data.push(fiber.avgParams?.min_temperature_value || 0);
-          echartDataWd.avgData.data.push(fiber.avgParams?.avg_temperature_value || 0);
+          echartDataWd.maxData.data.push(fiber.avgParam?.max_temperature_value || 0);
+          echartDataWd.minData.data.push(fiber.avgParam?.min_temperature_value || 0);
+          echartDataWd.avgData.data.push(fiber.avgParam?.avg_temperature_value || 0);
         });
       } else {
         topOutList[0].value = '--';

src/views/vent/monitorManager/alarmMonitor/common/predictionCurve.vue

@@ -60,8 +60,8 @@
   watch(
     () => props.chart,
     (el) => {
-      debugger;
-      if (!el) return;
+      // debugger;
+      if (!el || !el.time) return;
 
       // 新版的预测曲线处理，应用到了火灾预警下的各个模块
       if (isCurveProp(el)) {

src/views/vent/monitorManager/alarmMonitor/warn/dustWarn.vue

@@ -326,7 +326,7 @@
           });
 
           // 初始化预测曲线配置，分别为x轴时间、平均、最大、最小、实时
-          const avgParams = el.avgParam || {
+          const avgParam = el.avgParam || {
             avg_dusting_value: 0,
             max_dusting_value: 0,
             min_dusting_value: 0,
@@ -334,7 +334,7 @@
           chartListTfTemp.push({
             label: el.strinstallpos,
             time: new Date(),
-            data: [avgParams.avg_dusting_value, avgParams.max_dusting_value, avgParams.min_dusting_value, el.readData.dustval],
+            data: [avgParam.avg_dusting_value, avgParam.max_dusting_value, avgParam.min_dusting_value, el.readData.dustval],
           });
         });
       }

src/views/vent/monitorManager/alarmMonitor/warn/gasWarn.vue

@@ -185,7 +185,7 @@
             ],
           });
           // 初始化预测曲线配置，分别为x轴时间、平均、最大、最小、实时
-          const avgParams = el.avgParam || {
+          const avgParam = el.avgParam || {
             avg_gas_value: 0,
             max_gas_value: 0,
             min_gas_value: 0,
@@ -193,7 +193,7 @@
           chartListWs.push({
             label: el.strinstallpos,
             time: new Date(),
-            data: [avgParams.avg_gas_value, avgParams.max_gas_value, avgParams.min_gas_value, el.readData.gasC],
+            data: [avgParam.avg_gas_value, avgParam.max_gas_value, avgParam.min_gas_value, el.readData.gasC],
           });
         });
       }

src/views/vent/monitorManager/alarmMonitor/warn/ventilateWarn.vue

@@ -226,7 +226,7 @@
             ],
           });
           // 初始化预测曲线配置，分别为x轴时间、平均、最大、最小、实时
-          const avgParams = el.avgParam || {
+          const avgParam = el.avgParam || {
             avg_vent_value: 0,
             max_vent_value: 0,
             min_vent_value: 0,
@@ -234,7 +234,7 @@
           chartTfList.push({
             label: el.strinstallpos,
             time: new Date(),
-            data: [avgParams.avg_m3_value, avgParams.max_m3_value, avgParams.min_m3_value, el.readData.m3],
+            data: [avgParam.avg_m3_value, avgParam.max_m3_value, avgParam.min_m3_value, el.readData.m3],
           });
         });
       }