From 81973b69678772cfa6f49d7f7c209da2cfe69963 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 21 May 2020 15:18:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E6=93=8D=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=20=E7=BB=93=E6=9D=9F=E7=94=9F=E6=88=90=E5=88=86?=
 =?UTF-8?q?=E5=80=BC=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index_Common.js                    |  4 +-
 src/views/jsxt/competition/examDetail.vue     |  4 +-
 src/views/jsxt/competition/result.vue         | 47 ++++++++++---------
 .../newMap/jointTrainingNew/menuDemon.vue     |  6 +--
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index 80aca8e5d..63005db1b 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -128,12 +128,12 @@ const CompetitionDetail = () => import('@/views/jsxt/competition/examDetail');
 const CompetitionManage = () => import('@/views/jsxt/competition/index');
 const CompetitionHome = () => import('@/views/jsxt/competition/home');
 const Refereedetail = () => import('@/views/jsxt/competition/theory/quiz/index');
+const JsxtExamResult = () => import('@/views/jsxt/competition/result');
 const JsxtApply = () => import('@/views/jsxt/apply/index');
 // const theoryManage = () => import('@/views/jsxt/competition/theory/index');
 const RefereeList = () => import('@/views/jsxt/refereeList/index');
 const homeJsxt = () => import('@/views/jsxt/home/index');
 const RecaList = () => import('@/views/jsxt/reca/list');
-const JsxtExamResult = () => import('@/views/jsxt/competition/result');
 
 import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 import { getSessionStorage } from '@/utils/auth';
@@ -1005,7 +1005,7 @@ export const JSXT = [
                         }
                     },
                     { // 考试结果
-                        path: 'result/:userExamId',
+                        path: 'result',
                         component: JsxtExamResult,
                         hidden: true
                     }
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 590079c65..1d28941f2 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -5,7 +5,7 @@
     </div>
     <div class="card_content">
       <el-scrollbar wrap-class="scrollbar-wrapper">
-        <p class="list-item">
+        <!-- <p class="list-item">
           <span class="list-label">{{ $t('exam.examStartTime') +':' }}</span>
           <span v-if="examDetails.startTime" class="list-elem">
             {{ examDetails.startTime }} - {{ examDetails.endTime }}</span>
@@ -39,7 +39,7 @@
               <el-table-column prop="chapterIdLong" :label="this.$t('exam.totalScore')" />
             </el-table>
           </p>
-        </div>
+        </div> -->
         <div class="btn-start">
           <el-button :disabled="disabled" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
         </div>
diff --git a/src/views/jsxt/competition/result.vue b/src/views/jsxt/competition/result.vue
index 2ae9a3995..52f0c8133 100644
--- a/src/views/jsxt/competition/result.vue
+++ b/src/views/jsxt/competition/result.vue
@@ -32,8 +32,8 @@
   </div>
 </template>
 <script>
-import { submitExam } from '@/api/management/userexam';
-import { UrlConfig } from '@/scripts/ConstDic';
+// import { submitExam } from '@/api/management/userexam';
+// import { UrlConfig } from '@/scripts/ConstDic';
 
 export default {
     name: 'ExamResult',
@@ -87,29 +87,30 @@ export default {
             return sums;
         },
         submitExamData() {
-            this.loading = true;
-            let count = 3;
-            const userExamId = this.$route.params.userExamId;
-            let interval = setInterval(() => {
-                submitExam(userExamId).then(response => {
-                    this.loading = false;
-                    this.resultModel = response.data;
-                    clearInterval(interval);
-                    interval = null;
-                }).catch(() => {
-                    if (count-- < 0) {
-                        this.loading = false;
-                        clearInterval(interval);
-                        interval = null;
-                        this.$messageBox(this.$t('error.submitExamFailed'));
-                    }
-                });
-            }, 1000);
-
+            // this.loading = true;
+            // let count = 3;
+            // const userExamId = this.$route.params.userExamId;
+            // let interval = setInterval(() => {
+            //     submitExam(userExamId).then(response => {
+            this.loading = false;
+            //         this.resultModel = response.data;
+            //         clearInterval(interval);
+            //         interval = null;
+            //     }).catch(() => {
+            //         if (count-- < 0) {
+            //             this.loading = false;
+            //             clearInterval(interval);
+            //             interval = null;
+            //             this.$messageBox(this.$t('error.submitExamFailed'));
+            //         }
+            //     });
+            // }, 1000);
         },
         back() {
-            const examId = this.resultModel.examId;
-            this.$router.push({path: `${UrlConfig.trainingPlatform.examDetail}/${examId}`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId }});
+            const query = {type: 'operation', mapId: this.$route.query.mapId};
+            this.$router.push({path: `/jsxt/examDetail`, query: query});
+            // const examId = this.resultModel.examId;
+            // this.$router.push({path: `${UrlConfig.trainingPlatform.examDetail}/${examId}`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId }});
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 05950274c..74c717432 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -313,8 +313,8 @@ export default {
                 type: 'warning'
             }).then(() => {
                 participantCompleteCompetition(1, this.group).then(resp => {
-                    this.$router.go(-1);
-                    // this.submit();
+                    // this.$router.go(-1);
+                    this.submit();
                 }).catch(()=> {
                     this.$message.success('提交试卷失败！');
                 });
@@ -323,7 +323,7 @@ export default {
         submit() {
             // this.$store.dispatch('exam/over').then(() => {
             //     this.$store.dispatch('trainingList/clearTrainingList');
-            this.$router.replace({ path: `/jsxt/result/${this.$route.query.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId } });
+            this.$router.replace({ path: `/jsxt/result`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId } });
             // });
         }
     }