From 12fb4b8e4fb75347b25f3ba473b930408ed2ec05 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 22 九月 2023 17:49:18 +0800
Subject: [PATCH] 1、优化查询时若无选择日期的提示信息 2、增加部分加载时间较长的数据的加载动画

---
 src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
index c025553..f861422 100644
--- a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
+++ b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
@@ -14,7 +14,7 @@
               <a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" format='YYYY-MM-DD' @change="dataChange"/>
             </a-form-item>
           </a-col>
-          <a-col :md="3" :sm="3" :xs="3">
+          <a-col :md="2" :sm="2" :xs="2">
             <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
           </a-col>
           <a-col :md="2" :sm="2" :xs="2">
@@ -589,9 +589,9 @@
         StartupLine.setOption(StartupLine_option);
       },
       queryStatistical(){
+        if(this.queryParams.collectTime){
           getAction(this.url.dayStatisticalRate,this.queryParams).then(res =>{
             if(res.success){
-              // console.log(res);
               this.StatCharOpeningRate = res.result.openRate;
               this.StatCharUsedRate = res.result.utilizationRate;
               this.UtilizationHeight = res.result.openRate;
@@ -604,16 +604,20 @@
               this.totalLong = parseInt(this.openingLong) + parseInt(this.closedLong);
               this.draw();
             }
-            else{
-              this.draw();
-            }
           })
+        }else{
+          this.$notification.warning({
+            message:'娑堟伅',
+            description:'璇烽�夋嫨鏃堕棿'
+          })
+        }
       },
       dataChange(val) {
         this.queryParam.collectTime1 = "";
-        this.queryParams.dateTime = val.format('YYYYMMDD')
-        this.queryParams.collectTime = val.format('YYYY-MM-DD');
-
+        if(val){
+          this.queryParams.dateTime = val.format('YYYYMMDD')
+          this.queryParams.collectTime = val.format('YYYY-MM-DD');
+        }
       },
       initEquipmentNode(id) {
         let _this = this
@@ -652,7 +656,7 @@
         this.queryParam = {}
         this.queryParams = {}
         // this.dates = []
-        this.queryStatistical()
+        // this.queryStatistical()
         // this.onClearSelected()
       },
       searchQuery(){
@@ -667,18 +671,14 @@
             this.$set(this.queryParam, 'equipmentId', val.equipmentId)
             this.queryParams.parentId = ''
             this.queryParams.equipmentId = val.equipmentId
-            this.searchQuery()
           }else{
             this.queryParams.parentId = val.key
             this.queryParams.equipmentId = ''
             this.$set(this.queryParam, 'tierName', val.title)
-            this.searchQuery()
             }
             this.searchQuery()
           }
           // this.searchQuery();
-
-
       }
 
   }

--
Gitblit v1.9.3