From 93850b9aee34d3a66c2770a1eb0435ce104e772f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 15:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/BaseNav/PublicBounced/common/PublicChart.vue |   71 +++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 0939e64..d4654b2 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -4,15 +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>-->
-<!--            <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>-->
-<!--            <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>-->
-<!--            <li @click='tabTaggle("EChartsDate")'>浜哄伐鏁版嵁</li>-->
+        <ul class="tab" v-show="this.$attrs.value === 'feiqi'">
             <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("EChartsDate",2)'>鏃ユ暟鎹�</li>
             <li :class="active==3?'hover':''" @click='tabTaggle("EChartsTable",3)'>浜哄伐鏁版嵁</li>
+        </ul>
+        <ul class="tab" v-show="this.$attrs.value !== 'feiqi'">
+            <li :class="active==0?'hover':''" @click='tabTaggle("EChartsRealWasteWater",0)'>瀹炴椂鏁版嵁</li>
+            <li :class="active==1?'hover':''" @click='tabTaggle("EChartsHourWasteWater",1)'>灏忔椂鏁版嵁</li>
+            <li :class="active==2?'hover':''" @click='tabTaggle("EChartsDateWasteWater",2)'>鏃ユ暟鎹�</li>
+            <li :class="active==3?'hover':''" @click='tabTaggle("EChartsWasteWaterTable",3)'>浜哄伐鏁版嵁</li>
         </ul>
         <div class="legend" >
             <span >姝ｅ父</span>
@@ -27,12 +29,15 @@
 </template>
 
 <script>
+import ECharts from './echarts/Echarts'
 import EChartsHour from './echarts/EChartsHour'
 import EChartsDate from './echarts/EChartsDate'
-import ECharts from './echarts/Echarts'
-// import EChartsDate from './EChartsDate'
+import EChartsTable from './echarts/EChartsTable'
+
+import EChartsRealWasteWater from './echarts/EChartsRealWasteWater'
 import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
-import EChartsTable from '@components/BaseNav/PublicBounced/common/echarts/EChartsTable'
+import EChartsDateWasteWater from './echarts/EChartsDateWasteWater'
+import EChartsWasteWaterTable from './echarts/EChartsWasteWaterTable'
 
 export default {
   name: 'PublicChart',
@@ -40,24 +45,33 @@
     EChartsHour,
     EChartsDate,
     ECharts,
-    // EChartsDate
+    EChartsTable,
+    EChartsRealWasteWater,
     EChartsHourWasteWater,
-    EChartsTable
-  },
-  updated () {
-    this.$refs.Echats.CreateChart()
+    EChartsDateWasteWater,
+    EChartsWasteWaterTable
   },
   data () {
     return {
-      currentTab: EChartsHour,
-      active: '1'
+      currentTab: this.current(),
+      active: '0'
     }
   },
+  // updated () {
+  //   this.$refs.Echats.DrawEXHRealTimeDateChart()
+  // },
   methods: {
     tabTaggle (taggleMenu, num) {
       this.currentTab = taggleMenu
       this.active = num
-      // debugger
+    },
+    current (currentTab) {
+      if (this.$attrs.value === 'feishui') {
+        currentTab = 'EChartsRealWasteWater'
+      } else {
+        currentTab = 'ECharts'
+      }
+      return currentTab
     }
   }
 }
@@ -67,10 +81,8 @@
 <style scoped lang="less">
 .win {
   position: relative;
-  /*margin-bottom: 13px;*/
   background:@background-color;
   border: 0.8px solid #396d83;
-  /*height: 1.5rem;*/
 }
 
 .border_corner {
@@ -113,16 +125,17 @@
 .tab {
   display: flex;
   border-bottom: 1px solid #396d83;
-    padding:5px 10px
+    padding:0.02rem 0.04rem;
 }
 
 .tab li {
   background-color: #243a55;
-  line-height: 25px;
+  line-height:0.15rem;
+    height: 0.15rem;
   text-align: center;
   border-radius: 5px;
-    margin-right: 10px;
-    padding:0 15px
+    margin-right: 0.04rem;
+    padding:0 0.04rem;
 }
 .tab li.hover,
 .tab li:hover {
@@ -132,20 +145,22 @@
 }
 .legend{
     position: absolute;
-    top:10px;
+    top:0.05rem;
     right: 0;
     display: flex;
     justify-items: center;
 }
 .legend i {
     display: block;
-    width: 35px;
-    height: 15px;
-    margin:0 10px 0 3px;
-    border-radius: 3px;
+    width: 0.2rem;
+    height: 0.09rem;
+    margin:0 0.1rem 0 0.05rem;
+    border-radius: 0.02rem;
 }
 .legend span{
-    line-height: 15px;
+    line-height: 0.09rem;
+    height: 0.09rem;
+    font-size: 0.06rem;
 }
 
 </style>

--
Gitblit v1.8.0