From d58be9584f409e7d198fd34982155331d6710f1f Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期二, 15 八月 2023 17:37:52 +0800
Subject: [PATCH] 修改了数据库多表联查语句

---
 src/views/ExceedingFume.vue |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/views/ExceedingFume.vue b/src/views/ExceedingFume.vue
index ffbb091..f732802 100644
--- a/src/views/ExceedingFume.vue
+++ b/src/views/ExceedingFume.vue
@@ -22,6 +22,7 @@
           plain
           @click="showTable"
           style="margin-left: 20px"
+          :loading="button.queryButton"
           >鏌ヨ</el-button
         >
 
@@ -387,6 +388,7 @@
       <ExceptionTypeLineChart
         :option="option"
         :is-open-dialog="centerDialogVisible"
+        v-loading="chartLoading"
       ></ExceptionTypeLineChart>
 
       <!--  -->
@@ -451,6 +453,8 @@
   },
   data() {
     return {
+      // 鎶樼嚎鍥惧姞杞戒腑
+      chartLoading:false,
       button:{
         // 鏌ヨ鎸夐挳
         queryButton:false,
@@ -806,7 +810,7 @@
     getNextRowData() {
       // 涓嶆槸琛ㄦ牸鐨勭涓�琛�
       if (this.selectedRowIndex !== 0) {
-        // 璁剧疆涓婁笅鏉℃寜閽笉鍙偣鍑�
+        // 鐐瑰嚮杩囩▼涓� 閿佷綇涓婁笅鏉℃寜閽�  鍦ㄨ缃畬鍥惧舰閰嶇疆椤瑰悗瑙ｉ攣
         this.banTouch = 1
 
         //寰楀埌涓婁竴琛屾暟鎹储寮�
@@ -833,22 +837,16 @@
             this.drawChartTest();
             this.exceptionTotal = this.exceedingData.length;
             this.button.afterButton = false
-
-            this.banTouch = 0
-
           });
       }
-      // //琛ㄦ牸鐨勭涓�琛岋紝鍒欎笂涓�鏉℃棤鏁版嵁
-      // else {
-      //   console.log(null);
-      // }
+ 
     },
 
     // 鑾峰彇鑾峰彇琛ㄦ牸涓嬩竴琛屾暟鎹�
     getPreviousRowData() {
       // 涓嶆槸琛ㄦ牸鐨勭涓�琛�
       if (this.selectedRowIndex < this.displayData.length - 1) {
-        // 璁剧疆涓婁笅鏉℃寜閽笉鍙偣鍑�
+        // 鐐瑰嚮杩囩▼涓� 閿佷綇涓婁笅鏉℃寜閽�  鍦ㄨ缃畬鍥惧舰閰嶇疆椤瑰悗瑙ｉ攣
         this.banTouch = 1
 
         //寰楀埌涓婁竴琛屾暟鎹储寮�
@@ -876,15 +874,8 @@
             this.drawChartTest();
             this.exceptionTotal = this.exceedingData.length;
             this.button.preButton = false
-
-          
-            this.banTouch = 0
           });
       }
-      //琛ㄦ牸鐨勭涓�琛岋紝鍒欎笂涓�鏉℃棤鏁版嵁
-      // else {
-      //   console.log(null);
-      // }
     },
 
     // 鈥樻煡鐪嬭鎯呪�� 寮瑰嚭妗嗛儴鍒�
@@ -910,6 +901,7 @@
       if (this.drawerData.endTime) {
         params['endTime'] = this.drawerData.endTime;
       }
+
       axiosInstanceInstance
         .get('/fume/exceed', { params: params })
         .then((response) => {
@@ -943,6 +935,7 @@
       }
       this.loading = true;
       this.button.queryButton = true
+      
       axiosInstanceInstance
         .get('/fume/abnormalthree', { params: params })
         .then((response) => {
@@ -1296,6 +1289,7 @@
           ]
         };
       }
+      this.banTouch = 0
     },
 
     // 鍔熻兘锛氱偣鍑� 鈥樻煡鐪嬭鎯呪�欙紝 鈥樹笅涓�鏉♀�欐寜閽椂浼� 鍏堥�昏緫璁＄畻銆傛渶鍚庡睍绀哄浘褰�
@@ -1329,6 +1323,8 @@
         beforeAndAfterTime[2]
       );
 
+      // 鎶樼嚎鍥惧姞杞戒腑鏁堟灉
+      this.chartLoading = true
       // 璇锋眰鍓嶅崐娈�
       axiosInstanceInstance
         .get('/fume/history', { params: paramsBefore })
@@ -1445,6 +1441,7 @@
                   endIndex
                 );
               }
+              this.chartLoading = false
             });
         });
     },

--
Gitblit v1.9.3