From 2a3368dfd32f564f37f22c9df5865f52bc4ee3db Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 19 四月 2021 13:53:06 +0800
Subject: [PATCH] 弹框修改问题

---
 src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue |   46 ++++++++++++++++++++--------------------------
 1 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 1cad629..7a7d07e 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -1,6 +1,13 @@
 <template>
   <div id="Tab">
-    <public-data-standard :dataStandard = "dataStandard"></public-data-standard>
+    <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">5.23</i></span>
+      </div>
+    </div>
     <div class="form-echrts">
       <div class="from-search">
         <div class="pickerMon">
@@ -19,7 +26,7 @@
         </div>
         <div>
           閲囨牱鐐规暟:
-          <el-select v-model="formInline.region" placeholder="50" class="">
+          <el-select v-model="formInline.region" placeholder="50">
             <el-option label="0" value="0"></el-option>
             <el-option label="25" value="25"></el-option>
             <el-option label="50" value="50"></el-option>
@@ -29,9 +36,9 @@
         </div>
         <div class="detailbtn"  @click="onSubmit">鏌ヨ</div>
       </div>
-        <div  style="width:5rem;height:1.5rem;" ref="echarts"> </div>
-      </div>
+      <div  style="width:5rem;height:1.5rem;" ref="echarts"> </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -39,13 +46,9 @@
 // import mapApi from '@/api/mapApi'
 import 'dayjs/locale/es'
 import dayjs from 'dayjs'
-import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
 
 export default {
   name: 'ECharts',
-  components: {
-    PublicDataStandard
-  },
   data () {
     return {
       days: dayjs(new Date()).format('YYYYMMDDHHmmss'),
@@ -59,23 +62,6 @@
         timeEnd: ''
       },
       RealTimeChart: null,
-      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 }
-      }
-      ],
       JsonTimeCtarts: {
         id: 'mychart_ss ',
         title: '鐑熷皹',
@@ -1024,6 +1010,7 @@
         this.IntervalEXHRealTimeDate()
       }, 15000)
     }
+
   }
 }
 </script>
@@ -1038,6 +1025,13 @@
   padding:0 10px
   >i{
     color: #ffffff;
+  }
+}
+.animation {
+  //width: 600px;
+  //height: 0.06rem;
+  .infomation {
+    padding: 5px 10px;
   }
 }
 .form-echrts {
@@ -1067,7 +1061,7 @@
     }
     /deep/.el-input__inner{
       position: relative;
-      //width:140px;
+      width:140px;
       background-color: #2e4967;
       color: #fff;
       font-size: 12px;

--
Gitblit v1.8.0