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:
zyy 2020-05-25 10:29:14 +08:00
commit 15643b0d05
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/jsxt/competition/examDetail.vue
View File

@ -151,14 +151,14 @@ export default {
async exmaStart() { async exmaStart() {
if (this.$route.query.type == 'theory') { if (this.$route.query.type == 'theory') {
getCompetitionTheory({competitionId:this.$route.query.raceId}).then(()=>{ getCompetitionTheory({competitionId:this.$route.query.raceId}).then(()=>{
this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}`); this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
}).catch(()=>{ }).catch(()=>{
}); });
} else { } else {
// this.disabled = true; // this.disabled = true;
getCompetitionPractical(this.$route.query.raceId).then(()=>{ getCompetitionPractical(this.$route.query.raceId).then(()=>{
participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => { participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
const query = { lineCode: '11', mapId: '41', group: resp.data, roomId: '385' }; const query = { lineCode: '11', mapId: '41', group: resp.data, roomId: '385', raceId: this.$route.query.raceId};
this.$router.replace({ path: `/jointTrainingNew`, query: query}); this.$router.replace({ path: `/jointTrainingNew`, query: query});
}); });
}); });

2
src/views/jsxt/competition/result.vue
View File

@ -125,7 +125,7 @@ export default {
} }
}, },
back() { back() {
const query = {type: 'operation', mapId: this.$route.query.mapId}; const query = {type: 'operation', mapId: this.$route.query.mapId, raceId:this.$route.query.raceId};
this.$router.push({path: `/jsxt/home`, query: query }); this.$router.push({path: `/jsxt/home`, query: query });
}, },
objectSpanMethod({ row, column, rowIndex, columnIndex }) { objectSpanMethod({ row, column, rowIndex, columnIndex }) {

3
src/views/jsxt/competition/theory/quiz/index.vue
View File

@ -156,7 +156,8 @@ export default {
doEnd() { doEnd() {
// console.log('考试成绩'); // console.log('考试成绩');
// this.$router.push({ path: `/jsxt/home`}); // this.$router.push({ path: `/jsxt/home`});
postCompetitionTheory(1, {competitionId:this.$route.query.raceId}).then(()=>{ const params = {competitionId:this.$route.query.raceId};
postCompetitionTheory(1, params).then(()=>{
this.$router.push({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } }); this.$router.push({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
}); });
}, },