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/EChartsHourWasteWater.vue |   28 +++++++++-------------------
 src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue |   26 +++++++-------------------
 2 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index 325d981..272508c 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -27,16 +27,6 @@
             </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>
@@ -75,8 +65,6 @@
       myChar: null,
       value: '',
       formInline: {
-        user: '',
-        region: '',
         timeStart: '2021-03-15 00:00:00',
         timeEnd: '2021-04-13 00:00:00'
       },
@@ -287,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>'
@@ -305,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
               }
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index 9baaa67..4bd8a25 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -27,16 +27,6 @@
                       </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>
@@ -161,9 +151,9 @@
       this.myChart.clear()
       var dataUnit = ''
       if (datatype === 1) {
-        dataUnit = '娴侀噺(m鲁/d)'
+        dataUnit = '搴熸按娴侀噺(m鲁/d)'
       } else {
-        dataUnit = '娴侀噺(m鲁/h)'
+        dataUnit = '搴熸按娴侀噺(m鲁/h)'
       }
 
       var serLists = []
@@ -294,12 +284,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>'
@@ -312,7 +302,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
         }

--
Gitblit v1.8.0