From 1f5d63f62c4a1b1d73927d276b116d79bece8566 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期日, 25 四月 2021 10:32:34 +0800
Subject: [PATCH] 附属设施修改增加附属设施按钮1
---
src/components/BaseNav/WasteWater/DayData.vue | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/DayData.vue b/src/components/BaseNav/WasteWater/DayData.vue
index a5f0006..d087100 100644
--- a/src/components/BaseNav/WasteWater/DayData.vue
+++ b/src/components/BaseNav/WasteWater/DayData.vue
@@ -1,51 +1,32 @@
<!-- 鏃ユ暟鎹� -->
<template>
<div id="Tab">
- <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
+ <div class="tab-scroll">
+ <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
+ <span class="time-select">{{ formInline.timeStart }}鏃モ�斺�攞{ formInline.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>
+ <el-date-picker type="datetime" value-format="yyyy-MM-dd" v-model="formInline.timeStart"></el-date-picker>
</span>
</div>
<div class="pickerData">
<span>缁撴潫鏃堕棿:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeEnd"></el-date-picker>
+ <el-date-picker type="datetime" value-format="yyyy-MM-dd" v-model="formInline.timeEnd"></el-date-picker>
</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 class="detailbtn hover-bottom">鏌ヨ</div>
<div class="detailbtn hover-bottom">鏄庣粏琛�</div>
</div>
- <div style="width:5rem;height:2rem;" id="echarts" ref="echartsday">
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="echartsday">
</div>
</div>
- <!-- <!– 鏄庣粏寮规 –>-->
- <!-- <el-dialog :visible.sync="dialogVisible"-->
- <!-- :append-to-body="true"-->
- <!-- :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"-->
- <!-- width="68%"-->
- <!-- center-->
- <!-- v-dialogDrag-->
- <!-- >-->
- <!-- <div class="el-dialog-div" style="height: 500px">-->
- <!-- <public-detailed-list v-bind="$attrs"></public-detailed-list>-->
- <!-- </div>-->
- <!-- </el-dialog>-->
</div>
</template>
@@ -106,9 +87,11 @@
}],
formInline: {
region: '',
- timeStart: '',
- timeEnd: ''
+ timeStart: dayjs().subtract(1, 'month').format('YYYY-MM-DD'),
+ timeEnd: dayjs().format('YYYY-MM-DD')
},
+ timeStart: '',
+ timeEnd: '',
chart: null,
dataType: 1,
jcdID: 1,
@@ -120,14 +103,12 @@
this.$nextTick(() => {
this.draw24Chart()
})
- 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')
},
methods: {
async draw24Chart () {
// 鐢ㄤ簬鎺ュ彛鏁版嵁璇锋眰鐨勫弬鏁� 寮�濮�/缁撴潫鏃堕棿 || 鍙�夋嫨鏌ヨ鐨勫紑濮�/缁撴潫鏃堕棿
- this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- this.formInline.timeStart = dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD')
+ this.formInline.timeStart = dayjs().subtract(24, 'hours').format('YYYY-MM-DD')
const data = {
onLineMonEmissPointId: 23,
monItemId: 28,
@@ -306,7 +287,7 @@
},
effChartShow (divid, title, legend, xdata, ydatas, yname, jcdID, datatype) {
this.chart = this.$echarts.init(this.$refs.echartsday)
- console.log(this.chart)
+ // console.log(this.chart)
this.chart.clear()
var dataUnit = ''
if (datatype === 1) {
@@ -461,8 +442,8 @@
}
},
grid: { // 缃戞牸
- top: '20%',
- left: '5%'
+ top: '20%'
+ // left: '5%'
},
legend: {
data: legend
@@ -574,6 +555,7 @@
series: serLists
}
this.chart.setOption(option)
+ window.onresize = this.chart.resize
}
}
}
@@ -598,13 +580,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 +621,8 @@
display: flex;
> span {
- line-height: 22px
+ line-height: 22px;
+ margin-right: 15px;
}
.pickerTable {
--
Gitblit v1.8.0