From edbf4224c71014eacdcdcde12a9a2885ab0ffd23 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 17:42:31 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
index 4f96d4a..bdb4463 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
@@ -2,10 +2,10 @@
<div id="Tab">
<div class="animation">
<div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i>29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i>17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i>6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i>120343.18</i></span>
+ <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
+ <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
</div>
</div>
<div class="form-echrts">
@@ -14,7 +14,7 @@
<div class="pickerData">
<span> 寮�濮嬫椂闂�:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
+ <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
</span>
</div>
<div class="pickerData">
@@ -205,10 +205,20 @@
}
}
},
- // mounted () {
- // this.DrawEXHRealTimeDateChart()
- // },
+ mounted () {
+ // const Day = new Date()
+ // console.log(Day)
+ this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ },
methods: {
+ // EndTime () {
+ // var myDate = new Date()
+ // var mytime = myDate.toLocaleTimeString() // 鑾峰彇褰撳墠鏃堕棿
+ // console.log(mytime)
+ // },
+ // handleshowcomplaint(row) {
+ // this.temp.complaint_consultationtime = new Date()
+ // },
onSubmit () {
this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
},
@@ -490,6 +500,9 @@
border-radius: 2px;
margin-right: 10px;
padding:0 10px
+ >i{
+ color: #ffffff;
+ }
}
.animation {
//width: 600px;
--
Gitblit v1.8.0