From 6e8be954635ce5d45bea51044893b48316774246 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Fri, 27 Jun 2025 19:58:18 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/my-calendar/my-calendar.vue | 8 +++++---
main.js | 2 +-
.../staffAttendance/dailyAttendanceDetail.vue | 9 +++++++--
.../staffAttendance/personalAttendanceDetail.vue | 5 ++++-
.../laborManage/staffAttendance/punchingCardRecord.vue | 4 ++--
.../laborManage/staffAttendance/staffAttendance.vue | 2 +-
6 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/components/my-calendar/my-calendar.vue b/components/my-calendar/my-calendar.vue
index 525358db..e56b7240 100644
--- a/components/my-calendar/my-calendar.vue
+++ b/components/my-calendar/my-calendar.vue
@@ -288,8 +288,10 @@
if (weeks.disable) return
this.calendar = weeks
// 设置多选
- this.cale.setMultiple(this.calendar.fullDate)
- this.weeks = this.cale.weeks
+ this.cale.setMultiple(this.calendar.fullDate);
+ this.weeks = this.cale.weeks;
+ // console.log(1111222,weeks)
+ this.nowDate.date = weeks.date;
this.change()
},
/**
@@ -298,7 +300,7 @@
backtoday() {
console.log(this.cale.getDate(new Date()).fullDate);
let date = this.cale.getDate(new Date()).fullDate
- // this.cale.setDate(date)
+ this.cale.setDate(date)
this.init(date)
this.change()
this.monthSwitch()
diff --git a/main.js b/main.js
index e81e717a..fb00f4ac 100644
--- a/main.js
+++ b/main.js
@@ -106,7 +106,7 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//金林湾测试
// Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信
// Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段
-
+ Vue.prototype.url_config = 'http://10.0.1.49:9500/'// 测试环境h5
} else {
// 生产环境
diff --git a/pages/projectEnd/laborManage/staffAttendance/dailyAttendanceDetail.vue b/pages/projectEnd/laborManage/staffAttendance/dailyAttendanceDetail.vue
index 6d2ad88f..731bb126 100644
--- a/pages/projectEnd/laborManage/staffAttendance/dailyAttendanceDetail.vue
+++ b/pages/projectEnd/laborManage/staffAttendance/dailyAttendanceDetail.vue
@@ -57,7 +57,10 @@
projectDetail: {},
optInfo: {},
workerDailyAttendanceDetail:{},
- viewDayAttendanceInfo: {},
+ viewDayAttendanceInfo: {
+ minTime: "",
+ maxTime: "",
+ },
}
},
onLoad(opts) {
@@ -111,10 +114,12 @@
console.log('res', res)
if (res.code == 200) {
const resultList = res.result.sort((a, b) => new Date(a.createTime) - new Date(b.createTime));
- console.log(resultList);
+ console.log(111, resultList);
if(resultList.length > 0) {
+ console.log(111)
this.viewDayAttendanceInfo.minTime = resultList[0].createTime;
this.viewDayAttendanceInfo.maxTime = resultList[resultList.length - 1].createTime;
+ console.log(this.viewDayAttendanceInfo)
}
}
}
diff --git a/pages/projectEnd/laborManage/staffAttendance/personalAttendanceDetail.vue b/pages/projectEnd/laborManage/staffAttendance/personalAttendanceDetail.vue
index 0ea9bfe3..8f4ab64f 100644
--- a/pages/projectEnd/laborManage/staffAttendance/personalAttendanceDetail.vue
+++ b/pages/projectEnd/laborManage/staffAttendance/personalAttendanceDetail.vue
@@ -86,7 +86,7 @@
chartData: {},
opts: {
padding: [0, 0, 0, 0],
- color: ["#E6E6E6", "#3BA1FF"],
+ color: ["#3BA1FF", "#E6E6E6"],
enableScroll: true,
legend: {
position: "top",
@@ -211,11 +211,13 @@
series: [{
name: "出勤天数",
textColor: "#FFFFFF",
+ legendShape: "circle",
data: res.result.map(item => item.attendance)
},
{
name: "缺勤天数",
textColor: "#1A1A1A",
+ legendShape: "circle",
data: res.result.map(item => item.absence)
}
]
@@ -409,6 +411,7 @@
background-size: 100% 100%;
margin-right: 16rpx;
}
+
.sex-icon_girl {
width: 52rpx;
height: 40rpx;
diff --git a/pages/projectEnd/laborManage/staffAttendance/punchingCardRecord.vue b/pages/projectEnd/laborManage/staffAttendance/punchingCardRecord.vue
index 38a3ef16..c8181b4b 100644
--- a/pages/projectEnd/laborManage/staffAttendance/punchingCardRecord.vue
+++ b/pages/projectEnd/laborManage/staffAttendance/punchingCardRecord.vue
@@ -116,11 +116,11 @@
viewDayAttendanceListUp(){
if(this.chartsType == 1) {
return this.viewDayAttendanceList.filter(item => {
- return this.$dayjs(item.createTime).hour() > 12
+ return this.$dayjs(item.createTime).hour() < 12
})
} else if(this.chartsType == 2) {
return this.viewDayAttendanceList.filter(item => {
- return this.$dayjs(item.createTime).hour() < 12
+ return this.$dayjs(item.createTime).hour() > 12
})
} else if(this.chartsType == 3) {
return this.viewDayAttendanceList.filter(item => item.passType == 1)
diff --git a/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue b/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue
index 835edeae..96d78fa6 100644
--- a/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue
+++ b/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue
@@ -22,7 +22,7 @@
:options="teamOptions" />
-