|
@@ -94,7 +94,7 @@
|
|
|
<span class="base-title">设备监测曲线 <span style="color: red">{{ posMonitor['netStatus'] != 1 ? '(设备未连接)' :
|
|
|
'' }}</span></span>
|
|
|
<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" />
|
|
|
|
|
|
<!-- 爆炸三角形 -->
|
|
@@ -217,7 +217,12 @@ export default defineComponent({
|
|
|
const result = await getHistoryData({ ...params });
|
|
|
if(result['records'].length!=0){
|
|
|
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'];
|