From 4076c14a8eac96cd716522f2cb15dcda0eb4fcef Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 10 四月 2024 08:37:53 +0800
Subject: [PATCH] 新修改
---
src/views/monitorData/fluxData/index.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/src/views/monitorData/fluxData/index.vue b/src/views/monitorData/fluxData/index.vue
index 107a490..664a26c 100644
--- a/src/views/monitorData/fluxData/index.vue
+++ b/src/views/monitorData/fluxData/index.vue
@@ -48,7 +48,7 @@
</el-button>
</el-form>
</div>
- <div id="gasChart" style="height: 500px;width: auto"></div>
+ <div :id="fluxChart" style="height: 500px;width: auto"></div>
<el-table :data="state.tableData.data" style="width: 100%" v-loading="loading">
<el-table-column type="index" label="序号" width="80" />
<el-table-column align="center" prop="time" label="采集时间"/>
@@ -108,7 +108,7 @@
const loading = ref(false);
const myChart = shallowRef(null)
-
+const fluxChart =ref("eChartfluxN" + Date .now() + Math .random())
const chooseTime = (val:any) => {
console.log("val",val)
let sTime = Date.parse(new Date(val[0]));
@@ -167,18 +167,53 @@
let resChart = await fluxDataApi().getFluxLineChart(chartParam);
if(resChart.data.code == 100) {
if(resChart.data.data) {
- yData.value = mapArray(resChart.data.data);
+ // yData.value = mapArray(resChart.data.data);
+ const gasTime = resChart.data.data.map(i=>i.time?.slice(11))
+ const gasTlTime = [...new Set(gasTime)]
+ let areaData = state.tableData.areaList.map((item)=>{
+ return {
+ areaId: item.id,
+ name: item.name,
+ dotList: []
+ }
+ })
+ for(let i of gasTlTime){
+ const sameTimeData = resChart.data.data.filter(it=>it.time?.slice(11) == i)
+ for(let j of areaData){
+ const foundData = sameTimeData.find(k=>k.areaId == j.areaId)
+ if(foundData){
+ j.dotList.push(foundData.gasValue)
+ }else{
+ j.dotList.push(0)
+ }
+ }
+ }
+ yData.value = areaData.map((i)=>{
+ return {
+ name: i.name,
+ type: 'bar',
+ data: i.dotList,
+ label: labelOption,
+ emphasis:{
+ focus: 'series'
+ }
+ }
+ })
areaChart.value = yData.value.map((item: any) => {
return item.name
});
- dataZoomEnd.value = xData.value.length > 25 ? 5 : 100;
+
+ dataZoomEnd.value = gasTlTime.length > 25 ? 5 : 100;
+ console.log(yData,'y')
+
+ initCharts(gasTlTime,yData.value)
}else {
yData.value = [];
xData.value = [];
dataZoomEnd.value = 100;
}
- initCharts();
+ // initCharts();
}else {
ElMessage({
type: 'warning',
@@ -316,11 +351,12 @@
}
-const initCharts = () => {
+const initCharts = (time: Array<string>,data: Array<any>) => {
if (myChart.value != null && myChart.value != "" && myChart.value != undefined) {
myChart.value.dispose();
}
- myChart.value = echarts.init(document.getElementById('gasChart'));
+
+ myChart.value = echarts.init(document.getElementById(fluxChart.value));
// 指定图表的配置项和数据
const option = {
tooltip: {
@@ -363,7 +399,7 @@
{
type: 'category',
axisTick: { show: false },
- data: xData.value
+ data: time
}
],
yAxis: [
@@ -371,7 +407,7 @@
type: 'value'
}
],
- series: yData.value,
+ series: data,
dataZoom: [
{
--
Gitblit v1.9.2