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

Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

Browse Source
This commit is contained in:
joylink_fanyuhong 2020-03-06 10:05:31 +08:00
commit 50ef8c5474
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jmapNew/theme/ningbo_01/menus/dialog/routeHandControl.vue
View File

@ -230,6 +230,8 @@ export default {
if (!item.disabled) { if (!item.disabled) {
this.changeList.push(false); this.changeList.push(false);
this.selection.splice(this.selection.indexOf(item.code), 1); this.selection.splice(this.selection.indexOf(item.code), 1);
} else {
this.changeList = [];
} }
}); });
this.allSelect = false; this.allSelect = false;
@ -287,7 +289,10 @@ export default {
const operate = { const operate = {
over: true, over: true,
operation: OperationEvent.Signal.humanControl.menu.operation, operation: OperationEvent.Signal.humanControl.menu.operation,
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
param:{
routeCodeList: this.selection
}
}; };
this.sendCommand(operate); this.sendCommand(operate);
@ -297,7 +302,10 @@ export default {
const operate = { const operate = {
over: true, over: true,
operation: OperationEvent.Signal.atsAutoControl.menu.operation, operation: OperationEvent.Signal.atsAutoControl.menu.operation,
cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
param:{
routeCodeList: this.selection
}
}; };
this.sendCommand(operate); this.sendCommand(operate);

16
src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue
View File

@ -201,13 +201,17 @@ export default {
this.treeData[0].children[2].value = selected.parkingTime != -1 ? selected.parkingTime : '自动'; this.treeData[0].children[2].value = selected.parkingTime != -1 ? selected.parkingTime : '自动';
// 跳停 // 跳停
this.treeData[0].children[3].value = selected.allSkip || selected.assignSkip ? '已设置' : '未设置'; this.treeData[0].children[3].value = selected.allSkip || selected.assignSkip ? '已设置' : '未设置';
if (!stationStand || !station) { // if (selected.direction == '01') {
this.tempData.push({ item: '运行等级', status: `自动` }); // 待添加
} else { // }
this.tempData.push({ item: '运行等级', status: selected.runLevelTime > 0 ? `至${station.name}${stationStand.name}:人工` : `至${station.name}${stationStand.name}:自动` }); // if (!stationStand || !station) {
} // this.tempData.push({ item: '运行等级', status: `自动` });
// } else {
// this.tempData.push({ item: '运行等级', status: selected.runLevelTime > 0 ? `至${station.name}${stationStand.name}:人工` : `至${station.name}${stationStand.name}:自动` });
// }
// this.tempData.push({ item: '跳停', status: opts.jumpStopStatus != '01' ? '已设置' : '未设置' }); // this.tempData.push({ item: '跳停', status: opts.jumpStopStatus != '01' ? '已设置' : '未设置' });
this.tempData.push({ item: '下行折返策略', status: this.strategyMap[selected.reentryStrategy] ? this.strategyMap[selected.reentryStrategy] : '默认' }); // 待添加
// this.tempData.push({ item: '下行折返策略', status: this.strategyMap[selected.reentryStrategy] ? this.strategyMap[selected.reentryStrategy] : '默认' });
}, },
doShow(operate, selected, opts) { doShow(operate, selected, opts) {
this.selected = selected; this.selected = selected;