From a87de2a4276ce68ad05a9eea15d49bf394f2b2a0 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 19 Jun 2025 16:55:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=8D=95=E4=B8=AA=E4=BB=BB=E5=8A=A1=E4=BA=A7=E9=87=8F=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_gx.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index b5ef4570..5ed56cb2 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -706,12 +706,12 @@ export default { let week = nowDate.getDay();//当前时间的week数 let weekFirst = week-1;//第一天对应的天数 let weekLast = 7-week;//最后一天对应的天数 - let first = new Date(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一 - let last = new Date(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日 + let first = that.$TOOL.dateFormat2(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一 + let last = that.$TOOL.dateFormat2(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日 let objWeek = {query:{ start_date:first,end_date:last,mgroup_name:'二次超洗', group_bys_date:',月,周',order_bys_date:',月,周', - select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月,EXTRACT(WEEK FROM mlog.work_end_time) AS 周' + select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月,EXTRACT(WEEK FROM mlog.handle_date) AS 周' }}; that.$API.bi.dataset.exec.req('lineDay_m2', objWeek).then((res1) => { if(res1.data2.ds0&&res1.data2.ds0.length>0){ @@ -723,7 +723,7 @@ export default { let objMonth = {query:{ start_date:start_month,end_date:end_month,mgroup_name:'二次超洗', group_bys_date:',月',order_bys_date:',月', - select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月' + select_cols_date:', EXTRACT ( MONTH FROM mlog.handle_date) AS 月' }}; that.$API.bi.dataset.exec.req('lineDay_m2', objMonth).then((res2) => { if(res2.data2.ds0&&res2.data2.ds0.length>0){