更新

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

@@ -143,7 +143,7 @@
           <gasDeviceStatusControl class="content__module" :option="config.config.option" :statusData="config.data" />
         </template>
         <template v-else-if="config.name === 'board_gas'">
-          <gasBoard class="content__module" :option="config.config.option" :type="config.config.type" />
+          <gasBoard class="content__module" :option="config.config.option" :type="config.config.type" :listData="config.data" />
         </template>
          <template v-else-if="config.name === 'gas_inject_card'">
           <gasInjectCard class="content__module" :option="config.config.option" />

src/views/vent/home/configurable/components/gasInject/echartLineDate.vue

@@ -86,16 +86,18 @@ function changeRadio(val) {
 //数据格式化
 function getFormat() {
   if (nowData.value == 'hours') {
-    ecahrtDatas.xData = ecahrtDatas.hourData.xlist
-    ecahrtDatas.injectionPressure = ecahrtDatas.hourData.datalist.records.map(el => el.readData.injectionPressure) || []
-    ecahrtDatas.flowStdInstant = ecahrtDatas.hourData.datalist.records.map(el => el.readData.flowStdInstant) || []
+   ecahrtDatas.xData = ['3.26', '3.27', '3.28', '3.29', '3.30', '3.31']
+    // ecahrtDatas.xData = ecahrtDatas.hourData.xlist
+    // ecahrtDatas.injectionPressure = ecahrtDatas.hourData.datalist.records.map(el => el.readData.injectionPressure) || []
+    // ecahrtDatas.flowStdInstant = ecahrtDatas.hourData.datalist.records.map(el => el.readData.flowStdInstant) || []
     ecahrtDatas.yData = ["20", "50", "12", "65", "30", "60", "50", "12", "65",]
     ecahrtDatas.yData1 = ["40", "60", "22", "85", "50", "40", "60", "22", "85",]
     ecahrtDatas.yData2 = ["70", "30", "42", "65", "80", "60", "30", "42", "65",]
   } else {
-    ecahrtDatas.xData = ecahrtDatas.minitesData.xlist || []
-    ecahrtDatas.injectionPressure = ecahrtDatas.minitesData.datalist.records.map(el => el.readData.injectionPressure) || []
-    ecahrtDatas.flowStdInstant = ecahrtDatas.minitesData.datalist.records.map(el => el.readData.flowStdInstant) || []
+      ecahrtDatas.xData = ['3.26', '3.27', '3.28', '3.29', '3.30', '3.31']
+    // ecahrtDatas.xData = ecahrtDatas.minitesData.xlist || []
+    // ecahrtDatas.injectionPressure = ecahrtDatas.minitesData.datalist.records.map(el => el.readData.injectionPressure) || []
+    // ecahrtDatas.flowStdInstant = ecahrtDatas.minitesData.datalist.records.map(el => el.readData.flowStdInstant) || []
     ecahrtDatas.yData = ["200", "500", "120", "650", "300", "600", "500", "120", "650",]
     ecahrtDatas.yData1 = ["400", "600", "220", "850", "500", "400", "600", "220", "850",]
     ecahrtDatas.yData2 = ["700", "300", "420", "650", "800", "600", "300", "420", "650",]

src/views/vent/home/configurable/components/preset/gasBoard.vue

@@ -8,7 +8,7 @@
         <div :class="`board-item-content-${type}`">
           <div :class="`item-content-label-${type}`">{{ item.label }}</div>
           <div :class="`item-content-value-${type}`">
-            <span>{{ item.value }}</span>
+            <span>{{ listData ?  listData[item.value] : '-'  }}</span>
             <span style="margin-left: 10px;">{{ item.unit }}</span>
           </div>
         </div>
@@ -27,6 +27,9 @@ let props = defineProps({
   },
   type: {
     type: String
+  },
+  listData:{
+    type:Object as any
   }
 })
 

src/views/vent/home/configurable/configurable.api.ts

@@ -689,6 +689,10 @@ export const getSystemApi = (params) => {
     res.historyDataCc = historyDataCc
     //注气数据
     let zqData = res.msgTxt.find(v => v.type == 'injection_standard').datalist[0]
+    let co= res.msgTxt.find(v => v.type == 'modelsensor_co').datalist[0]
+    let ch4= res.msgTxt.find(v => v.type == 'modelsensor_ch4').datalist[0]
+    let o2= res.msgTxt.find(v => v.type == 'modelsensor_o2').datalist[0]
+    let temp= res.msgTxt.find(v => v.type == 'modelsensor_temperature').datalist[0]
     //注气驱替促抽系统状态
     res.zyStatusData = {
       Pressure: zqData.readData.Pressure,
@@ -712,7 +716,25 @@ export const getSystemApi = (params) => {
       flowStdAccum: zqData.readData.flowStdAccum,
       injectionTemperature: zqData.readData.injectionTemperature,
       injectionPressure: zqData.readData.injectionPressure,
-
+    }
+    //环境监测
+    res.environmentData = {
+     //coVal:co.readData.coval || '-',
+     //ch4Val:co.readData.ch4Value || '-',
+     //o2Val:co.readData.o2Value || '-',
+     //coVal:co.readData.coval || '-',
+    }
+    //装备运行工况监测
+    res.deviceGkData = {
+      xitongVoltage: zqData.readData.xitongVoltage || '-',
+      zhujiCurrent: zqData.readData.zhujiCurrent || '-',
+      fenglengCurrent: zqData.readData.fenglengCurrent || '-',
+      qianzhouTemp: zqData.readData.qianzhouTemp || '-',
+      houzhouTemp: zqData.readData.houzhouTemp || '-',
+      raozuTemp: zqData.readData.raozuTemp || '-',
+      paiqiTemp: zqData.readData.paiqiTemp || '-',
+      penyouTemp: zqData.readData.penyouTemp || '-',
+      youqitongTemp: zqData.readData.youqitongTemp || '-',
     }
 
     return res;

src/views/vent/home/configurable/configurable.data.ts

@@ -1128,12 +1128,12 @@ export const testConfigGasInjectZq: Config[] = [
             },
             {
               label: '累计标况流量',
-              value: '${fy_merge}',
+              value: '${flowStdAccum}',
               unit: 'Nm³/min',
             },
             {
               label: '注气温度',
-              value: '${flowStdAccum}',
+              value: '${injectionTemperature}',
               unit: '℃',
             },
             {
@@ -1204,10 +1204,10 @@ export const testConfigGasInjectZq: Config[] = [
           readFrom: '',
           type: 'A',
           option: [
-            { label: '氧气浓度', value: '60', iconName: 'o2-gas', unit: '%' },
-            { label: '甲烷浓度', value: '60', iconName: 'ch4-gas', unit: '%' },
-            { label: '环境温度', value: '60', iconName: 'temp-gas', unit: '℃' },
-            { label: 'CO浓度', value: '60', iconName: 'wind-gas', unit: 'ppm' },
+            { label: '氧气浓度', value: 'xitongVoltage', iconName: 'o2-gas', unit: '%' },
+            { label: '甲烷浓度', value: 'xitongVoltage', iconName: 'ch4-gas', unit: '%' },
+            { label: '环境温度', value: 'xitongVoltage', iconName: 'temp-gas', unit: '℃' },
+            { label: 'CO浓度', value: 'xitongVoltage', iconName: 'wind-gas', unit: 'ppm' },
           ],
         },
       ],
@@ -1261,60 +1261,60 @@ export const testConfigGasInjectZq: Config[] = [
       gallery_list: [],
       preset: [
         {
-          readFrom: '',
+          readFrom: 'deviceGkData',
           type: 'B',
           option: [
             {
               label: '系统电压',
-              value: 'xxxx',
+              value: 'xitongVoltage',
               iconName: 'dian',
               unit: 'V',
             },
             {
               label: '主机电流',
-              value: 'xxxx',
+              value: 'zhujiCurrent',
               iconName: 'dian',
               unit: 'A',
             },
             {
-              label: '风机电流',
-              value: 'xxxx',
+              label: '风冷电流',
+              value: 'fenglengCurrent',
               iconName: 'dian',
               unit: 'A',
             },
             {
               label: '前轴温度',
-              value: 'xxxx',
+              value: 'qianzhouTemp',
               iconName: 'temp-gk',
               unit: '℃',
             },
             {
               label: '后轴温度',
-              value: 'xxxx',
+              value: 'houzhouTemp',
               iconName: 'temp-gk',
               unit: '℃',
             },
             {
               label: '绕组温度',
-              value: 'xxxx',
+              value: 'raozuTemp',
               iconName: 'temp-gk',
               unit: '℃',
             },
             {
               label: '排气温度',
-              value: 'xxxx',
+              value: 'paiqiTemp',
               iconName: 'temp-gk',
               unit: '℃',
             },
             {
               label: '喷油温度',
-              value: 'xxxx',
+              value: 'penyouTemp',
               iconName: 'temp-gk',
               unit: '℃',
             },
             {
               label: '油气桶温度',
-              value: 'xxxx',
+              value: 'youqitongTemp',
               iconName: 'temp-gk',
               unit: '℃',
             },
@@ -1695,10 +1695,10 @@ export const testConfigGasInjectCc: Config[] = [
           readFrom: '',
           type: 'C',
           option: [
-            { label: '抽采率', value: '60', iconName: 'ccl', unit: '%' },
-            { label: '残余瓦斯含量', value: '60', iconName: 'wshl', unit: 'm³/t' },
-            { label: '瓦斯含量降低速率', value: '60', iconName: 'jdsl', unit: 'm³/t/mon' },
-            { label: '注抽比', value: '60', iconName: 'czb', unit: '%' },
+            { label: '抽采率', value: 'xitongVoltage', iconName: 'ccl', unit: '%' },
+            { label: '残余瓦斯含量', value: 'xitongVoltage', iconName: 'wshl', unit: 'm³/t' },
+            { label: '瓦斯含量降低速率', value: 'xitongVoltage', iconName: 'jdsl', unit: 'm³/t/mon' },
+            { label: '注抽比', value: 'xitongVoltage', iconName: 'czb', unit: '%' },
           ],
         },
       ],