From e7be1efbb7046b9213b4551cb99a662977f87ea9 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 24 May 2024 09:42:02 +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/views/site/jingCaiGongKaiKe/index.vue        |  8 ++++----
 .../site/renKeJiaoCheng/checkKecheng/dqxqkc.vue  |  4 ++--
 .../checkKecheng/history/kcHistoryDetail.vue     |  2 +-
 src/views/site/renKeJiaoCheng/index.vue          | 11 ++++++-----
 src/views/site/studentWdkc/studentWdkc.vue       |  5 ++++-
 src/views/site/studentWdkc/studentZyxx.vue       |  2 +-
 src/views/zy/zyInfo/StudentZyInfoList.vue        | 16 +++++++++++++---
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/views/site/jingCaiGongKaiKe/index.vue b/src/views/site/jingCaiGongKaiKe/index.vue
index c4a1923..e07a805 100644
--- a/src/views/site/jingCaiGongKaiKe/index.vue
+++ b/src/views/site/jingCaiGongKaiKe/index.vue
@@ -12,8 +12,8 @@
           {{funSj(item.rq)}} {{item.kssj}}-{{item.jssj}}
         </div>
         <div>
-          <!-- <a href="javascript:void(0)" @click="funGkk(item.jslj)"> -->
-          <a href="javascript:void(0)">
+          <a href="javascript:void(0)" @click="funGkk(item.jslj)">
+          <!-- <a href="javascript:void(0)"> -->
             <div>
               <span style="position: absolute;top: 4rem;border-radius: 0 10px 10px 0;background: #1ab394;color: #FFF;padding: 3px 10px 3px 5px;z-index: 2;" v-if="item.dqztpx == 1">{{item.dqzt}}</span>
               <span style="position: absolute;top: 4rem;border-radius: 0 10px 10px 0;background: #1c84c6;color: #FFF;padding: 3px 10px 3px 5px;z-index: 2;" v-if="item.dqztpx == 2">{{item.dqzt}}</span>
@@ -27,13 +27,13 @@
             </div>
           </a>
           <div style="padding: 10px 1rem 1rem;background: #f3f3f3;">
-          <a href="javascript:void(0)" >
+          <!-- <a href="javascript:void(0)" > -->
           <!-- <a href="javascript:void(0)" @click="funGkk(item.jslj)"> -->
             <div class="ggkTitle ggkCcxs" :title="item.hxr +`·`+item.hxrlb">{{item.hxr}} · {{item.hxrlb}}</div>
             <div class="ggkTwoTitle ggkCcxs" :title="item.zc +`·`+item.xy">{{item.zc}} {{item.xy}}</div>
             <div class="ggkThreeTitle ggkCcxs">{{item.ktzt}}</div>
             <div class="ggkFourTitle">{{item.logcount}}人听课</div>
-          </a>
+          <!-- </a> -->
             <!-- -{{ item.kclj }}-{{item.sfxs}}-{{ item.jslj }} -->
             <div v-if="(item.dqztpx=='1'||item.dqztpx=='2')&&item.kclj!=null"><a-button type="primary" class="ggkButton" target="_blank" :href="item.kclj" @click="jrkt(item)">进入课堂</a-button></div>
             <div v-else><a-button type="primary" class="ggkButton" target="_blank"  :href="item.kclj" @click="jrkt(item)" >直播回放</a-button></div>
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue
index 2eb7db7..8131311 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card>
+  <div>
     <a-row>
         <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }" :key="index" v-for="(item, index) in allList" >
           <div class="ketangCard ketangCardcol"  >
@@ -14,7 +14,7 @@
           </div>
         </a-col>
       </a-row>
-  </a-card>
+    </div>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryDetail.vue
index f02dcdb..c8b58a3 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryDetail.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryDetail.vue
@@ -158,7 +158,7 @@ const baseApiUrl = globSetting.domainUrl;
   }
   //获取课程简介和教学大纲内容
   function getKcjsJxdg(){
-    defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh:rwbh} }).then((res) => {
+    defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh:rwbh,xqxn:xqxn} }).then((res) => {
       console.log(`🚀 1111111111111~ getKcjsJxdg ~ res:`, res)
       if(res){
         jxdgInfo.value = res;
diff --git a/src/views/site/renKeJiaoCheng/index.vue b/src/views/site/renKeJiaoCheng/index.vue
index af548e4..38991be 100644
--- a/src/views/site/renKeJiaoCheng/index.vue
+++ b/src/views/site/renKeJiaoCheng/index.vue
@@ -6,9 +6,9 @@
       <span style="margin-left: 10px;"><a href="javascript:void(0);" @click="openKecheng(null)">全部课程</a></span>
     </template>
     <!-- <template #extra></template> -->
-    <div class="cardBody">
-
-      <a-row>
+    <!-- <div class="cardBody"> -->
+      <dqxqkc/>
+      <!-- <a-row>
         <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 8 }" :key="index" v-for="(item, index) in allList" :hidden="currentPageSize * 3 <= index" class="">
 
           <div class="ketangCard ketangCardcol"  >
@@ -32,8 +32,8 @@
           <a v-if="currentPageSize != 1" style="float: right;" @click="closePage">收起</a>
         </a-col>
       </a-row>
-      <a hidden @click="initData">刷新</a>
-    </div>
+      <a hidden @click="initData">刷新</a> -->
+    <!-- </div> -->
   </a-card>
   <baseModal ref="registerForm"/>
 </template>
@@ -45,6 +45,7 @@ import { addTingKeLog, getUserId } from '/@/views/site/utils';
 import { onMounted } from 'vue';
 import { useRouter } from 'vue-router'
   import { getUserSf,getSysConfig } from '/@/views/site/utils/index';
+  import dqxqkc from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue';
 
 onMounted(() => {
   initData();
diff --git a/src/views/site/studentWdkc/studentWdkc.vue b/src/views/site/studentWdkc/studentWdkc.vue
index bf4e0f7..2f8a9e2 100644
--- a/src/views/site/studentWdkc/studentWdkc.vue
+++ b/src/views/site/studentWdkc/studentWdkc.vue
@@ -3,7 +3,7 @@
     <div style="margin-top: 20px;">
         <span style="margin-left: 30px;font-size: 24px;font-weight: 600;">我的课程</span>
     </div>
-    <div>
+    <div style="min-height:200px;">
       <a-row>
         <a-col :xs="{ span: 24 }" :sm="{ span: 12 }" :lg="{ span: 6 }" style="padding: 0 10px;margin-bottom: 10px;"  v-for="(item,index2) in dataSource" :key="index2">
           <div style="border: 2px #eef1f2 solid;">
@@ -27,6 +27,9 @@
             </div>
           </div>
         </a-col>
+        <a-col :span="24" v-show="dataSource.length == 0">
+          <a-empty/>
+        </a-col>
       </a-row>
     </div>
   </div>
diff --git a/src/views/site/studentWdkc/studentZyxx.vue b/src/views/site/studentWdkc/studentZyxx.vue
index 319bca4..b0dd655 100644
--- a/src/views/site/studentWdkc/studentZyxx.vue
+++ b/src/views/site/studentWdkc/studentZyxx.vue
@@ -179,7 +179,7 @@ function openJxrlPdf(record){
   }
   //获取课程简介和教学大纲内容
   function getKcjsJxdg(){
-    defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh:rwbh} }).then((res) => {
+    defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh:rwbh,xqxn:xqxn} }).then((res) => {
       // console.log(`🚀 1111111111111~ getKcjsJxdg ~ res:`, res)
       if(res){
         jxdgInfo.value = res;
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 1a8cc81..53911b7 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -160,9 +160,19 @@
       return;
     }
 
-    ZyInfoStudentModalPage.value.disableSubmit = false;
-    var param = {id:record.stuId,zyfj:record.filePath}
-    ZyInfoStudentModalPage.value.edit(param);
+    createConfirm({
+    iconType: 'warning',
+    title: '确认上传',
+    content: '是否确认上传作业',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      ZyInfoStudentModalPage.value.disableSubmit = false;
+      var param = {id:record.stuId,zyfj:record.filePath}
+      ZyInfoStudentModalPage.value.edit(param);
+    }
+  });
+    
   }
 
   //获取选课人数