From 1750486cc4c353e2b7e639360bab7b95336a43ff Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期二, 13 四月 2021 11:30:51 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 51c7f4f..aa20800 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,10 +5,10 @@
<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("ECharts")'>瀹炴椂鏁版嵁</li>
<li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
<li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+ <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
<span >姝ｅ父</span>
@@ -25,12 +25,18 @@
<script>
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
+import ECharts from './Echarts'
+// import EChartsHourWasteWater from './EChartsHourWasteWater'
+// import EChartsDateWasteWater from './EChartsDateWasteWater'
export default {
name: 'PublicChart',
components: {
EChartsHour,
- EChartsDate
+ EChartsDate,
+ ECharts
+ // EChartsHourWasteWater,
+ // EChartsDateWasteWater,
},
data () {
return {
@@ -47,17 +53,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 +113,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