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/WasteGas/WasteGasIndex.vue | 155 ++++++++++++++++++++++++++-------------------------
1 files changed, 79 insertions(+), 76 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/WasteGasIndex.vue b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
index 7a82933..d86efc6 100644
--- a/src/components/BaseNav/WasteGas/WasteGasIndex.vue
+++ b/src/components/BaseNav/WasteGas/WasteGasIndex.vue
@@ -9,38 +9,22 @@
<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-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 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>
- <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>
@@ -56,13 +40,13 @@
import PublicVideo from '../PublicVideo'
import PublicSector from '../PublicSector'
// 鍥捐〃缁勪欢
-import RealData from './RealData'
+import RealData from './WasteGasRealChart'
import HourData from './HourData'
import DayData from './DayData'
import Detail from './Detail'
export default {
- name: 'WasteWaterIndex',
+ name: 'WasteGasIndex',
props: ['storagePlaceId'],
components: {
PublicSector,
@@ -76,7 +60,6 @@
data () {
return {
activeName: 'first',
- // currentTab: this.current(),
currentTab: RealData,
active: 0
}
@@ -88,62 +71,82 @@
},
current (currentTab) {
currentTab = RealData
+ },
+ handleClick (tab, event) {
+ console.log(tab, event)
}
}
}
</script>
<style lang="less" scoped>
-
-.tab {
+.navigation {
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;
-}
+ justify-content: space-between;
+ padding: 5px 0;
+ border-bottom: 1px #243a55 solid;
-.legend i {
- display: block;
- width: 0.2rem;
- height: 0.09rem;
- margin: 0 0.1rem 0 0.05rem;
- border-radius: 0.02rem;
-}
+ .navigation-left {
+ display: flex;
+ align-items: center;
-.legend span {
- line-height: 0.09rem;
- height: 0.09rem;
- font-size: 0.06rem;
+ .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;
- margin-bottom: 0.1rem;
+
background-color: @background-color;
font-size: 0.06rem;
font-weight: normal;
--
Gitblit v1.8.0