From ffbccfb5f47186bef14c5af8aa35b94f900e0062 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 09:59:57 +0800
Subject: [PATCH] 换行行高问题

---
 src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue |   96 ++++++++++++++++++++++++++----------------------
 1 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 79a1a2b..2c4725f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -53,32 +53,28 @@
 <!--                <option value="Jim">-->
 <!--                <option value="Lily">-->
 <!--              </datalist>-->
-              <el-row type="flex" :gutter="20">
-<!--                <el-col :span="14">-->
-<!--                  <el-row>-->
-<!--                    <el-col :span="12">-->
-<!--                      <el-row type="flex" justify="space-between">-->
-<!--                        <el-col class="pickerData">-->
-<!--                          寮�濮嬫椂闂�:-->
-<!--                          <el-date-picker-->
-<!--                              type="date">-->
-<!--                          </el-date-picker>-->
-<!--                        </el-col>-->
-<!--                      </el-row>-->
-<!--                    </el-col>-->
-<!--                    <el-col :span="12" type="flex">-->
-<!--                      <el-row type="flex" justify="center">-->
-<!--                        <el-col>-->
-<!--                          缁撴潫鏃堕棿:-->
-<!--                          <el-date-picker-->
-<!--                              type="date"-->
-<!--                          >-->
-<!--                          </el-date-picker>-->
-<!--                        </el-col>-->
-<!--                      </el-row>-->
-<!--                    </el-col>-->
-<!--                  </el-row>-->
-<!--                </el-col>-->
+              <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">
@@ -89,16 +85,6 @@
                     <option value="75" />
                     <option value="100" />
                   </datalist>
-<!--                  <div data-tap-disabled="true">-->
-<!--                    閲囨牱鐐规暟:-->
-<!--                    <select id="source">-->
-<!--                      <option value="1">0</option>-->
-<!--                      <option value="2">25</option>-->
-<!--                      <option value="3">50</option>-->
-<!--                      <option value="4">75</option>-->
-<!--                      <option value="5">100</option>-->
-<!--                    </select>-->
-<!--                  </div>-->
                 </el-col>
                 <el-col class="detailbtn" :span="2" @click="onSubmit">鏌ヨ</el-col>
                 <el-col :span="3">
@@ -117,7 +103,7 @@
                 </el-col>
               </el-row>
             </div>
-            <div style="width:100%;height:200px;" id="echarts" ref="main">
+            <div style="width:100%;height:300px;" id="echarts" ref="main">
             </div>
         </div>
     </div>
@@ -133,6 +119,8 @@
   },
   data () {
     return {
+      value1: '',
+      value2: '',
       watchData: [],
       dialogVisible: false,
       dataDate: [],
@@ -353,20 +341,40 @@
 
 .form-echrts {
   width: 100%;
-  height: 1rem;
+  height: 2rem;
   border-top: 1px solid #396d83;
   //margin: 10px 10px 10px 10px;
   .from-search{
-    //display: flex;
-    //justify-content: space-between;
-    .pickerData{
+    margin-top: 6px;
+    .pickerMon{
       display: flex;
-      justify-content: space-between;
+      .pickerData{
+        flex: 1;
+        display: flex;
+        .pickerTable{
+          margin-left: 6px;
+          width: 40px;
+
+          /deep/.el-input__icon {
+            width: 0.9rem;
+            font-size: 0;
+          }
+        }
+      }
+    }
+    /deep/.el-date-editor--datetime{
+      width: 100%;
     }
     /deep/.el-input__inner{
-      width: 40px!important;
-      height: 16px!important;
+      position: relative;
+      width: 0.9rem!important;
+      height: 0.125rem!important;
       background-color: #2e4967;
+      color: #ffffff;
+      font-size: 8px;
+      padding: 0;
+      //padding-left:20px ;
+      //padding: 0!important;
     }
     .echatsInput{
       color: #00ffff;

--
Gitblit v1.8.0