From ac41dd3a9b8632c9cbda389012a85de87135ed47 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 22 四月 2021 14:56:42 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteWater/RealData.vue | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/RealData.vue b/src/components/BaseNav/WasteWater/RealData.vue
index 2f38d20..7a134ae 100644
--- a/src/components/BaseNav/WasteWater/RealData.vue
+++ b/src/components/BaseNav/WasteWater/RealData.vue
@@ -1,6 +1,9 @@
<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">
@@ -100,6 +103,8 @@
timeStart: '',
timeEnd: ''
},
+ // timeStart:,
+ // timeEnd:'',
// echarts鐨刼ptions鏁版嵁浼犲叆
echartsOptions: {
@@ -135,7 +140,7 @@
$endTime: this.formInline.timeStart,
$step: 15
}
- const result = (await mapApi.DataItems(data)).data
+ const result = (await mapApi.getDataItems(data)).data
this.getRtdb15s(result)
},
// echarts鏁版嵁澶勭悊
@@ -314,10 +319,10 @@
const BBZMAPPING = [
{
COD: 35,
- 搴熸按娴侀噺: null,
+ ph: 9,
鎬绘爱: 15,
鎬荤７: 0.3,
- 榛贰: 3
+ 姘ㄦ爱: 3
}
]
for (let m = 0; m < this.RealTimeDataList.length; m++) {
@@ -647,6 +652,24 @@
}
}
+.tab-scroll {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .time-select {
+ //margin: 0 10px;
+ cursor: pointer;
+ padding: 5px;
+ border: 1px solid #2b87c8;
+ border-radius: 4px;
+ text-align: center;
+ color: #fff;
+ font-size: 11px;
+ width: 280px;
+ }
+}
+
.animation {
//width: 600px;
//height: 0.06rem;
@@ -661,7 +684,8 @@
//margin: 10px 10px 10px 10px;
.from-search {
display: flex;
- padding: 5px;
+ //justify-content: space-evenly;
+ padding: 15px 0;
> div {
margin-left: 10px
@@ -679,7 +703,8 @@
display: flex;
> span {
- line-height: 22px
+ line-height: 22px;
+ margin-right: 15px;
}
.pickerTable {
--
Gitblit v1.8.0