From d0391dba3708d3f32bcd94e1881d1b598a0d9ef0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 17:21:10 +0800
Subject: [PATCH] 修改图表问题

---
 src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue |   84 ++++++++++++++++++++++--------------------
 1 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index 5e82f97..272508c 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -3,8 +3,9 @@
   <div id="Tab">
     <div class="animation">
       <div class="infomation">
-        <span class="grid-content">COD :<i style="color: #e8ee0b">8.115</i>  鏍囧噯 : 20</span>
-        <span class="grid-content">姘ㄦ爱 : <i style="color: #e8ee0b">0.31</i> 鏍囧噯 : 5</span>
+        <span class="grid-content">COD :<i style="color: #e8ee0b">8.115</i>  鏍囧噯 : <i style="color: #fff">20</i></span>
+        <span class="grid-content">姘ㄦ爱 : <i style="color: #e8ee0b">0.31</i> 鏍囧噯 : <i style="color: #fff">5</i></span>
+        <span class="grid-content">pH : <i style="color: #e8ee0b">7.673</i> 鏍囧噯 : <i style="color: #fff">9</i></span>
         <span class="grid-content">搴熸按娴侀噺 : <i style="color: #e8ee0b">5191.693848</i></span>
       </div>
     </div>
@@ -26,21 +27,11 @@
             </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 class="detailbtn"  @click="onSubmit">鏌ヨ</div>
         <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
       </div>
-      <div class="boxChart" style="height: 260px">
-        <div style="width: 100%;height: 100%;" id="popChart" ref="main">
+      <div class="boxChart">
+        <div style="width:5rem;height:1.5rem" id="popChart" ref="main">
         </div>
       </div>
     </div>
@@ -60,7 +51,7 @@
 </template>
 
 <script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
 
 export default {
   name: 'EChartsDateWasteWater',
@@ -74,10 +65,8 @@
       myChar: null,
       value: '',
       formInline: {
-        user: '',
-        region: '',
-        timeStart: '2021-03-14 00:00:00',
-        timeEnd: '2021-04-12 00:00:00'
+        timeStart: '2021-03-15 00:00:00',
+        timeEnd: '2021-04-13 00:00:00'
       },
       JsonDateWater: {
         datatype: 1,
@@ -87,44 +76,58 @@
           {
             name: 'COD',
             icon: 'image://../assets/imgs/legend/SO2.png',
-            textStyle: { color: '#ccc' },
+            textStyle: { color: '#CCC' },
             itemWidth: 20,
             itemHeight: 5
           },
           {
             name: '姘ㄦ爱',
             icon: 'image://../assets/imgs/legend/NOX.png',
-            textStyle: { color: '#ccc' },
+            textStyle: { color: '#CCC' },
+            itemWidth: 20,
+            itemHeight: 5
+          },
+          {
+            name: 'pH',
+            icon: 'image://../assets/imgs/legend/WenDu.png',
+            textStyle: { color: '#CCC' },
             itemWidth: 20,
             itemHeight: 5
           },
           {
             name: '搴熸按娴侀噺',
             icon: 'image://../assets/imgs/legend/VOCs.png',
-            textStyle: { color: '#ccc' },
+            textStyle: { color: '#CCC' },
             itemWidth: 20,
             itemHeight: 5
           }
         ],
-        xdata: ['14鏃�', '15鏃�', '16鏃�', '17鏃�', '18鏃�', '19鏃�', '20鏃�', '21鏃�', '22鏃�', '23鏃�', '24鏃�', '25鏃�', '26鏃�', '27鏃�', '28鏃�', '29鏃�', '30鏃�', '31鏃�', '1 鏃�', '2 鏃�', '3 鏃�', '4 鏃�', '5 鏃�', '6 鏃�', '7 鏃�', '8 鏃�', '9 鏃�', '10鏃�', '11鏃�', '12鏃�'],
+        xdata: ['15鏃�', '16鏃�', '17鏃�', '18鏃�', '19鏃�', '20鏃�', '21鏃�', '22鏃�', '23鏃�', '24鏃�', '25鏃�', '26鏃�', '27鏃�', '28鏃�', '29鏃�', '30鏃�', '31鏃�', '1 鏃�', '2 鏃�', '3 鏃�', '4 鏃�', '5 鏃�', '6 鏃�', '7 鏃�', '8 鏃�', '9 鏃�', '10鏃�', '11鏃�', '12鏃�', '13鏃�'],
         ydatas: [
           {
             name: 'COD',
-            data: [11.626, 11.263, 13.186, 16.041, 20.021, 11.285, 19.546, 15.592, 16.603001, 23.582001, 23.325001, 21.077999, 20.959999, 18.955, 18.676001, 19.322001, 11.976, 11.92, 8.247, 6.38, 6.559, 10.25, 8.354, 7.562, 7.442, 7.543, 7.268, 6.255, 5.735, 8.115],
+            data: [18.271, 18.806, 18.615, 20.938, 18.933001, 18.789, 17.612, 17.319, 18.403999, 17.724001, 17.450001, 17.299, 17.906, 17.761, 16.913, 17.087, 16.094, 13.851, 15.783, 15.785, 15.503, 17.163, 15.008, 12.056, 14.812, 15.243, 15.562, 13.034, 11.11, 10.746],
             zdcbcolor: 'red',
             zxcolor: '#fff21c',
-            bzz: 80
-          },
-          {
-            name: '姘ㄦ爱',
-            data: [0.224, 3.283, 1.715, 0.831, 4.168, 2.197, 0.451, 0.342, 0.601, 2.669, 1.503, 0.595, 0.649, 0.74, 0.631, 0.432, 0.488, 1.817, 0.579, 2.748, 0.527, 1.01, 0.441, 0.459, 0.582, 0.578, 0.575, 0.295, 0.297, 0.31],
-            zdcbcolor: 'red',
-            zxcolor: '#00B0F0',
             bzz: 25
           },
           {
+            name: '姘ㄦ爱',
+            data: [0.1, 0.169, 0.125, 0.266, 0.126, 0.156, 0.174, 0.161, 0.224, 0.178, 0.166, 0.152, 0.146, 0.138, 0.125, 0.171, 0.145, 0.147, 0.123, 0.117, 0.109, 0.106, 0.159, 0.121, 0.133, 0.181, 0.208, 0.115, 0.108, 0.162],
+            zdcbcolor: 'red',
+            zxcolor: '#00B0F0',
+            bzz: 5
+          },
+          {
+            name: 'pH',
+            data: [7.461, 7.486, 7.495, 7.498, 7.512, 7.526, 7.535, 7.555, 7.585, 7.585, 7.512, 7.365, 7.334, 7.349, 7.367, 7.397, 7.399, 7.384, 7.424, 7.466, 7.496, 7.527, 7.599, 7.612, 7.613, 7.614, 7.618, 7.644, 7.661, 7.673],
+            zdcbcolor: 'red',
+            zxcolor: '#F206FF',
+            bzz: 9
+          },
+          {
             name: '搴熸按娴侀噺',
-            data: [5697.10791, 5623.143066, 5177.564941, 5162.195801, 4633.836914, 4198.133789, 4286.970215, 4162.566895, 2561.10791, 1808.824951, 2961.506104, 2758.715088, 3373.334961, 3282.522949, 3817.322998, 3382.928955, 4747.026855, 2645.947021, 3539.041992, 2540.4729, 4657.589844, 3618.812988, 5725.787109, 6082.206055, 6345.832031, 6470.28418, 5611.5, 5599.958984, 4924.814941, 5191.693848],
+            data: [49.395836, 49.337986, 48.906597, 51.755833, 48.786461, 48.124866, 47.832222, 70.607361, 77.931816, 63.092083, 70.620911, 63.302162, 66.679314, 66.482918, 81.546745, 95.860214, 87.731102, 53.503544, 63.230419, 70.389374, 63.531391, 63.028618, 63.168613, 63.55653, 63.631458, 51.364937, 28.757296, 31.669098, 26.574379, 30.628475],
             zdcbcolor: 'red',
             zxcolor: '#9ACD32',
             bzz: null
@@ -272,12 +275,12 @@
                   var seriesName = params[i].seriesName
                   // 鍊�
                   var value = params[i].value
-                  var valueFliter
-                  if (value === 'NaN') {
-                    valueFliter = ''
-                  } else {
-                    // valueFliter = formatter(value)
-                  }
+                  // var valueFliter
+                  // if (value === 'NaN') {
+                  //   valueFliter = ''
+                  // } else {
+                  //   // valueFliter = formatter(value)
+                  // }
                   var maker = params[i].marker
                   if (seriesName === 'COD') {
                     maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
@@ -290,7 +293,7 @@
                   } else {
                     maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#9ACD32;"></span>'
                   }
-                  s += maker + seriesName + ':' + valueFliter + '<br />'
+                  s += maker + seriesName + ':' + value + '<br />'
                 }
                 return s
               }
@@ -304,7 +307,8 @@
             grid: { // 缃戞牸
               top: '20%',
               left: '7%',
-              bottom: '10%'
+              bottom: '11%',
+              right: '5%'
             },
             legend: {
               data: legend

--
Gitblit v1.8.0