From adcaec20e132dd5c319e51f9d229c30a42c7f707 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 9 Oct 2023 09:59:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laborRealName/attendanceStatistics/index.vue | 13 +++++++++++-- .../projectSelect/components/projectDetails.vue | 10 +++++++++- .../laborRealName/attendanceStatistics/index.vue | 10 ++++++++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/views/enterprise/laborRealName/attendanceStatistics/index.vue b/src/views/enterprise/laborRealName/attendanceStatistics/index.vue index 3f1f73d..1593ee2 100644 --- a/src/views/enterprise/laborRealName/attendanceStatistics/index.vue +++ b/src/views/enterprise/laborRealName/attendanceStatistics/index.vue @@ -315,8 +315,17 @@ const getTableList = (params: any) => { return statisticsList(newParams); }; const changeThead = (month: any) => { - console.log(month, "--------123456"); - let dayNumber = dayjs(month).daysInMonth(); + let val = ""; + if (navigator.userAgent.indexOf("Firefox") > -1) { + // 判断是否为火狐浏览器 + val = dayjs().year() + month; + } else { + val = month; + } + let dayNumber = dayjs(val).daysInMonth(); + for (let i = 0; i < columns.length; i++) { + columns[i].isShow = true; + } for (let i = 0; i < columns.length; i++) { columns[i].isShow = true; } diff --git a/src/views/goverment/laborRealName/projectSelect/components/projectDetails.vue b/src/views/goverment/laborRealName/projectSelect/components/projectDetails.vue index 3a88874..597c084 100644 --- a/src/views/goverment/laborRealName/projectSelect/components/projectDetails.vue +++ b/src/views/goverment/laborRealName/projectSelect/components/projectDetails.vue @@ -311,7 +311,15 @@ const getAttendanceCountList = async () => { ...attendaceSearch.value }; let month = requestData.month.substring(5); - for (let i = 0; i < dayjs(month).daysInMonth(); i++) { + let val = ""; + if (navigator.userAgent.indexOf("Firefox") > -1) { + // 判断是否为火狐浏览器 + val = dayjs().year() + month; + } else { + val = month; + } + let dayNumber = dayjs(val).daysInMonth(); + for (let i = 0; i < dayNumber; i++) { monthColumns.value.push({ prop: "day" + (i + 1), label: "" + (i + 1) diff --git a/src/views/project/laborRealName/attendanceStatistics/index.vue b/src/views/project/laborRealName/attendanceStatistics/index.vue index 008e3c0..d7c74b0 100644 --- a/src/views/project/laborRealName/attendanceStatistics/index.vue +++ b/src/views/project/laborRealName/attendanceStatistics/index.vue @@ -325,8 +325,14 @@ const getTableList = (params: any) => { return statisticsList(newParams); }; const changeThead = (month: any) => { - console.log(month, "--------123456"); - let dayNumber = dayjs(month).daysInMonth(); + let val = ""; + if (navigator.userAgent.indexOf("Firefox") > -1) { + // 判断是否为火狐浏览器 + val = dayjs().year() + month; + } else { + val = month; + } + let dayNumber = dayjs(val).daysInMonth(); for (let i = 0; i < columns.length; i++) { columns[i].isShow = true; }