From 910e0c5712eceb558c927fe57f4f3fd340794298 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 16 Jan 2023 10:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E6=8A=98=E8=BF=94=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/options.js                        |  1 -
 .../menus/dialog/standBackStrategy.vue        | 22 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/jmapNew/options.js b/src/jmapNew/options.js
index 42354088a..1e4fb43a2 100644
--- a/src/jmapNew/options.js
+++ b/src/jmapNew/options.js
@@ -43,7 +43,6 @@ class Options {
     }
 
     update(payload) {
-        console.log(payload, '*****---------');
         if (Number.isFinite(payload.dx)) {
             this.offsetX -= payload.dx;
         }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
index 57a895825..d3d4d1eff 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
@@ -118,12 +118,12 @@ export default {
         loadInitData(selected, opts) {
             this.tempData = [];
             const station = this.stationList.find(n => n.code == selected.stationCode);
-            this.tempData.push({ name: station.name, station: selected.name, strategy: opts.reentryStrategy });
+            this.tempData.push({ name: station.name, station: selected.name, strategy: opts ? opts.reentryStrategy : '' });
             this.$nextTick(() => {
                 this.$refs.table.setCurrentRow(null);
             });
         },
-        doShow(operate, selected, opts) {
+        doShow(operate, selected) {
             this.selected = selected;
             if (!this.dialogShow) {
                 this.stationName = '';
@@ -132,14 +132,18 @@ export default {
                     const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
                     if (station) {
                         this.stationName = station.name;
-                        this.strategyList.forEach(item => {
-                            if (item.value == opts.reentryStrategy) {
-                                this.stationStrategy = item.label;
-                            }
-                        });
+                        if (selected.typeStrategy === 'DEFAULT') {
+                            this.stationStrategy = '关闭';
+                        } else if (selected.typeStrategy === 'NONE') {
+                            this.stationStrategy = '无折返';
+                        } else if (selected.typeStrategy === 'UNMANNED') {
+                            this.stationStrategy = '无人折返';
+                        } else if (selected.typeStrategy === 'AUTO') {
+                            this.stationStrategy = '自动换端';
+                        }
                     }
                 }
-                this.loadInitData(selected, opts);
+                this.loadInitData(selected);
             }
 
             this.dialogShow = true;
@@ -177,7 +181,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.$root.$emit('dialogClose', this.selected);
+            this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },