From d997809ced00d38cf52e0bf3db6470c047a33642 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 28 Jul 2022 16:55:58 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1----?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/statics/cEvent.vue | 28 ++++++++++++------- .../modules/shequzhili/statics/gridEvent.vue | 18 ++++++------ 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue index 03d2aad5b..0614f4516 100644 --- a/src/views/modules/shequzhili/statics/cEvent.vue +++ b/src/views/modules/shequzhili/statics/cEvent.vue @@ -13,7 +13,7 @@ --> + prop="startDate"> --> - + + + @@ -116,8 +120,8 @@ export default { timeRange: '', dataForm: { agencyId: '', - startTime: '', - endTime: '', + startDate: '', + endDate: '', type: '' }, total: 0, @@ -137,11 +141,11 @@ export default { watch: { timeRange (val) { if (Array.isArray(val) && val.length == 2) { - this.dataForm.startTime = val[0]; - this.dataForm.endTime = val[1]; + this.dataForm.startDate = val[0]; + this.dataForm.endDate = val[1]; } else { - this.dataForm.startTime = ""; - this.dataForm.endTime = ""; + this.dataForm.startDate = ""; + this.dataForm.endDate = ""; } } }, @@ -154,11 +158,15 @@ export default { }, }, methods: { + handleClick(row) { + this.dataForm.agencyId = row.orgId + this.handleSearch() + }, resetForm(formName) { this.$refs[formName].resetFields(); this.timeRange = ""; - this.dataForm.startTime = ""; - this.dataForm.endTime = ""; + this.dataForm.startDate = ""; + this.dataForm.endDate = ""; this.dataForm.type = ""; this.pageNo = 1 this.getTableList() diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue index af24a50e8..4392a738e 100644 --- a/src/views/modules/shequzhili/statics/gridEvent.vue +++ b/src/views/modules/shequzhili/statics/gridEvent.vue @@ -17,7 +17,7 @@ --> + prop="startDate"> Date: Thu, 28 Jul 2022 18:06:35 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E8=AE=A9=E4=BB=96=E7=82=B9=E5=87=BB=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/statics/cEvent.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue index 0614f4516..33341da6f 100644 --- a/src/views/modules/shequzhili/statics/cEvent.vue +++ b/src/views/modules/shequzhili/statics/cEvent.vue @@ -51,7 +51,8 @@ From 527fdf05a90d78e7f6c2fccf9935c25e4cd44e7c Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 29 Jul 2022 14:17:40 +0800 Subject: [PATCH 3/7] dd --- src/views/modules/shequzhili/statics/gridEvent.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue index 4392a738e..98d1c8b4c 100644 --- a/src/views/modules/shequzhili/statics/gridEvent.vue +++ b/src/views/modules/shequzhili/statics/gridEvent.vue @@ -52,8 +52,9 @@ :height="tableHeight"> - + + From 4c627d9269d1484ff21503fb01b00e2e48e7b91f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 29 Jul 2022 14:28:31 +0800 Subject: [PATCH 4/7] dd --- src/views/modules/shequzhili/statics/cEvent.vue | 2 +- src/views/modules/shequzhili/statics/gridEvent.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue index 33341da6f..a7bb5bd26 100644 --- a/src/views/modules/shequzhili/statics/cEvent.vue +++ b/src/views/modules/shequzhili/statics/cEvent.vue @@ -114,7 +114,7 @@ export default { totalVisible: false, pickerOptions: { disabledDate(time) { - return time.getTime() > (Date.now() - 3600 * 1000 * 24); + return time.getTime() > Date.now(); }, }, dataList: [], diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue index 98d1c8b4c..9e348c6e0 100644 --- a/src/views/modules/shequzhili/statics/gridEvent.vue +++ b/src/views/modules/shequzhili/statics/gridEvent.vue @@ -111,7 +111,7 @@ export default { totalVisible: false, pickerOptions: { disabledDate(time) { - return time.getTime() > (Date.now() - 3600 * 1000 * 24); + return time.getTime() > Date.now(); }, }, timeRange: '', From f1d60691825bfe61b86a9f720e3f657df401b4b0 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 29 Jul 2022 16:41:51 +0800 Subject: [PATCH 5/7] dd --- src/views/modules/shequzhili/statics/cEvent.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue index a7bb5bd26..b96e16830 100644 --- a/src/views/modules/shequzhili/statics/cEvent.vue +++ b/src/views/modules/shequzhili/statics/cEvent.vue @@ -48,13 +48,14 @@ :height="tableHeight"> - + + @@ -83,8 +84,9 @@ style="width: 100%" height="200"> - + + From 9d10f984f078f345b1b1e30b94d71749bbd83a3c Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 29 Jul 2022 16:48:07 +0800 Subject: [PATCH 6/7] dd --- src/views/modules/shequzhili/statics/gridEvent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue index 9e348c6e0..4e692f868 100644 --- a/src/views/modules/shequzhili/statics/gridEvent.vue +++ b/src/views/modules/shequzhili/statics/gridEvent.vue @@ -52,9 +52,9 @@ :height="tableHeight"> - - + + From 9d9c44058f6ea75dd2d5c75fe25173ddc80fdce1 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 2 Aug 2022 09:37:23 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/statics/cEvent.vue | 4 ++-- src/views/modules/shequzhili/statics/gridEvent.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue index b96e16830..80b02473b 100644 --- a/src/views/modules/shequzhili/statics/cEvent.vue +++ b/src/views/modules/shequzhili/statics/cEvent.vue @@ -15,14 +15,14 @@ + value-format="yyyyMMddHHmmss"> diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue index 4e692f868..55cf91432 100644 --- a/src/views/modules/shequzhili/statics/gridEvent.vue +++ b/src/views/modules/shequzhili/statics/gridEvent.vue @@ -19,14 +19,14 @@ + value-format="yyyyMMddHHmmss">