From 6593aa7e93db29becfdd9572aa91546ee92fbe3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 23 May 2024 14:15:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BB=8B=E7=BB=8D?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=B8=B8=E8=A7=81=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AB=AF=E8=B0=83=E6=95=B4=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=8F=E5=8F=B7=E8=BF=9E=E7=BB=AD=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkKecheng/dqxqkcDetail.vue             | 33 ++++++++---------
 src/views/site/studentWdkc/studentZyxx.vue    | 36 ++++++++++---------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
index 14d9a5b..e52764e 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
@@ -42,7 +42,7 @@
         <a-col :span="24" v-for="(item,index) in cjwtSource" :key="index">
           <a-row>
             <a-col :span="24">
-              <span style="float: left;">{{index+1}}.{{item.question}}</span>
+              <span style="float: left;">{{(pageNo-1)*pageSize+index+1}}.{{item.question}}</span>
               <span style="float: right;">
                 <a title="修改" @click="handleEdit(item)"><Icon icon="ant-design:form-outlined" /></a>
                 <a-divider type="vertical" style="height: 30px; background-color: #7cb305" />
@@ -95,7 +95,7 @@
 
 const globSetting = useGlobSetting();
 const baseApiUrl = globSetting.domainUrl;
- 
+
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
@@ -117,7 +117,7 @@ const baseApiUrl = globSetting.domainUrl;
     jxrlFilePath:null,
     kcjs:''
   });
-  
+
   //引用功能
   function handleYinyong(){
     var record = {xqxn,rwbh}
@@ -146,37 +146,38 @@ const baseApiUrl = globSetting.domainUrl;
 
   function openPdf(record){
     var url2 = getFileAccessHttpUrl(record.pdfPath)
-    console.log(`🚀 ~ openPdf ~ url2:`, url2)
+    // console.log(`🚀 ~ openPdf ~ url2:`, url2)
     let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
     window.open(url,"_blank")
   }
 
   function openJxrlPdf(record){
     var url2 = getFileAccessHttpUrl(record.jxrlPdfPath)
-    console.log(`🚀 ~ openPdf ~ url2:`, url2)
+    // console.log(`🚀 ~ openPdf ~ url2:`, url2)
     let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
     window.open(url,"_blank")
   }
-  
-   
+
+
 
   //常见问题回调刷新
   function handleCjwtOk() {
-    console.log('--------cjwt ok -----------')
+    // console.log('--------cjwt ok -----------')
     cjwtData(1);
   }
-  
+
   //常见问题新增翻页
   function handlePageChange(page: number) {
     cjwtData(page);
   }
 
   function cjwtData(arg){
+    pageNo.value = arg;
     defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => {
-    console.log(`🚀 ~ defHttp.get ~ res:`, res)
+    // console.log(`🚀 ~ defHttp.get ~ res:`, res)
       cjwtSource.value = res.records;
       total.value = res.total;
-      console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
+      // console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
     });
   }
   //获取课程简介和教学大纲内容
@@ -192,13 +193,13 @@ const baseApiUrl = globSetting.domainUrl;
     var model = jxdgInfo.value;
     model.rwbh = rwbh;
     model.xqxn = xqxn;
-    console.log(`🚀 ~ addKcjsHandle ~ model:`, model)
+    // console.log(`🚀 ~ addKcjsHandle ~ model:`, model)
     if(model.id){
       if(type=='1'){
         model.filePath = '';
       }
       defHttp.post({ url: '/zyJxdg/zyJxdg/edit', params: model }).then((res) => {
-      console.log(`🚀 ~ defHttp.post 111~ res:`, res)
+      // console.log(`🚀 ~ defHttp.post 111~ res:`, res)
       getKcjsJxdg();
       });
     }else{
@@ -206,7 +207,7 @@ const baseApiUrl = globSetting.domainUrl;
         model.filePath = '';
       }
       defHttp.post({ url: '/zyJxdg/zyJxdg/add', params: model }).then((res) => {
-      console.log(`🚀 ~ defHttp.post 222~ res:`, res)
+      // console.log(`🚀 ~ defHttp.post 222~ res:`, res)
       getKcjsJxdg();
       });
     }
@@ -218,7 +219,7 @@ const baseApiUrl = globSetting.domainUrl;
     cjwtData(1);
 
   });
- 
+
 </script>
 <style lang="less" scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/site/studentWdkc/studentZyxx.vue b/src/views/site/studentWdkc/studentZyxx.vue
index b623720..b96cb16 100644
--- a/src/views/site/studentWdkc/studentZyxx.vue
+++ b/src/views/site/studentWdkc/studentZyxx.vue
@@ -44,7 +44,7 @@
         <a-col :span="24" v-for="(item,index) in cjwtSource" :key="index">
           <a-row>
             <a-col :span="24">
-              <span style="float: left;">{{index+1}}.{{item.question}}</span>
+              <span style="float: left;">{{(pageNo-1)*pageSize+index+1}}.{{item.question}}</span>
             </a-col>
             <a-col :span="24"><span><Icon icon="ant-design:caret-right-outlined" />答：{{item.answer}}</span></a-col>
             <a-col :span="24">
@@ -93,7 +93,7 @@
 
 const globSetting = useGlobSetting();
 const baseApiUrl = globSetting.domainUrl;
- 
+
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
@@ -114,7 +114,7 @@ const baseApiUrl = globSetting.domainUrl;
     filePath:'',
     kcjs:''
   });
-  
+
   //引用功能
   function handleYinyong(){
     var record = {xqxn,rwbh}
@@ -143,41 +143,43 @@ const baseApiUrl = globSetting.domainUrl;
 
   function openPdf(record){
     var url2 = getFileAccessHttpUrl(record.pdfPath)
-    console.log(`🚀 ~ openPdf ~ url2:`, url2)
+    // console.log(`🚀 ~ openPdf ~ url2:`, url2)
     let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
     window.open(url,"_blank")
   }
 
 function openJxrlPdf(record){
   var url2 = getFileAccessHttpUrl(record.jxrlPdfPath)
-  console.log(`🚀 ~ openPdf ~ url2:`, url2)
+  // console.log(`🚀 ~ openPdf ~ url2:`, url2)
   let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
   window.open(url,"_blank")
 }
-   
+
 
   //常见问题回调刷新
   function handleCjwtOk() {
-    console.log('--------cjwt ok -----------')
+    // console.log('--------cjwt ok -----------')
     cjwtData(1);
   }
-  
+
   //常见问题新增翻页
   function handlePageChange(page: number) {
     cjwtData(page);
   }
 
   function cjwtData(arg){
-    defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn } }).then((res) => {
-    console.log(`🚀 ~ defHttp.get ~ res:`, res)
+    pageNo.value = arg;
+    defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => {
+    // console.log(`🚀 ~ defHttp.get ~ res:`, res)
       cjwtSource.value = res.records;
-      console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
+      total.value = res.total;
+      // console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
     });
   }
   //获取课程简介和教学大纲内容
   function getKcjsJxdg(){
     defHttp.get({ url: '/zyJxdg/zyJxdg/getKcjsJxdg', params: { rwbh:rwbh} }).then((res) => {
-      console.log(`🚀 1111111111111~ getKcjsJxdg ~ res:`, res)
+      // console.log(`🚀 1111111111111~ getKcjsJxdg ~ res:`, res)
       if(res){
         jxdgInfo.value = res;
       }
@@ -188,13 +190,13 @@ function openJxrlPdf(record){
     var model = jxdgInfo.value;
     model.rwbh = rwbh;
     model.xqxn = xqxn;
-    console.log(`🚀 ~ addKcjsHandle ~ model:`, model)
+    // console.log(`🚀 ~ addKcjsHandle ~ model:`, model)
     if(model.id){
       if(type=='1'){
         model.filePath = '';
       }
       defHttp.post({ url: '/zyJxdg/zyJxdg/edit', params: model }).then((res) => {
-      console.log(`🚀 ~ defHttp.post 111~ res:`, res)
+      // console.log(`🚀 ~ defHttp.post 111~ res:`, res)
       getKcjsJxdg();
       });
     }else{
@@ -202,7 +204,7 @@ function openJxrlPdf(record){
         model.filePath = '';
       }
       defHttp.post({ url: '/zyJxdg/zyJxdg/add', params: model }).then((res) => {
-      console.log(`🚀 ~ defHttp.post 222~ res:`, res)
+      // console.log(`🚀 ~ defHttp.post 222~ res:`, res)
       getKcjsJxdg();
       });
     }
@@ -214,7 +216,7 @@ function openJxrlPdf(record){
     cjwtData(1);
 
   });
- 
+
 </script>
 <style lang="less" scoped>
-</style>
\ No newline at end of file
+</style>

From db0b90370a7e78e414b8e8fe21b3250842dcf29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 23 May 2024 14:25:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AB=AF=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E3=80=81=E6=B5=8B=E8=AF=95=E3=80=81=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=8D=A1=E7=89=87=E9=A1=B5=E9=9D=A2=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/wjxCswj/WjxCswjHisList.vue       | 10 +++---
 src/views/kc/wjxCswj/WjxCswjStuList.vue       |  7 ++--
 src/views/kc/wjxDcwj/WjxDcwjHisList.vue       | 10 +++---
 src/views/kc/wjxDcwj/WjxDcwjStuList.vue       |  7 ++--
 src/views/zy/zyInfo/StudentZyInfoList.vue     | 29 ++++++++-------
 .../zy/zyInfo/SutdentZyInfoHistoryList.vue    | 35 ++++++++++---------
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/views/kc/wjxCswj/WjxCswjHisList.vue b/src/views/kc/wjxCswj/WjxCswjHisList.vue
index 4883ec8..40ca703 100644
--- a/src/views/kc/wjxCswj/WjxCswjHisList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjHisList.vue
@@ -210,8 +210,7 @@
   function handleFabu(record: Recordable) {
     defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "6" } }).then(res => {
       total.value = 1;
-      pageNo.value = 0;
-      reload();
+      handlePageChange(1);
     });
   }
   /**
@@ -241,16 +240,15 @@
    */
   function handleSuccess() {
     total.value = 1;
-    pageNo.value = 0;
-    reload();
+    handlePageChange(1);
   }
 
   /**
    * 查询
    */
   function searchQuery() {
-    pageNo.value = 0;
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
 
   /**
diff --git a/src/views/kc/wjxCswj/WjxCswjStuList.vue b/src/views/kc/wjxCswj/WjxCswjStuList.vue
index dffb804..0e769fc 100644
--- a/src/views/kc/wjxCswj/WjxCswjStuList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjStuList.vue
@@ -152,16 +152,15 @@
    */
   function handleSuccess() {
     total.value = 1;
-    pageNo.value = 0;
-    reload();
+    handlePageChange(1);
   }
 
   /**
    * 查询
    */
   function searchQuery() {
-    pageNo.value = 0;
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
 
   /**
diff --git a/src/views/kc/wjxDcwj/WjxDcwjHisList.vue b/src/views/kc/wjxDcwj/WjxDcwjHisList.vue
index 394fdb2..9dd8671 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjHisList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjHisList.vue
@@ -207,8 +207,7 @@
   function handleFabu(record: Recordable) {
     defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "1" } }).then(res => {
       total.value = 1;
-      pageNo.value = 0;
-      reload();
+      handlePageChange(1);
     });
   }
   /**
@@ -238,16 +237,15 @@
    */
   function handleSuccess() {
     total.value = 1;
-    pageNo.value = 0;
-    reload();
+    handlePageChange(1);
   }
 
   /**
    * 查询
    */
   function searchQuery() {
-    pageNo.value = 0;
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
 
   /**
diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
index ca619eb..b735970 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
@@ -152,16 +152,15 @@
    */
   function handleSuccess() {
     total.value = 1;
-    pageNo.value = 0;
-    reload();
+    handlePageChange(1);
   }
 
   /**
    * 查询
    */
   function searchQuery() {
-    pageNo.value = 0;
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
 
   /**
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 44c311e..4777977 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -88,7 +88,7 @@
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
 
 
-  
+
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
@@ -106,7 +106,7 @@
   const pageNo = ref<number>(0);
   const pageSize = ref<number>(6);
   const tableData = ref<any>([]);
-    
+
 
   const labelCol = reactive({
     xs: { span: 24 },
@@ -117,7 +117,7 @@
     sm: { span: 16 },
   });
 
-   
+
   function classFun(record){
     if(record.score){
       return "background: #1f77f8";
@@ -147,7 +147,7 @@
   //上传作业附件
   function handleShangchuan(record){
 
-    
+
     let timestamp = new Date().getTime();
     let startTimestamp = Date.parse(record.startTime);
     if(timestamp<startTimestamp){
@@ -171,30 +171,33 @@
     XxhbbksListModalPage.value.disableSubmit = false;
     XxhbbksListModalPage.value.init(record);
   }
-   
+
 
   /**
    * 成功回调
    */
   function handleSuccess() {
-    reload()
+    total.value = 1;
+    handlePageChange(1);
   }
-   
+
 
   /**
    * 查询
    */
   function searchQuery() {
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
-  
+
   /**
    * 重置
    */
   function searchReset() {
     queryParam.value = {};
     //刷新数据
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
 
   function reload(){
@@ -213,11 +216,11 @@
       tableData.value = res.records;
     });
   }
-  
+
 
   function handlePageChange(record){
     pageNo.value = record;
-    searchQuery();
+    reload();
   }
 
   onMounted(() => {
@@ -258,7 +261,7 @@
 .zyCon{
   line-height: 30px;
 }
-.rotate {    
+.rotate {
   transform: rotate(45deg);
   background: rgb(28, 132, 198);
   color: #fff;
diff --git a/src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue b/src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue
index 0b0f698..ab6c185 100644
--- a/src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue
+++ b/src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue
@@ -89,7 +89,7 @@
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
 
 
-  
+
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
@@ -107,7 +107,7 @@
   const pageNo = ref<number>(0);
   const pageSize = ref<number>(6);
   const tableData = ref<any>([]);
-    
+
 
   const labelCol = reactive({
     xs: { span: 24 },
@@ -125,7 +125,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -133,7 +133,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -141,7 +141,7 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-  
+
   //获取选课人数
   function openXkrs(record){
     console.log(`🚀 ~ openXkrs ~ record:`, record)
@@ -152,7 +152,7 @@
   function handleZyxx(record){
     ZyInfoStudentListModalPage.value.disableSubmit = true;
     ZyInfoStudentListModalPage.value.init(record);
-    
+
   }
 
   function handleShangchuan(record){
@@ -160,7 +160,7 @@
     var param = {mainId:record.id,zyfj:record.filePath}
     ZyInfoStudentModalPage.value.edit(param);
   }
-   
+
   /**
    * 删除事件
    */
@@ -184,30 +184,33 @@
     }
   });
   }
-   
+
 
   /**
    * 成功回调
    */
   function handleSuccess() {
-    reload()
+    total.value = 1;
+    handlePageChange(1);
   }
-   
+
 
   /**
    * 查询
    */
   function searchQuery() {
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
-  
+
   /**
    * 重置
    */
   function searchReset() {
     queryParam.value = {};
     //刷新数据
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
 
   function reload(){
@@ -226,11 +229,11 @@
       tableData.value = res.records;
     });
   }
-  
+
 
   function handlePageChange(record){
     pageNo.value = record;
-    searchQuery();
+    reload();
   }
 
   onMounted(() => {
@@ -271,7 +274,7 @@
 .zyCon{
   line-height: 30px;
 }
-.rotate {    
+.rotate {
   transform: rotate(45deg);
   background: rgb(28, 132, 198);
   color: #fff;

From af8d6673d5dd8ce4933555bb241380e13fd60c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 23 May 2024 17:30:43 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kc/wjxCswj/WjxCswjHisList.vue       |  5 ++-
 src/views/kc/wjxCswj/WjxCswjList.vue          |  5 ++-
 src/views/kc/wjxCswj/WjxCswjStuList.vue       |  5 ++-
 src/views/kc/wjxDcwj/WjxDcwjHisList.vue       |  5 ++-
 src/views/kc/wjxDcwj/WjxDcwjList.vue          |  5 ++-
 src/views/kc/wjxDcwj/WjxDcwjStuList.vue       |  5 ++-
 .../checkKecheng/dqxqkcDetail.vue             |  2 +-
 .../checkKecheng/dqxqkcMain.vue               |  8 ++--
 .../checkKecheng/dqxqkcMenu.vue               | 10 ++---
 .../checkKecheng/history/kcHistoryMenu.vue    |  4 +-
 src/views/site/studentWdkc/studentMenu.vue    |  4 +-
 src/views/site/studentWdkc/studentZyxx.vue    |  2 +-
 src/views/zy/jiaoXueDanYuanNeiRong/index2.vue |  6 ++-
 .../zy/jiaoXueDanYuanNeiRong/stuIndex.vue     |  6 ++-
 src/views/zy/zyGonggao/StudentGonggaoList.vue |  9 ++--
 src/views/zy/zyGonggao/ZyGonggaoList.vue      |  2 +-
 src/views/zy/zyInfo/StudentZyInfoList.vue     |  5 ++-
 .../zy/zyInfo/SutdentZyInfoHistoryList.vue    |  5 ++-
 src/views/zy/zyInfo/ZyInfoHisList.vue         | 45 ++++++++++---------
 src/views/zy/zyInfo/ZyInfoList.vue            | 12 ++---
 src/views/zy/zyTlq/StuZyTlqList.vue           | 16 ++++---
 src/views/zy/zyTlq/ZyTlqList.vue              | 16 ++++---
 22 files changed, 100 insertions(+), 82 deletions(-)

diff --git a/src/views/kc/wjxCswj/WjxCswjHisList.vue b/src/views/kc/wjxCswj/WjxCswjHisList.vue
index 40ca703..9460bf6 100644
--- a/src/views/kc/wjxCswj/WjxCswjHisList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjHisList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 600px;padding: 10px 0;overflow-y: auto;overflow-x: hidden;">
+  <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;overflow-x: hidden;padding: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -30,7 +30,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 280px;">
           <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish =='0'? '待发布':'已发布'}}</div>
@@ -282,6 +282,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width: 99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue
index 2bc9aae..3589cef 100644
--- a/src/views/kc/wjxCswj/WjxCswjList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 600px;padding: 10px 0;overflow-y: auto;overflow-x: hidden;">
+  <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;overflow-x: hidden;padding: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -33,7 +33,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 280px;">
           <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish_dictText}}</div>
@@ -292,6 +292,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width:99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/kc/wjxCswj/WjxCswjStuList.vue b/src/views/kc/wjxCswj/WjxCswjStuList.vue
index 0e769fc..6addf42 100644
--- a/src/views/kc/wjxCswj/WjxCswjStuList.vue
+++ b/src/views/kc/wjxCswj/WjxCswjStuList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -31,7 +31,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 210px;">
           <div class="rotate" :style="classFun(item.flag)">{{getStatus(item.flag)}}</div>
@@ -206,6 +206,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width: 99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/kc/wjxDcwj/WjxDcwjHisList.vue b/src/views/kc/wjxDcwj/WjxDcwjHisList.vue
index 9dd8671..25f2bb4 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjHisList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjHisList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -30,7 +30,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 280px;">
           <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish =='0'? '待发布':'已发布'}}</div>
@@ -279,6 +279,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width: 99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/kc/wjxDcwj/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue
index e843f30..ba2c449 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -32,7 +32,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 280px;">
           <div class="rotate" :style="classFun(item.qpublish)">{{item.qpublish_dictText}}</div>
@@ -295,6 +295,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width:99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
index b735970..d864d14 100644
--- a/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
+++ b/src/views/kc/wjxDcwj/WjxDcwjStuList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -31,7 +31,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 210px;">
           <div class="rotate" :style="classFun(item.flag)">{{getStatus(item.flag)}}</div>
@@ -206,6 +206,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width: 99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
index e52764e..d112b43 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="margin-top:10px;background:#fff;height:630px;overflow:auto;">
+  <div style="margin-top:10px;background:#fff;height: calc(100vh - 225px);overflow:auto;">
      <a-card>
       <div>
         <a-row>
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue
index 3ed208f..894593d 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue
@@ -32,7 +32,7 @@
   import footerPage from '/@/views/site/common/footer.vue';
   import dqxqkcMenu from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue';
   import dqxqkc from '/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkc.vue';
- 
+
   const maxClassName = ref<any>({});
   const selectedKeys = ref<string[]>([]);
   //当前路由信息
@@ -41,7 +41,7 @@
   const { rwbh,xqxn } = query;//获取传递参数
   let router = useRouter();
   const kcxxInfo = ref<string>('');
-  
+
 
   //进入就加载
   onMounted(() => {
@@ -51,7 +51,7 @@
     kcxxInfo.value = res;
     });
   });
- 
+
 </script>
 <style lang="less" scoped>
 #siteMain {
@@ -90,4 +90,4 @@
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index 7aca988..2f445cd 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -1,12 +1,12 @@
 <template>
-  <div id="siteMain" style="min-height: calc(100vh - 160px);">
+  <div id="siteMain" style="min-height: calc(100vh - 205px);">
             <a-row>
               <a-col :span="24">
                 <a-menu
-                  v-model:openKeys="openKeys"
-                  v-model:selectedKeys="selectedKeys"
-                  style="width: 98%;min-height: calc(100vh - 142px);margin: 10px 0;"
-                  mode="inline"
+                    v-model:openKeys="openKeys"
+                    v-model:selectedKeys="selectedKeys"
+                    style="width: 98%;min-height: calc(100vh - 225px);margin: 10px 0;"
+                    mode="inline"
                 >
                   <a-sub-menu key="sub1">
                     <template #title>教学内容</template>
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMenu.vue
index 6cdde12..33f7bc6 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMenu.vue
@@ -1,10 +1,10 @@
 <template>
-  <div id="siteMain" style="min-height: calc(100vh - 160px);">
+  <div id="siteMain" style="min-height: calc(100vh - 205px);">
             <a-row>
               <a-col :span="24">
                 <a-menu
                   v-model:selectedKeys="selectedKeys"
-                  style="width: 98%;min-height: calc(100vh - 142px);margin: 10px 0;"
+                  style="width: 98%;min-height: calc(100vh - 225px);margin: 10px 0;"
                   mode="inline"
                 >
                   <a-sub-menu key="sub1">
diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue
index 6cc8077..99002f2 100644
--- a/src/views/site/studentWdkc/studentMenu.vue
+++ b/src/views/site/studentWdkc/studentMenu.vue
@@ -1,10 +1,10 @@
 <template>
-  <div id="siteMain" style="height: 640px;">
+  <div id="siteMain" style="min-height: calc(100vh - 205px);">
             <a-row>
               <a-col :span="24">
                 <a-menu
                   v-model:selectedKeys="selectedKeys"
-                  style="width: 98%;height:640px; margin: 10px 0;"
+                  style="width: 98%;min-height: calc(100vh - 225px); margin: 10px 0;"
                   mode="inline"
                 >
                   <a-sub-menu key="sub1">
diff --git a/src/views/site/studentWdkc/studentZyxx.vue b/src/views/site/studentWdkc/studentZyxx.vue
index b96cb16..8a2fa6a 100644
--- a/src/views/site/studentWdkc/studentZyxx.vue
+++ b/src/views/site/studentWdkc/studentZyxx.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="margin-top:10px;background:#fff;height:642px;overflow:auto;">
+  <div style="margin-top:10px;background:#fff;height: calc(100vh - 225px);overflow: auto;">
      <a-card>
       <div>
         <a-row>
diff --git a/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue b/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue
index 0752297..145894a 100644
--- a/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue
+++ b/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue
@@ -475,10 +475,12 @@
 
 <style lang="less" scoped>
 .max {
-  height: calc(-132px + 100vh);
+  height: calc(100vh - 225px);
+  //height: calc(-132px + 100vh);
   // min-height: calc(-132px + 100vh);
   // max-height: calc(-132px + 100vh);
-  overflow: hidden;
+  overflow: auto;
+  //overflow: hidden;
   .maxDiv {
     height: calc(100% - 94px);
     overflow-y: auto;
diff --git a/src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue b/src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue
index 1d1bbf6..9fc0bad 100644
--- a/src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue
+++ b/src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue
@@ -459,10 +459,12 @@
 
 <style lang="less" scoped>
 .max {
-  height: calc(-132px + 100vh);
+  height: calc(100vh - 225px);
+  //height: calc(-132px + 100vh);
   // min-height: calc(-132px + 100vh);
   // max-height: calc(-132px + 100vh);
-  overflow: hidden;
+  overflow: auto;
+  //overflow: hidden;
   .maxDiv {
     height: calc(100% - 94px);
     overflow-y: auto;
diff --git a/src/views/zy/zyGonggao/StudentGonggaoList.vue b/src/views/zy/zyGonggao/StudentGonggaoList.vue
index 86d7e4a..701eef1 100644
--- a/src/views/zy/zyGonggao/StudentGonggaoList.vue
+++ b/src/views/zy/zyGonggao/StudentGonggaoList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height:642px;margin-top:10px;">
+  <div style="background: #fff;height: calc(100vh - 225px);overflow: auto;margin-top:10px;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -26,7 +26,6 @@
             <a-collapse-panel :key="index" >
               <template #header>
                 <sapn style="font-size: 16px; font-weight: bold;">{{index+1}}.{{item.title}}</sapn>
-                
               </template>
               <div v-html="item.content"></div>
               <!-- <setting-outlined /> -->
@@ -44,7 +43,7 @@
           <a-empty/>
         </a-col>
       </a-row>
-     
+
   </div>
 </template>
 
@@ -86,7 +85,7 @@
   function searchQuery() {
     reload(1);
   }
-  
+
   /**
    * 重置
    */
@@ -98,7 +97,7 @@
     //刷新数据
     reload(1);
   }
-  
+
   //翻页
   function handlePageChange(page: number) {
     reload(page);
diff --git a/src/views/zy/zyGonggao/ZyGonggaoList.vue b/src/views/zy/zyGonggao/ZyGonggaoList.vue
index 9373bdc..36e4248 100644
--- a/src/views/zy/zyGonggao/ZyGonggaoList.vue
+++ b/src/views/zy/zyGonggao/ZyGonggaoList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;min-height:97.5%;margin-top:10px;">
+  <div style="background: #fff;height: calc(100vh - 225px);overflow: auto;margin-top:10px;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container" style="border-bottom: 2px solid #f0f0f0;">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" style="padding: 20px 10px 0px 10px;">
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 4777977..152afa5 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -31,7 +31,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 240px;border: 1px solid rgb(28, 132, 198);">
           <div class="rotate" :style="classFun(item)">{{callText(item)}}</div>
@@ -232,6 +232,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width: 99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue b/src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue
index ab6c185..bf36d07 100644
--- a/src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue
+++ b/src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;margin: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -37,7 +37,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 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>
@@ -245,6 +245,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width: 99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/zy/zyInfo/ZyInfoHisList.vue b/src/views/zy/zyInfo/ZyInfoHisList.vue
index 782a2a4..a18ef3e 100644
--- a/src/views/zy/zyInfo/ZyInfoHisList.vue
+++ b/src/views/zy/zyInfo/ZyInfoHisList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;margin: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -26,7 +26,7 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 240px;border: 1px solid rgb(28, 132, 198);">
           <div class="rotate" :style="classFun(item.zyStatus)">{{item.zyStatus_dictText}}</div>
@@ -37,7 +37,7 @@
             <a-col :span="24" class="zyCon">时间：{{item.startTime}} - {{item.endTime}}</a-col>
             <a-col :span="24" class="zyCon"><div style="float:left">{{item.xnxq}}</div><div style="float:right;" @click="openXkrs(item)"><a>{{item.xkxs}}人选课</a></div></a-col>
             <a-col :span="24" class="zyCon"><div style="float:left">未提交：{{item.wtjnum?item.wtjnum:0}}人;</div><div style="float:right;" >已提交：{{item.ytjnum?item.ytjnum:0}}人</div></a-col>
-            
+
             <a-col :span="24" style="text-align:center;margin-top:20px;">
               <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;background:rgb(28, 132, 198);">详情</a-button>
               <a-button type="primary" @click="handleZyxx(item)" style="margin-left:5px;background:rgb(28, 132, 198);" >作业</a-button>
@@ -76,7 +76,7 @@
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
 
 
-  
+
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
@@ -94,7 +94,7 @@
   const pageNo = ref<number>(0);
   const pageSize = ref<number>(6);
   const tableData = ref<any>([]);
-    
+
 
   const labelCol = reactive({
     xs: { span: 24 },
@@ -119,7 +119,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -127,7 +127,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -135,12 +135,12 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-  
+
   //查看作业信息
   function handleZyxx(record){
     ZyInfoStudentListModalPage.value.disableSubmit = true;
     ZyInfoStudentListModalPage.value.init(record);
-    
+
   }
 
   //上传作业附件
@@ -156,7 +156,7 @@
     ZyInfoStudentModalPage.value.disableSubmit = true;
     XxhbbksListModalPage.value.init(record);
   }
-   
+
   /**
    * 删除事件
    */
@@ -181,39 +181,41 @@
     }
   });
   }
-   
+
 
   /**
    * 成功回调
    */
   function handleSuccess() {
-    reload()
+    total.value = 1;
+    handlePageChange(1);
   }
 
   function handleZySuccess(zyid){
     setTimeout(()=>{handleSuccess()}, 1500);
-    
+
     var url = "/zyInfo/zyInfo/editStudent";
     defHttp.get({ url: url, params:{id:zyid} }).then((res) => {
     });
 
   }
-   
+
 
   /**
    * 查询
    */
   function searchQuery() {
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
-  
+
   /**
    * 重置
    */
   function searchReset() {
     queryParam.value = {};
-    //刷新数据
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
 
   function reload(){
@@ -232,11 +234,11 @@
       tableData.value = res.records;
     });
   }
-  
+
 
   function handlePageChange(record){
     pageNo.value = record;
-    searchQuery();
+    reload();
   }
 
   onMounted(() => {
@@ -248,6 +250,7 @@
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width: 99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
@@ -277,7 +280,7 @@
 .zyCon{
   line-height: 30px;
 }
-.rotate {    
+.rotate {
   transform: rotate(45deg);
   // background: rgb(28, 132, 198);
   color: #fff;
diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue
index 04c225d..d9662e3 100644
--- a/src/views/zy/zyInfo/ZyInfoList.vue
+++ b/src/views/zy/zyInfo/ZyInfoList.vue
@@ -1,10 +1,10 @@
 <template>
-  <div style="background: #fff;height: 97%;margin: 10px 0;">
+  <div style="background: #fff;height: calc(100vh - 255px);overflow-y: auto;margin: 10px 0;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-          <a-col :lg="8">
+          <a-col :lg="7">
             <a-form-item label="作业名称">
               <j-input placeholder="请输入作业名称" v-model:value="queryParam.title"></j-input>
             </a-form-item>
@@ -14,7 +14,7 @@
               <j-dict-select-tag placeholder="请选择类型" v-model:value="queryParam.zyType" dictCode="zy_type"/>
             </a-form-item>
           </a-col> -->
-          <a-col :lg="8">
+          <a-col :lg="7">
             <a-form-item label="状态">
               <j-dict-select-tag placeholder="请选择状态" v-model:value="queryParam.zyStatus" dictCode="zy_status"/>
             </a-form-item>
@@ -36,8 +36,8 @@
         </a-row>
       </a-form>
     </div>
-    <a-row>
-      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 10px 5px;overflow:hidden;">
+    <a-row style="overflow:hidden;">
+      <a-col :span="8" v-for="(item, index) in tableData" :key="index" style="padding: 0px 0px 5px 5px;overflow:hidden;">
         <div style="width: 100%; height: 20px; background-color: rgb(28, 132, 198);"></div>
         <a-card  style="height: 290px;border: 1px solid rgb(28, 132, 198);">
           <div class="rotate" :style="classFun(item.zyStatus)">{{item.zyStatus_dictText}}</div>
@@ -213,7 +213,6 @@ import dayjs from 'dayjs';
 
   function handleZySuccess(zyid){
     setTimeout(()=>{handleSuccess()}, 1500);
-
     var url = "/zyInfo/zyInfo/editStudent";
     defHttp.get({ url: url, params:{id:zyid} }).then((res) => {
     });
@@ -270,6 +269,7 @@ import dayjs from 'dayjs';
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
     padding: 0;
+    width: 99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/zy/zyTlq/StuZyTlqList.vue b/src/views/zy/zyTlq/StuZyTlqList.vue
index 71edfec..d4349e5 100644
--- a/src/views/zy/zyTlq/StuZyTlqList.vue
+++ b/src/views/zy/zyTlq/StuZyTlqList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="margin-top:10px;background:#fff;">
+  <div style="margin-top:10px;background:#fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container" >
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -106,7 +106,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -114,7 +114,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -122,21 +122,21 @@
     var url = "/site/dqkcTlqjh?id="+record.id;
     window.open(url,"_blank")
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     loadData(1);
   }
-   
+
 
   /**
    * 查询
@@ -144,7 +144,7 @@
   function searchQuery() {
     loadData(1);
   }
-  
+
   /**
    * 重置
    */
@@ -171,6 +171,8 @@
 
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
+    padding: 0;
+    width:99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/zy/zyTlq/ZyTlqList.vue b/src/views/zy/zyTlq/ZyTlqList.vue
index 0ce72fe..029380b 100644
--- a/src/views/zy/zyTlq/ZyTlqList.vue
+++ b/src/views/zy/zyTlq/ZyTlqList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="margin-top:10px;background:#fff;">
+  <div style="margin-top:10px;background:#fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container" >
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -115,7 +115,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -123,7 +123,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -131,21 +131,21 @@
     var url = "/site/dqkcTlqjh?id="+record.id;
     window.open(url,"_blank")
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     loadData(1);
   }
-   
+
 
   /**
    * 查询
@@ -153,7 +153,7 @@
   function searchQuery() {
     loadData(1);
   }
-  
+
   /**
    * 重置
    */
@@ -180,6 +180,8 @@
 
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
+    padding: 0;
+    width:99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;

From 096a85db6df803e24d745daa2616ccbc73eaba83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 23 May 2024 17:52:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/zy/zyGonggao/StudentGonggaoList.vue | 30 +++++++++++--------
 src/views/zy/zyGonggao/ZyGonggaoList.vue      | 11 +++----
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/views/zy/zyGonggao/StudentGonggaoList.vue b/src/views/zy/zyGonggao/StudentGonggaoList.vue
index 701eef1..306afa5 100644
--- a/src/views/zy/zyGonggao/StudentGonggaoList.vue
+++ b/src/views/zy/zyGonggao/StudentGonggaoList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: calc(100vh - 225px);overflow: auto;margin-top:10px;">
+  <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin-top:10px;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -83,7 +83,8 @@
    * 查询
    */
   function searchQuery() {
-    reload(1);
+    total.value = 1;
+    handlePageChange(1);
   }
 
   /**
@@ -94,21 +95,21 @@
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.ggStatus='1';
-    //刷新数据
-    reload(1);
+    total.value = 1;
+    handlePageChange(1);
   }
 
   //翻页
   function handlePageChange(page: number) {
-    reload(page);
+    pageNo.value = page;
+    reload();
   }
-  //进入就加载
-  onMounted(() => {
-    reload(1);
-  });
 
-  function reload(arg){
-    queryParam.pageNo = arg;
+  function reload(){
+    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageSize = pageSize;
+    queryParam.value.rwbh = rwbh;
+    queryParam.value.xqxn = xqxn;
     console.log(`🚀 ~ reload ~ queryParam:`, queryParam)
     defHttp.get({ url: '/zyGonggao/zyGonggao/list', params: queryParam.value }).then((res) => {
       console.log(res);
@@ -119,12 +120,17 @@
     });
   }
 
-
+  //进入就加载
+  onMounted(() => {
+    searchQuery();
+  });
 
 </script>
 
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
+    padding: 0;
+    width:99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;
diff --git a/src/views/zy/zyGonggao/ZyGonggaoList.vue b/src/views/zy/zyGonggao/ZyGonggaoList.vue
index 36e4248..18c458f 100644
--- a/src/views/zy/zyGonggao/ZyGonggaoList.vue
+++ b/src/views/zy/zyGonggao/ZyGonggaoList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="background: #fff;height: calc(100vh - 225px);overflow: auto;margin-top:10px;">
+  <div style="background: #fff;height: calc(100vh - 225px);overflow-y: auto;overflow-x: hidden;margin-top:10px;">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container" style="border-bottom: 2px solid #f0f0f0;">
       <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" style="padding: 20px 10px 0px 10px;">
@@ -195,16 +195,15 @@
    */
   function handleSuccess() {
     total.value = 1;
-    pageNo.value = 0;
-    reload()
+    handlePageChange(1);
   }
 
   /**
    * 查询
    */
   function searchQuery() {
-    pageNo.value = 0;
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
 
   /**
@@ -246,6 +245,8 @@
 
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {
+    padding: 0;
+    width:99%;
     .table-page-search-submitButtons {
       display: block;
       margin-bottom: 24px;