From 15f7aa656e226091de8d078ad80fef4e01f27e2f Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 30 Dec 2019 09:57:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=9C=B0=E5=9B=BE=E5=8C=85?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=BB=BF=E7=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/simulation.js                                |  6 +++++-
 .../menus/menuDialog/stationControlConvert.vue       | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/api/simulation.js b/src/api/simulation.js
index 3136539c5..42d2f2189 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -447,7 +447,11 @@ export function getNewMapDataByGroup(group) {
 }
 /** 新版地图指令操作定义 */
 export function newMapOperate(group, operationId, data) {
-
+    return request({
+        url: `/simulation/${group}/operate/${operationId}`,
+        method: 'post',
+        data: data
+    });
 }
 /** 新版地图根据group获取仿真运行图 */
 export function getRunPlanNew(group) {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
index cf6276fb0..dbf3d60ea 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
@@ -96,7 +96,7 @@ export default {
     },
     computed: {
         ...mapGetters('map', [
-            'stationList',
+            'stationList'
         ]),
         ...mapGetters('training', [
             'mode',
@@ -111,16 +111,22 @@ export default {
         isFork() {
             if (this.dialogShow) {
                 return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
+            } else {
+                return '';
             }
         },
         isRequest() {
             if (this.dialogShow) {
                 return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
+            } else {
+                return '';
             }
         },
         isConter() {
             if (this.dialogShow) {
                 return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
+            } else {
+                return '';
             }
         },
         domIdChoose() {
@@ -132,6 +138,8 @@ export default {
                 } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                     return OperationEvent.StationControl.requestCentralControl.choose.domId;
                 }
+            } else {
+                return '';
             }
         },
         domIdConter() {
@@ -356,7 +364,7 @@ export default {
                 } else {
                     this.disabledSure = false;
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.disabledSure = false;
                 this.disabledClose = false;
             });