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

Merge remote-tracking branch 'origin/test'

Browse Source
This commit is contained in:
fan 2020-08-31 18:33:54 +08:00
commit 6eed1b58a9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/newMap/displayNew/dispatherContest/sceneList.vue
View File

@ -50,7 +50,7 @@ export default {
selectMapLineCode:'',
mainSceneData: [
{type: '车辆故障', scene: '列车救援'},
{type: '信号系统故障', scene: '道岔故障'},
{type: '信号系统故障', scene: '道岔故障', id: '9'},
{type: '信号系统故障', scene: '区域控制器故障'},
{type: '信号系统故障', scene: '联锁故障'},
{type: '供电系统故障', scene: '接触轨(网)断电'},

15
src/views/scriptManage/tipScriptRecord.vue
View File

@ -93,6 +93,7 @@ export default {
isSavingScript: false,
mapLocation:null,
memberId:'',
oldMemberId:'',
allMemberList:[],
memberList:[],
quickChangeMember:[],
@ -153,6 +154,7 @@ export default {
});
if (member) {
this.memberId = member.id;
this.oldMemberId = member.id;
}
this.$store.dispatch('training/setPrdType', '02');
this.$store.dispatch('training/setRoles', 'DISPATCHER');
@ -337,13 +339,20 @@ export default {
this.$parent.resetBeginTime();
this.$refs['getAction'].loadInitData();
this.changeRunPlanStatus();
// 有问题
// this.memberId = '';
this.$store.dispatch('training/setPrdType', '02');
this.$store.dispatch('map/resetActiveTrainList');
this.$store.dispatch('training/updateMemberListInScript',
{
oldMemberId:this.memberId,
newMemberId:this.oldMemberId,
userId:this.$store.state.user.id,
name:this.$store.state.user.nickname
}
);
// this.initAutoSaveScript();
this.$store.dispatch('scriptRecord/updateRole', '');
this.$store.dispatch('scriptRecord/updateRole', 'DISPATCHER:' + this.oldMemberId);
this.$store.dispatch('scriptRecord/updateBgSet', false);
this.memberId = this.oldMemberId;
this.$message.success(this.$t('scriptRecord.resetDataSuccess'));
}).catch(() => {
this.$messageBox(this.$t('scriptRecord.resetDataFail'));