From 046a09f8b575e51190d5c5ee945e4bfdf9b8ebdc Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 3 Jun 2020 16:18:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E6=93=8D=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B&=E6=98=9F=E6=9C=9F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                        | 14 +++++++++++
 src/views/jsxt/competition/examDetail.vue     | 23 +++++++++++--------
 .../newMap/displayNew/menuSystemTime.vue      | 14 +++++------
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index a156cafe6..3c73a5b57 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -163,3 +163,17 @@ export function getTestPaperDatail(competitionId) {
         method: 'get'
     });
 }
+/** 提交实操结果 */
+export function submitPracticalCompetition(group, competitionId, data) {
+    return request({
+        url: `/api/v1/competitionPractical/${group}/${competitionId}/finish`,
+        method: 'put',
+        data
+    });
+}
+/** 开始实操竞赛 */
+export function startPracticalCompetition(group, competitionId, data) {
+    return request({
+        url: `/api/v1/competitionPractical/${group}/${competitionId}/start`
+    });
+}
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 46407892b..9b694b057 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -19,6 +19,7 @@ import ConstConfig from '@/scripts/ConstConfig';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {getRaceUserById} from '@/api/competition';
 import { participantCreatTrainingRoom, getPracticalQuestion, getTheoryQuestion } from '@/api/competition';
+import {getRaceById } from '@/api/competition';
 // import applyImg from '@/assets/apply.png';
 
 export default {
@@ -181,17 +182,19 @@ export default {
                     this.$messageBox('试卷还没被加载');
                 });
             } else {
-                getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
-                    if (responese.data) {
-                        participantCreatTrainingRoom(this.$route.query.raceId, {mapId: 41, prdType: '03'}).then(resp => {
-                            const query = { lineCode: '11', mapId: '41', group: resp.data, raceId: this.$route.query.raceId};
-                            this.$router.replace({ path: `/jointTrainingNew`, query: query});
-                        });
-                    } else {
+                getRaceById(this.$route.query.raceId).then(resp => {
+                    getPracticalQuestion(this.$route.query.raceId).then((responese)=>{
+                        if (responese.data) {
+                            participantCreatTrainingRoom(this.$route.query.raceId, {mapId: resp.data.mapId, prdType: '03'}).then(resp => {
+                                const query = { lineCode: '11', mapId: resp.data.mapId, group: resp.data, raceId: this.$route.query.raceId};
+                                this.$router.replace({ path: `/jointTrainingNew`, query: query});
+                            });
+                        } else {
+                            this.$messageBox('试卷还没被加载');
+                        }
+                    }).catch(()=>{
                         this.$messageBox('试卷还没被加载');
-                    }
-                }).catch(()=>{
-                    this.$messageBox('试卷还没被加载');
+                    });
                 });
             }
         }
diff --git a/src/views/newMap/displayNew/menuSystemTime.vue b/src/views/newMap/displayNew/menuSystemTime.vue
index 0e5ed6dca..e771a36aa 100644
--- a/src/views/newMap/displayNew/menuSystemTime.vue
+++ b/src/views/newMap/displayNew/menuSystemTime.vue
@@ -89,25 +89,25 @@ export default {
             const day = date.getDay();
             switch (day) {
             case 0:
-                this.dayString = '星 期 一';
+                this.dayString = '星 期 日';
                 break;
             case 1:
-                this.dayString = '星 期 二';
+                this.dayString = '星 期 一';
                 break;
             case 2:
-                this.dayString = '星 期 三';
+                this.dayString = '星 期 二';
                 break;
             case 3:
-                this.dayString = '星 期 四';
+                this.dayString = '星 期 三';
                 break;
             case 4:
-                this.dayString = '星 期 五';
+                this.dayString = '星 期 四';
                 break;
             case 5:
-                this.dayString = '星 期 六';
+                this.dayString = '星 期 五';
                 break;
             case 6:
-                this.dayString = '星 期 日';
+                this.dayString = '星 期 六';
             }
         }
     }