diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 873514704..c8bacc86f 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -489,7 +489,7 @@ export default { EventBus.$emit('sendMsg', {message: '命令执行失败！'}); } }); - if (val._type != 'Psd' && val._type != 'StationStand') { + if (val._type !== 'Psd' && val._type !== 'StationStand' && val._type !== 'Train') { this.dialogVisible = !this.isLocal; } this.handleIbpShow(); diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 6438bc550..f23d713bd 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -225,6 +225,8 @@ export default { CMD_STAND_EMERGENCY_CLOSE : {value: 'Stand_Emergency_Close', label: '站台紧急停车'}, /** 取消站台紧急停车 */ CMD_STAND_CANCEL_EMERGENCY_CLOSE : {value: 'Stand_Cancel_Emergency_Close', label: '取消站台紧急停车'} + // /** 批量设置停站时间 */ + // CMD_STAND_BATCH_SET_PARK_TIME : {value: 'Stand_Batch_Set_Park_Time', label: '批量设置停站时间' } }, Station: { @@ -313,7 +315,9 @@ export default { /** 列车取消指定站台的跳停 */ CMD_TRAIN_CANCEL_SKIP_STOP : { value: 'Train_Cancel_Skip_Stop', label: '取消指定站台跳停' }, /** 换端 */ - CMD_TRAIN_TURN_DIRECTION: { value: 'Turn_Direction', label: '换端' } + CMD_TRAIN_TURN_DIRECTION: { value: 'Turn_Direction', label: '换端' }, + /** 选择调度模式 */ + CMD_TRAIN_REGULATION : { value:'Train_Regulation', label:'选择调度模式' } }, TrainWindow: { /** 修改列车识别号 */ diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index bc303bcc8..8b75cd8e6 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.2.175:9000'; // 旭强 有线 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线 - // BASE_API = 'http://192.168.2.183:9000'; // 张赛 + BASE_API = 'http://192.168.2.183:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 diff --git a/src/views/newMap/displayBaSiDi/atr.vue b/src/views/newMap/displayBaSiDi/atr.vue new file mode 100644 index 000000000..77b8e360f --- /dev/null +++ b/src/views/newMap/displayBaSiDi/atr.vue @@ -0,0 +1,399 @@ + + + + diff --git a/src/views/newMap/displayBaSiDi/baSiDi.vue b/src/views/newMap/displayBaSiDi/baSiDi.vue index 80929b6f3..e14ab7e5a 100644 --- a/src/views/newMap/displayBaSiDi/baSiDi.vue +++ b/src/views/newMap/displayBaSiDi/baSiDi.vue @@ -45,7 +45,7 @@
运图
时刻表
编表
-
调度
+
调度
站控
计划
diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue index 33b79d79d..f02c234b7 100644 --- a/src/views/newMap/displayBaSiDi/index.vue +++ b/src/views/newMap/displayBaSiDi/index.vue @@ -16,6 +16,7 @@ + @@ -40,6 +41,7 @@ import TroDetail from './troDetail'; import TraDialog from './tra'; import TtlDialog from './ttl'; import TmtDialog from './tmt'; +import AtrDialog from './atr'; import parseStatus from '@/utils/parseStatus'; export default { @@ -53,7 +55,8 @@ export default { TroDetail, TraDialog, TtlDialog, - TmtDialog + TmtDialog, + AtrDialog }, data() { return {