From 575895afe19025a24f55fbf1a69a4a48d5ab7ef6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 29 Dec 2020 15:53:20 +0800
Subject: [PATCH] =?UTF-8?q?ISCS=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iscs/iscsSystem/config/canvas/iscsCanvas.vue |  3 ++-
 src/views/iscs/iscsSystem/index.vue              |  3 ++-
 .../stationConfig/environment/index.vue          |  3 ++-
 .../stationConfig/powerMonitor/substation.vue    |  3 ++-
 .../iscsSystem/stationConfig/psdSystem/index.vue |  3 ++-
 src/views/iscs/iscsSystem/stationNav.vue         | 16 ++++++++++++----
 src/views/iscsSystem/index.vue                   |  3 ++-
 7 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
index a59c34312..0070088bb 100644
--- a/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
+++ b/src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue
@@ -80,7 +80,8 @@ export default {
     methods: {
         async getDetail(mode, system, part) {
             const params = {
-                lineCode: this.$route.query.lineCode,
+                // lineCode: this.$route.query.lineCode,
+                mapId:this.$route.query.mapId,
                 totalSystem: mode,
                 system: system,
                 userInterface : part
diff --git a/src/views/iscs/iscsSystem/index.vue b/src/views/iscs/iscsSystem/index.vue
index bbc491cc4..f6a971c79 100644
--- a/src/views/iscs/iscsSystem/index.vue
+++ b/src/views/iscs/iscsSystem/index.vue
@@ -8,7 +8,8 @@
         <router-view />
       </div>
     </div>
-    <div v-if="lineCode=='02'" style="height:100%">
+    <!-- if="lineCode=='02'" -->
+    <div v-else style="height:100%">
       <station-nav v-if="$route.query.group" />
       <div class="content-box-station iscs_content_box" :class="{'displayStationIscs': $route.query.group}">
         <router-view />
diff --git a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue
index 328967856..2be0ca4b6 100644
--- a/src/views/iscs/iscsSystem/stationConfig/environment/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/environment/index.vue
@@ -144,7 +144,8 @@ export default {
         },
         getDetail() {
             const params = {
-                lineCode: this.$route.query.lineCode,
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
                 system: this.system,
                 totalSystem :'environment02',
                 userInterface : this.mode
diff --git a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
index 956b4d281..e12c6dc5d 100644
--- a/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue
@@ -51,7 +51,8 @@ export default {
     methods:{
         getInitData() {
             const params = {
-                lineCode: this.$route.query.lineCode,
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
                 system: 'powerMonitoring',
                 totalSystem :'powerMonitoring02'
             };
diff --git a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue
index 8a9104f85..1a4116a19 100644
--- a/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue
@@ -37,7 +37,8 @@ export default {
     },
     mounted() {
         const params = {
-            lineCode: this.$route.query.lineCode,
+            // lineCode: this.$route.query.lineCode,
+            mapId: this.$route.query.mapId,
             totalSystem: 'psdSystem02',
             system: 'psdSystem',
             userInterface: 'psdOne'
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index 8fd265e88..80a743204 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -328,10 +328,18 @@ export default {
             this.stationList = [];
             res.data.forEach(station => {
                 if (!station.depot && station.visible) {
-                    const param = {
-                        name: station.runPlanName + '站',
-                        id: station.code
-                    };
+                    let param = {};
+                    if (station.runPlanName.includes('站')) {
+                        param = {
+                            name: station.runPlanName,
+                            id: station.code
+                        };
+                    } else {
+                        param = {
+                            name: station.runPlanName + '站',
+                            id: station.code
+                        };
+                    }
                     this.stationList.push(param);
                 }
             });
diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue
index 3a64755df..d8e528213 100644
--- a/src/views/iscsSystem/index.vue
+++ b/src/views/iscsSystem/index.vue
@@ -115,7 +115,8 @@ export default {
             });
             Vue.prototype.$iscs = this.$iscs;
             const params = {
-                lineCode: this.$route.query.lineCode,
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
                 totalSystem: mode,
                 system: system,
                 userInterface: part