From cbc576d15f6682cb5054c46b76492c18b8490eb5 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Wed, 30 Aug 2023 10:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E7=8A=B6=E6=80=81=E7=AA=97=E5=8F=A3=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=97=E7=8A=B6=E6=80=81=E5=BC=B9=E7=AA=97=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=89=93=E5=BC=80=E4=B9=8B=E5=90=8E=20loading=20?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E4=B8=8D=E6=98=8E=E6=98=BE=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=92=99=E7=89=88=0B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomChart/index.vue                       | 1 -
 src/views/stationOperation/components/MapPane.vue          | 7 ++++++-
 .../stationOperation/components/RealTimeDataChart.vue      | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue
index e9c13db..a785e99 100644
--- a/src/components/CustomChart/index.vue
+++ b/src/components/CustomChart/index.vue
@@ -75,6 +75,5 @@ export default {
 <style lang="less" scoped>
 .custom-chart {
   height: 100% !important;
-  min-height: 600px;
 }
 </style>
diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue
index 7545875..5706da2 100644
--- a/src/views/stationOperation/components/MapPane.vue
+++ b/src/views/stationOperation/components/MapPane.vue
@@ -236,6 +236,7 @@
             <RealTimeDataChart ref="realtimeChartRef" :spinning="spinLoading" :list="statusList" :scale-settings="initialDataRecieveSettings" />
             <resize-observer @notify="handleResize" />
           </template>
+          <div v-show="maskVisi" style="z-index: 1;position: absolute;top: 0;left: 0;width:100%;height: 100%;background: rgba(0, 0, 0, .45);"></div>
         </div>
         <!-- 右侧图表展示栏结束 -->
       </div>
@@ -420,7 +421,8 @@ export default {
       markerList: [], // 要在地图上展示的marker列表
 
       showPane: true,
-      spinLoading: false
+      spinLoading: false,
+      maskVisi: false
     }
   },
   created() {
@@ -727,6 +729,7 @@ export default {
 
     // 获取数据接收状态列表
     async getDataRecieveStatusList() {
+      this.maskVisi = true
       this.spinLoading = true
       try {
         this.isGettingStatusList = true
@@ -736,6 +739,7 @@ export default {
             userId: this.$store.getters.userInfo.id
           }
         )
+        this.maskVisi = false
         this.spinLoading = false
         if (success) {
           const statusList = []
@@ -755,6 +759,7 @@ export default {
           this.$message.error(message)
         }
       } catch (error) {
+        this.maskVisi = false
         this.spinLoading = false
         console.error(error)
       } finally {
diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue
index ca78bef..1f72568 100644
--- a/src/views/stationOperation/components/RealTimeDataChart.vue
+++ b/src/views/stationOperation/components/RealTimeDataChart.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="position: relative;">
+  <div>
     <!-- 图例 -->
     <div class="legend">
       <div
@@ -15,7 +15,7 @@
     </div>
     <!-- 图例结束 -->
     <custom-chart ref="customChartRef" :option="option" :height="list.length * 295"></custom-chart>
-    <a-spin style="position: absolute;top: 45%;left: 48%;" :spinning="spinning" />
+    <a-spin style="z-index: 11;position: absolute;top: 45%;left: 48%;" :spinning="spinning" />
   </div>
 </template>