From e2bf4ab5fbcc29209d74101d99c0690d4ffbe234 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 21 五月 2021 17:14:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteWater/WasteWaterIndex.vue | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
index 852f050..0e8c77a 100644
--- a/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
+++ b/src/components/BaseNav/WasteWater/WasteWaterIndex.vue
@@ -9,20 +9,6 @@
<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>
@@ -30,13 +16,13 @@
<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">
+ <div class="navigation-right" v-if="active !== 3">
<p>姝ｅ父</p>
<i style=" background: #4ec99c;"></i>
<p>棰勮</p>
- <i style=" background: orange;"></i>
+ <i style=" background: #fc9303;"></i>
<p>瓒呮爣</p>
- <i style=" background: red;"></i>
+ <i style=" background: #fc1d04;"></i>
</div>
</div>
<component :is="currentTab" ref="RealData"></component>
@@ -55,8 +41,8 @@
import PublicSector from '../PublicSector'
// 鍥捐〃缁勪欢
import RealData from './WasteWaterRealChart'
-import HourData from './HourData'
-import DayData from './DayData'
+import HourData from './WasteWaterHoursChart'
+import DayData from './WasteWaterDayChart'
import Detail from './Detail'
export default {
@@ -109,31 +95,36 @@
margin: 0 10px;
cursor: pointer;
padding: 5px;
- border: 1px solid #2b87c8;
- border-radius: 4px;
+ /*border: 1px solid #2b87c8;*/
+ /*border-radius: 4px;*/
text-align: center;
+ vertical-align: middle !important;
color: #fff;
+ -webkit-transform: skew(30deg);
+ -moz-transform: skew(30deg);
+ -o-transform: skew(30deg);
+ transform: skew(15deg);
}
.default-uncheck {
background-color: #0e639e;
- color: #fff;
+ color: #C0C0C0;
cursor: pointer;
}
.hover {
- background-color: #0e639e;
- color: #fff;
+ background-color: #0e539e;
+ color: #ffffff;
cursor: pointer;
}
.hover:hover {
cursor: pointer;
padding: 5px;
- border: 1px solid #2b87c8;
+ border: 1px solid #5F9EA0;
border-radius: 4px;
text-align: center;
- color: #fff;
+ color: #F0FFFF;
}
}
@@ -160,7 +151,6 @@
.public-part {
position: relative;
- margin-bottom: 0.1rem;
background-color: @background-color;
font-size: 0.06rem;
font-weight: normal;
--
Gitblit v1.8.0