From 7cb82d5220007f1c619b9ac76abbe975c4d212d5 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 16 四月 2021 14:06:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index f77581c..d22a3ce 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -57,6 +57,7 @@
</template>
<script>
+import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
@@ -150,6 +151,17 @@
this.onSubmit()
},
methods: {
+ async getWasteGasMonData () {
+ const GasOnlinedata = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: '2020-04-07 15:13:20',
+ dataType: '1'
+ }
+ const data = await mapApi.getWasteGasMonData(GasOnlinedata)
+ this.JsonDayCharts = data
+ },
onSubmit () {
console.log('submit!')
this.CreateCharts(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
@@ -160,9 +172,9 @@
this.mychartDay.clear()
var dataUnit = ''
if (datatype === 1) {
- dataUnit = '姘旈噺(m鲁/d)'
+ dataUnit = '搴熸皵姘旈噺(m鲁/d)'
} else {
- dataUnit = '姘旈噺(m鲁/h)'
+ dataUnit = '搴熸皵姘旈噺(m鲁/h)'
}
var serLists = []
@@ -734,6 +746,7 @@
padding: 0;
border:none;
text-align: center;
+ z-index: 9999;
//padding-left:20px ;
//padding: 0!important;
}
--
Gitblit v1.8.0