From 15b52f9fedae04bceb4ce6ea8dce834123921df1 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 9 Jan 2025 09:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=E4=B9=8B=E5=90=8E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataReport/index.vue | 94 ++++++++++++------- .../warnMessage/components/warnDialog.vue | 2 +- 2 files changed, 63 insertions(+), 33 deletions(-) diff --git a/src/views/dataReport/index.vue b/src/views/dataReport/index.vue index a73d9cd5..ab6ba2ee 100644 --- a/src/views/dataReport/index.vue +++ b/src/views/dataReport/index.vue @@ -283,6 +283,10 @@ export default { //图表所有数据 chartDataArr: [], //数据 chartLoading: false, + + //开始时间和结束时间全局 + allStartTime: "", + allEndTime: "", }; }, @@ -315,11 +319,15 @@ export default { "starttime", new Date(thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)) ); + this.allStartTime = new Date( + thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30) + ); console.log(this.formdata.starttime); const currentDate = new Date(); // 获取当前时间 currentDate.setHours(23); // 设置小时为23 currentDate.setMinutes(59); // 设置分钟为59 currentDate.setSeconds(59); // 设置秒数为59 + this.allEndTime = currentDate; this.$set(this.formdata, "endtime", currentDate); console.log("我是开始时间", this.formdata.starttime); console.log("我是结束时间", currentDate); @@ -421,7 +429,8 @@ export default { startDate.setSeconds(0); // 设置秒数为59 this.formdata.starttime = startDate; } else { - this.formdata.starttime = val; + this.allStartTime = val; + this.formdata.starttime = this.allStartTime; } }, //结束日期 @@ -438,7 +447,8 @@ export default { val.setHours(23); // 设置小时为23 val.setMinutes(59); // 设置分钟为59 val.setSeconds(59); // 设置秒数为59 - this.formdata.endtime = val; + this.allEndTime = val; + this.formdata.endtime = this.allEndTime; console.log(val); } }, @@ -459,39 +469,59 @@ export default { // "starttime", // new Date(thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)) // ); - const thirtyDaysAgo = new Date(); - this.$set( - this.formdata, - "starttime", - new Date(thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)) + console.log( + "全局开始时间和结束时间为0", + this.allStartTime, + this.allEndTime ); - console.log(this.formdata.starttime); - const currentDate = new Date(); // 获取当前时间 - console.log("asddddadadadadadasd", currentDate); - currentDate.setHours(23); // 设置小时为23 - currentDate.setMinutes(59); // 设置分钟为59 - currentDate.setSeconds(59); // 设置秒数为59 - this.$set(this.formdata, "endtime", currentDate); - console.log("我是开始时间", this.formdata.starttime); - console.log("我是结束时间", currentDate); + if (this.allStartTime == "" && this.allEndTime == "") { + const thirtyDaysAgo = new Date(); + this.$set( + this.formdata, + "starttime", + new Date(thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)) + ); + console.log(this.formdata.starttime); + const currentDate = new Date(); // 获取当前时间 + console.log("asddddadadadadadasd", currentDate); + currentDate.setHours(23); // 设置小时为23 + currentDate.setMinutes(59); // 设置分钟为59 + currentDate.setSeconds(59); // 设置秒数为59 + this.$set(this.formdata, "endtime", currentDate); + console.log("我是开始时间", this.formdata.starttime); + console.log("我是结束时间", currentDate); + } else { + this.$set(this.formdata, "starttime", this.allStartTime); + this.$set(this.formdata, "endtime", this.allEndTime); + } } else { - console.log(res.data.content[0].acquisitionTime); - this.formdata.endtime = res.data.content[0].acquisitionTime; - const qet = new Date(this.formdata.endtime); - qet.setHours(23); // 设置小时为23 - qet.setMinutes(59); // 设置分钟为59 - qet.setSeconds(59); // 设置秒数为59 - this.$set(this.formdata, "endtime", qet); - - const thirtyDaysAgo = new Date(this.formdata.endtime); - thirtyDaysAgo.setHours(0); // 设置小时为23 - thirtyDaysAgo.setMinutes(0); // 设置分钟为59 - thirtyDaysAgo.setSeconds(0); // 设置秒数为59 - this.$set( - this.formdata, - "starttime", - new Date(thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)) + console.log( + "全局开始时间和结束时间不为0", + this.allStartTime, + this.allEndTime ); + if (this.allStartTime == "" && this.allEndTime == "") { + console.log(res.data.content[0].acquisitionTime); + this.formdata.endtime = res.data.content[0].acquisitionTime; + const qet = new Date(this.formdata.endtime); + qet.setHours(23); // 设置小时为23 + qet.setMinutes(59); // 设置分钟为59 + qet.setSeconds(59); // 设置秒数为59 + this.$set(this.formdata, "endtime", qet); + + const thirtyDaysAgo = new Date(this.formdata.endtime); + thirtyDaysAgo.setHours(0); // 设置小时为23 + thirtyDaysAgo.setMinutes(0); // 设置分钟为59 + thirtyDaysAgo.setSeconds(0); // 设置秒数为59 + this.$set( + this.formdata, + "starttime", + new Date(thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)) + ); + } else { + this.$set(this.formdata, "starttime", this.allStartTime); + this.$set(this.formdata, "endtime", this.allEndTime); + } } this.handleSearch(); diff --git a/src/views/homePage/warnMessage/components/warnDialog.vue b/src/views/homePage/warnMessage/components/warnDialog.vue index 3ad552f6..668d4702 100644 --- a/src/views/homePage/warnMessage/components/warnDialog.vue +++ b/src/views/homePage/warnMessage/components/warnDialog.vue @@ -128,7 +128,7 @@ - +