From 9657b86a47c05888f1c6d70b49f24da37382deca Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 4 Nov 2021 20:19:19 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/record/show/index.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index 932c937..f024c34 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -74,38 +74,38 @@
                 <div class="meta-title-wrap">
                     <p class="meta-title">实验数据</p>
                 </div>
-                <el-table :data="expData" class="table" stripe header-align="center">
+                <el-table :data="expData" class="table" border stripe header-align="center">
                     <el-table-column type="index" width="100" label="序号" align="center">
                         <template slot-scope="scope">
                             {{ scope.$index + 1 }}
                         </template>
                     </el-table-column>
                     <el-table-column prop="judgmentName" label="任务名称"></el-table-column>
-                    <el-table-column prop="userAnswer" label="学生答案">
+                    <el-table-column prop="ruleAnswer" label="参考答案">
                         <!--
                         <template slot-scope="scope">
-                            <pre v-html="scope.row.userAnswer" style="white-space: pre-wrap"></pre>
+                            <pre v-html="scope.row.answer" style="white-space: pre-wrap"></pre>
                         </template>
                         -->
                         <template slot-scope="scope">
                             <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                <span>{{index+1}}. </span>{{item.userAnswer}}
+                                <span>{{index+1}}. </span>{{item.ruleAnswer}}
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="ruleAnswer" label="参考答案">
+                    <el-table-column prop="userAnswer" label="学生答案">
                         <!--
                         <template slot-scope="scope">
-                            <pre v-html="scope.row.answer" style="white-space: pre-wrap"></pre>
+                            <pre v-html="scope.row.userAnswer" style="white-space: pre-wrap"></pre>
                         </template>
                         -->
                         <template slot-scope="scope">
                             <div v-for="(item, index) in scope.row.lcRuleRecords">
-                                <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                                <span>{{index+1}}. </span>{{item.userAnswer}}
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="score" label="得分" align="center"></el-table-column>
+                    <el-table-column prop="score" label="得分" align="center" width="100"></el-table-column>
                 </el-table>
             </div>
 

From 132ebd9f226faccef867aa292ecf4e9af94f6930 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 5 Nov 2021 11:13:40 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/details/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/course/details/index.vue b/src/pages/course/details/index.vue
index e4b5e83..0aed5fb 100644
--- a/src/pages/course/details/index.vue
+++ b/src/pages/course/details/index.vue
@@ -47,13 +47,13 @@
                         <h4 class="title">{{courseName}}</h4>
                         <div class="desc-wrap">
                             <div class="desc" :class="{active: desShrink}" v-html="description"></div>
-                            <i class="arrow" :class="{active: desShrink}" v-if="description.length > 40">
+                            <i class="arrow" :class="{active: desShrink}" v-if="description && description.length > 40">
                                 <span>...</span>
                                 <img src="@/assets/img/arrow-down.png" alt="" @click="desShrink = !desShrink">
                             </i>
                         </div>
                         <div class="chapters">
-                            <template v-if="videoList.length">
+                            <template v-if="videoList && videoList.length">
                                 <div class="chapter" v-for="(item,index) in videoList" :key="index">
                                     <div class="chapterName">{{item.name}}</div>
                                     <div class="section" v-if="item.subsectionList.length">

From 507571b5d4cf9a10937a0140ae45e50d07db79ae Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 5 Nov 2021 11:16:28 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=EF=BC=9Aarticle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/info/details/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/info/details/index.vue b/src/pages/info/details/index.vue
index d8068de..df98e74 100644
--- a/src/pages/info/details/index.vue
+++ b/src/pages/info/details/index.vue
@@ -35,7 +35,6 @@ import 'quill/dist/quill.core.css';
 import 'quill/dist/quill.snow.css';
 import 'quill/dist/quill.bubble.css';
 export default {
-    name: 'article',
     data() {
         return {
             firstName: this.$route.query.first,

From 11cb2d744a9c41965730f6cc1543f4c765dbafd5 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 5 Nov 2021 11:49:47 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BC=9A=E8=B7=B3=E5=8A=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ass/list/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index be1376c..e0424f8 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -87,12 +87,12 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="实验状态" align="center">
-                    <template slot-scope="scope">
+                    <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">
+                    <template slot-scope="scope" v-if="scope.row.show">
                         <!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)-->
                         <el-button v-if="scope.row.status === 2 && scope.row.stuState === 0" type="text" disabled>未参加</el-button>
                         <el-button v-if="scope.row.status !== 2 && (scope.row.stuState === 0 || scope.row.stuState === 1)" type="text"
@@ -260,6 +260,7 @@ export default {
                             item.status = 2;
                         }
                     }
+                    item.show = true;
                     this.$set(this.listData, i, item);
                 }
             }, 1000);
@@ -277,6 +278,7 @@ export default {
                 this.listData = res.list;
                 this.totals = res.total;
                 this.listData.forEach(i => {
+                    i.show = false;
                     if (i.status === 2) { // 已结束
                         i.countDown = 0;
                     } else {

From d861727bb9627f568b6f0308caa6c2c45447704b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 5 Nov 2021 12:12:52 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=BF=AB?=
 =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ass/list/index.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index e0424f8..ec52cee 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -7,7 +7,7 @@
                 <ul class="filter">
                     <li>
                         <label>考核时间</label>
-                        <el-radio-group size="small" v-model="form.month" @change="initData">
+                        <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 }}
                             </el-radio>
@@ -62,7 +62,7 @@
                 </ul>
             </div>
 
-            <el-table :data="listData" class="table" stripe header-align="center">
+            <el-table v-loading="listLoading" :data="listData" class="table" stripe header-align="center">
                 <el-table-column type="index" width="100" label="序号" align="center">
                     <template slot-scope="scope">
                         {{ scope.$index + (page - 1) * pageSize + 1 }}
@@ -185,6 +185,7 @@ export default {
             page: 1,
             pageSize: 10,
             totals: 0,
+            listLoading:false,// 列表加载
             icVisible: false,
             invitationCode: "",
             searchTimer: null,
@@ -214,7 +215,7 @@ export default {
                 this.form.startTime = "";
                 this.form.endTime = "";
             }
-            this.getData();
+            this.initData();
         },
         keyword: function(val) {
             clearTimeout(this.searchTimer);
@@ -266,6 +267,8 @@ export default {
             }, 1000);
         },
         getData() {
+            this.listLoading = true;
+            this.listData.splice(0);
             if (this.ticker) {
                 clearInterval(this.ticker);
             }
@@ -302,7 +305,10 @@ export default {
                     }
                 });
                 this.beginTimer();
-            }).catch(err => {});
+                this.listLoading = false;
+            }).catch(err => {
+                this.listLoading = false;
+            });
         },
         initData() {
             this.page = 1;