diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue index a4e14b092..85b716fbe 100644 --- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue +++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue @@ -93,7 +93,7 @@ export default { operation: '', planMode: 5, headMode: 5, - fontSize: 16 + fontSize: 30 }; }, computed: { diff --git a/src/jmapNew/theme/xian_01/model.js b/src/jmapNew/theme/xian_01/model.js index 4920490ff..e8193db1f 100644 --- a/src/jmapNew/theme/xian_01/model.js +++ b/src/jmapNew/theme/xian_01/model.js @@ -36,7 +36,7 @@ class Model { }; this['private'][deviceType.Train] = { nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式 - nameFontSize: 10 // 字体大小 + nameFontSize: 30 // 字体大小 }; this['private'][deviceType.TrainWindow] = { trainWindowShow: true diff --git a/src/views/jsxt/competition/theory/question.vue b/src/views/jsxt/competition/theory/question.vue index 284264b2a..207115cd3 100644 --- a/src/views/jsxt/competition/theory/question.vue +++ b/src/views/jsxt/competition/theory/question.vue @@ -2,14 +2,14 @@
+
+ 考试总分: + {{ totalScore }}分 +
@@ -25,7 +29,8 @@ // import { commitExam, getExamInfo, getUserExam, saveExamAnswer } from '@/api/exam.js'; // import WindowResizeHandler from '@/mixin/WindowResizeHandler'; import Question from './question'; -import { getTheoryQuestion } from '@/api/competition'; +// import { getTheoryQuestion } from '@/api/competition'; +import { getCompetitionDetail } from '@/api/competition'; export default { components: { @@ -47,6 +52,7 @@ export default { totalScore: 0, passScore: 10 }, + totalScore: 0, examQuestions: [] }; }, @@ -86,13 +92,13 @@ export default { }, methods: { loadInitData() { - getTheoryQuestion(this.$route.query.raceId).then((resp)=>{ + getCompetitionDetail(this.$route.query.raceId).then((resp)=>{ if (resp.data) { - this.examQuestions = resp.data.questions.map((el, i) => { - el.index = i; - el.answer = String(el.optionList[0].id); - return el; + resp.data.forEach((item, i) => { + this.examQuestions.push({...item.question, ...{answer: String(item.answerOptionId), score: item.score, index: i}}); }); + this.totalScore = resp.data.reduce((pre, ver) => pre + ver.score, 0); + console.log(this.totalScore); } }).catch(error => { this.$message.error(`加载考试详情失败:${error.message}`); }); }, diff --git a/src/views/jsxt/refereeList/editScore.vue b/src/views/jsxt/refereeList/editScore.vue index 8fb168848..158a3c744 100644 --- a/src/views/jsxt/refereeList/editScore.vue +++ b/src/views/jsxt/refereeList/editScore.vue @@ -75,8 +75,8 @@ export default { const data = { raceId: this.info.raceId, userId: this.info.userId, - theoryScore: this.info.theoryScore, - practiceScore: this.info.practiceScore + artificialTheoryScore: Number(this.info.theoryScore), + artificialPracticeScore: Number(this.info.practiceScore) }; putRefereeScoring(data).then(res => { this.doClose();