From 22e5d744b28c0df0f115476b44a75d1d46cac228 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 17:36:12 +0800
Subject: [PATCH] echarts数据显示功能完善
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 51c7f4f..a93a90c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -4,11 +4,17 @@
<div class="border_corner border_corner_right_top"></div>
<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>
+ <ul class="tab" v-if="this.$attrs.value === 'feiqi'">
+ <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
<li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
<li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+ <li @click='tabTaggle("EChartsTable")'>浜哄伐鏁版嵁</li>
+ </ul>
+ <ul class="tab" v-else>
+ <li @click='tabTaggle("EChartsRealWasteWater")'>瀹炴椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsHourWasteWater")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsDateWasteWater")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("EChartsWasteWaterTable")'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
<span >姝ｅ父</span>
@@ -23,18 +29,31 @@
</template>
<script>
+import ECharts from './Echarts'
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
+import EChartsTable from './EChartsTable'
+
+import EChartsRealWasteWater from './EChartsRealWasteWater'
+import EChartsHourWasteWater from './EChartsHourWasteWater'
+import EChartsDateWasteWater from './EChartsDateWasteWater'
+import EChartsWasteWaterTable from './EChartsWasteWaterTable'
export default {
name: 'PublicChart',
components: {
EChartsHour,
- EChartsDate
+ EChartsDate,
+ ECharts,
+ EChartsTable,
+ EChartsHourWasteWater,
+ EChartsDateWasteWater,
+ EChartsRealWasteWater,
+ EChartsWasteWaterTable
},
data () {
return {
- currentTab: 'EChartsHour'
+ currentTab: 'EChartsHourWasteWater'
}
},
methods: {
@@ -47,17 +66,11 @@
</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);
+ background:@background-color;
border: 0.8px solid #396d83;
/*height: 1.5rem;*/
}
@@ -113,10 +126,10 @@
margin-right: 10px;
padding:0 15px
}
-
+.tab li.hover,
.tab li:hover {
background-color: #0e639e;
- color: #682000;
+ color: #fff;
cursor: pointer;
}
.legend{
--
Gitblit v1.8.0