From 37544bea6068f4ef3100f8c165c323809de10959 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Thu, 9 May 2024 13:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=AD=A6=E4=B9=A0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Study/manager.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 4356cb16..7f51b8fb 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -192,7 +192,7 @@
               </el-table-column>-->
               <el-table-column label="学习人员" width="110">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="info" @click="getCatalogue(scope.row)" >学习人员</el-button>
+                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentName)" >学习人员</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -260,13 +260,13 @@
               </el-table-column>
               <el-table-column prop="status" label="状态">
                 <template slot-scope="scope">
-                  <span>{{scope.row.status == 9? '已完成':'未开始'}}</span>
+                  <span>{{scope.row.contentName.split('--')[1]!=='考试'?scope.row.status == 9? '已完成':'未开始':scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="duration" label="进度">
                 <template slot-scope="scope">
 <!--                  {{scope.row.studyDuration == 0?'0':scope.row.studyDuration/60}}-->
-                  {{scope.row.studyDuration}}
+                  {{scope.row.contentName.split('--')[1]!=='考试'?scope.row.studyDuration:''}}
                 </template>
               </el-table-column>
             </el-table>
@@ -297,7 +297,7 @@
         <el-table-column prop="finishTime" label="完成时间" width="180"></el-table-column>
         <el-table-column label="状态"  width="100">
             <template slot-scope="scope">
-                 {{scope.row.progress}}%
+                 {{!typePress?scope.row.progress+'%':scope.row.status==9?'已完成':scope.row.status==2?'进行中':'未开始'}}
                 </template>
         </el-table-column>
       </el-table>
@@ -346,6 +346,7 @@ export default {
   },
   data() {
     return {
+      typePress: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -693,7 +694,12 @@ export default {
       this.study.pageIndex = val;
       this.getSignupList();
     },
-    getCatalogue(row) {
+    getCatalogue(row,type) {
+      if(type=='考试'){
+        this.typePress = true
+      }else{
+        this.typePress = false
+      }
       this.contentId = row.id;
       this.study.catalogueShow = true;
       this.learningSituation.pageIndex = 1;//重置为第一页