From a5e86bbc3cbb4d6e3e8ccaa9607d0d405fbf039a Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 13 四月 2021 16:42:58 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 58 ++++++++++++++--------------------------------------------
1 files changed, 14 insertions(+), 44 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 63f6a30..377daaf 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -25,16 +25,16 @@
</span>
</div>
</div>
- <div>
- 閲囨牱鐐规暟:
- <el-select v-model="formInline.region" placeholder="50">
- <el-option label="0" value="0"></el-option>
- <el-option label="25" value="25"></el-option>
- <el-option label="50" value="50"></el-option>
- <el-option label="75" value="75"></el-option>
- <el-option label="100" value="100"></el-option>
- </el-select>
- </div>
+<!-- <div>-->
+<!-- 閲囨牱鐐规暟:-->
+<!-- <el-select v-model="formInline.region" placeholder="50">-->
+<!-- <el-option label="0" value="0"></el-option>-->
+<!-- <el-option label="25" value="25"></el-option>-->
+<!-- <el-option label="50" value="50"></el-option>-->
+<!-- <el-option label="75" value="75"></el-option>-->
+<!-- <el-option label="100" value="100"></el-option>-->
+<!-- </el-select>-->
+<!-- </div>-->
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
@@ -138,6 +138,10 @@
datatype: 1
}
}
+ },
+ mounted () {
+ this.onSubmit()
+ // this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
},
methods: {
onSubmit () {
@@ -667,40 +671,6 @@
// }
// return options
// }
- },
- mounted () {
- // this.$nextTick(() => {
- // this.drawChart()
- // const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getQueryOnlineMonDateData)).reverse()
- // console.log(dataWatch)
- // var dateDate = []
- // // {COD:[3,4,5]}
- // var data = {}
- // for (var n = 0; n < dataWatch.length; n++) {
- // var d = dataWatch[n].MonTimeStr.substring(5, 9)
- // if (dateDate.indexOf(d) < 0) {
- // dateDate.push(d)
- // }
- // if (data[dataWatch[n].PoltmtrlName]) {
- // data[dataWatch[n].PoltmtrlName].push(dataWatch[n].MonQty)
- // } else {
- // data[dataWatch[n].PoltmtrlName] = [dataWatch[n].MonQty]
- // }
- // }
- // var series = []
- // for (var k in data) {
- // series.push({
- // name: k,
- // type: 'line',
- // yAxisIndex: k === '搴熸按娴侀噺' ? 1 : 0,
- // data: data[k]
- // })
- // }
- // console.log(series)
- // const opitons = this.initOptions(dateDate, series)
- // this.mychartDay = this.$echarts.init(this.$refs.main)
- // this.mychartDay.setOption(opitons)
- // })
}
}
</script>
--
Gitblit v1.8.0