diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue index 65a4410d7..5e6a6b832 100644 --- a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue +++ b/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue @@ -117,7 +117,7 @@ export default { operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL; operate.operation = OperationEvent.StationControl.emergencyStationControl.confirm.operation; } else if (this.operation == OperationEvent.StationControl.forcedStationControl.menu.operation) { - operate.cmdType = CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL; + operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL; operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation; } this.$emit('setOperate', { selection: this.operate.selection, commit: true }); diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue index 7bad2ac58..cb686d661 100644 --- a/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue +++ b/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue @@ -50,7 +50,7 @@ - Forced Station Control + Emergency Station Control To Station Control To Center Control diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 09f5d349f..c3d8d55e6 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -23,13 +23,13 @@ export function handlerUrl() { let OSS_URL; if (process.env.NODE_ENV === 'development') { // 开发分支 - // BASE_API = 'http://192.168.3.233/rtss-server'; + BASE_API = 'http://192.168.3.233/rtss-server'; // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.3.47:9000'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 - BASE_API = 'http://192.168.3.15:9000'; // 张赛 + // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip';