Browse Source

束管监测详情历史数据图表修改提交

lxh 9 tháng trước cách đây
mục cha
commit
2b38e9a8c7

+ 7 - 2
src/views/vent/monitorManager/deviceMonitor/components/device/modal/bundle.modal.vue

@@ -94,7 +94,7 @@
           <span class="base-title">设备监测曲线&nbsp; <span style="color: red">{{ posMonitor['netStatus'] != 1 ? '(设备未连接)' :
           <span class="base-title">设备监测曲线&nbsp; <span style="color: red">{{ posMonitor['netStatus'] != 1 ? '(设备未连接)' :
             '' }}</span></span>
             '' }}</span></span>
           <div class="echarts-box">
           <div class="echarts-box">
-            <BarAndLine class="echarts-line" xAxisPropType="ttime" :dataSource="historyList" height="100%" width="65%"
+            <BarAndLine class="echarts-line" xAxisPropType="time" :dataSource="historyList" height="100%" width="65%"
               :chartsColumns="chartsColumns" :option="echatsOption" chartsType="listMonitor" />
               :chartsColumns="chartsColumns" :option="echatsOption" chartsType="listMonitor" />
 
 
             <!-- 爆炸三角形 -->
             <!-- 爆炸三角形 -->
@@ -217,7 +217,12 @@ export default defineComponent({
         const result = await getHistoryData({ ...params });
         const result = await getHistoryData({ ...params });
         if(result['records'].length!=0){
         if(result['records'].length!=0){
           result['records'].forEach(el=>{
           result['records'].forEach(el=>{
-            Object.assign(el, el.readData);
+            el.ch2val=el.C2H4
+            el.chval=el.C2H2
+            el.co2val=el.CO2
+            el.coval=el.CO
+            el.gasval=el.CH4
+            el.o2val=el.O2
           })
           })
         }
         }
         historyList.value = result['records'];
         historyList.value = result['records'];