flx：优化

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()

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 {
 	// 生产环境

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)
 							}
 						}
 					}

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;

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)

pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue

@@ -22,7 +22,7 @@
 					:options="teamOptions" />
 				<van-dropdown-item :disabled="optsDetail.enterDate == 1" @change="onMenuChage" title="进场日期"
 					v-model="searchInfo.enterDate" :options="enterDateList" />
-				<van-dropdown-item @change="onMenuChage" title="在职" v-model="searchInfo.inserviceType"
+				<van-dropdown-item @change="onMenuChage" v-model="searchInfo.inserviceType"
 					:options="inserviceTypeList" />
 				<van-dropdown-item @change="onMenuChage" title="工种" v-model="searchInfo.workerTypeId"
 					:options="workerTypeList" />