From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue b/src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue
index 8334982..765f402 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterHoursChart.vue
@@ -2,31 +2,23 @@
<div class="echarts-box">
<div class="tab-scroll">
<PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <span class="time-select">{{ formData.startTime }}鏃垛�攞{ formData.endTime }}鏃�</span>
</div>
<div class="echarts-form">
<span class="demonstration">寮�濮嬫椂闂达細</span>
- <el-date-picker
- v-model="formData.startTime"
- value-format="yyyy-MM-dd HH"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.startTime" value-format="yyyy-MM-dd HH" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">缁撴潫鏃堕棿锛�</span>
- <el-date-picker
- v-model="formData.endTime"
- value-format="yyyy-MM-dd HH"
- type="datetime">
- </el-date-picker>
+ <el-date-picker v-model="formData.endTime" value-format="yyyy-MM-dd HH" type="datetime" size="mini"></el-date-picker>
<span class="demonstration">閲囨牱鐐规暟锛�</span>
- <el-select v-model="formData.region" placeholder="璇烽�夋嫨" style="width: 80px">
+ <el-select v-model="formData.region" placeholder="璇烽�夋嫨" size="mini">
<el-option v-for="(item,index) in formData.regionList" :key="index" :label="item" :value="item"></el-option>
</el-select>
<el-button @click="querySearch()">鏌ヨ</el-button>
<el-button>鏄庣粏琛�</el-button>
</div>
<div class="echarts-chart">
- <div style="width:5rem;height:1.5rem;" ref="echartsHour"></div>
+ <div ref="echartsHour"></div>
</div>
+ <span class="time-select">{{ formData.startTime }}鏃垛�攞{ formData.endTime }}鏃�</span>
</div>
</template>
@@ -77,7 +69,7 @@
{
current: {
name: '搴熸皵娴侀噺',
- val: 120
+ val: 123
},
standard: {
name: '',
@@ -104,7 +96,7 @@
methods: {
// 鐐瑰嚮鏌ヨ鍔熻兘
querySearch () {
-
+ this.draw24Chart()
},
// 鍒濆鍖栨暟鎹姹�
async draw24Chart () {
--
Gitblit v1.8.0