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; });