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/WasteWaterIndex.vue | 240 ++++++++++++++++++++----------------------------------------
1 files changed, 80 insertions(+), 160 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
index 030c173..ca2be94 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
@@ -4,25 +4,28 @@
<public-tabs :storagePlaceId="storagePlaceId"></public-tabs>
</template>
<template v-slot:publicPart>
- <div class="publicPart">
+ <div class="public-part">
<span></span>
<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>
+ <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" v-if="active !== 3">
+ <p>姝ｅ父</p>
+ <i style=" background: #4ec99c;"></i>
+ <p>棰勮</p>
+ <i style=" background: #fc9303;"></i>
+ <p>瓒呮爣</p>
+ <i style=" background: #fc1d04;"></i>
+ </div>
+ </div>
+ <component :is="currentTab" ref="RealData"></component>
</div>
</template>
<template v-slot:video>
@@ -37,9 +40,9 @@
import PublicVideo from '../PublicVideo'
import PublicSector from '../PublicSector'
// 鍥捐〃缁勪欢
-import RealData from './RealData'
-import HourData from './HourData'
-import DayData from './DayData'
+import RealData from './WasteWaterRealChart'
+import HourData from './WasteWaterHoursChart'
+import DayData from './WasteWaterDayChart'
import Detail from './Detail'
export default {
@@ -58,86 +61,91 @@
return {
activeName: 'first',
currentTab: RealData,
- active: '0',
- displayContentTable: '',
- flag: false,
- tabTaggle (taggleMenu, num) {
- this.currentTab = taggleMenu
- this.active = num
- }
+ active: 0
}
},
- mounted () {
- this.$nextTick(() => {
- this.refsData()
- })
- },
methods: {
+ tabTaggle (taggleMenu, num) {
+ this.currentTab = taggleMenu
+ this.active = num
+ },
+ current (currentTab) {
+ currentTab = RealData
+ },
handleClick (tab, event) {
console.log(tab, event)
- },
- refsData () {
- // 璇锋眰鏁版嵁闇�瑕佹惡甯︾殑鍙傛暟
- // const data = this.EpsGisMonPointId
- this.$refs.refsTabsData.refsDataTabs()
}
}
}
</script>
<style lang="less" scoped>
-.public-bounced {
- z-index: 2000;
- position: absolute;
- top: 35%;
- left: 20%;
+.navigation {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 5px 0;
+ border-bottom: 1px #243a55 solid;
- .public-bounced-title {
- cursor: move;
- height: 0.1rem;
- padding: 10px 0;
+ .navigation-left {
display: flex;
align-items: center;
- justify-content: space-between;
- span {
- color: #f4f7ff;
- margin: 0 15px;
- font-size: 14px;
+ .uncheck {
+ margin: 0 10px;
+ cursor: pointer;
+ padding: 5px;
+ border: 1px solid #2b87c8;
+ border-radius: 4px;
+ text-align: center;
+ color: #fff;
}
- i {
- color: #C0C4CC;
- margin: 0 15px;
- font-size: 22px;
+ .default-uncheck {
+ background-color: #0e639e;
+ color: #C0C0C0;
cursor: pointer;
}
- i:hover {
- color: #00fff6;
+ .hover {
+ background-color: #0e539e;
+ color: #ffffff;
+ cursor: pointer;
+ }
+
+ .hover:hover {
+ cursor: pointer;
+ padding: 5px;
+ border: 1px solid #5F9EA0;
+ border-radius: 4px;
+ text-align: center;
+ color: #F0FFFF;
}
}
- .public-bounced-content {
- padding: 0.1rem;
+ .navigation-left :hover {
+ background-color: #0e639e;
+ color: #fff;
+ cursor: pointer;
+ }
+
+ .navigation-right {
display: flex;
- //align-items: center;
- //justify-content: space-around;
+ align-items: center;
- .public-bounced-content-left {
- //width: 4.8rem;
- }
-
- .public-bounced-content-right {
- //width: 3rem;
- margin-left: 0.1rem;
+ i {
+ display: block;
+ width: 0.1rem;
+ height: 0.1rem;
+ margin: 0 0.1rem 0 0.05rem;
+ border-radius: 50%;
+ border: 2px #ffffff solid;
}
}
}
-.publicPart {
+.public-part {
position: relative;
- margin-bottom: 0.1rem;
background-color: @background-color;
font-size: 0.06rem;
font-weight: normal;
@@ -145,7 +153,7 @@
border: 1px solid #396d83;
}
-.publicPart span:nth-child(1) {
+.public-part span:nth-child(1) {
position: absolute;
left: -2px;
top: -2px;
@@ -155,7 +163,7 @@
border-width: 2px 0 0 2px;
}
-.publicPart span:nth-child(2) {
+.public-part span:nth-child(2) {
position: absolute;
right: -2px;
top: -2px;
@@ -165,7 +173,7 @@
border-width: 2px 2px 0 0;
}
-.publicPart span:nth-child(3) {
+.public-part span:nth-child(3) {
position: absolute;
right: -2px;
bottom: -2px;
@@ -175,7 +183,7 @@
border-width: 0 2px 2px 0;
}
-.publicPart span:nth-child(4) {
+.public-part span:nth-child(4) {
position: absolute;
left: -2px;
bottom: -2px;
@@ -183,94 +191,6 @@
border-style: solid;
border-color: #02a6b5;
border-width: 0 0 2px 2px;
-}
-
-.win {
- position: relative;
- background: @background-color;
- border: 0.8px solid #396d83;
-}
-
-.border_corner {
- z-index: 999;
- position: absolute;
- width: 10px;
- height: 10px;
- background: rgba(0, 0, 0, 0);
- border: 1.5px solid #47d5ea;
-}
-
-.border_corner_left_top {
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
-}
-
-.border_corner_right_top {
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
-}
-
-.border_corner_left_bottom {
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
-}
-
-.border_corner_right_bottom {
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
-}
-
-.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;
-}
-
-.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;
}
</style>
--
Gitblit v1.8.0