From f0efaed32d322f4e389f77169b81992118913656 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 08 四月 2021 09:14:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index fcca905..4a06df2 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -21,7 +21,7 @@
</div>
</el-dialog>
</div>
- <div style="width:100%;height:1.2rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
+ <div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
</div>
</div>
</div>
@@ -219,22 +219,20 @@
this.$nextTick(() => {
this.drawChart()
const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
- console.log(dataWatch)
+ // console.log(dataWatch)
for (var i = 0; i < dataWatch.length; i++) {
this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
}
- console.log(this.dataDate)
+ // console.log(this.dataDate)
})
}
}
</script>
<style scoped lang="less">
-#Tab {
- height: 3rem;
-}
.Infomation {
margin-left: 10px;
+ height: 0.2rem;
}
.el-tag {
@@ -250,7 +248,7 @@
.form-echrts {
width: 100%;
- height: 100%;
+ height: 1rem;
border-top: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
.el-dialog-div {
@@ -262,7 +260,7 @@
#echarts {
margin: 0;
padding: 0;
- height: 3rem;
+ //height: 3rem;
//border: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
}
--
Gitblit v1.8.0