From 8bb5942235c86ea771c4215a77c46b1245c30a93 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 11:31:58 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue |   68 +++++++++++++++++++++++++++++++---
 1 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 42ad235..dc6ab00 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,10 +5,19 @@
         <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("ECharts")'>鏃ユ暟鎹�</li>
+            <li @click='tabTaggle("EChartsDate")'>鏃ユ暟鎹�</li>
             <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+            <div id="title" >
+                <span><strong> &nbsp; </strong></span>
+                <span >姝ｅ父</span>
+                <span ></span>
+                <span >棰勮</span>
+                <span ></span>
+                <span >瓒呮爣</span>
+                <span ></span>
+            </div>
         </ul>
         <component :is="currentTab" v-bind="$attrs"></component>
     </div>
@@ -16,11 +25,15 @@
 
 <script>
 import EChartsHour from './EChartsHour'
+import EChartsDate from './EChartsDate'
+import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
 
 export default {
   name: 'PublicChart',
   components: {
-    EChartsHour
+    EChartsHour,
+    EChartsDate,
+    Echarts
   },
   data () {
     return {
@@ -30,7 +43,7 @@
   methods: {
     tabTaggle (taggleMenu) {
       this.currentTab = taggleMenu
-      debugger
+      // debugger
     }
   }
 }
@@ -46,10 +59,10 @@
 
 .win {
   position: relative;
-  margin-bottom: 13px;
+  /*margin-bottom: 13px;*/
   background-color: rgba(33, 41, 69, 0.9);
   border: 0.8px solid #396d83;
-  height: 1.5rem;
+  /*height: 1.5rem;*/
 }
 
 .border_corner {
@@ -111,4 +124,47 @@
   color: #682000;
   cursor: pointer;
 }
+#title{
+    height: 30px;
+    /* margin-top: 30px; */
+    color: #ffffff;
+    margin-top: 5px;
+}
+
+#title span:nth-child(1){
+    /*margin-left: 478px*/
+}
+#title span:nth-child(2){
+    /*margin-left: 177px*/
+}
+#title span:nth-child(3){
+    display: inline-block;
+    background-color: #4ec99c;
+    height: 15px;
+    width: 35px;
+    margin-left: 10px;
+    border-radius: 5px;
+}
+#title span:nth-child(6){
+    /*margin-left: 21px*/
+}
+#title span:nth-child(7){
+    display: inline-block;
+    background-color: red;
+    height: 15px;
+    width: 35px;
+    margin-left: 7px;
+    border-radius: 5px;
+}
+#title span:nth-child(4){
+    margin-left: 17px;
+}
+#title span:nth-child(5){
+    display: inline-block;
+    background-color: orange;
+    height: 15px;
+    width: 35px;
+    margin-left: 9px;
+    border-radius: 5px;
+}
 </style>

--
Gitblit v1.8.0