Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx

# Conflicts:
#	src/views/kc/wjxDcwj/WjxDcwjList.vue

src/views/kc/wjxCswj/WjxCswjHisList.vue

@@ -101,12 +101,13 @@
   import WjxWjxxTmlbDjjgsModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue'
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
   import {useRouter} from "vue-router";
+  import {useMessage} from "/@/hooks/web/useMessage";
 
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
   const { rwbh,xqxn,typa } = query;//获取传递参数
-
+  const { createConfirm } = useMessage();
   const APagination = Pagination;
   const queryParam = ref<any>({});
   const current = ref<number>(0);
@@ -209,20 +210,28 @@
    */
   function handleFabu(record: Recordable) {
     defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "6" } }).then(res => {
-      total.value = 1;
+      handleSuccess();
-      handlePageChange(1);
     });
   }
   /**
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除此测验？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        deleteOne({ id: record.id }, handleSuccess2);
+      }
+    });
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.atype = "6";
@@ -236,13 +245,20 @@
   }
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
    */
-  function handleSuccess() {
+  function handleSuccess2() {
     total.value = 1;
     handlePageChange(1);
   }
 
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
+
   /**
    * 查询
    */
@@ -261,7 +277,7 @@
   }
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/kc/wjxCswj/WjxCswjList.vue

@@ -111,13 +111,14 @@
   import WjxWjxxTmlbDjModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjModal.vue'
   import WjxWjxxTmlbDjjgsModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue'
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
+  import {useMessage} from "/@/hooks/web/useMessage";
   import TikuListModal from '/@/views/kc/wjxWjxxTmlb/TikuListModal.vue';
 
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
   const { rwbh,xqxn,typa } = query;//获取传递参数
-
+  const { createConfirm } = useMessage();
   const APagination = Pagination;
   const queryParam = ref<any>({});
   const current = ref<number>(0);
@@ -229,19 +230,27 @@
    */
   function handleFabu(record: Recordable) {
     defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "6" } }).then(res => {
-      total.value = 1;
+      handleSuccess();
-      handlePageChange(1);
     });
   }
   /**
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除此测验？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        deleteOne({ id: record.id }, handleSuccess2);
+      }
+    });
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo.value;
+    queryParam.value.pageNo = current.value;
     queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
@@ -256,13 +265,20 @@
   }
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
    */
-  function handleSuccess() {
+  function handleSuccess2() {
     total.value = 1;
     handlePageChange(1);
   }
 
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
+
   /**
    * 查询
    */
@@ -281,7 +297,7 @@
   }
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/kc/wjxCswj/WjxCswjStuList.vue

@@ -133,8 +133,8 @@
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.atype = "6";
@@ -151,8 +151,7 @@
    * 成功回调
    */
   function handleSuccess() {
-    total.value = 1;
+    reload();
-    handlePageChange(1);
   }
 
   /**
@@ -173,7 +172,7 @@
   }
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/kc/wjxDcwj/WjxDcwjHisList.vue

@@ -99,12 +99,13 @@
   import WjxWjxxTmlbDjjgsDcModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcModal.vue'
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
   import {useRouter} from "vue-router";
+  import {useMessage} from "/@/hooks/web/useMessage";
 
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
   const { rwbh,xqxn,typa} = query;//获取传递参数
-
+  const { createConfirm } = useMessage();
   const APagination = Pagination;
   const queryParam = ref<any>({});
   const current = ref<number>(0);
@@ -206,20 +207,28 @@
    */
   function handleFabu(record: Recordable) {
     defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "1" } }).then(res => {
-      total.value = 1;
+      handleSuccess();
-      handlePageChange(1);
     });
   }
   /**
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除此问卷？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        deleteOne({ id: record.id }, handleSuccess2);
+      }
+    });
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.atype = "1";
@@ -233,13 +242,20 @@
   }
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
    */
-  function handleSuccess() {
+  function handleSuccess2() {
     total.value = 1;
     handlePageChange(1);
   }
 
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
+
   /**
    * 查询
    */
@@ -258,7 +274,7 @@
   }
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/kc/wjxDcwj/WjxDcwjList.vue

@@ -113,13 +113,13 @@
   import {useRouter} from "vue-router";
   import { JInput } from '/@/components/Form';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import {useMessage} from "/@/hooks/web/useMessage";
   import TikuListModal from '/@/views/kc/wjxWjxxTmlb/TikuListModal.vue';
-
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
   const { rwbh,xqxn,typa} = query;//获取传递参数
-
+  const { createConfirm } = useMessage();
   const APagination = Pagination;
   const queryParam = ref<any>({});
   const current = ref<number>(0);
@@ -229,19 +229,27 @@
    */
   function handleFabu(record: Recordable) {
     defHttp.get({ url: '/wjxWjxx/wjxWjxx/fbwj', params: { id: record.id,wjlx: "1" } }).then(res => {
-      total.value = 1;
+      handleSuccess();
-      handlePageChange(1);
     });
   }
   /**
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除此问卷？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        deleteOne({ id: record.id }, handleSuccess2);
+      }
+    });
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo.value;
+    queryParam.value.pageNo = current.value;
     queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
@@ -258,13 +266,20 @@
   }
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
    */
-  function handleSuccess() {
+  function handleSuccess2() {
     total.value = 1;
     handlePageChange(1);
   }
 
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
+
   /**
    * 查询
    */
@@ -283,7 +298,7 @@
   }
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/kc/wjxDcwj/WjxDcwjStuList.vue

@@ -133,8 +133,8 @@
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.atype = "1";
@@ -151,8 +151,7 @@
    * 成功回调
    */
   function handleSuccess() {
-    total.value = 1;
+    reload();
-    handlePageChange(1);
   }
 
   /**
@@ -173,7 +172,7 @@
   }
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/site/common/header.vue

@@ -50,7 +50,7 @@
             </a-menu-item>
           </a-menu>
         </a-col>
-        <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }" v-if="getUserSf()=='S'">
+        <a-col :xs="{ span: 0 }" :sm="{ span: 24 }" :lg="{ span: 24 }" v-if="getUserSf()=='S-'">
           <a-menu style="margin-top: 20px;" :selectable="false">
             <a-menu-item key="2" >
               <a class="abox" @click="toDom('stujrkbDom')">今日课表</a>

src/views/site/index.vue

@@ -59,9 +59,9 @@
 
         </a-layout-content>
           <!-- 学生部分今日课表 -->
-        <StudentJrkbPage v-if="getUserSf()=='S'"></StudentJrkbPage>
+        <StudentJrkbPage v-if="getUserSf()=='S-'"></StudentJrkbPage>
           <!-- 学生部分近六日课表 -->
-        <StudentJlrkbPage v-if="getUserSf()=='S'"></StudentJlrkbPage>
+        <StudentJlrkbPage v-if="getUserSf()=='S-'"></StudentJlrkbPage>
           <!-- 我的课程 -->
         <studentWdkc v-if="getUserSf()=='S'"></studentWdkc>
         <!-- 页尾 -->

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;">{{(pageNo-1)*pageSize+index+1}}.{{item.question}}</span>
+              <span style="float: left;">{{(current-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" />
@@ -101,7 +101,7 @@ const baseApiUrl = globSetting.domainUrl;
   const { query } = unref(currentRoute);
   const { rwbh,xqxn } = query;//获取传递参数
   const APagination = Pagination;
-  const current = ref<number>(0);
+  const current = ref<number>(1);
   const total = ref<number>(0);
   const pageNo = ref<number>(0);
   const pageSize = ref<number>(3);
@@ -141,7 +141,7 @@ const baseApiUrl = globSetting.domainUrl;
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleCjwtOk);
+    await deleteOne({ id: record.id }, handleCjwtOk2);
   }
 
   function openPdf(record){
@@ -158,25 +158,31 @@ const baseApiUrl = globSetting.domainUrl;
     window.open(url,"_blank")
   }
 
-
-
   //常见问题回调刷新
   function handleCjwtOk() {
     // console.log('--------cjwt ok -----------')
-    cjwtData(1);
+    cjwtData();
+  }
+
+  //常见问题回调刷新
+  function handleCjwtOk2() {
+    total.value = 1;
+    handlePageChange(1);
   }
 
   //常见问题新增翻页
   function handlePageChange(page: number) {
-    cjwtData(page);
+    current.value = page;
+    cjwtData();
   }
 
-  function cjwtData(arg){
+  function cjwtData(){
-    pageNo.value = arg;
+    defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:current.value, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => {
-    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;
       total.value = res.total;
+      pageNo.value = res.pages;
+      current.value = res.current;
       // console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
     });
   }
@@ -216,7 +222,7 @@ const baseApiUrl = globSetting.domainUrl;
   //进入就加载
   onMounted(() => {
     getKcjsJxdg();
-    cjwtData(1);
+    cjwtData();
 
   });
 

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;">{{(pageNo-1)*pageSize+index+1}}.{{item.question}}</span>
+              <span style="float: left;">{{(current-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">
@@ -99,7 +99,7 @@ const baseApiUrl = globSetting.domainUrl;
   const { query } = unref(currentRoute);
   const { rwbh,xqxn } = query;//获取传递参数
   const APagination = Pagination;
-  const current = ref<number>(0);
+  const current = ref<number>(1);
   const total = ref<number>(0);
   const pageNo = ref<number>(0);
   const pageSize = ref<number>(3);
@@ -138,7 +138,7 @@ const baseApiUrl = globSetting.domainUrl;
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleCjwtOk);
+    await deleteOne({ id: record.id }, handleCjwtOk2);
   }
 
   function openPdf(record){
@@ -155,24 +155,25 @@ function openJxrlPdf(record){
   window.open(url,"_blank")
 }
 
-
   //常见问题回调刷新
-  function handleCjwtOk() {
+  function handleCjwtOk2() {
-    // console.log('--------cjwt ok -----------')
+    total.value = 1;
-    cjwtData(1);
+    handlePageChange(1);
   }
 
   //常见问题新增翻页
   function handlePageChange(page: number) {
-    cjwtData(page);
+    current.value = page;
+    cjwtData();
   }
 
-  function cjwtData(arg){
+  function cjwtData(){
-    pageNo.value = arg;
+    defHttp.get({ url: '/zyCjwt/zyCjwt/list', params: { pageSize: 3,pageNo:current.value, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => {
-    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;
       total.value = res.total;
+      pageNo.value = res.pages;
+      current.value = res.current;
       // console.log(`🚀 ~ defHttp.get ~ cjwtSource:`, cjwtSource)
     });
   }
@@ -213,7 +214,7 @@ function openJxrlPdf(record){
   //进入就加载
   onMounted(() => {
     getKcjsJxdg();
-    cjwtData(1);
+    cjwtData();
 
   });
 

src/views/zy/zyGonggao/StudentGonggaoList.vue

@@ -101,15 +101,17 @@
 
   //翻页
   function handlePageChange(page: number) {
-    pageNo.value = page;
+    current.value = page;
     reload();
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
+    queryParam.value.column="createTime";
+    queryParam.value.order="desc";
     console.log(`🚀 ~ reload ~ queryParam:`, queryParam)
     defHttp.get({ url: '/zyGonggao/zyGonggao/list', params: queryParam.value }).then((res) => {
       console.log(res);

src/views/zy/zyGonggao/ZyGonggaoList.vue

@@ -44,7 +44,8 @@
               <a-button type="primary" @click="handleDelete(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.ggStatus==0">删除</a-button>
               <a-button type="primary" @click="handleCh(item)" style="margin-left:5px;padding: 0px 8px;background:#a7a6a6;" v-if="item.ggStatus==1">撤回</a-button>
               <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;padding: 0px 8px;background:#18a689;">预览</a-button>
-              <a-button type="primary" @click="handleHistory(item)" style="margin-left:5px;padding: 0px 8px;background:#18a689;">历史</a-button>
+              <a-button type="primary" @click="handleFabu(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.ggStatus==0">发布</a-button>
+<!--              <a-button type="primary" @click="handleHistory(item)" style="margin-left:5px;padding: 0px 8px;background:#18a689;">历史</a-button>-->
             </a-col>
             <a-col :span="8">
               <div style="text-align: right;color:#9e9e9e;font-weight: bold;">{{item.createTime}}</div>
@@ -63,7 +64,7 @@
     </a-row>
     <ZyGonggaoModal ref="registerModal" @success="handleSuccess"></ZyGonggaoModal>
     <ZyGonggaoYlModal ref="registerYlModal" @success="handleSuccess"></ZyGonggaoYlModal>
-    <ZyGonggaoHistoryModal ref="registerHistoryModal" @success="handleSuccess"></ZyGonggaoHistoryModal>
+<!--    <ZyGonggaoHistoryModal ref="registerHistoryModal" @success="handleSuccess"></ZyGonggaoHistoryModal>-->
   </div>
 </template>
 
@@ -73,7 +74,7 @@
   import { deleteOne } from './ZyGonggao.api';
   import ZyGonggaoModal from './components/ZyGonggaoModal.vue';
   import ZyGonggaoYlModal from './components/ZyGonggaoYlModal.vue';
-  import ZyGonggaoHistoryModal from './components/ZyGonggaoHistoryModal.vue';
+  // import ZyGonggaoHistoryModal from './components/ZyGonggaoHistoryModal.vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from "/@/hooks/web/useMessage";
   import { JInput } from '/@/components/Form';
@@ -90,7 +91,7 @@
   const queryParam = ref<any>({rwbh,  xqxn,"createBy":userName});
   const registerModal = ref();
   const registerYlModal = ref();
-  const registerHistoryModal = ref();
+  // const registerHistoryModal = ref();
   const current = ref<number>(0);
   const total = ref<number>(0);
   const pageNo = ref<number>(0);
@@ -137,10 +138,10 @@
   /**
    * 历史通知
    */
-  function handleHistory(record: Recordable) {
+  // function handleHistory(record: Recordable) {
-    registerHistoryModal.value.disableSubmit = true;
+  //   registerHistoryModal.value.disableSubmit = true;
-    registerHistoryModal.value.edit(record);
+  //   registerHistoryModal.value.edit(record);
-  }
+  // }
 
   /**
    * 删除事件
@@ -153,7 +154,7 @@
       okText: '确认',
       cancelText: '取消',
       onOk: () => {
-        deleteOne({ id: record.id }, handleSuccess);
+        deleteOne({ id: record.id }, handleSuccess2);
       }
     });
   }
@@ -191,13 +192,20 @@
   }
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
    */
-  function handleSuccess() {
+  function handleSuccess2() {
     total.value = 1;
     handlePageChange(1);
   }
 
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
+
   /**
    * 查询
    */
@@ -218,13 +226,13 @@
   }
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.column="createTime";

src/views/zy/zyGonggao/components/ZyGonggaoYlForm.vue

@@ -98,11 +98,9 @@
           .then((res) => {
             if (res.success) {
               createMessage.success(res.message);
-              console.log("111111111");
               emit('ok');
             } else {
               createMessage.warning(res.message);
-              console.log("222222");
             }
           })
           .finally(() => {

src/views/zy/zyInfo/StudentZyInfoList.vue

@@ -122,7 +122,7 @@
     if(record.score){
       return "background: #18a689";
     }else if(record.stuFilePath){
-      return "background: #c6c209"; 
+      return "background: #c6c209";
     }else{
       return "background: #fe1a1a";
     }
@@ -172,13 +172,11 @@
     XxhbbksListModalPage.value.init(record);
   }
 
-
   /**
-   * 成功回调
+   * 成功回调，用于增加、修改、发布和撤回
    */
   function handleSuccess() {
-    total.value = 1;
+    reload();
-    handlePageChange(1);
   }
 
 
@@ -201,15 +199,15 @@
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.zyStatus = '1,2,3,4';
     queryParam.value.column="createTime";
     queryParam.value.order="desc";
     defHttp.get({ url: '/zyInfo/zyInfo/stuList', params: queryParam.value }).then(res => {
-      console.log(`🚀 ~ defHttp.get ~ res:`, res)
+      // console.log(`🚀 ~ defHttp.get ~ res:`, res)
       total.value = res.total;
       pageNo.value = res.pages;
       current.value = res.current;
@@ -219,7 +217,7 @@
 
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/zy/zyInfo/SutdentZyInfoHistoryList.vue

@@ -165,7 +165,7 @@
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    await deleteOne({ id: record.id }, handleSuccess2);
   }
 
   async function handleFabu(record){
@@ -187,13 +187,19 @@
 
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
    */
-  function handleSuccess() {
+  function handleSuccess2() {
     total.value = 1;
     handlePageChange(1);
   }
 
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
 
   /**
    * 查询
@@ -214,8 +220,8 @@
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.sflssj = '1';
@@ -232,7 +238,7 @@
 
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/zy/zyInfo/ZyInfoHisList.vue

@@ -161,7 +161,7 @@
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    await deleteOne({ id: record.id }, handleSuccess2);
   }
 
   //发布作业
@@ -184,13 +184,20 @@
 
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
    */
-  function handleSuccess() {
+  function handleSuccess2() {
     total.value = 1;
     handlePageChange(1);
   }
 
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
+
   function handleZySuccess(zyid){
     setTimeout(()=>{handleSuccess()}, 1500);
 
@@ -219,8 +226,8 @@
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     // queryParam.value.sflssj = '0';
@@ -237,7 +244,7 @@
 
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/zy/zyInfo/ZyInfoHistoryList.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,12 +160,12 @@
     var param = {mainId:record.id,zyfj:record.filePath}
     ZyInfoStudentModalPage.value.edit(param);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    await deleteOne({ id: record.id }, handleSuccess2);
   }
 
   async function handleFabu(record){
@@ -184,52 +184,61 @@
     }
   });
   }
-   
+
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
+   */
+  function handleSuccess2() {
+    total.value = 1;
+    handlePageChange(1);
+  }
+
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
    */
   function handleSuccess() {
-    reload()
+    reload();
   }
-   
+
 
   /**
    * 查询
    */
   function searchQuery() {
-    reload();
+    total.value = 1;
+    handlePageChange(1);
   }
-  
+
   /**
    * 重置
    */
   function searchReset() {
     queryParam.value = {};
-    //刷新数据
+    total.value = 1;
-    reload();
+    handlePageChange(1);
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = current.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.sflssj = '1';
     queryParam.value.column="startTime";
     queryParam.value.order="desc";
     defHttp.get({ url: '/zyInfo/zyInfo/list', params: queryParam.value }).then(res => {
-      console.log(`🚀 ~ defHttp.get ~ res:`, res)
+      // console.log(`🚀 ~ defHttp.get ~ res:`, res)
       total.value = res.total;
       pageNo.value = res.pages;
       current.value = res.current;
       tableData.value = res.records;
     });
   }
-  
+
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     searchQuery();
   }
 
@@ -271,7 +280,7 @@
 .zyCon{
   line-height: 30px;
 }
-.rotate {    
+.rotate {
   transform: rotate(45deg);
   background: rgb(28, 132, 198);
   color: #fff;

src/views/zy/zyInfo/ZyInfoList.vue

@@ -181,7 +181,16 @@ import dayjs from 'dayjs';
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除此作业？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        deleteOne({ id: record.id }, handleSuccess2);
+      }
+    });
   }
 
   //发布作业
@@ -204,13 +213,20 @@ import dayjs from 'dayjs';
 
 
   /**
-   * 成功回调
+   * 成功回调,用于删除
    */
-  function handleSuccess() {
+  function handleSuccess2() {
     total.value = 1;
     handlePageChange(1);
   }
 
+  /**
+   * 成功回调，用于增加、修改、发布和撤回
+   */
+  function handleSuccess() {
+    reload();
+  }
+
   function handleZySuccess(zyid){
     setTimeout(()=>{handleSuccess()}, 1500);
     var url = "/zyInfo/zyInfo/editStudent";
@@ -238,7 +254,7 @@ import dayjs from 'dayjs';
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo.value;
+    queryParam.value.pageNo = current.value;
     queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
@@ -249,14 +265,14 @@ import dayjs from 'dayjs';
       console.log(`🚀 ~ defHttp.get ~ res:`, res)
       total.value = res.total;
       pageNo.value = res.pages;
-      current.value = res.total;
+      current.value = res.current;
       tableData.value = res.records;
     });
   }
 
 
   function handlePageChange(record){
-    pageNo.value = record;
+    current.value = record;
     reload();
   }
 

src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts

@@ -43,7 +43,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'wwxsl'
   // },
   {
-    title: '外网检测是否通过',
+    title: '外网检测',
     align: "center",
     dataIndex: 'wwsftg',
     slots: { customRender: 'wwsftgaction' },
@@ -54,7 +54,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'nwxsl'
   // },
   {
-    title: '内网检测是否通过',
+    title: '内网检测',
     align: "center",
     dataIndex: 'nwsftg',
     slots: { customRender: 'nwsftgaction' },
@@ -65,7 +65,7 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'aigcxsl'
   // },
   {
-    title: 'aigc检测是否通过',
+    title: 'aigc检测',
     align: "center",
     dataIndex: 'aigcsftg',
     slots: { customRender: 'aigcsftgaction' },

src/views/zy/zyInfoStudent/ZyInfoStudentList.vue

@@ -24,10 +24,10 @@
     <BasicTable @register="registerTable" style="margin-top: 20px;">
       <!--插槽:table标题-->
       <template #tableTitle>
-    <div style="padding: 10px;">
+        <!-- <div style="padding: 10px;">
-      <span style="background: green;color:#fff;padding: 5px 15px;margin-left:20px;">通过</span>
+          <span style="background: green;color:#fff;padding: 5px 15px;margin-left:20px;">通过</span>
-      <span style="background: red;color:#fff;padding: 5px 15px;margin-left:20px;">未通过</span>
+          <span style="background: red;color:#fff;padding: 5px 15px;margin-left:20px;">未通过</span>
-    </div>
+        </div> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -38,12 +38,12 @@
         <div v-html="text"></div>
       </template>
       <!--省市区字段回显插槽-->
-      
+
       <template #wwsftgaction="{text,record}">
         <span v-if="record.wwcc=='0'">-</span>
         <span v-else>
-          <span v-if="text=='通过'" style="background: green;color:#fff;padding: 5px 15px;" title="通过">{{record.wwxsl}}%</span>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.wwxsl}}%</span>
-          <span v-else-if="text=='未通过'" style="background: red;color:#fff;padding: 5px 15px;" title="未通过">{{record.wwxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.wwxsl}}%</span>
           <span v-else>
             <span v-if="record.filePath">检测中</span>
             <span v-else>未提交</span>
@@ -53,8 +53,8 @@
       <template #nwsftgaction="{text,record}">
         <span v-if="record.nwcc=='0'">-</span>
         <span v-else>
-          <span v-if="text=='通过'" style="background: green;color:#fff;padding: 5px 15px;" title="通过">{{record.nwxsl}}%</span>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.nwxsl}}%</span>
-          <span v-else-if="text=='未通过'" style="background: red;color:#fff;padding: 5px 15px;" title="未通过">{{record.nwxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.nwxsl}}%</span>
           <span v-else>
             <span v-if="record.filePath">检测中</span>
             <span v-else>未提交</span>
@@ -64,8 +64,8 @@
       <template #aigcsftgaction="{text,record}">
         <span v-if="record.aigccc=='0'">-</span>
         <span v-else>
-          <span v-if="text=='通过'" style="background: green;color:#fff;padding: 5px 15px;" title="通过">{{record.aigcxsl}}%</span>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.aigcxsl}}%</span>
-          <span v-else-if="text=='未通过'" style="background: red;color:#fff;padding: 5px 15px;" title="未通过">{{record.aigcxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.aigcxsl}}%</span>
           <span v-else>
             <span v-if="record.filePath">检测中</span>
             <span v-else>未提交</span>
@@ -87,7 +87,7 @@
     <!-- 表单区域 -->
     <ZyInfoStudentModal ref="registerModal" @success="handleSuccess"></ZyInfoStudentModal>
     <ZyInfoStudentScoreModal ref="registerScoreModal" @success="handleSuccess"></ZyInfoStudentScoreModal>
-    
+
   </div>
 </template>
 
@@ -100,17 +100,20 @@
   import { downloadFile } from '/@/utils/common/renderUtils';
   import ZyInfoStudentModal from './components/ZyInfoStudentModal.vue'
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
-import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
   import ZyInfoStudentScoreModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue'
   import { useGlobSetting } from '/@/hooks/setting';
   import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
 
   const globSetting = useGlobSetting();
-const baseApiUrl = globSetting.domainUrl;
+  const baseApiUrl = globSetting.domainUrl;
 
   const queryParam = ref<any>({});
   const mainId = ref<string>('');
-    
+
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   const registerScoreModal = ref();
@@ -155,7 +158,7 @@ const baseApiUrl = globSetting.domainUrl;
     // let url = "https://view.officeapps.live.com/op/view.aspx?src="+encodeURIComponent(getFileAccessHttpUrl(text));
     // let url = "https://view.xdocin.com/view?src="+encodeURIComponent('https://view.xdocin.com/demo/view.docx');
     // window.open(url,"_blank")
-    
+
     var url2 = getFileAccessHttpUrl(record.pdfPath)
     console.log(`🚀 ~ openPdf ~ url2:`, url2)
     let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
@@ -168,7 +171,7 @@ const baseApiUrl = globSetting.domainUrl;
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -187,11 +190,16 @@ const baseApiUrl = globSetting.domainUrl;
     })
   }
   function handleScoreFabu(record: Recordable){
+    //判断
+    if(!record.score){
+      createMessage.warn('请填写评分！');
+      return;
+    }
     defHttp.post({url:'/zyInfoStudent/zyInfoStudent/editFabu',params:{id:record.id,scoreFabu:'1'}}).then(res =>{
       handleSuccess()
     })
   }
-   
+
   /**
    * 详情
    */
@@ -199,21 +207,21 @@ const baseApiUrl = globSetting.domainUrl;
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
@@ -224,7 +232,7 @@ const baseApiUrl = globSetting.domainUrl;
   function handleDown(record){
     downloadFile(record.filePath);
   }
-   
+
   /**
    * 操作栏
    */
@@ -273,7 +281,7 @@ const baseApiUrl = globSetting.domainUrl;
         }];
         return list;
       }
-      
+
     }else{
       var list = [
       {
@@ -282,9 +290,9 @@ const baseApiUrl = globSetting.domainUrl;
       },];
       return list;
     }
-    
+
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -309,7 +317,7 @@ const baseApiUrl = globSetting.domainUrl;
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -320,13 +328,13 @@ const baseApiUrl = globSetting.domainUrl;
     //刷新数据
     reload();
   }
-  
+
   function init(record){
     queryParam.value.mainId = record.id;
     mainId.value = record.id;
       reload();
   }
-  
+
 
   defineExpose({
     init,

src/views/zy/zyTlq/StuZyTlqList.vue

@@ -13,6 +13,7 @@
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
               </a-col>
             </span>
           </a-col>
@@ -25,7 +26,7 @@
         <!-- <a-card> -->
           <a-row>
             <a-col :span="24">
-              <span style="float: left;">{{index+1}}.{{item.title}}</span>
+              <span style="float: left;">{{(current-1)*pageSize+index+1}}.{{item.title}}</span>
               <span style="float: right;">
                 <a title="详情" @click="handleDetail(item)"><Icon icon="ant-design:snippets-outlined" /></a>
               </span>
@@ -68,7 +69,7 @@
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   const dataSource = ref<any>([]);
-  const current = ref<number>(0);
+  const current = ref<number>(1);
   const total = ref<number>(0);
   const pageNo = ref<number>(0);
   const pageSize = ref<number>(3);
@@ -85,20 +86,6 @@
     sm: { span: 16 },
   });
 
-  /**
-   * 发布
-   */
-   function handleFabu(record) {
-    defHttp.post({ url: '/zyTlq/zyTlq/edit', params: { id: record.id,sffb: "6" } }).then(res => {
-      total.value = 1;
-      pageNo.value = 0;
-      loadData(1);
-    });
-  }
-  //新增翻页
-  function handlePageChange(page: number) {
-    loadData(page);
-  }
   /**
    * 新增事件
    */
@@ -130,19 +117,40 @@
     await deleteOne({ id: record.id }, handleSuccess);
   }
 
+  /**
+   * 发布
+   */
+  function handleFabu(record) {
+    defHttp.post({ url: '/zyTlq/zyTlq/edit', params: { id: record.id,sffb: "6" } }).then(res => {
+      handleSuccess();
+    });
+  }
+  //新增翻页
+  function handlePageChange(page: number) {
+    current.value = page;
+    loadData();
+  }
   /**
    * 成功回调
    */
   function handleSuccess() {
-    loadData(1);
+    loadData();
   }
 
+  /**
+   * 成功回调
+   */
+  function handleSuccess2() {
+    total.value = 1;
+    handlePageChange(1);
+  }
 
   /**
    * 查询
    */
   function searchQuery() {
-    loadData(1);
+    total.value = 1;
+    handlePageChange(1);
   }
 
   /**
@@ -151,22 +159,24 @@
   function searchReset() {
     queryParam.value = {};
     //刷新数据
-    loadData(1);
+    total.value = 1;
+    handlePageChange(1);
   }
-  function loadData(arg){
+
-    defHttp.get({ url: '/zyTlq/zyTlq/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn,sffb:'1',column:'createTime',order:'desc' } }).then((res) => {
+  function loadData(){
+    defHttp.get({ url: '/zyTlq/zyTlq/list', params: { pageSize: 3,pageNo:current.value, rwbh:rwbh,xqxn:xqxn,sffb:'1',column:'createTime',order:'desc' } }).then((res) => {
     console.log(`🚀 ~ defHttp.get ~ res:`, res)
       dataSource.value = res.records;
       total.value = res.total;
+      pageNo.value = res.pages;
+      current.value = res.current;
     });
   }
   //进入就加载
   onMounted(() => {
-    loadData(1);
+    loadData();
   });
 
-
-
 </script>
 
 <style lang="less" scoped>

src/views/zy/zyTlq/ZyTlqList.vue

@@ -13,6 +13,7 @@
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
                 <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleAdd" style="margin-left: 8px"> 新增</a-button>
               </a-col>
             </span>
@@ -26,7 +27,7 @@
         <!-- <a-card> -->
           <a-row>
             <a-col :span="24">
-              <span style="float: left;">{{index+1}}.{{item.title}}</span>
+              <span style="float: left;">{{(current-1)*pageSize+index+1}}.{{item.title}}</span>
               <span style="float: right;">
                 <span v-if="item.sffb=='0'">【未发布】</span>
                 <span v-else>【已发布】</span>
@@ -72,12 +73,14 @@
   import { useRouter } from 'vue-router';
   import { JInput } from '/@/components/Form';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import {useMessage} from "/@/hooks/web/useMessage";
 
+  const { createConfirm } = useMessage();
   const queryParam = ref<any>({});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
   const dataSource = ref<any>([]);
-  const current = ref<number>(0);
+  const current = ref<number>(1);
   const total = ref<number>(0);
   const pageNo = ref<number>(0);
   const pageSize = ref<number>(3);
@@ -94,20 +97,6 @@
     sm: { span: 16 },
   });
 
-  /**
-   * 发布
-   */
-   function handleFabu(record) {
-    defHttp.post({ url: '/zyTlq/zyTlq/edit', params: { id: record.id,sffb: "1" } }).then(res => {
-      total.value = 1;
-      pageNo.value = 0;
-      loadData(1);
-    });
-  }
-  //新增翻页
-  function handlePageChange(page: number) {
-    loadData(page);
-  }
   /**
    * 新增事件
    */
@@ -136,22 +125,53 @@
    * 删除事件
    */
   async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除此讨论？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        deleteOne({ id: record.id }, handleSuccess2);
+      }
+    });
+  }
+
+  /**
+   * 发布
+   */
+  function handleFabu(record) {
+    defHttp.post({ url: '/zyTlq/zyTlq/edit', params: { id: record.id,sffb: "1" } }).then(res => {
+      handleSuccess();
+    });
+  }
+  //新增翻页
+  function handlePageChange(page: number) {
+    current.value = page;
+    loadData();
   }
 
   /**
    * 成功回调
    */
   function handleSuccess() {
-    loadData(1);
+    loadData();
   }
 
+  /**
+   * 成功回调
+   */
+  function handleSuccess2() {
+    total.value = 1;
+    handlePageChange(1);
+  }
 
   /**
    * 查询
    */
   function searchQuery() {
-    loadData(1);
+    total.value = 1;
+    handlePageChange(1);
   }
 
   /**
@@ -160,22 +180,24 @@
   function searchReset() {
     queryParam.value = {};
     //刷新数据
-    loadData(1);
+    total.value = 1;
+    handlePageChange(1);
   }
-  function loadData(arg){
+
-    defHttp.get({ url: '/zyTlq/zyTlq/list', params: { pageSize: 3,pageNo:arg, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => {
+  function loadData(){
+    defHttp.get({ url: '/zyTlq/zyTlq/list', params: { pageSize: 3,pageNo:current.value, rwbh:rwbh,xqxn:xqxn,column:'createTime',order:'desc' } }).then((res) => {
     console.log(`🚀 ~ defHttp.get ~ res:`, res)
       dataSource.value = res.records;
       total.value = res.total;
+      pageNo.value = res.pages;
+      current.value = res.current;
     });
   }
   //进入就加载
   onMounted(() => {
-    loadData(1);
+    loadData();
   });
 
-
-
 </script>
 
 <style lang="less" scoped>