From e9c742f5718fd6450188009b12f44d766eaa906b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com> Date: Thu, 12 Oct 2023 18:31:12 +0800 Subject: [PATCH] 1 --- src/assets/js/charts.js | 49 +++++++++++++++++++++++++++++++++++-- src/views/page/realTime.vue | 8 +++--- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/src/assets/js/charts.js b/src/assets/js/charts.js index 0ebc371..423f511 100644 --- a/src/assets/js/charts.js +++ b/src/assets/js/charts.js @@ -13,17 +13,20 @@ export function realTimeLine(id,data) { var data7=[]//1#水肥EC var data8=[]//2#水肥EC var data9=[]//1#空气温度 + var data10=[]//1#管道压力 data.forEach((el,index)=>{ Xdata.push(el.time) data1.push(el.value['目标水肥PH']) data2.push(el.value['目标水肥EC']) - data3.push(el.value['平均值水肥PH']) - data4.push(el.value['平均值水肥EC']) + data3.push(el.value['1#平均水肥EC']) + data4.push(el.value['1#平均水肥PH']) data5.push(el.value['1#水肥PH']) data6.push(el.value['2#水肥PH']) data7.push(el.value['1#水肥EC']) data8.push(el.value['2#水肥EC']) data9.push(el.value['1#空气温度']) + data10.push(el.value['1#管道压力']) + }) console.log(data1,data2); var list = [ @@ -404,6 +407,48 @@ export function realTimeLine(id,data) { borderWidth: 1, }, }, + }, + { + name: '1#管道压力', + data: data9, + type: "line", + symbol: "circle", + smooth: true, + symbolSize: 5, + showSymbol: false, + lineStyle: { + normal: { + width: 2, + }, + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: "rgba(255, 156, 154, 0.50)", + }, + { + offset: 0.8, + color: "rgba(255, 156, 154, 0)", + }, + ], + false + ), + }, + }, + itemStyle: { + normal: { + color: "rgba(255, 156, 154, 1)", + borderColor: "rgba(255, 156, 154, 1)", + borderWidth: 1, + }, + }, }] var option = { tooltip: { diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 24ef270..73766eb 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -180,15 +180,15 @@ export default { // } if(el.equipmentNumber==0){ if(el.targetValue==1){ - name=el.environmentDataId+'(目标值)' + name='目标'+el.environmentDataId }else{ - name=el.environmentDataId+'(1号平均值)' + name='1#平均'+el.environmentDataId } }else if(el.equipmentNumber==15){ if(el.targetValue==1){ - name=el.environmentDataId+'(目标值)' + name='目标'+el.environmentDataId }else{ - name=el.environmentDataId+'(2号平均值)' + name='2#平均'+el.environmentDataId } }else{ name=el.equipmentNumber+'#'+el.environmentDataId