From 725f2a119a648e8efcd4ef5ce906aab9d18923d6 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Tue, 16 Nov 2021 17:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ass/list/index.vue | 41 +++++++++++++++++-------------------
 src/setting.js               |  6 +++---
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 7548f66..c40c3b9 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -6,7 +6,7 @@
             <div class="tool mul">
                 <ul class="filter">
                     <li>
-                        <label>创建时间</label>
+                        <label>考核时间</label>
                         <el-radio-group size="small" v-model="form.month">
                             <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>
                                 {{ item.name }}
@@ -71,7 +71,7 @@
                 <el-table-column prop="sysName" label="课程名称" align="center"></el-table-column>
                 <el-table-column prop="experimentalName" label="考核名称" align="center"></el-table-column>
                 <el-table-column prop="className" label="实验班级" align="center"></el-table-column>
-                <el-table-column prop="experimentalNumber" label="实验人数" align="center"></el-table-column>
+                <el-table-column prop="experimentalNum" label="实验人数" align="center"></el-table-column>
                 <el-table-column prop="experimentDuration" label="考试时长" align="center"></el-table-column>
                 <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
                 <el-table-column prop="startTime" label="起始时间" align="center"></el-table-column>
@@ -86,11 +86,11 @@
                         <span class="ellipsis">{{ status[scope.row.status] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="实验状态" align="center">
-                    <template slot-scope="scope" v-if="scope.row.show">
-                        <span class="ellipsis">{{ stuState[scope.row.stuState] }}</span>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column label="实验状态" align="center">-->
+<!--                    <template slot-scope="scope" v-if="scope.row.show">-->
+<!--                        <span class="ellipsis">{{ stuState[scope.row.stuState] }}</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope" v-if="scope.row.show">
                         <!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)-->
@@ -254,11 +254,11 @@ export default {
                     if (item.countDown > 0) {
                         item.countDown--;
                     } else {
-                        if (item.status === 0 && item.type === 2) { // 待开始-定时发布
+                        if (item.status == 0 && item.type == 2) { // 待开始-定时发布
                             item.status = 1;
                             item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
-                        } else if (item.status === 1) {
-                            item.status = 2;
+                        } else if (item.status == 1) {
+                            // item.status = 2;
                         }
                     }
                     item.show = true;
@@ -282,22 +282,22 @@ export default {
                 this.totals = res.total;
                 this.listData.forEach(i => {
                     i.show = false;
-                    if (i.status === 2) { // 已结束
+                    if (i.status == 2) { // 已结束
                         i.countDown = 0;
                     } else {
-                        if (i.type === 2) { // 定时发布
-                            if (i.status === 0) {
+                        if (i.type == 2) { // 定时发布
+                            if (i.status == 0) {
                                 // 待开始
                                 i.countDown = (new Date(i.startTime).getTime() - new Date().getTime()) / 1000; // 获得两个日期时间的秒数差
-                            } else if (i.status === 1) {
+                            } else if (i.status == 1) {
                                 // 进行中
                                 i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
                             }
-                        } else if (i.type === 1) { // 手动发布
-                            if (i.status === 0) {
+                        } else if (i.type == 1) { // 手动发布
+                            if (i.status == 0) {
                                 // 待开始
                                 i.countDown = 0;
-                            } else if (i.status === 1) {
+                            } else if (i.status == 1) {
                                 // 进行中
                                 i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
                             }
@@ -340,11 +340,8 @@ export default {
                 if (row.isCode === 0) { // 是否启用邀请码(0、未启用 1、启用)
                     this.goSubSystem();
                 } else {
-                    this.$get(this.api.checkInvitationCode, {
-                        userId: this.userId,
-                        id: row.id
-                    }).then(res => {
-                        if (res.errmessage == "false") {
+                    this.$post(`${this.api.enterExam}?assessmentId=${row.assessmentId}&classId=${row.classId}`).then(res => {
+                        if (res.message == "false") {
                             this.icVisible = true;
                         } else {
                             this.goSubSystem();
diff --git a/src/setting.js b/src/setting.js
index 1a575f4..6f28761 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -4,7 +4,7 @@
 const url = location.host;
 const isDev = process.env.NODE_ENV === "development"; // 开发环境
 const isHh = url.includes("10.196.131.73"); //是否河海版本
-const isCH = url.includes("120.78.127.12"); //是否巢湖版本
+const isCH = url.includes("124.71.12.62"); //是否巢湖版本
 const isBeta = url.includes("120.78.198.231"); //是否职站测试
 const isPro = url.includes("occupationlab.com"); //是否职站生产
 const isTest = url.includes('39.108.250.202'); //是否中台测试服
@@ -21,8 +21,8 @@ if (isHh) {
     title = "学生端";
 } else if (isCH) {
     // 巢湖
-    host = "http://120.78.127.12/";
-    defaultSubSystem = "http://120.78.127.12/pyTrials/#/";
+    host = "http://124.71.12.62/";
+    defaultSubSystem = "http://124.71.12.62/pyTrials/#/";
     title = "学生端";
 } else if (isBeta) {
     // 职站测试