From 188abb2598a9253b19762d0cf4c4b36db64bfe8b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 18:54:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 7a6739f..b61ec1e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,33 +5,45 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<ul class="tab">
- <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
- <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+ <li :class="active==0?'hover':''" @click='tabTaggle("Echarts",0)'>瀹炴椂鏁版嵁</li>
+ <li :class="active==1?'hover':''" @click='tabTaggle("EChartsHour",1)'>灏忔椂鏁版嵁</li>
+ <li :class="active==2?'hover':''" @click='tabTaggle("EChartsHourWasteWater",2)'>鏃ユ暟鎹�</li>
+ <li :class="active==3?'hover':''" @click='tabTaggle("ECharts",3)'>浜哄伐鏁版嵁</li>
</ul>
+ <div class="legend" >
+ <span >姝ｅ父</span>
+ <i style=" background: #4ec99c;"></i>
+ <span >棰勮</span>
+ <i style=" background: red;"></i>
+ <span >瓒呮爣</span>
+ <i style=" background: orange;"></i>
+ </div>
<component :is="currentTab" v-bind="$attrs"></component>
</div>
</template>
<script>
import EChartsHour from './EChartsHour'
-import EChartsDate from './EChartsDate'
+// import EChartsDate from './EChartsDate'
+import EChartsHourWasteWater from './EChartsHourWasteWater'
export default {
name: 'PublicChart',
components: {
EChartsHour,
- EChartsDate
+ // EChartsDate
+ EChartsHourWasteWater
},
data () {
return {
- currentTab: 'EChartsHour'
+ currentTab: 'EChartsHour',
+ active: '0'
}
},
methods: {
- tabTaggle (taggleMenu) {
+ tabTaggle (taggleMenu, num) {
this.currentTab = taggleMenu
+ this.active = num
// debugger
}
}
@@ -39,18 +51,13 @@
</script>
-<style scoped>
-* {
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
+<style scoped lang="less">
.win {
position: relative;
- margin-bottom: 13px;
- background-color: rgba(33, 41, 69, 0.9);
+ /*margin-bottom: 13px;*/
+ background:@background-color;
border: 0.8px solid #396d83;
+ /*height: 1.5rem;*/
}
.border_corner {
@@ -93,23 +100,39 @@
.tab {
display: flex;
border-bottom: 1px solid #396d83;
- margin-bottom: 10px;
+ padding:5px 10px
}
-li {
+.tab li {
background-color: #243a55;
- margin: 10px 10px 2px 10px;
- /*padding: 5px 10px;*/
- width: 90px;
- height: 25px;
line-height: 25px;
text-align: center;
border-radius: 5px;
+ margin-right: 10px;
+ padding:0 15px
}
-
-ul li:hover {
+.tab li.hover,
+.tab li:hover {
background-color: #0e639e;
- color: #682000;
+ color: #fff;
cursor: pointer;
}
+.legend{
+ position: absolute;
+ top:10px;
+ right: 0;
+ display: flex;
+ justify-items: center;
+}
+.legend i {
+ display: block;
+ width: 35px;
+ height: 15px;
+ margin:0 10px 0 3px;
+ border-radius: 3px;
+}
+.legend span{
+ line-height: 15px;
+}
+
</style>
--
Gitblit v1.8.0