From ccc8f37b85badbd8fd8896eebcc2e42b505f7015 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 13 May 2024 22:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E5=8F=8A?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routes/modules/zy/zy.ts            |  2 +-
 .../site/pjjgPage/studentPjjgTeaList.vue      |  4 +--
 .../checkKecheng/dqxqkcDetail.vue             |  9 ++++++
 .../checkKecheng/dqxqkcMenu.vue               | 29 ++++++++++++-------
 src/views/site/renKeJiaoCheng/index.vue       |  3 +-
 src/views/site/studentWdkc/studentMenu.vue    | 15 ++++------
 src/views/zy/zyInfo/StudentZyInfoList.vue     | 22 ++++++++++++--
 src/views/zy/zyInfo/ZyInfoList.vue            |  1 -
 8 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/src/router/routes/modules/zy/zy.ts b/src/router/routes/modules/zy/zy.ts
index 70a8d55..3533bf7 100644
--- a/src/router/routes/modules/zy/zy.ts
+++ b/src/router/routes/modules/zy/zy.ts
@@ -49,7 +49,7 @@ const zuoye: AppRouteModule = {
     {
       path: 'dqkcGongju',
       name: 'dqkcGongju',
-      component: () => import('/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcGongju.vue'),
+      component: () => import('/@/views/kc/detection/zyZhjsList.vue'),
       meta: {
         title: '课程工具',
       },
diff --git a/src/views/site/pjjgPage/studentPjjgTeaList.vue b/src/views/site/pjjgPage/studentPjjgTeaList.vue
index 9974c15..06dc060 100644
--- a/src/views/site/pjjgPage/studentPjjgTeaList.vue
+++ b/src/views/site/pjjgPage/studentPjjgTeaList.vue
@@ -1,8 +1,8 @@
 <template>
   
   <div style="width:100%;text-align: right;line-height:40px;">
-    <a style="padding-right: 0.5rem;" @click="init()">刷新</a>
-    <RouterLink to="/site/xspjjgore">查看更多</RouterLink>
+    <!-- <a style="padding-right: 0.5rem;" @click="init()">刷新</a>
+    <RouterLink to="/site/xspjjgore">查看更多</RouterLink> -->
   </div>
   <a-list item-layout="horizontal" :data-source="list" :grid="{ gutter: 12, xs: 2, sm: 3, md: 3, lg: 3, xl: 3, xxl: 3, xxxl: 3 }">
     <template #renderItem="{ item }">
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
index dea9773..c3d7977 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
@@ -1,5 +1,14 @@
 <template>
   <div style="margin-top:10px;background:#fff;height:630px;overflow:auto;">
+     <a-card>
+      <div>
+        <a-row>
+          <a-col :span="3" style="font-size: 18px;font-weight: bold;">课程介绍：</a-col>
+          <a-col :span="15"><a-textarea style="width: 100%;"></a-textarea></a-col>
+          <a-col :span="6" style="text-align:right;"><a-button type="primary">提交</a-button><a-button type="primary" style="margin-left:10px;">引用</a-button></a-col>
+        </a-row>
+      </div>
+     </a-card>
      <a-card>
       <div>
         <span style="float: left;line-height: 30px; font-size: 18px; font-weight: bold;">教学大纲：</span>
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index 8d3fbfc..3c9d45c 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -10,28 +10,33 @@
                   <a-sub-menu key="sub1">
                     <template #title>教学内容</template>
                     <a-menu-item key="1" @click="getGzt('kcjs')">课程介绍</a-menu-item>
-                    <a-menu-item key="2" @click="getGzt('gonggao')">公告</a-menu-item>
-                    <a-menu-item key="3">教学单元内容</a-menu-item>
+                    <a-menu-item key="2" @click="getGzt('gonggao')">通知公告</a-menu-item>
+                    <a-menu-item key="3">教学单元</a-menu-item>
                   </a-sub-menu>
                   <a-sub-menu key="sub2">
                     <template #title>测验/作业</template>
                     <a-menu-item key="4" @click="getGzt('dqzy')">课程作业</a-menu-item>
                     <a-menu-item key="5" @click="getGzt('kcjc')">课程测验</a-menu-item>
                   </a-sub-menu>
-                  <a-menu-item key="sub3">
-                    <span  @click="getGzt('dqwj')">问卷调查</span>
+                  <a-sub-menu key="sub3">
+                    <template #title>教学工具</template>
+                    <a-menu-item key="6" @click="getGzt('dqwj')">问卷调查</a-menu-item>
+                    <a-menu-item key="7" @click="getGzt('gongju')">到课率识别</a-menu-item>
+                  </a-sub-menu>
+                  <a-menu-item key="sub4">
+                    <span>教学资源库</span>
                   </a-menu-item>
+                  <!-- <a-menu-item key="sub3">
+                    <span  @click="getGzt('dqwj')">问卷调查</span>
+                  </a-menu-item> -->
                   <!-- <a-sub-menu key="sub3">
                     <template #title>问卷管理</template>
                     <a-menu-item key="6" @click="getGzt('dqwj')">当前问卷</a-menu-item>
                     <a-menu-item key="7">历史问卷</a-menu-item>
                   </a-sub-menu> -->
-                  <a-menu-item key="sub4">
-                    <span>资源库</span>
-                  </a-menu-item>
-                  <a-menu-item key="sub5">
-                    <span>工具</span>
-                  </a-menu-item>
+                  <!-- <a-menu-item key="sub5">
+                    <span @click="getGzt('gongju')">教学工具</span>
+                  </a-menu-item> -->
                 </a-menu>
               </a-col>
             </a-row>
@@ -74,8 +79,10 @@
       href = "/zy/dqkcDetail";
     }else if(zytype=='kcjc'){
       href = "/zy/dqkcWenjuan";
+    }else if(zytype=='gongju'){
+      href = "/zy/dqkcGongju";
     }
-    
+    console.log('href---->',href);
     router.push({path:href,query: {rwbh,xqxn,type}});
   }
 
diff --git a/src/views/site/renKeJiaoCheng/index.vue b/src/views/site/renKeJiaoCheng/index.vue
index ca5e5f8..af548e4 100644
--- a/src/views/site/renKeJiaoCheng/index.vue
+++ b/src/views/site/renKeJiaoCheng/index.vue
@@ -1,8 +1,9 @@
 <template>
   <a-card class="rowGutter" id="rkjcDom">
     <template #title>
-      <span style="font-size: 24px;font-weight: bold;" @click="openKecheng(null)">任教课程</span>
+      <span style="font-size: 24px;font-weight: bold;" >任教课程</span>
       <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="openChangeKcPage">修改课程提醒</a></span>
+      <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="openKecheng(null)">全部课程</a></span>
     </template>
     <!-- <template #extra></template> -->
     <div class="cardBody">
diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue
index 398eba3..1ed3e90 100644
--- a/src/views/site/studentWdkc/studentMenu.vue
+++ b/src/views/site/studentWdkc/studentMenu.vue
@@ -9,15 +9,10 @@
                 >
                   <a-sub-menu key="sub1">
                     <template #title>课程介绍</template>
-                    <a-menu-item key="1">教学大纲</a-menu-item>
-                    <a-menu-item key="2">常见问题</a-menu-item>
+                    <a-menu-item key="1">课程介绍</a-menu-item>
+                    <a-menu-item key="2">通知公告</a-menu-item>
+                    <a-menu-item key="3">教学单元</a-menu-item>
                   </a-sub-menu>
-                  <a-menu-item key="sub2">
-                    <span>公告</span>
-                  </a-menu-item>
-                  <a-menu-item key="sub3">
-                    <span>教学日历</span>
-                  </a-menu-item>
                   <a-sub-menu key="sub4">
                     <template #title>测验/作业</template>
                     <a-menu-item key="4" @click="getGzt('dqzy')">课程作业</a-menu-item>
@@ -26,9 +21,9 @@
                   <a-menu-item key="sub5">
                     <span>问卷调查</span>
                   </a-menu-item>
-                  <a-menu-item key="sub5">
+                  <!-- <a-menu-item key="sub5">
                     <span>讨论区</span>
-                  </a-menu-item>
+                  </a-menu-item> -->
 
                 </a-menu>
               </a-col>
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 21840b9..d9c7345 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -34,11 +34,11 @@
       <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 210px;border: 1px solid rgb(28, 132, 198);">
-          <div class="rotate" >{{item.zyStatus_dictText}}</div>
+          <div class="rotate" :style="classFun(item)">{{callText(item)}}</div>
           <a-row style="top: -48px;position: relative;">
             <a-col :span="24" style="margin-bottom: 10px;height:53px;overflow:hidden;" :title="item.title">
               <!-- <div style="font-size: 18px;font-weight: bold;" class="ellipsis">{{item.title}}</div> -->
-              <div style="font-size: 18px;font-weight: bold;">【{{item.zyType_dictText}}】{{item.title}}</div>
+              <div style="font-size: 18px;font-weight: bold;">{{item.title}}</div>
             </a-col>
             <a-col :span="24" class="zyCon">时间：{{item.startTime}} - {{item.endTime}}</a-col>
             <a-col :span="24" class="zyCon"><div style="float:left" v-if="item.score">{{item.score}}分</div><div style="float:right;" @click="openXkrs(item)"><a>{{item.xkxs}}人选课</a></div></a-col>
@@ -110,6 +110,24 @@
   });
 
    
+  function classFun(record){
+    if(record.score){
+      return "background: #1f77f8";
+    }else if(record.stuFilePath){
+      return "background: #18a689";
+    }else{
+      return "background: #a7a6a6";
+    }
+  }
+  function callText(record){
+    if(record.score){
+      return "已评分";
+    }else if(record.stuFilePath){
+      return "已提交";
+    }else{
+      return "未提交";
+    }
+  }
   /**
    * 详情
    */
diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue
index 128e67e..613f871 100644
--- a/src/views/zy/zyInfo/ZyInfoList.vue
+++ b/src/views/zy/zyInfo/ZyInfoList.vue
@@ -125,7 +125,6 @@
     }else if(type == '1'){
       return "background: #18a689";
     }
-
   }
   /**
    * 新增事件