diff --git a/manifest.json b/manifest.json index c379a5c0..30f866e9 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "智慧工地云平台", //中建四局 "appid" : "__UNI__4AA4101", "description" : "", - "versionName" : "1.3.7", - "versionCode" : 137, + "versionName" : "1.3.8", + "versionCode" : 138, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/projectEnd/laborManage/index.vue b/pages/projectEnd/laborManage/index.vue index 7dafacb3..62f64df3 100644 --- a/pages/projectEnd/laborManage/index.vue +++ b/pages/projectEnd/laborManage/index.vue @@ -14,7 +14,7 @@ - 现场工人 + 在场劳务人员 {{statictisData.presencePerson.lwPersonTotal}} @@ -25,20 +25,20 @@ - 现场管理人员 + 在场管理人员 {{statictisData.presencePerson.glPersonTotal}} - - 出勤 + 劳务人员出勤 + 管理人员出勤 {{tabIndex==0?statictisData.attendancePerson.lwPersonTotal:statictisData.attendancePerson.glPersonTotal}} @@ -49,7 +49,8 @@ - 在岗 + 劳务人员总数 + 管理人员总数 {{tabIndex==0?statictisData.toaltPerson.lwPersonTotal:statictisData.toaltPerson.glPersonTotal}} @@ -62,14 +63,16 @@ - 昨日出勤率 + 劳务昨日出勤率 + 管理人员昨日出勤率 + - {{((statictisData.yesterdayAttendancePerson.lwPersonTotal/Number(statictisData.yesterdayAttendancePerson.totalPerson))*100).toFixed(2)}}% + {{((statictisData.yesterdayAttendancePerson.lwPersonTotal/Number(statictisData.toaltPerson.lwPersonTotal))*100).toFixed(2)}}% - {{((statictisData.yesterdayAttendancePerson.glPersonTotal/Number(statictisData.yesterdayAttendancePerson.totalPerson))*100).toFixed(2)}}% + {{((statictisData.yesterdayAttendancePerson.glPersonTotal/Number(statictisData.toaltPerson.glPersonTotal))*100).toFixed(2)}}% diff --git a/pages/projectEnd/laborManage/queryStaff.vue b/pages/projectEnd/laborManage/queryStaff.vue index 90c47974..016a77a7 100644 --- a/pages/projectEnd/laborManage/queryStaff.vue +++ b/pages/projectEnd/laborManage/queryStaff.vue @@ -71,6 +71,10 @@ }, success:res=>{ this.listData = res.result; + this.listData.map(item => { + let str = "***************" + item.idCard = item.idCard.substring(0,3)+str+item.idCard.substring(16) + }) } }) }, diff --git a/unpackage/release/apk/__UNI__4AA4101__20240415200716.apk b/unpackage/release/apk/__UNI__4AA4101__20240415200716.apk new file mode 100644 index 00000000..b470b2c4 Binary files /dev/null and b/unpackage/release/apk/__UNI__4AA4101__20240415200716.apk differ diff --git a/unpackage/release/apk/__UNI__4AA4101__20240415231556.apk b/unpackage/release/apk/__UNI__4AA4101__20240415231556.apk new file mode 100644 index 00000000..5f6ddd9a Binary files /dev/null and b/unpackage/release/apk/__UNI__4AA4101__20240415231556.apk differ