From c70af998d761762509bbcc193423a969a8a08843 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Sat, 10 Oct 2020 15:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=B7=9E=E4=B8=80=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=20iscs=20=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iscs/iscsSystem/stationConfig/index.vue   |  2 +-
 .../stationConfig/powerMonitor/substation.vue | 24 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/iscs/iscsSystem/stationConfig/index.vue b/src/views/iscs/iscsSystem/stationConfig/index.vue
index a2f833b87..00d2dbb76 100644
--- a/src/views/iscs/iscsSystem/stationConfig/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 100%; width: 100%;overflow-y: auto;overflow-x:hidden">
+  <div style="height: 100%; width: 100%;overflow-y:hidden;overflow-x:hidden;position: relative;">
     <psd-system v-if="mode=='psdSystem'" />
     <substation v-else-if="mode=='substation'" />
   </div>
diff --git a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
index 579ca5c44..7b8fc763a 100644
--- a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
@@ -1,14 +1,15 @@
 <template>
-  <div v-loading="loading" class="Substation" :style="{'background':bacground}" element-loading-background="rgba(0, 0, 0, 0.6)">
-    <div class="Substation_header">{{ title }}</div>
-    <div>
-      <iscsSystem ref="iscsPlate" />
-      <!-- :width-canvas="width" :canvas-height="height" :scale-rate="scaleRate"  -->
-    </div>
+  <div v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.6)" style="width:100%;height:100%;">
+    <div class="Substation" :style="{'background':bacground}">
+      <div class="Substation_header">{{ title }}</div>
+      <div>
+        <iscsSystem ref="iscsPlate" />
+      </div>
     <!-- <div class="psdSystem_footer">
       <div class="prevButton">{{}}</div>
       <div class="nextButton">{{}}</div>
     </div> -->
+    </div>
   </div>
 </template>
 <script>
@@ -86,9 +87,10 @@ export default {
             this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
             getIscsData(params).then(resp=>{
                 if (resp.data) {
+                    this.loading = false;
                     const data = JSON.parse(resp.data.graphData);
                     this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
-                    this.loading = false;
+                    document.querySelector('.Substation').scrollTop = 0;
                 }
             });
         }
@@ -103,5 +105,13 @@ export default {
 }
 .Substation{
     display: inline-block;
+    width:100%;
+    height:100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+}
+.SubstationIn{
+    display: inline-block;
 }
 </style>