From 06d06577f35464dd8157a178a33fe31afbbd4507 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 10:38:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=B6=EF=BC=8C=E6=89=93=E5=BC=80=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=BB=8E=E5=89=8D=E5=8F=B0=E8=8E=B7=E5=8F=96=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=90=8E=E5=8F=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue index 5283ee5..b27e1e6 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjForm.vue @@ -91,14 +91,14 @@ const disabled = ref(false); const confirmLoading = ref(false); const tiganData = ref([]); const tmxxPar = ref({}); -const openTime = ref(''); +// const openTime = ref(''); 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); From 3621cce16529098624f5bd5eb0298e223068eb92 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 11:16:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E3=80=81=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E3=80=81=E9=97=AE=E5=8D=B7=E5=8D=A1=E7=89=87=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=86=E9=A1=B5BUG=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/WjxCswjList.vue | 14 ++++------ src/views/kc/wjxDcwj/WjxDcwjList.vue | 14 ++++------ src/views/zy/zyInfo/ZyInfoList.vue | 42 ++++++++++++++-------------- 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/src/views/kc/wjxCswj/WjxCswjList.vue b/src/views/kc/wjxCswj/WjxCswjList.vue index ef5d460..314bbe8 100644 --- a/src/views/kc/wjxCswj/WjxCswjList.vue +++ b/src/views/kc/wjxCswj/WjxCswjList.vue @@ -215,8 +215,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); }); } /** @@ -227,8 +226,8 @@ } function reload(){ - queryParam.value.pageNo = pageNo; - queryParam.value.pageSize = pageSize; + queryParam.value.pageNo = pageNo.value; + queryParam.value.pageSize = pageSize.value; queryParam.value.rwbh = rwbh; queryParam.value.xqxn = xqxn; queryParam.value.atype = "6"; @@ -246,16 +245,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/WjxDcwjList.vue b/src/views/kc/wjxDcwj/WjxDcwjList.vue index 15ea013..41130b4 100644 --- a/src/views/kc/wjxDcwj/WjxDcwjList.vue +++ b/src/views/kc/wjxDcwj/WjxDcwjList.vue @@ -217,8 +217,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); }); } /** @@ -229,8 +228,8 @@ } function reload(){ - queryParam.value.pageNo = pageNo; - queryParam.value.pageSize = pageSize; + queryParam.value.pageNo = pageNo.value; + queryParam.value.pageSize = pageSize.value; queryParam.value.rwbh = rwbh; queryParam.value.xqxn = xqxn; queryParam.value.atype = "1"; @@ -248,16 +247,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/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue index 2a4650c..7d41026 100644 --- a/src/views/zy/zyInfo/ZyInfoList.vue +++ b/src/views/zy/zyInfo/ZyInfoList.vue @@ -49,7 +49,7 @@
 
未提交：{{item.wtjnum}}人;
已提交：{{item.ytjnum}}人
未评阅：{{item.wpynum}}人;
已评阅：{{item.ypynum}}人
 - + 编辑作业 发布作业 @@ -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(0); const pageSize = ref(6); const tableData = ref([]); - + const labelCol = reactive({ xs: { span: 24 }, @@ -137,7 +137,7 @@ import dayjs from 'dayjs'; registerModal.value.disableSubmit = false; registerModal.value.add(); } - + /** * 编辑事件 */ @@ -145,7 +145,7 @@ import dayjs from 'dayjs'; registerModal.value.disableSubmit = false; registerModal.value.edit(record); } - + /** * 详情 */ @@ -153,12 +153,12 @@ import dayjs from 'dayjs'; registerModal.value.disableSubmit = true; registerModal.value.edit(record); } - + //查看作业信息 function handleZyxx(record){ ZyInfoStudentListModalPage.value.disableSubmit = true; ZyInfoStudentListModalPage.value.init(record); - + } //上传作业附件 @@ -174,7 +174,7 @@ import dayjs from 'dayjs'; ZyInfoStudentModalPage.value.disableSubmit = true; XxhbbksListModalPage.value.init(record); } - + /** * 删除事件 */ @@ -199,41 +199,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; - reload(); + total.value = 1; + handlePageChange(1); } - + /** * 重置 */ function searchReset() { queryParam.value = {}; - queryParam.value.pageNo = 1; - //刷新数据 - reload(); + total.value = 1; + handlePageChange(1); } function reload(){ @@ -252,11 +252,11 @@ import dayjs from 'dayjs'; tableData.value = res.records; }); } - + function handlePageChange(record){ pageNo.value = record; - searchQuery(); + reload(); } onMounted(() => { @@ -297,7 +297,7 @@ import dayjs from 'dayjs'; .zyCon{ line-height: 30px; } -.rotate { +.rotate { transform: rotate(45deg); // background: rgb(28, 132, 198); color: #fff;