From b51c25c2ef1cc38ff892021eb926c6cdc54d6ece Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 15 Nov 2024 09:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A6=86=E5=86=B0=E5=BE=AE?=
 =?UTF-8?q?=E6=B0=94=E8=B1=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iceWeather/weather/index.vue | 135 ++++++++++++++-----------
 1 file changed, 74 insertions(+), 61 deletions(-)

diff --git a/src/views/iceWeather/weather/index.vue b/src/views/iceWeather/weather/index.vue
index 7fcd855..ab5684e 100644
--- a/src/views/iceWeather/weather/index.vue
+++ b/src/views/iceWeather/weather/index.vue
@@ -150,20 +150,28 @@
               </el-form>
             </div>
             <div class="termalBox">
-              <h3>当前监测终端</h3>
-              <el-descriptions direction="vertical" :column="4" border>
-                <el-descriptions-item label="线路">{{
-                  childMsg.lineName
-                }}</el-descriptions-item>
-                <el-descriptions-item label="杆塔">{{
-                  childMsg.towerName
-                }}</el-descriptions-item>
-                <el-descriptions-item label="终端">{{
-                  childMsg.cmdid
-                }}</el-descriptions-item>
-              </el-descriptions>
+              <p>
+                <span class="text"
+                  >线路:{{ childMsg.lineName || childMsg.lineName }}</span
+                >
+                <span class="text"
+                  >杆塔:{{ childMsg.towerName || childMsg.name }}</span
+                >
+                <span class="text">终端:{{ childMsg.cmdid }}</span>
+              </p>
+              <div class="gropBtn">
+                <el-button type="text" @click="onWdLine" icon="el-icon-odometer"
+                  >温度趋势</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="onSdLine"
+                  icon="el-icon-heavy-rain"
+                  >湿度趋势</el-button
+                >
+              </div>
             </div>
-            <div class="echartsBox">
+            <!-- <div class="echartsBox">
               <div class="btnbox">
                 <el-button type="primary" @click="onWdLine"
                   >温度变化趋势</el-button
@@ -175,16 +183,16 @@
               </div>
               <div id="wDechart" class="chartClass" v-show="wdFlag"></div>
               <div id="sDechart" class="chartClass" v-show="sdFlag"></div>
-            </div>
+            </div> -->
+
             <div class="childTableShowBox">
-              <h3>气象数据列表</h3>
               <el-table
                 :data="childTableDate"
                 style="width: 100%"
                 v-loading="loading"
-                height="calc(100% - 40px)"
+                height="calc(100% - 2px)"
               >
-                <el-table-column prop="updateTime" label="时间">
+                <el-table-column prop="updateTime" label="时间" width="138px">
                   <template slot-scope="scope">
                     <span v-if="scope.row.updateTime">
                       {{
@@ -278,6 +286,12 @@
               >
               </el-pagination>
             </div>
+            <el-dialog title="温度折线图" :visible.sync="wdFlag">
+              <div id="wDechart" class="chartClass"></div>
+            </el-dialog>
+            <el-dialog title="湿度折线图" :visible.sync="sdFlag">
+              <div id="sDechart" class="chartClass"></div>
+            </el-dialog>
           </div>
         </div>
       </div>
@@ -310,7 +324,7 @@ export default {
       childParma: "",
       childMsg: "",
       echartsData: "", //echarts数据
-      wdFlag: true,
+      wdFlag: false,
       sdFlag: false,
     };
   },
@@ -363,12 +377,13 @@ export default {
         this.getWeatherData(weatherParams);
       } else {
         console.log("装置-杆塔");
-        weatherParams = {
-          pageNum: 1,
-          pageSize: this.pageSize,
-          towerId: data.towerid,
-        };
-        this.getWeatherData(weatherParams);
+        // weatherParams = {
+        //   pageNum: 1,
+        //   pageSize: this.pageSize,
+        //   towerId: data.towerid,
+        // };
+        this.moreDataClick(data);
+        // this.getWeatherData(weatherParams);
       }
       //this.getAllData(data);
     },
@@ -523,10 +538,6 @@ export default {
         .then((res) => {
           console.log(res);
           this.echartsData = res.data.list;
-
-          //获取温度折线图
-          this.getEchart4(this.echartsData);
-          this.getEchart5(this.echartsData);
         })
         .catch((err) => {
           console.log(err); //代码错误、请求失败捕获
@@ -535,10 +546,13 @@ export default {
     onWdLine() {
       this.wdFlag = true;
       this.sdFlag = false;
+      //获取温度折线图
+      this.getEchart4(this.echartsData);
     },
     onSdLine() {
       this.wdFlag = false;
       this.sdFlag = true;
+      this.getEchart5(this.echartsData);
     },
     onHidden() {
       this.wdFlag = false;
@@ -733,6 +747,10 @@ export default {
     border-left: 1px solid #ddd;
     .el-table .el-table__cell {
       text-align: center;
+      -webkit-user-select: text;
+      -moz-user-select: text;
+      -ms-user-select: text;
+      user-select: text;
     }
     .dataBox {
       width: calc(100% - 24px);
@@ -745,23 +763,24 @@ export default {
     }
     .childBox {
       height: 100%;
-      .echartsBox {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-
-        .btnbox {
-          display: flex;
-          margin-bottom: 8px;
-          .el-button--primary {
-            width: auto;
-          }
-        }
-        .chartClass {
-          height: 450px;
-          width: 800px;
-        }
+      .chartClass {
+        height: 450px;
+        width: 100%;
       }
+      // .echartsBox {
+      //   display: flex;
+      //   flex-direction: column;
+      //   align-items: center;
+
+      //   .btnbox {
+      //     display: flex;
+      //     margin-bottom: 8px;
+      //     .el-button--primary {
+      //       width: auto;
+      //     }
+      //   }
+
+      // }
       .childTableShowBox {
         h3 {
           font-size: 16px;
@@ -771,27 +790,21 @@ export default {
           color: #666;
           margin-top: 16px;
         }
-        height: calc(100% - 200px);
+        height: calc(100% - 124px);
       }
       .termalBox {
-        h3 {
-          font-size: 16px;
-          font-weight: normal;
-          margin-bottom: 4px;
-          text-align: center;
-          color: #666;
-        }
-        .el-descriptions {
-          margin-bottom: 16px;
-          .el-descriptions-item__label.is-bordered-label {
-            color: #333;
-          }
-          .el-descriptions__body
-            .el-descriptions__table
-            .el-descriptions-item__cell {
-            text-align: center;
+        margin-bottom: 4px;
+        display: flex;
+        align-items: center;
+        line-height: 32px;
+        p {
+          .text {
+            margin-right: 12px;
           }
         }
+        .gropBtn {
+          //margin-left: auto;
+        }
       }
     }
   }