From a19ce43fb54c9d5e3aeb237ca3b2ca2f2abe0ba8 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 10:38:08 +0800
Subject: [PATCH] 废水图标完善

---
 src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue |   78 +++++++++++++++++++++++----------------
 1 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
index a94b2d5..cf7c29f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
@@ -3,9 +3,9 @@
     <div id="Tab">
         <div class="infomation">
           <div>
-            <span class="grid-content">COD :<i>6.039</i>  鏍囧噯 : 100</span>
-            <span class="grid-content">姘ㄦ爱 : <i>0.38</i> 鏍囧噯 : 50</span>
-            <span class="grid-content">搴熸按娴侀噺 : <i>254.643997</i></span>
+            <span class="grid-content">COD : <i style="color: #e8ee0b">6.039</i>  鏍囧噯 : 10</span>
+            <span class="grid-content">姘ㄦ爱 : <i style="color: #e8ee0b">0.38</i> 鏍囧噯 : 5</span>
+            <span class="grid-content">搴熸按娴侀噺 : <i style="color: #e8ee0b">254.643997</i></span>
           </div>
         </div>
         <div class="form-echrts">
@@ -26,20 +26,22 @@
                       </span>
                     </div>
                 </div>
-                <div>
-                    閲囨牱鐐规暟:
-                    <el-select v-model="formInline.region">
-                        <el-option label="0" value="0"></el-option>
-                        <el-option label="25" value="25"></el-option>
-                        <el-option label="50" value="50"></el-option>
-                        <el-option label="75" value="75"></el-option>
-                        <el-option label="100" value="100"></el-option>
-                    </el-select>
-                </div>
+<!--                <div>-->
+<!--                    閲囨牱鐐规暟:-->
+<!--                    <el-select v-model="formInline.region">-->
+<!--                        <el-option label="0" value="0"></el-option>-->
+<!--                        <el-option label="25" value="25"></el-option>-->
+<!--                        <el-option label="50" value="50"></el-option>-->
+<!--                        <el-option label="75" value="75"></el-option>-->
+<!--                        <el-option label="100" value="100"></el-option>-->
+<!--                    </el-select>-->
+<!--                </div>-->
                 <div class="detailbtn"  @click="onSubmit">鏌ヨ</div>
                 <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
              </div>
-            <div style="width:5rem;height:2rem;" id="echarts" ref="main">
+            <div class="boxChart" style="height: 260px">
+                <div style="width: 100%;height: 100%;" id="popChart" ref="main">
+                </div>
             </div>
         </div>
         <!-- 鏄庣粏寮规 -->
@@ -123,11 +125,23 @@
       }
     }
   },
+  mounted () {
+    this.onSubmit()
+  },
   methods: {
     onSubmit () {
-      this.effChartShow(this.JsonHourWater.id, this.JsonHourWater.title, this.JsonHourWater.legend, this.JsonHourWater.xdata, this.JsonHourWater.ydatas, this.JsonHourWater.yname, this.JsonHourWater.id, this.JsonHourWater.datatype)
+      this.effChartShow()
     },
-    effChartShow: function (id, title, legend, xdata, ydatas, yname, jcdID, datatype) {
+    effChartShow: function () {
+      // var id = this.JsonHourWater.id
+      // var title = this.JsonHourWater.title
+      var legend = this.JsonHourWater.legend
+      var xdata = this.JsonHourWater.xdata
+      var ydatas = this.JsonHourWater.ydatas
+      var yname = this.JsonHourWater.yname
+      // var jcdId = this.JsonHourWater.jcdID
+      var datatype = this.JsonHourWater.datatype
+
       this.myChart = this.$echarts.init(this.$refs.main)
       this.myChart.clear()
       var dataUnit = ''
@@ -146,6 +160,7 @@
           ydatas[j].data[k] = it2
         }
       }
+
       for (var i = 0; i < ydatas.length; i++) {
         // var zdcbcolor = ydatas[i].zdcbcolor
         var bz = ydatas[i].bzz
@@ -175,18 +190,17 @@
                 },
                 lineStyle: { // 鎶樼嚎鐨勯鑹�
                   color: ydatas[i].zxcolor,
-                  width: 4
+                  width: 5
                 },
                 borderColor: 'black', // 鎶樼偣杈规鐨勯鑹�
                 label: { // 鏄剧ず鍊�
                   show: false
                 }
               }
-
             },
             type: 'line',
             data: ydatas[i].data,
-            markLine: { // 骞冲潎鍊� 锛� 鍜� 鎸囨爣涓婇檺
+            markLine: { // 骞冲潎鍊�  鍜� 鎸囨爣涓婇檺
               symbol: 'none',
               data: [{
                 label: {
@@ -549,20 +563,20 @@
         }
         // createDivByMouse("s",params.event);
       }) */
-    },
-    drawChart: function () {
-      window.onresize = function () {
-        var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
-        if (h1 > 700) {
-          this.myChart.getDom().style.height = 3 + 'rem'
-          this.myChart.getDom().style.width = 6 + 'rem'
-        } else {
-          this.myChart.getDom().style.height = 3 + 'rem'
-          this.myChart.getDom().style.width = 6 + 'rem'
-        }
-        this.myChart.resize()
-      }
     }
+    // drawChart: function () {
+    //   window.onresize = function () {
+    //     var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+    //     if (h1 > 700) {
+    //       this.myChart.getDom().style.height = 3 + 'rem'
+    //       this.myChart.getDom().style.width = 6 + 'rem'
+    //     } else {
+    //       this.myChart.getDom().style.height = 3 + 'rem'
+    //       this.myChart.getDom().style.width = 6 + 'rem'
+    //     }
+    //     this.myChart.resize()
+    //   }
+    // }
 
   }
 

--
Gitblit v1.8.0