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/WasteGas/WasteGasIndex.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/WasteGasIndex.vue b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
index 21b5661..4903bd3 100644
--- a/src/components/BaseNav/WasteGas/WasteGasIndex.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
@@ -16,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>
@@ -95,10 +95,15 @@
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 {
@@ -146,7 +151,7 @@
.public-part {
position: relative;
- margin-bottom: 0.1rem;
+
background-color: @background-color;
font-size: 0.06rem;
font-weight: normal;
--
Gitblit v1.8.0