diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 4f28f29..e4f5f8e 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -862,11 +862,13 @@ function jumpBgd() { const envList = ["agjt", "zkax", "zkjc", "hfqc", "cpgs", "cqna", "jzjt", "tj", "scwc", "bthg", "zmml"]; // 环境标识 // 标准版——跳转演示平台项目后台 if (COMPANY == "") { + console.log(2222, window.location) // window.location.replace("http://192.168.34.216:8080/#/login?token=" + store.token); // window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token); // window.location.replace(BASEURL + "/#/login?token=" + store.token); // 新项目通用(百色服务器) - window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token); + // window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token); + window.location.replace(`${window.location.protocol}//${window.location.host}/#/login?token=` + store.token); } else if (COMPANY === "tj") { window.location.replace("http://192.168.110.220:9809/#/login?token=" + store.token); } else if (COMPANY === "as") { diff --git a/src/views/sevenLargeScreen/newLaborManagement/rightTop.vue b/src/views/sevenLargeScreen/newLaborManagement/rightTop.vue index bc27cc6..a068b05 100644 --- a/src/views/sevenLargeScreen/newLaborManagement/rightTop.vue +++ b/src/views/sevenLargeScreen/newLaborManagement/rightTop.vue @@ -187,10 +187,10 @@ function drawChart(result: any) { if (event.data) { const res = await getCountNumByEnterpriseWorkerDailyAttendanceStatisticsV2Api({ projectSn: store.sn, - startDate: dayjs(rangeTime.value).format("YYYY-MM-DD 00:00:00"), - endDate: dayjs(rangeTime.value).format("YYYY-MM-DD 23:59:59"), - isSecondLevel: 1, - parentEnterpriseId: event.data.groupId + startDate: dayjs(rangeTime.value).format("YYYY-MM-DD"), + endDate: dayjs(rangeTime.value).format("YYYY-MM-DD"), + parentEnterpriseId: event.data.groupId, + personType: 1, }); const subData: any = res.result; if (!subData && subData.length === 0) { @@ -233,8 +233,10 @@ function drawChart(result: any) { const getQueryTodayList = async () => { const res = await getCountNumByEnterpriseWorkerDailyAttendanceStatisticsV2Api({ projectSn: store.sn, - startDate: dayjs(rangeTime.value).format("YYYY-MM-DD 00:00:00"), - endDate: dayjs(rangeTime.value).format("YYYY-MM-DD 23:59:59") + startDate: dayjs(rangeTime.value).format("YYYY-MM-DD"), + endDate: dayjs(rangeTime.value).format("YYYY-MM-DD"), + isSecondLevel: 1, + personType: 1, }); if (res.result) { nextTick(() => {