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] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E5=88=86?=
 =?UTF-8?q?=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;