From 20bac7bbc63788b14a40757da47a7f200d4155c1 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 22 四月 2021 09:00:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteWater/DayData.vue | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/DayData.vue b/src/components/BaseNav/WasteWater/DayData.vue
index 110baea..c46779f 100644
--- a/src/components/BaseNav/WasteWater/DayData.vue
+++ b/src/components/BaseNav/WasteWater/DayData.vue
@@ -1,12 +1,15 @@
<!-- 鏃ユ暟鎹� -->
<template>
<div id="Tab">
- <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
+ <div class="tab-scroll">
+ <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
+ <span class="time-select">{{ timeStart }}鏃モ�斺�攞{ timeEnd }}鏃�</span>
+ </div>
<div class="form-echrts">
<div class="from-search">
<div class="pickerMon">
<div class="pickerData">
- <span> 寮�濮嬫椂闂�:</span>
+ <span>寮�濮嬫椂闂�:</span>
<span class="pickerTable">
<el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
</span>
@@ -109,6 +112,8 @@
timeStart: '',
timeEnd: ''
},
+ timeStart: '',
+ timeEnd: '',
chart: null,
dataType: 1,
jcdID: 1,
@@ -122,6 +127,8 @@
})
this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
this.formInline.timeStart = dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss')
+ this.timeEnd = dayjs().format('YYYY-MM-DD')
+ this.timeStart = dayjs().subtract(1, 'month').format('YYYY-MM-DD')
},
methods: {
async draw24Chart () {
@@ -461,8 +468,8 @@
}
},
grid: { // 缃戞牸
- top: '20%',
- left: '5%'
+ top: '20%'
+ // left: '5%'
},
legend: {
data: legend
@@ -598,13 +605,30 @@
}
}
+.tab-scroll {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .time-select {
+ cursor: pointer;
+ padding: 5px;
+ border: 1px solid #2b87c8;
+ border-radius: 4px;
+ text-align: center;
+ color: #fff;
+ font-size: 11px;
+ width: 280px;
+ }
+}
+
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
//margin: 10px 10px 10px 10px;
.from-search {
display: flex;
- padding: 0.02rem;
+ padding: 15px 0;
> div {
margin-left: 10px
@@ -622,7 +646,8 @@
display: flex;
> span {
- line-height: 22px
+ line-height: 22px;
+ margin-right: 15px;
}
.pickerTable {
--
Gitblit v1.8.0