From b95dbbad0ef4f7be29217ed7907c8a0f3e7253c8 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 11 Dec 2020 09:37:33 +0800
Subject: [PATCH] =?UTF-8?q?1.0=E7=89=88=E6=9C=AC=E5=B0=81=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js              |  2 +-
 src/layouts/header/index.vue  |  2 +-
 src/pages/exam/do/index.vue   |  7 +++++--
 src/pages/exam/list/index.vue | 13 +++++++++----
 src/setting.js                |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 7488ad8..8a2de49 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -25,7 +25,7 @@ export default {
   addGzAnswerDetails: `/user/exam/addGzAnswerDetails`,
   addTestPaperRecord: `/user/exam/addTestPaperRecord`,
   calculationScore: `/user/exam/calculationScore`,
-  enterExam: `/user/exam/enterExam`,
+  enterExam: `user/exam/enterExam`,
   queryExam: `/user/exam/queryExam`,
   queryGzAnswerDetails: `/user/exam/queryGzAnswerDetails`,
   coverGzAnswerDetails: `/user/exam/coverGzAnswerDetails`,
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 20d3418..5771254 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="header flex j-between">
+    <div class="header flex a-center j-between">
         <div v-if="showBack" class="goBack" v-throttle @click="back"><i class="el-icon-arrow-left"></i>返回</div>
         <div v-else class="logo">
             <img src="../../assets/img/logo-fill.png">
diff --git a/src/pages/exam/do/index.vue b/src/pages/exam/do/index.vue
index c6f8748..c0767e4 100644
--- a/src/pages/exam/do/index.vue
+++ b/src/pages/exam/do/index.vue
@@ -147,6 +147,7 @@ export default {
                         let seconds = Math.floor(total % (60 * 60) % 60)
                         time = `${util.formateTime(hours)}:${util.formateTime(minutes)}:${util.formateTime(seconds)}`
                     }else{
+                        that.isDone = true
                         that.save()
                         clearInterval(that.timer)
                     }
@@ -168,7 +169,7 @@ export default {
     },
     methods: {
         getData() {
-            this.$get(`${this.api.enterExam}?testPaperId=${this.testPaperId}`)
+            this.$get(`${this.api.enterExam}?testPaperId=${this.testPaperId}&userId=${this.userId}&assessmentId=${this.assessmentId}`)
             .then(res => {
                 let data = res.data
                 this.subjects = [
@@ -333,7 +334,9 @@ export default {
                     })
                     .catch(err => {})
                 })
-                .catch(err => {})
+                .catch(err => {
+                    clearInterval(this.queryStateTimer)
+                })
             })
             .catch(err => {})
         },
diff --git a/src/pages/exam/list/index.vue b/src/pages/exam/list/index.vue
index 7c20db7..fde8a89 100644
--- a/src/pages/exam/list/index.vue
+++ b/src/pages/exam/list/index.vue
@@ -41,17 +41,22 @@
                 </el-table-column>
                 <el-table-column prop="startTime" label="考生开始时间" align="center"></el-table-column>
                 <el-table-column prop="endTime" label="考试结束时间" align="center"></el-table-column>
-                <el-table-column prop="timeCost" label="用时（分钟）" width="120" align="center"></el-table-column>
+                <el-table-column prop="timeCost" label="用时（分钟）" width="120" align="center">
+                    <template slot-scope="scope">
+                        {{(scope.row.timeCost / 60).toFixed(2)}}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="score" label="得分" width="100" align="center"></el-table-column>
                 <el-table-column prop="state" label="考试状态" width="100" align="center">
                     <template slot-scope="scope">
                         {{scope.row.state == 2 ? '已提交' : '未提交'}}
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" width="150">
+                <el-table-column label="操作" width="150">
                     <template slot-scope="scope">
-                        <!-- <el-button type="text" @click="toExam(scope.row)" v-if="scope.row.assessmentState == 2" :disabled="scope.row.state != 0">进入考试</el-button> -->
-                        <el-button type="text" @click="toExam(scope.row)">进入考试</el-button>
+                        <!-- 学生考试状态:考试状态 state: (0、未考 1、在考 2、已考)
+                        考核状态:  state: 考核状态(1、待开始 2、进行中 3、已结束) -->
+                        <el-button type="text" @click="toExam(scope.row)" v-if="scope.row.assessmentState == 2" :disabled="scope.row.state == 2">进入考试</el-button>
                         <el-button type="text" @click="query(scope.row)" v-if="scope.row.state == 2">成绩查询</el-button>
                     </template>
                 </el-table-column>
diff --git a/src/setting.js b/src/setting.js
index c41e27c..36f3239 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -16,7 +16,7 @@ const Setting = {
     showProgressBar: true,
     // 接口请求地址
     // apiBaseURL: env === 'development' ? 'http://192.168.31.152:8001' : 'http://39.108.250.202:8000',
-    apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000' : 'http://39.108.250.202:9000',
+    apiBaseURL: env === 'development' ? 'http://192.168.31.152:8001' : 'http://39.108.250.202:9000',
     // 接口请求返回错误时，弹窗的持续时间，单位：秒
     modalDuration: 3,
     // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice