From 79779e2a862940c0c9ba84f54350823f3b21fd29 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Wed, 30 Dec 2020 13:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98iscs=E7=9A=84=E6=95=B0=E6=8D=AE=E7=9A=84lineCode?=
 =?UTF-8?q?=E4=B8=BAmapId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iscs/iscsDesign/demonList.vue         | 2 +-
 src/views/iscs/iscsDraw/icscComponents/text.vue | 9 ++++++---
 src/views/iscs/iscsDraw/index.vue               | 3 +--
 src/views/iscs/iscsSystem/stationNav.vue        | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue
index 09555b5ea..b6f341536 100644
--- a/src/views/iscs/iscsDesign/demonList.vue
+++ b/src/views/iscs/iscsDesign/demonList.vue
@@ -58,7 +58,7 @@ export default {
             mapPublishList: [],
             pageTreeMap: {
                 '01': [],
-                '02': [
+                '114': [
                     {
                         // 牵引降压混合变电所主接线图 变电所接线图 降压变电所主接线图 解除网图 混合变电所主接线图
                         name: '电力监控系统',
diff --git a/src/views/iscs/iscsDraw/icscComponents/text.vue b/src/views/iscs/iscsDraw/icscComponents/text.vue
index d96a0bf8b..27a4339a9 100644
--- a/src/views/iscs/iscsDraw/icscComponents/text.vue
+++ b/src/views/iscs/iscsDraw/icscComponents/text.vue
@@ -3,7 +3,7 @@
     <el-form ref="form" :rules="rules" :model="form" label-width="120px" style="width: 100%;padding: 10px 50px;">
       <el-form-item label="code:" prop="code">
         <el-select v-model="form.code">
-          <el-option v-for="(item, index) in iscs.iscsTextList" :key="index" :label="item.code" :value="item.code" disabled />
+          <el-option v-for="(item, index) in iscsTextList" :key="index" :label="item.code" :value="item.code" disabled />
         </el-select>
       </el-form-item>
       <el-form-item label="文字内容:" prop="context">
@@ -106,7 +106,10 @@ export default {
     computed:{
         ...mapGetters('iscs', [
             'iscs'
-        ])
+        ]),
+        iscsTextList() {
+            return this.iscs ? this.iscs.iscsTextList || [] : [];
+        }
     },
     watch:{
         '$store.state.iscs.rightClickCount': function (val) {
@@ -141,7 +144,7 @@ export default {
                             x: this.form.x,
                             y: this.form.y
                         },
-                        code: this.isUpdate ? this.form.code : getUID('IscsText', this.iscs.iscsTextList),
+                        code: this.isUpdate ? this.form.code : getUID('IscsText', this.iscsTextList),
                         _type: 'IscsText',
                         context: this.form.context,
                         unit: this.form.unit,
diff --git a/src/views/iscs/iscsDraw/index.vue b/src/views/iscs/iscsDraw/index.vue
index 737656dca..a4545b875 100644
--- a/src/views/iscs/iscsDraw/index.vue
+++ b/src/views/iscs/iscsDraw/index.vue
@@ -112,8 +112,7 @@ export default {
         handleSave(data) {
             const param = {
                 graphData: data,
-                lineCode: this.$route.query.lineCode,
-                stationCode: '',
+                mapId: this.$route.query.mapId,
                 system: this.$route.query.system,
                 totalSystem: this.$route.query.mode,
                 userInterface: this.$route.query.part
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index c915e0d48..eb77d9498 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -35,8 +35,8 @@
             <div class="mainHouseTwo">
               <div class="station-list-button" :class="{'active': selectStation == 'mainHouseTwo'}" @click="changeStation('mainHouseTwo')" />
             </div>
-            <div class="mainHouseOneName">黄山主所</div>
-            <div class="mainHouseTwoName">茶亭主所</div>
+            <div class="mainHouseOneName">主所1</div>
+            <div class="mainHouseTwoName">主所2</div>
           </div>
         </div>
       </div>
@@ -328,7 +328,7 @@ export default {
             res.data.forEach(station => {
                 if (!station.depot && station.visible) {
                     const param = {
-                        name: station.name.includes('站') ? station.name : `${station.name}站`,
+                        name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`,
                         id: station.code
                     };