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

src/views/kc/wjxCswj/WjxCswjList.vue

@@ -218,8 +218,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;
+      handlePageChange(1);
-      reload();
     });
   }
   /**
@@ -230,8 +229,8 @@
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = pageNo.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.atype = "6";
@@ -249,16 +248,15 @@
    */
   function handleSuccess() {
     total.value = 1;
-    pageNo.value = 0;
+    handlePageChange(1);
-    reload();
   }
 
   /**
    * 查询
    */
   function searchQuery() {
-    pageNo.value = 0;
+    total.value = 1;
-    reload();
+    handlePageChange(1);
   }
 
   /**

src/views/kc/wjxDcwj/WjxDcwjList.vue

@@ -219,8 +219,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;
+      handlePageChange(1);
-      reload();
     });
   }
   /**
@@ -231,8 +230,8 @@
   }
 
   function reload(){
-    queryParam.value.pageNo = pageNo;
+    queryParam.value.pageNo = pageNo.value;
-    queryParam.value.pageSize = pageSize;
+    queryParam.value.pageSize = pageSize.value;
     queryParam.value.rwbh = rwbh;
     queryParam.value.xqxn = xqxn;
     queryParam.value.atype = "1";
@@ -252,16 +251,15 @@
    */
   function handleSuccess() {
     total.value = 1;
-    pageNo.value = 0;
+    handlePageChange(1);
-    reload();
   }
 
   /**
    * 查询
    */
   function searchQuery() {
-    pageNo.value = 0;
+    total.value = 1;
-    reload();
+    handlePageChange(1);
   }
 
   /**

src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue

@@ -91,14 +91,14 @@ const disabled = ref<boolean>(false);
 const confirmLoading = ref<boolean>(false);
 const tiganData = ref<any>([]);
 const tmxxPar = ref<any>({});
-const openTime = ref<string>('');
+// const openTime = ref<string>('');
 const { createMessage } = useMessage();
 
 const emit = defineEmits(['ok', 'closeLoading']);
 
 //初始化
 function edit(record,isDisabled,type,flag){
-  openTime.value = getCurrentTimeFormat();
+  // openTime.value = getCurrentTimeFormat();
   tiganData.value = [];
   disabled.value = isDisabled;
   if(type == '6'){
@@ -152,7 +152,7 @@ async function submitForm(){
         return;
       }
     }
-    values[i].openTime = openTime.value;
+    // values[i].openTime = openTime.value;
   }
   const isUpdate = false
   await djtj(values, isUpdate);

src/views/zy/zyInfo/ZyInfoList.vue

@@ -49,7 +49,7 @@
             <a-col :span="24" class="zyCon"><div style="float:left">&nbsp;</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}}人;</div><div style="float:right;" >已提交：{{item.ytjnum}}人</div></a-col>
             <a-col :span="24" class="zyCon"><div style="float:left">未评阅：{{item.wpynum}}人;</div><div style="float:right;" >已评阅：{{item.ypynum}}人</div></a-col>
-            
+
             <a-col :span="24" style="text-align:center;margin-top:20px;">
               <a-button type="primary" @click="handleEdit(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="item.zyStatus==0">编辑作业</a-button>
               <a-button type="primary" @click="handleFabu(item)" style="margin-left:5px;background:rgb(28, 132, 198);" v-if="item.zyStatus==0">发布作业</a-button>
@@ -94,7 +94,7 @@ import dayjs from 'dayjs';
   import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
 
 
-  
+
   //当前路由信息
   const { currentRoute } = useRouter();
   const { query } = unref(currentRoute);
@@ -112,7 +112,7 @@ import dayjs from 'dayjs';
   const pageNo = ref<number>(0);
   const pageSize = ref<number>(6);
   const tableData = ref<any>([]);
-    
+
 
   const labelCol = reactive({
     xs: { span: 24 },
@@ -139,7 +139,7 @@ import dayjs from 'dayjs';
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -147,7 +147,7 @@ import dayjs from 'dayjs';
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -155,12 +155,12 @@ import dayjs from 'dayjs';
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-  
+
   //查看作业信息
   function handleZyxx(record){
     ZyInfoStudentListModalPage.value.disableSubmit = true;
     ZyInfoStudentListModalPage.value.init(record);
-    
+
   }
 
   //上传作业附件
@@ -176,7 +176,7 @@ import dayjs from 'dayjs';
     ZyInfoStudentModalPage.value.disableSubmit = true;
     XxhbbksListModalPage.value.init(record);
   }
-   
+
   /**
    * 删除事件
    */
@@ -201,41 +201,41 @@ import dayjs from 'dayjs';
     }
   });
   }
-   
+
 
   /**
    * 成功回调
    */
   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() {
-    queryParam.value.pageNo = 1;
+    total.value = 1;
-    reload();
+    handlePageChange(1);
   }
-  
+
   /**
    * 重置
    */
   function searchReset() {
     queryParam.value = {};
-    queryParam.value.pageNo = 1;
+    total.value = 1;
-    //刷新数据
+    handlePageChange(1);
-    reload();
   }
 
   function reload(){
@@ -254,11 +254,11 @@ import dayjs from 'dayjs';
       tableData.value = res.records;
     });
   }
-  
+
 
   function handlePageChange(record){
     pageNo.value = record;
-    searchQuery();
+    reload();
   }
 
   onMounted(() => {
@@ -299,7 +299,7 @@ import dayjs from 'dayjs';
 .zyCon{
   line-height: 30px;
 }
-.rotate {    
+.rotate {
   transform: rotate(45deg);
   // background: rgb(28, 132, 198);
   color: #fff;