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/RealData.vue | 31 ++
src/components/BaseNav/WasteWater/Detail.vue | 75 +++++++
src/components/BaseNav/WasteGas/RealData.vue | 14
src/components/BaseNav/WasteWater/WasteWaterIndex.vue | 119 ++++++++++-
src/components/BaseNav/WasteWater/HourData.vue | 163 +++++++++------
src/components/BaseNav/WasteGas/WasteGasIndex.vue | 106 ++++++++-
src/components/BaseNav/WasteGas/HourData.vue | 2
src/components/BaseNav/WasteWater/DayData.vue | 37 +++
8 files changed, 426 insertions(+), 121 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/HourData.vue b/src/components/BaseNav/WasteGas/HourData.vue
index 832658b..a50c62b 100644
--- a/src/components/BaseNav/WasteGas/HourData.vue
+++ b/src/components/BaseNav/WasteGas/HourData.vue
@@ -314,7 +314,7 @@
if (nameList[j] === '浜屾哀鍖栫～') {
zdcbcolor = 'red'
zxcolor = '#fff21c'
- } else if (nameList[j] === '姘哀鍖栫墿') {
+ } else if (nameList[j] === '姘ㄦ爱') {
zdcbcolor = 'red'
zxcolor = '#00B0F0'
} else if (nameList[j] === '鐑熷皹') {
diff --git a/src/components/BaseNav/WasteGas/RealData.vue b/src/components/BaseNav/WasteGas/RealData.vue
index b440dda..19184e4 100644
--- a/src/components/BaseNav/WasteGas/RealData.vue
+++ b/src/components/BaseNav/WasteGas/RealData.vue
@@ -130,7 +130,6 @@
$step: 15
}
const result = (await mapApi.DataItems(data)).data
- console.log(result)
this.getRtdb15s(result)
},
// echarts鏁版嵁澶勭悊
@@ -294,7 +293,7 @@
// 涓存椂鏁版嵁
const BBZMAPPING = [
{
- COD: 35,
+ 浜屾哀鍖栫⒊: 35,
ph: 9,
鎬绘爱: 15,
鎬荤７: 0.3,
@@ -425,13 +424,13 @@
}
}
- if (ydatas[i].name === '搴熸皵娴侀噺' || ydatas[i].name === '搴熸皵') {
+ if (ydatas[i].name === '姘哀鍖栫墿' || ydatas[i].name === '搴熸皵') {
obj.yAxisIndex = 1
}
// 涓存椂
const datatype = 1
if (datatype === 1) {
- dataUnit = '娴侀噺(m鲁/d)'
+ dataUnit = '搴熸皵娴侀噺(m鲁/d)'
} else {
dataUnit = '娴侀噺(m鲁/h)'
}
@@ -551,9 +550,10 @@
yAxis: [{
type: 'value',
name: yname,
- max: function (value) {
- return parseInt(value.max + 30)
- },
+ // max: function (value) {
+ // console.log(value)
+ // return parseInt(value.max + 30)
+ // },
axisLabel: {
formatter: '{value}',
textStyle: {
diff --git a/src/components/BaseNav/WasteGas/WasteGasIndex.vue b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
index ff50e1f..7a82933 100644
--- a/src/components/BaseNav/WasteGas/WasteGasIndex.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
@@ -9,20 +9,39 @@
<span></span>
<span></span>
<span></span>
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="瀹炴椂鏁版嵁" name="first">
- <RealData></RealData>
- </el-tab-pane>
- <el-tab-pane label="灏忔椂鏁板眳" name="second">
- <HourData></HourData>
- </el-tab-pane>
- <el-tab-pane label="鏃ユ暟鎹�" name="third">
- <DayData></DayData>
- </el-tab-pane>
- <el-tab-pane label="浜哄伐鐩戞祴鏁版嵁" name="fourth">
- <Detail></Detail>
- </el-tab-pane>
- </el-tabs>
+ <!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
+ <!-- <el-tab-pane label="瀹炴椂鏁版嵁" name="first">-->
+ <!-- <RealData></RealData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="灏忔椂鏁板眳" name="second">-->
+ <!-- <HourData></HourData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="鏃ユ暟鎹�" name="third">-->
+ <!-- <DayData></DayData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="浜哄伐鐩戞祴鏁版嵁" name="fourth">-->
+ <!-- <Detail></Detail>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="ccc" name="five"></el-tab-pane>-->
+ <!-- </el-tabs>-->
+ <div class="legend">
+ <!-- <span>姝ｅ父</span>-->
+ <p>瓒呮爣</p>
+ <i style=" background: #4ec99c;"></i>
+ <!-- <span>棰勮</span>-->
+ <p>棰勮</p>
+ <i style=" background: orange;"></i>
+ <!-- <span>瓒呮爣</span>-->
+ <p>瓒呮爣</p>
+ <i style=" background: red;"></i>
+ </div>
+ <ul class="tab">
+ <li :class="active===0?'hover':''" @click='tabTaggle("RealData",0)'>瀹炴椂鏁版嵁</li>
+ <li :class="active===1?'hover':''" @click='tabTaggle("HourData",1)'>灏忔椂鏁版嵁</li>
+ <li :class="active===2?'hover':''" @click='tabTaggle("DayData",2)'>鏃ユ暟鎹�</li>
+ <li :class="active===3?'hover':''" @click='tabTaggle("Detail",3)'>浜哄伐鐩戞祴鏁版嵁</li>
+ </ul>
+ <component :is="currentTab" ref="RealData"></component>
</div>
</template>
<template v-slot:video>
@@ -56,12 +75,19 @@
},
data () {
return {
- activeName: 'first'
+ activeName: 'first',
+ // currentTab: this.current(),
+ currentTab: RealData,
+ active: 0
}
},
methods: {
- handleClick (tab, event) {
- console.log(tab, event)
+ tabTaggle (taggleMenu, num) {
+ this.currentTab = taggleMenu
+ this.active = num
+ },
+ current (currentTab) {
+ currentTab = RealData
}
}
}
@@ -69,6 +95,52 @@
<style lang="less" scoped>
+.tab {
+ display: flex;
+ //border-bottom: 1px solid #396d83;
+ //padding: 0.02rem 0.04rem;
+}
+
+.tab li {
+ background-color: #243a55;
+ line-height: 0.15rem;
+ height: 0.15rem;
+ text-align: center;
+ border-radius: 5px;
+ margin-right: 0.04rem;
+ padding: 0 0.04rem;
+}
+
+.tab li.hover,
+.tab li:hover {
+ background-color: #0e639e;
+ color: #fff;
+ cursor: pointer;
+}
+
+.legend {
+ position: absolute;
+ top: 0.05rem;
+ right: 0;
+ display: flex;
+ justify-items: center;
+ align-items: center;
+}
+
+.legend i {
+ display: block;
+ width: 0.2rem;
+ height: 0.09rem;
+ margin: 0 0.1rem 0 0.05rem;
+ border-radius: 0.02rem;
+}
+
+.legend span {
+ line-height: 0.09rem;
+ height: 0.09rem;
+ font-size: 0.06rem;
+}
+
.public-part {
position: relative;
margin-bottom: 0.1rem;
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 {
diff --git a/src/components/BaseNav/WasteWater/Detail.vue b/src/components/BaseNav/WasteWater/Detail.vue
index 29c7a3b..4cc659f 100644
--- a/src/components/BaseNav/WasteWater/Detail.vue
+++ b/src/components/BaseNav/WasteWater/Detail.vue
@@ -1,9 +1,13 @@
<template>
- <div class="detail" style="width: 5rem">
+ <div class="detail" style="width: 5.5rem">
+ <div class="tab-scroll">
+ <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
+ <span class="time-select">{{ timeStart }}鈥斺�攞{ timeEnd }}</span>
+ </div>
<el-table
:data="tableData"
style="width: 100%;"
- height="200px"
+ height="280px"
>
<el-table-column
prop="LabMonTime"
@@ -73,15 +77,63 @@
<script>
+import PublicDataStandard from '../PublicDataStandard'
import mapApi from '@/api/mapApi'
import 'dayjs/locale/es'
import dayjs from 'dayjs'
export default {
name: 'Detail',
+ components: {
+ PublicDataStandard
+ },
data () {
return {
- tableData: []
+ tableData: [],
+ // tab鏍忎紶閫掓帴鏀舵暟鎹�
+ dataStandard: [
+ {
+ current: {
+ name: '姘哀鍖栫墿',
+ val: 29.93
+ },
+ standard: {
+ name: '鏍囧噯',
+ val: 100
+ }
+ },
+ {
+ current: {
+ name: '浜屾哀鍖栫～',
+ val: 17.34
+ },
+ standard: {
+ name: '鏍囧噯',
+ val: 50
+ }
+ },
+ {
+ current: {
+ name: '鐑熷皹',
+ val: 6.93
+ },
+ standard: {
+ name: '鏍囧噯',
+ val: 30
+ }
+ },
+ {
+ current: {
+ name: '搴熸皵娴侀噺',
+ val: 120
+ },
+ standard: {
+ name: '',
+ val: null
+ }
+ }],
+ timeEnd: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+ timeStart: dayjs().subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss')
}
},
mounted () {
@@ -114,4 +166,21 @@
/*/deep/ .el-table {*/
/* border: none !important;*/
/*}*/
+
+.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;
+}
</style>
diff --git a/src/components/BaseNav/WasteWater/HourData.vue b/src/components/BaseNav/WasteWater/HourData.vue
index 20031db..f78dd9b 100644
--- a/src/components/BaseNav/WasteWater/HourData.vue
+++ b/src/components/BaseNav/WasteWater/HourData.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">{{ timeStart }}鏃垛�斺�攞{ timeEnd }}鏃�</span>
+ </div>
<div class="form-echrts">
<div class="from-search">
<div class="pickerMon">
@@ -87,6 +90,8 @@
timeStart: '',
timeEnd: ''
},
+ timeEnd: dayjs().format('YYYY-MM-DD HH'),
+ timeStart: dayjs().subtract(24, 'hours').format('YYYY-MM-DD HH'),
chart: null,
jcdID: 1,
dataType: 2,
@@ -128,7 +133,7 @@
continue
}
- var MonTimeStr = d[i].MonTimeStr
+ const MonTimeStr = d[i].MonTimeStr
// getWRW(d[i])
@@ -176,7 +181,7 @@
if (nameList.length === 0) {
nameList.push(d[i].PoltmtrlName.trim())
dateList.push(strDate)
- /* var data=new Array();
+ /* let data=new Array();
data.push(d.MonQty); */
if ((d[i].PoltmtrlName === '搴熸按娴侀噺' || d[i].PoltmtrlName === '搴熸按') && d[i].MonQty < 0) {
d[i].MonQty = 0
@@ -216,7 +221,7 @@
const newList = []
for (let i = 0; i < dataList.length; i++) {
- var list = dataList[i].reverse()
+ const list = dataList[i].reverse()
newList.push(list)
}
dataList = newList
@@ -267,11 +272,11 @@
}
lengList.push(objTemp)
- var legend = lengList
- var xdata = dateList.reverse()
- var ydatas = []
+ const legend = lengList
+ const xdata = dateList.reverse()
+ const ydatas = []
- for (var j = 0; j < nameList.length; j++) {
+ for (let j = 0; j < nameList.length; j++) {
let zdcbcolor, zxcolor
if (nameList[j] === 'COD') {
zdcbcolor = 'red'
@@ -282,12 +287,12 @@
} else if (nameList[j] === '鎬荤７') {
zdcbcolor = 'red'
zxcolor = '#f48183'
- } else if (nameList[j] === '鎬绘爱') {
- zdcbcolor = 'red'
- zxcolor = '#d9f2f4'
- } else {
+ } else if (nameList[j] === '搴熸按娴侀噺') {
zdcbcolor = 'red'
zxcolor = '#9ACD32'
+ } else {
+ zdcbcolor = 'red'
+ zxcolor = '#d9f2f4'
}
const ydata = {
name: nameList[j],
@@ -304,61 +309,62 @@
this.bzzList.push(this.bzz)
ydatas.push(ydata)
}
+ console.log(ydatas)
- var yname = '娴撳害(mg/l)'
+ const yname = '娴撳害(mg/l)'
this.effChartShow(divid, title, legend, xdata, ydatas, yname, this.jcdID, this.datatype)
}
},
effChartShow (divid, title, legend, xdata, ydatas, yname, jcdID, datatype) {
this.chart = this.$echarts.init(this.$refs.echartsHour)
- // console.log(this.chart)
- this.chart.clear()
- var dataUnit = ''
+ console.log(ydatas)
+ // this.chart.clear()
+ let dataUnit = ''
if (datatype === 1) {
dataUnit = '娴侀噺(m鲁/d)'
} else {
dataUnit = '娴侀噺(m鲁/h)'
}
- var serLists = []
- for (var i = 0; i < ydatas.length; i++) {
- // var zdcbcolor = ydatas[i].zdcbcolor
- var bz = ydatas[i].bzz
- var obj
+ const serLists = []
+ for (let i = 0; i < ydatas.length; i++) {
+ // let zdcbcolor = ydatas[i].zdcbcolor
+ const bz = ydatas[i].bzz
+ let obj
if (bz) {
obj = {
name: ydatas[i].name,
symbol: 'circle', // 鎶樼偣褰㈢姸
symbolSize: 10, // 澶у皬
smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
- // itemStyle: {
- // normal: {
- // color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
- // // var biaozhuiz
- // let bzlist = this.bzzList
- // for (let i = 0; i < this.bzzList.length; i++) {
- // if (this.bzzList[i].name === c.seriesName) {
- // this.bz = this.bzzList[i].bzhui
- // }
- // }
- // if (c.value > this.bz) {
- // return zdcbcolor
- // } else if (c.value > this.bz * 0.9) {
- // return '#FFA500'
- // } else {
- // return '#33c95f'
- // }
- // },
- // lineStyle: { // 鎶樼嚎鐨勯鑹�
- // color: ydatas[i].zxcolor,
- // width: 5
- // },
- // borderColor: 'black', // 鎶樼偣杈规鐨勯鑹�
- // label: { // 鏄剧ず鍊�
- // show: false
- // }
- // }
- // },
+ itemStyle: {
+ normal: {
+ // color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ // // let biaozhuiz
+ // let bzlist = this.bzzList
+ // for (let i = 0; i < this.bzzList.length; i++) {
+ // if (this.bzzList[i].name === c.seriesName) {
+ // this.bz = this.bzzList[i].bzhui
+ // }
+ // }
+ // if (c.value > this.bz) {
+ // return zdcbcolor
+ // } else if (c.value > this.bz * 0.9) {
+ // return '#FFA500'
+ // } else {
+ // return '#33c95f'
+ // }
+ // },
+ lineStyle: { // 鎶樼嚎鐨勯鑹�
+ color: ydatas[i].zxcolor,
+ width: 5
+ },
+ borderColor: 'black', // 鎶樼偣杈规鐨勯鑹�
+ label: { // 鏄剧ず鍊�
+ show: false
+ }
+ }
+ },
type: 'line',
data: ydatas[i].data,
markLine: { // 骞冲潎鍊� 锛� 鍜� 鎸囨爣涓婇檺
@@ -391,7 +397,7 @@
// itemStyle: {
// normal: {
// color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
- // // var biaozhuiz
+ // // let biaozhuiz
// for (let i = 0; i < this.bzzList.length; i++) {
// if (this.bzzList[i].name === c.seriesName) {
// this.bz = this.bzzList[i].bzhui
@@ -419,7 +425,7 @@
}
serLists.push(obj)
}
- var option = {
+ const option = {
/* title: {
text: title,
}, */
@@ -432,28 +438,28 @@
}
},
formatter: function (params) {
- var s = params[0].name + '<br />'
- for (var i = 0; i < params.length; i++) {
- // var name = params[i].name
+ let s = params[0].name + '<br />'
+ for (let i = 0; i < params.length; i++) {
+ // let name = params[i].name
// 鍥捐〃title鍚嶇О
- var seriesName = params[i].seriesName
+ const seriesName = params[i].seriesName
// 鍊�
- var value = params[i].value
+ const value = params[i].value
- // var valueFliter = formatter(value)
- var valueFliter = parseFloat(value).toFixed(2)
+ // let valueFliter = formatter(value)
+ const valueFliter = parseFloat(value).toFixed(2)
- var maker = params[i].marker
+ let maker = params[i].marker
if (seriesName === 'COD') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
} else if (seriesName === '姘ㄦ爱') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#00B0F0;"></span>'
} else if (seriesName === '鎬荤７') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
- } else if (seriesName === '鎬绘爱') {
- maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#d9f2f4;"></span>'
- } else {
+ } else if (seriesName === '搴熸按娴侀噺') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#9ACD32;"></span>'
+ } else {
+ maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#d9f2f4;"></span>'
}
s += maker + seriesName + ':' + valueFliter + '<br />'
}
@@ -467,8 +473,8 @@
}
},
grid: { // 缃戞牸
- top: '20%',
- left: '5%'
+ top: '20%'
+ // left: '15%'
},
legend: {
data: legend
@@ -522,7 +528,7 @@
type: 'value',
name: yname,
// max: function (value) {
- // var max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
+ // let max_val_list = [] // 鎵�鏈夋樉绀烘姌绾跨殑鏍囧噯鍊�
// if (bzzList && bzzList.length > 0) {
// $.each(bzzList, function (index, item) {
// max_val_list.push(item.bzhui)
@@ -531,7 +537,7 @@
// max_val_list = max_val_list.sort(function (a, b) {
// return a - b
// }) // 鎺掑簭
- // var ma = value.max > max_val_list[max_val_list.length - 1] ? value.max + 5 : max_val_list[max_val_list.length - 1]
+ // let ma = value.max > max_val_list[max_val_list.length - 1] ? value.max + 5 : max_val_list[max_val_list.length - 1]
// return parseInt(ma)
// },
axisLabel: {
@@ -586,6 +592,24 @@
</script>
<style scoped lang="less">
+.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;
+ }
+}
+
.grid-content {
font-size: 8px;
background-color: #2e4967;
@@ -608,10 +632,10 @@
//margin: 10px 10px 10px 10px;
.from-search {
display: flex;
- padding: 5px;
+ padding: 15px 0;
> div {
- margin-left: 10px
+ margin-left: 30px
}
.pickerMon {
@@ -626,7 +650,8 @@
display: flex;
> span {
- line-height: 22px
+ line-height: 22px;
+ margin-right: 15px;
}
.pickerTable {
diff --git a/src/components/BaseNav/WasteWater/RealData.vue b/src/components/BaseNav/WasteWater/RealData.vue
index affcae3..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: {
@@ -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 {
diff --git a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
index ff50e1f..fa9484c 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
@@ -9,20 +9,37 @@
<span></span>
<span></span>
<span></span>
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="瀹炴椂鏁版嵁" name="first">
- <RealData></RealData>
- </el-tab-pane>
- <el-tab-pane label="灏忔椂鏁板眳" name="second">
- <HourData></HourData>
- </el-tab-pane>
- <el-tab-pane label="鏃ユ暟鎹�" name="third">
- <DayData></DayData>
- </el-tab-pane>
- <el-tab-pane label="浜哄伐鐩戞祴鏁版嵁" name="fourth">
- <Detail></Detail>
- </el-tab-pane>
- </el-tabs>
+ <!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
+ <!-- <el-tab-pane label="瀹炴椂鏁版嵁" name="first">-->
+ <!-- <RealData></RealData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="灏忔椂鏁板眳" name="second">-->
+ <!-- <HourData></HourData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="鏃ユ暟鎹�" name="third">-->
+ <!-- <DayData></DayData>-->
+ <!-- </el-tab-pane>-->
+ <!-- <el-tab-pane label="浜哄伐鐩戞祴鏁版嵁" name="fourth">-->
+ <!-- <Detail></Detail>-->
+ <!-- </el-tab-pane>-->
+ <!-- </el-tabs>-->
+ <div class="navigation">
+ <div class="navigation-left">
+ <div :class="active===0?'hover':''" class="uncheck" @click='tabTaggle("RealData",0)'>瀹炴椂鏁版嵁</div>
+ <div :class="active===1?'hover':''" class="uncheck" @click='tabTaggle("HourData",1)'>灏忔椂鏁版嵁</div>
+ <div :class="active===2?'hover':''" class="uncheck" @click='tabTaggle("DayData",2)'>鏃ユ暟鎹�</div>
+ <div :class="active===3?'hover':''" class="uncheck" @click='tabTaggle("Detail",3)'>浜哄伐鐩戞祴鏁版嵁</div>
+ </div>
+ <div class="navigation-right">
+ <p>姝ｅ父</p>
+ <i style=" background: #4ec99c;"></i>
+ <p>棰勮</p>
+ <i style=" background: orange;"></i>
+ <p>瓒呮爣</p>
+ <i style=" background: red;"></i>
+ </div>
+ </div>
+ <component :is="currentTab" ref="RealData"></component>
</div>
</template>
<template v-slot:video>
@@ -56,10 +73,19 @@
},
data () {
return {
- activeName: 'first'
+ activeName: 'first',
+ currentTab: RealData,
+ active: 0
}
},
methods: {
+ tabTaggle (taggleMenu, num) {
+ this.currentTab = taggleMenu
+ this.active = num
+ },
+ current (currentTab) {
+ currentTab = RealData
+ },
handleClick (tab, event) {
console.log(tab, event)
}
@@ -68,6 +94,69 @@
</script>
<style lang="less" scoped>
+.navigation {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 5px 0;
+ border-bottom: 1px #243a55 solid;
+
+ .navigation-left {
+ display: flex;
+ align-items: center;
+
+ .uncheck {
+ margin: 0 10px;
+ cursor: pointer;
+ padding: 5px;
+ border: 1px solid #2b87c8;
+ border-radius: 4px;
+ text-align: center;
+ color: #fff;
+ }
+
+ .default-uncheck {
+ background-color: #0e639e;
+ color: #fff;
+ cursor: pointer;
+ }
+
+ .hover {
+ background-color: #0e639e;
+ color: #fff;
+ cursor: pointer;
+ }
+
+ .hover:hover {
+ cursor: pointer;
+ padding: 5px;
+ border: 1px solid #2b87c8;
+ border-radius: 4px;
+ text-align: center;
+ color: #fff;
+ }
+ }
+
+ .navigation-left :hover {
+ background-color: #0e639e;
+ color: #fff;
+ cursor: pointer;
+ }
+
+ .navigation-right {
+ display: flex;
+ align-items: center;
+
+ i {
+ display: block;
+ width: 0.1rem;
+ height: 0.1rem;
+ margin: 0 0.1rem 0 0.05rem;
+ border-radius: 50%;
+ border: 2px #ffffff solid;
+ }
+ }
+}
.public-part {
position: relative;
--
Gitblit v1.8.0