-
-
-
-
-
-
{{ examType }}
- ![]()
+
{{ $t('exam.startTheExam') }}
@@ -15,15 +15,16 @@ import LangStorage from '@/utils/lang';
import { getPublishMapInfo } from '@/api/jmap/map';
import ConstConfig from '@/scripts/ConstConfig';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { participantCreatTrainingRoom, getCompetitionPractical, getPracticalQuestion, getTheoryQuestion } from '@/api/competition';
-import applyImg from '@/assets/apply.png';
+import {getRaceUserById} from '@/api/competition';
+import { participantCreatTrainingRoom, getPracticalQuestion, getTheoryQuestion } from '@/api/competition';
+// import applyImg from '@/assets/apply.png';
export default {
name: 'ExamDetailView',
data() {
return {
disabled: false,
- applyImg: applyImg,
+ // applyImg: applyImg,
examDetails: {
lessonId: '',
name: '',
@@ -150,29 +151,38 @@ export default {
},
async exmaStart() {
if (this.$route.query.type == 'theory') {
- getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
- if (resp.data) {
- this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
- } else {
- this.$messageBox('试卷还没被加载');
- }
+ const res = await getRaceUserById(this.$route.query.raceId);
+ if (res.data.status != 4 || res.data.status != 5) {
+ getTheoryQuestion(this.$route.query.raceId).then((resp)=>{
+ if (resp.data) {
+ this.$router.push(`/jsxt/theory/detail/${this.$route.query.mapId}?raceId=${this.$route.query.raceId}`);
+ } else {
+ this.$messageBox('试卷还没被加载');
+ }
- }).catch(()=>{
- });
+ }).catch(()=>{
+ });
+ } else {
+ this.$router.replace({ path: `/jsxt/result`, query: { type: 'theory', raceId:this.$route.query.raceId } });
+ }
} else {
- getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
- if (responese.data) {
- participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
- // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
- // this.$router.replace({ path: `/displayNew/demon`, query: query});
- const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
- this.$router.replace({ path: `/jointTrainingNew`, query: query});
- });
- } else {
- this.$messageBox('试卷还没被加载');
- }
-
- });
+ const res = await getRaceUserById(this.$route.query.raceId);
+ if (res.data.status != 4 || res.data.status != 6) {
+ getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
+ if (responese.data) {
+ participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '02'}).then(resp => {
+ // const query = { lineCode: '11', mapId: '41', group: resp.data, prdType: '03', raceId: this.$route.query.raceId};
+ // this.$router.replace({ path: `/displayNew/demon`, query: query});
+ const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
+ this.$router.replace({ path: `/jointTrainingNew`, query: query});
+ });
+ } else {
+ this.$messageBox('试卷还没被加载');
+ }
+ });
+ } else {
+ this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId, type: 'operate', raceId:this.$route.query.raceId } });
+ }
}
}
}
@@ -196,11 +206,15 @@ export default {
height: 100%;
}
.title-name{
- position: absolute;
- left: 50%;
- top: 66px;
- transform: translateX(-80px);
+ // position: absolute;
+ // left: 50%;
+ // top: 66px;
+ // transform: translateX(-80px);
font-size: 30px;
+ text-align: center;
+ width: 100%;
+ margin-top: 50px;
+ display: block;
}
}
.img_box{
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 0a1412c22..e6cd8932b 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -365,7 +365,7 @@ export default {
// 01 现地 02 行调 '' 观众
let resp = {data: {}};
if (this.project == 'jsxt' ) {
- resp = await getRaceUserById(this.$route.query.raceId, this.userId);
+ resp = await getRaceUserById(this.$route.query.raceId);
resp.data.userRole = resp.data.role;
} else if (this.project == 'refereeJsxt') {
resp['code'] = 200;