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

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

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-08-12 10:03:14 +08:00
commit 55911240b6
7 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jmapNew/theme/components/menus/dialog/standControl.vue
View File

@ -191,6 +191,8 @@ export default {
return '区间自动扣车';
} else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
return '区间取消扣车';
} else if (this.operation == OperationEvent.StationStand.cancelDetainTrainForce.menu.operation) {
return '强制取消扣车';
}
return '';
}
@ -311,6 +313,9 @@ export default {
} else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
/** 取消区间自动扣车*/
this.cancelDetainTrainAuto();
} else if (this.operation == OperationEvent.StationStand.cancelDetainTrainForce.menu.operation) {
/** 强制取消扣车*/
this.cancelDetainTrainForce();
}
},
setDetainTrainAuto() { // 区间自动扣车
@ -331,6 +336,10 @@ export default {
earlyDeparture() {
this.sendCommand(menuOperate.StationStand.earlyDeparture);
},
// 强制取消扣车
cancelDetainTrainForce() {
this.sendCommand(menuOperate.StationStand.cancelDetainTrainForce);
},
sendCommand(operate, param) {
this.loading = true;
commitOperate(operate, param, 2).then(({valid})=>{

8
src/jmapNew/theme/foshan_01/menus/dialog/speedLimitControl.vue
View File

@ -134,7 +134,7 @@ export default {
},
speedList() {
const list = [{ name: '不限速', value: '-1' }];
for (var i = 0; i * this.speedSpace <= this.maxSpeed; i++) {
for (var i = 1; i * this.speedSpace <= this.maxSpeed; i++) {
const speed = String(i * this.speedSpace);
list.push({ name: speed, value: speed });
}
@ -382,15 +382,15 @@ export default {
} else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
/** 区段取消限速*/
operate.operation = OperationEvent.Section.cancelSpeed.order.operation;
operate.message = `在【${this.name}】区段，区段取消限速${this.speed}km/h，确认下达吗？`;
operate.message = `在【${this.name}】区段，区段取消限速，确认下达吗？`;
} else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
/** 道岔设置限速*/
operate.operation = OperationEvent.Switch.setSpeed.order.operation;
operate.message = `在【${this.name}】区段，道岔设置限速${this.speed}km/h，确认下达吗？`;
} else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
/** 区段取消限速*/
/** 道岔区段取消限速*/
operate.operation = OperationEvent.Switch.cancelSpeed.order.operation;
operate.message = `在【${this.name}】区段，道岔取消限速${this.speed}km/h，确认下达吗？`;
operate.message = `在【${this.name}】区段，道岔区段取消限速，确认下达吗？`;
}
this.setMessage('请点击“确认1”按钮，确认命令！');

5
src/jmapNew/theme/foshan_01/menus/menuSection.vue
View File

@ -57,6 +57,11 @@ export default {
label: '区段切除',
handler: this.split,
cmdType: CMD.Section.CMD_SECTION_CUT_OFF
},
{
label: '设置临时限速',
handler: this.setSpeed,
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
}
// {
// label: '区段故障解锁',

13
src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
View File

@ -73,6 +73,11 @@ export default {
handler: this.cancelDetainTrainAll,
cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN
},
{
label: '强制取消扣车',
handler: this.cancelDetainTrainForce,
cmdType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
},
{
label: '设置提前发车',
handler: this.earlyDeparture,
@ -227,6 +232,14 @@ export default {
}
});
},
// 强制取消扣车
cancelDetainTrainForce() {
commitOperate(menuOperate.StationStand.cancelDetainTrainForce, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.standControl.doShow(operate, this.selected);
}
});
},
// 设置跳停
setJumpStop() {
commitOperate(menuOperate.StationStand.setJumpStop, {standCode:this.selected.code}, 0).then(({valid, operate})=>{

3
src/views/newMap/jointTrainingNew/chatView/chatContent.vue
View File

@ -55,7 +55,6 @@ export default {
data() {
return {
chatContentList:[],
coversition:{},
currentAudioList:[],
currentAudioIndex:0,
isPlay:false,
@ -93,8 +92,6 @@ export default {
}
},
mounted() {
// this.coversition = this.currentCoversition;
// this.inintData();
},
methods:{
scrollTop() {

2
src/views/newMap/jointTrainingNew/index.vue
View File

@ -389,7 +389,7 @@ export default {
},
// 设置prdType和role
setSimulationPrdType(deviceCode) {
// Admin 管理员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘
// Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号
switch (this.userRole) {
case 'DISPATCHER':
this.$store.dispatch('training/setPrdType', '02');

7
src/views/newMap/newMapdraft/mapoperate/section/index.vue
View File

@ -603,7 +603,12 @@ export default {
models = [...models, ...arr];
} else {
const sectionModel = this.$store.getters['map/getDeviceByCode'](model.parentCode);
const arr = this.setLogicOffset(sectionModel, models);
let arr = [];
if (sectionModel) {
arr = this.setLogicOffset(sectionModel, models);
} else {
arr = this.setLogicOffset(model, models);
}
models = [...models, ...arr];
}