From c77abda3614ba5c0a317b92eef29edbb39501d8f Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 18:52:14 +0800
Subject: [PATCH] echarts的数据显示功能

---
 src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue |  233 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 126 insertions(+), 107 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
index 0b4fe94..0790c3b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -1,70 +1,59 @@
 <!--  鏃ユ暟鎹�  -->
 <template>
-    <div id="Tab">
-        <div class="infomation">
-            <el-row>
-                <el-col :span="6"><div class="grid-content bg-purple">姘哀鍖栫墿:29.93鏍囧噯:100</div></el-col>
-                <el-col :span="6"><div class="grid-content bg-purple">浜屾哀鍖栫~:17.34鏍囧噯:50</div></el-col>
-                <el-col :span="6"><div class="grid-content bg-purple">鐑熷皹:6.93 鏍囧噯:30</div></el-col>
-                <el-col :span="6"><div class="grid-content bg-purple">搴熸皵娴侀噺:120343.18</div></el-col>
-            </el-row>
-        </div>
-        <div class="form-echrts">
-            <div class="from-search">
-                <el-row type="flex">
-                    <el-col :span="14">
-                        <div class="pickerMon">
-                            <div class="pickerData">
-                                <span> 寮�濮嬫椂闂�:</span>
-                                <span class="pickerTable"><el-date-picker
-                                        type="datetime"
-                                        v-model="value1">
-                      </el-date-picker></span>
-                            </div>
-                            <div class="pickerData">
-                                <span >缁撴潫鏃堕棿:</span>
-                                <span class="pickerTable">
-                        <el-date-picker
-                                type="datetime"
-                                v-model="value2"
-                        >
-                      </el-date-picker>
-                      </span>
-                            </div>
-                        </div>
-                    </el-col>
-                    <el-col :span="5">
-                        閲囨牱鐐规暟:
-                        <input list="source" id="ipt" class="echatsInput">
-                        <datalist id="source">
-                            <option value="0" />
-                            <option value="25" />
-                            <option value="50" />
-                            <option value="75" />
-                            <option value="100" />
-                        </datalist>
-                    </el-col>
-                    <el-col class="detailbtn" :span="2" @click="onSubmit">鏌ヨ</el-col>
-                    <el-col :span="3">
-                        <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</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>
-                    </el-col>
-                </el-row>
-            </div>
-            <div style="width:5rem;height:2rem;" id="echarts" ref="main">
-            </div>
-        </div>
+  <div id="Tab">
+    <div class="animation">
+      <div class="infomation">
+        <span class="grid-content">姘哀鍖栫墿 :<i>29.93</i>  鏍囧噯 : 100</span>
+        <span class="grid-content">浜屾哀鍖栫~ : <i>17.34</i> 鏍囧噯 : 50</span>
+        <span class="grid-content">鐑熷皹 : <i>6.93</i> 鏍囧噯 : 30</span>
+        <span class="grid-content">搴熸皵娴侀噺 : <i>120343.18</i></span>
+      </div>
     </div>
+    <div class="form-echrts">
+      <div class="from-search">
+        <div class="pickerMon">
+          <div class="pickerData">
+            <span> 寮�濮嬫椂闂�:</span>
+            <span class="pickerTable">
+              <el-date-picker  type="datetime"   v-model="value1"></el-date-picker>
+            </span>
+          </div>
+          <div class="pickerData">
+            <span >缁撴潫鏃堕棿:</span>
+            <span class="pickerTable">
+              <el-date-picker type="datetime"  v-model="value2"></el-date-picker>
+            </span>
+          </div>
+        </div>
+        <div>
+          閲囨牱鐐规暟:
+          <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>
+            <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>
+    </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>
+  </div>
 </template>
 
 <script>
@@ -86,7 +75,8 @@
       formInline: {
         user: '',
         region: ''
-      }
+      },
+      info: this.series
     }
   },
   methods: {
@@ -287,48 +277,63 @@
 </script>
 
 <style scoped lang="less">
-    .grid-content{
-        font-size: 8px!important;
-        background-color:#2e4967;
-        text-align: center;
-        margin: 0 2px 4px 2px;
-        border-radius: 2px;
-    }
-    .Infomation {
-        margin-left: 10px;
-    }
-
-    .el-tag {
-        height: 25px;
-        width: 140px;
-        line-height: 25px;
-        margin-right: 10px;
-        font-size: 10px;
-        background-color: rgba(0, 255, 246, 0.14);
-        color: #00d0f9;
-        border: none;
-        padding: 0 15px;
-    }
-
+//.animation{
+//  padding: 0 1rem;
+//  overflow: hidden;
+//  //width: 1rem;
+//  .infomation{
+//    display: flex;
+//    //margin: 0 1rem;
+//    overflow: hidden;
+//    animation: move 1s linear 0s infinite;
+//    @keyframes move {
+//      0% {
+//      }
+//      100% {
+//        transform: translateX(-10%);
+//      }
+//    }
+//    /* 榧犳爣缁忚繃marquee 灏卞仠姝㈠姩鐢� */
+//    &:hover {
+//      //z-index: 9999999;
+//      animation-play-state: paused;
+//    }
+//  }
+//}
+  .grid-content {
+    font-size: 8px;
+    background-color: #2e4967;
+    text-align: center;
+    border-radius: 2px;
+    margin-right: 10px;
+    padding:0 10px
+  }
+.animation {
+  //width: 600px;
+  //height: 0.06rem;
+  .infomation {
+    padding: 5px 10px;
+  }
+}
     .form-echrts {
         width: 100%;
         border-top: 1px solid #396d83;
         //margin: 10px 10px 10px 10px;
         .from-search{
-            margin-top: 6px;
+          display: flex;
+          padding:5px;
+          >div{margin-left: 10px}
             .pickerMon{
-                display: flex;
+              display: flex;
+              >div:first-child {
+                margin-right: 10px;
+              }
                 .pickerData{
                     flex: 1;
                     display: flex;
-                    .pickerTable{
-                        margin-left: 6px;
-                        width: 40px;
-
-                        /deep/.el-input__icon {
-                            width: 0.9rem;
-                            font-size: 0;
-                        }
+                      >span{line-height: 22px}
+                    .pickerTable {
+                      margin-left: 3px;
                     }
                 }
             }
@@ -337,22 +342,36 @@
             }
             /deep/.el-input__inner{
                 position: relative;
-                width: 0.9rem!important;
-                height: 0.125rem!important;
+                width:140px;
                 background-color: #2e4967;
-                color: #ffffff;
-                font-size: 8px;
+                color: #fff;
+                font-size: 12px;
+                height: 24px;
                 padding: 0;
+                border-color:#00fff6;
+              text-align: center;
                 //padding-left:20px ;
                 //padding: 0!important;
             }
+          /deep/.el-input__icon{
+            display: block;
+            width: 140px;
+            height: 22px;
+            line-height: 22px;
+            cursor: pointer;
+            font-size: 0;
+          }
             .echatsInput{
-                color: #00ffff;
-                background-color: #2e4967;
-                border: none;
-                border-radius: 6px;
-                width: 40px;
+              color: #00ffff;
+              background-color: #2e4967;
+              border: none;
+              border-radius: 6px;
+              width: 80px;
+              height: 22px;
             }
+          input::-webkit-calendar-picker-indicator {
+            opacity: 100;
+          }
             .detailbtn{
                 background-color:#2e4967;
                 text-align: center;

--
Gitblit v1.8.0