joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

南京二号线调整

Browse Source
This commit is contained in:
fan 2021-05-11 15:36:11 +08:00
parent c1d5b84e0b
commit 8cf5d36ce3
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -361,7 +361,7 @@ export default {
this.doClose(); this.doClose();
} }
}, },
'selected': function (val) { 'selected': function (val) {
EventBus.$emit('sendMsg', {}); // 清空执行栏 EventBus.$emit('sendMsg', {}); // 清空执行栏
this.initMenus();// 初始化菜单数据 this.initMenus();// 初始化菜单数据
this.selectedObj = this.actualSelected; this.selectedObj = this.actualSelected;
@ -552,7 +552,7 @@ export default {
control = this.$store.getters['map/getDeviceStationCodeByStationCode'](model.deviceStationCode); control = this.$store.getters['map/getDeviceStationCodeByStationCode'](model.deviceStationCode);
} else if (model._type == 'Station') { } else if (model._type == 'Station') {
if (model.centralized) { if (model.centralized) {
control = model; control = model;
} else { } else {
this.stationList.forEach(el => { this.stationList.forEach(el => {
if (el.centralized && if (el.centralized &&
@ -583,6 +583,7 @@ export default {
routeCode: this.route.code routeCode: this.route.code
}; };
} }
this.initCentralizedStationList(this.routeParamList);
}, },
handleSwicthMenu() { // 转换底部道岔菜单栏 handleSwicthMenu() { // 转换底部道岔菜单栏
// 获取道岔相关区段显示高亮 // 获取道岔相关区段显示高亮
@ -677,9 +678,11 @@ export default {
if (this.selectedObj._event === MouseEvent.Right) { if (this.selectedObj._event === MouseEvent.Right) {
this.rightClickDialogVisible = true; this.rightClickDialogVisible = true;
} }
this.param = { routeCode: this.route.code }; // this.param = { routeCode: this.route.code };
if (this.route) {
this.tempData = []; this.param = { routeCode: this.route.code };
}
this.tempData = [];
this.selectRouteList.forEach(el => { this.selectRouteList.forEach(el => {
this.tempData.push(el); this.tempData.push(el);
}); });
@ -700,7 +703,9 @@ export default {
}); });
if (this.selectRouteList.length) { if (this.selectRouteList.length) {
this.route = this.selectRouteList[0]; if (this.selectRouteList.length === 1) {
this.route = this.selectRouteList[0];
}
this.handleRouteMenu(); this.handleRouteMenu();
this.deviceHighLight(this.selectedObj, true); this.deviceHighLight(this.selectedObj, true);
this.oldDevice = this.selectedObj; this.oldDevice = this.selectedObj;
@ -1060,13 +1065,13 @@ export default {
}, },
initMenus() { initMenus() {
this.basicParamList = this.$store.state.training.prdType === '01' ? [ this.basicParamList = this.$store.state.training.prdType === '01' ? [
{ name: '' }, { name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
{ name: '' }, { name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
{ name: '' }, { name: '释放指令', commandTip: '释放指令', cmdType: '', operate: '', fillStationCode: true, disabledCb: (stationControl) => true },
{ name: '' }, { name: '重启令解', commandTip: '重启令解', cmdType: CMD.Station.CMD_STATION_RESTART, operate: OperationEvent.Station.stationRestart.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
{ name: '' }, { name: '追踪全开', commandTip: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
{ name: '' }, { name: '追踪全关', commandTip: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
{ name: '' }, { name: '关区信号', commandTip: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
{ name: '强行站控', commandTip: '车站强行取得控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl) => ['Local'].includes(stationControl.controlMode) }, { name: '强行站控', commandTip: '车站强行取得控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl) => ['Local'].includes(stationControl.controlMode) },
{ name: '接收控制', commandTip: '接收控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, fillStationCode: true, disabledCb: (stationControl) => ['Local'].includes(stationControl.controlMode) }, { name: '接收控制', commandTip: '接收控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, fillStationCode: true, disabledCb: (stationControl) => ['Local'].includes(stationControl.controlMode) },
{ name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) }, { name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, fillStationCode: true, disabledCb: (stationControl) => ['Center', 'None'].includes(stationControl.controlMode) },
@ -1166,8 +1171,8 @@ export default {
{ name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, disabledCb: (stationControl) => ['Local', 'None'].includes(stationControl.controlMode) } { name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, disabledCb: (stationControl) => ['Local', 'None'].includes(stationControl.controlMode) }
]; ];
this.routeParamList = [ this.routeParamList = [
{ name: '排列进路', commandTip: '进路排列', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch }, { name: '排列进路', commandTip: '进路排列', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch || !this.route },
{ name: '取消进路', commandTip: '取消排列', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch } { name: '取消进路', commandTip: '取消排列', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch || !this.route }
]; ];
} }
} }
@ -1202,7 +1207,7 @@ export default {
line-height: 22px line-height: 22px
} }
.active{ .active{
background-color: #F6F6F6 !important; background-color: #2e46f6 !important;
border: 1px solid #DADADA !important; border: 1px solid #DADADA !important;
} }
</style> </style>

4
src/utils/baseUrl.js
View File

@ -2,11 +2,11 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // 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.8.107:9000'; // 袁琪
// BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线 // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
// BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
BASE_API = 'http://192.168.3.120:9000'; // 张赛 // BASE_API = 'http://192.168.3.120:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://192.168.8.140:9000'; // 杜康
// BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康

4
src/views/planMonitor/components/menus/editPlanningTrain.vue
View File

@ -304,7 +304,6 @@ export default {
each.startTime = each.arriveConfigList[0].arriveTime; each.startTime = each.arriveConfigList[0].arriveTime;
each.endTime = each.arriveConfigList[each.arriveConfigList.length - 1].departureTime; each.endTime = each.arriveConfigList[each.arriveConfigList.length - 1].departureTime;
}); });
console.log(this.model, '============');
addPlanService(this.model).then(() => { addPlanService(this.model).then(() => {
this.$emit('refresh'); this.$emit('refresh');
// this.$emit('dispatchOperate', { // this.$emit('dispatchOperate', {
@ -326,9 +325,6 @@ export default {
}); });
updatePlanService(this.$route.query.planId || this.loadRunPlanId, this.model.serviceNumber, this.model).then(() => { updatePlanService(this.$route.query.planId || this.loadRunPlanId, this.model.serviceNumber, this.model).then(() => {
this.$emit('refresh'); this.$emit('refresh');
// this.$emit('dispatchOperate', {
// dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
// });
this.$message.success('修改计划成功'); this.$message.success('修改计划成功');
}).catch(() => { }).catch(() => {
this.$messageBox('修改计划失败'); this.$messageBox('修改计划失败');