From 34a94e2c6dcf7b7b496752dbeb764f762db934d5 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 12 Apr 2023 17:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E9=80=89=E6=8B=A9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menus/menuDialog/areaSelection.vue        | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
index 8dc294630..da68e047f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
@@ -30,9 +30,9 @@
             </template>
           </el-table-column>
           <el-table-column prop="name" label="车站名" align="center" width="100" :show-overflow-tooltip="true" />
-          <el-table-column prop="control" label="控制状态" align="center" width="70">
+          <el-table-column prop="controller" label="控制状态" align="center" width="70">
             <template slot-scope="scope">
-              <div>{{ getControlStatus(scope.row.code) }}</div>
+              <div>{{ getControlStatus(scope.row.controller) }}</div>
             </template>
           </el-table-column>
           <el-table-column prop="stationCode" label="" align="center">
@@ -93,9 +93,12 @@ export default {
         }
     },
     watch: {
-        '$store.state.map.mapStateLoadedCount': function () {
+        '$store.state.map.mapStationStateUpdateCount': function() {
             if (this.show) {
-                this.tableData = [...this.tableData];
+                this.tableData.forEach(item => {
+                    const station = this.$store.getters['map/getDeviceByCode'](item.code);
+                    item.controller = station.controller;
+                });
             }
         }
     },
@@ -122,24 +125,18 @@ export default {
                 this.memberId = this.$store.state.training.myMemberId;
                 const centralizedStationCode = this.stationCentralizedMap[this.$store.state.training.roleDeviceCode];
                 const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
-                this.$set(centralizedStation, 'apply', false);
-                this.$set(centralizedStation, 'release', false);
-                this.$set(centralizedStation, 'distribution', false);
-                this.tableData.push(centralizedStation);
+                const data = { code: centralizedStation.code, name: centralizedStation.name, apply: false, release: false, distribution: false, controller: null };
+                this.tableData.push(data);
                 centralizedStation.chargeStationCodeList.forEach(elem => {
                     const station = this.$store.getters['map/getDeviceByCode'](elem);
-                    this.$set(station, 'apply', false);
-                    this.$set(station, 'release', false);
-                    this.$set(station, 'distribution', false);
-                    this.tableData.push(station);
+                    const data1 = { code: station.code, name: station.name, apply: false, release: false, distribution: false, controller: null };
+                    this.tableData.push(data1);
                 });
             } else if (this.$store.state.training.roles === 'DISPATCHER') {
                 this.memberId = this.$store.state.training.myMemberId;
                 this.stationList.forEach(item => {
-                    this.$set(item, 'apply', false);
-                    this.$set(item, 'release', false);
-                    this.$set(item, 'distribution', false);
-                    this.tableData.push(item);
+                    const data = { code: item.code, name: item.name, apply: false, release: false, distribution: false, controller: null };
+                    this.tableData.push(data);
                 });
             }
             this.show = true;
@@ -154,9 +151,8 @@ export default {
                 }
             });
         },
-        getControlStatus(code) {
-            const newStation = this.$store.getters['map/getDeviceByCode'](code);
-            return newStation.controller === this.memberId ? '自控' : '未控';
+        getControlStatus(controller) {
+            return controller === this.memberId ? '自控' : '未控';
         },
         getDisabled(code, type) {
             const newStation = this.$store.getters['map/getDeviceByCode'](code);
@@ -172,9 +168,8 @@ export default {
             }
         },
         getController(station) {
-            const newStation = this.$store.getters['map/getDeviceByCode'](station.code);
-            if (newStation.controller) {
-                const controller = this.$store.state.training.memberData[newStation.controller];
+            if (station.controller) {
+                const controller = this.$store.state.training.memberData[station.controller];
                 return controller.label;
             } else {
                 return '';