From 545ba46e971816dc56b4ea80e48ed26a4b152d62 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 19 四月 2021 14:04:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue |   72 +++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index d22a3ce..438dcd0 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -1,14 +1,7 @@
 <!--  鏃ユ暟鎹�  -->
 <template>
   <div id="Tab">
-    <div class="animation">
-      <div class="infomation">
-        <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i>  鏍囧噯 : 100</span>
-        <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
-        <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
-        <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">120343.18</i></span>
-      </div>
-    </div>
+<public-data-standard :dataStandard = "dataStandard"></public-data-standard>
     <div class="form-echrts">
       <div class="from-search">
         <div class="pickerMon">
@@ -41,30 +34,32 @@
       <div style="width:5rem;height:1.5rem;" id="echarts" ref="main">
       </div>
     </div>
-    <!-- 鏄庣粏寮规 -->
-    <el-dialog :visible.sync="dialogVisible"
-               :append-to-body="true"
-               :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
-               width="68%"
-               center
-               v-dialogDrag
-    >
-      <div class="el-dialog-div" style="height: 500px">
-        <public-detailed-list v-bind="$attrs"></public-detailed-list>
-      </div>
-    </el-dialog>
+<!--    &lt;!&ndash; 鏄庣粏寮规 &ndash;&gt;-->
+<!--    <el-dialog :visible.sync="dialogVisible"-->
+<!--               :append-to-body="true"-->
+<!--               :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"-->
+<!--               width="68%"-->
+<!--               center-->
+<!--               v-dialogDrag-->
+<!--    >-->
+<!--      <div class="el-dialog-div" style="height: 500px">-->
+<!--        <public-detailed-list v-bind="$attrs"></public-detailed-list>-->
+<!--      </div>-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
 <script>
 import mapApi from '@/api/mapApi'
-import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+// import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
 import dayjs from 'dayjs'
+import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
 
 export default {
   name: 'ECharts',
   components: {
-    PublicDetailedList
+    PublicDataStandard
+    // PublicDetailedList
   },
   data () {
     return {
@@ -78,6 +73,23 @@
         timeEnd: ''
       },
       info: this.series,
+      dataStandard: [{
+        current: { name: '姘哀鍖栫墿1', val: 29.93 },
+        standard: { name: '鏍囧噯', val: 100 }
+      },
+      {
+        current: { name: '浜屾哀鍖栫～', val: 17.34 },
+        standard: { name: '鏍囧噯', val: 50 }
+      },
+      {
+        current: { name: '鐑熷皹', val: 6.93 },
+        standard: { name: '鏍囧噯', val: 30 }
+      },
+      {
+        current: { name: '搴熸皵娴侀噺', val: 120343.18 },
+        standard: { name: '', val: null }
+      }
+      ],
       JsonDayCharts: {
         id: 'mychartsDay',
         title: '鍔犵儹鐐夌儫姘�',
@@ -695,22 +707,6 @@
 </script>
 
 <style scoped lang="less">
-
-.animation {
-  .infomation {
-    padding: 0.02rem 0.04rem;
-    .grid-content {
-      font-size: 0.08rem;
-      background-color: #2e4967;
-      text-align: center;
-      border-radius: 0.01rem;
-      height: 0.15rem;
-      line-height: 0.15rem;
-      margin-right: 0.04rem;
-      padding:0 0.04rem
-    }
-  }
-}
     .form-echrts {
         width: 100%;
         border-top: 1px solid #396d83;

--
Gitblit v1.8.0