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

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

Browse Source
This commit is contained in:
fan 2023-02-18 12:18:25 +08:00
commit 640b609831
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/theme/datie_02/menus/dialog/applyOrAgreeModeCovert.vue
View File

@ -288,9 +288,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation
};
this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
this.doClose();
}).catch(() => {
this.doClose();
});

5
src/jmapNew/theme/datie_02/menus/dialog/statusSelect.vue
View File

@ -194,7 +194,6 @@ export default {
},
commit() {
const list = this.getChangeInfoList();
console.log('🚀 ~ file: statusSelect.vue:154 ~ commit ~ list', list);
if (list.length) {
const operate = {
over: true,
@ -224,9 +223,7 @@ export default {
operation: OperationEvent.CTCCommand.switchRouteSetModel.cancel.operation
};
this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
if (valid) {
this.doClose();
}
this.doClose();
});
},
doClose() {

8
src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
View File

@ -409,9 +409,9 @@ export default {
operation: OperationEvent.CTCCommand.switchRouteSetModel.menu.operation
};
this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
if (valid) {
this.$refs.statusSelect.doShow();
}
// if (valid) {
this.$refs.statusSelect.doShow();
// }
});
},
modeCovertBtn(operation) {
@ -420,7 +420,7 @@ export default {
};
this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
this.modeCovertShow = true;
this.operation = operation;
// this.operation = operation;
});
},
buttonDown(operation, commandTypeList) {

18
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -3806,23 +3806,23 @@ export const OperationEvent = {
},
modeCovert:{
button:{
operation: '299d',
domId: '_Tips-Mode-Covert-Button{TOP}'
operation: '299e',
domId: '_Tips-Mode-Covert-Button{BOTTOM}'
},
agreeModeCovert:{
operation: '299e',
domId: '_Tips-Agree-Mode-Covert{TOP}'
operation: '299f',
domId: '_Tips-Agree-Mode-Covert{BOTTOM}'
},
applyModeCovert:{
operation: '299f',
domId: '_Tips-Apply-Mode-Covert{TOP}'
operation: '299g',
domId: '_Tips-Apply-Mode-Covert{BOTTOM}'
},
agreeModeCovertCommit:{
operation: '299g',
operation: '299h',
domId: '_Tips-Agree-Mode-Covert-Commit{TOP}'
},
applyModeCovertCommit:{
operation: '299g',
operation: '299i',
domId: '_Tips-Apply-Mode-Covert-Commit{TOP}'
}
}
@ -4252,7 +4252,7 @@ export const OperationEvent = {
switchRouteSetModel: {
menu: {
operation: 'a063',
domId: '_Tips-CTC-switchRouteSetModel-menu{TOP}'
domId: '_Tips-CTC-switchRouteSetModel-menu{BOTTOM}'
},
confirm: {
operation: 'a064',