From 3c93d885a3bc6a84079cc347bb30888d5fb98f11 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 13 四月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 2729caf..584f1db 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("EChartsTable")'>浜哄伐鏁版嵁</li>
</ul>
<div class="legend" >
<span >姝ｅ父</span>
@@ -25,14 +25,20 @@
<script>
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
-import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
+import ECharts from './Echarts'
+// import EChartsDate from './EChartsDate'
+import EChartsHourWasteWater from './EChartsHourWasteWater'
+import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'
export default {
name: 'PublicChart',
components: {
EChartsHour,
EChartsDate,
- Echarts
+ ECharts,
+ // EChartsDate
+ EChartsHourWasteWater,
+ EChartsTable
},
data () {
return {
@@ -49,17 +55,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;*/
}
@@ -115,10 +115,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