Merge remote-tracking branch 'origin/dev-cjw' into bjxz-wz

# Conflicts:
#	unpackage/cache/apk/__UNI__4AA4101_cm.apk
#	unpackage/cache/apk/apkurl
#	unpackage/cache/apk/cmManifestCache.json
#	unpackage/cache/certdata
#	unpackage/cache/wgt/__UNI__4AA4101/app-config-service.js
#	unpackage/cache/wgt/__UNI__4AA4101/app-service.js
#	unpackage/cache/wgt/__UNI__4AA4101/app-view.js
#	unpackage/cache/wgt/__UNI__4AA4101/manifest.json
#	unpackage/cache/wgt/__UNI__4AA4101/pages/projectEnd/laborManage/faceRecognition.js
#	unpackage/cache/wgt/__UNI__4AA4101/pages/projectEnd/project/projectInfo2.js
#	unpackage/dist/build/app-plus/app-config-service.js
#	unpackage/dist/build/app-plus/app-service.js
#	unpackage/dist/build/app-plus/app-view.js
#	unpackage/dist/build/app-plus/manifest.json
#	unpackage/dist/build/app-plus/pages/projectEnd/laborManage/faceRecognition.js
#	unpackage/dist/build/app-plus/pages/projectEnd/project/projectInfo2.js
#	unpackage/release/apk/__UNI__4AA4101__20240415200047.apk

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" : {

pages/projectEnd/laborManage/index.vue

@@ -14,7 +14,7 @@
 				<view class="itemInner" @click="tabIndex=0">
 					<view class="">
 						<view class="txt" :class="tabIndex==0?'active':''">
-							现场工人
+							在场劳务人员
 						</view>
 						<view class="num">
 							{{statictisData.presencePerson.lwPersonTotal}}
@@ -25,20 +25,20 @@
 				<view class="itemInner" @click="tabIndex=1">
 					<view class="">
 						<view class="txt" :class="tabIndex==1?'active':''">
-							现场管理人员
+							在场管理人员
 						</view>
 						<view class="num">
 							{{statictisData.presencePerson.glPersonTotal}}
 						</view>
 					</view>
-
 				</view>
 			</view>
 			<view class="item item2">
 				<view class="itemInner">
 					<view class="">
 						<view class="txt">
-							出勤
+							<text v-if="tabIndex === 0">劳务人员出勤</text>
+							<text v-if="tabIndex === 1">管理人员出勤</text>
 						</view>
 						<view class="num">
 							{{tabIndex==0?statictisData.attendancePerson.lwPersonTotal:statictisData.attendancePerson.glPersonTotal}}
@@ -49,7 +49,8 @@
 				<view class="itemInner">
 					<view class="">
 						<view class="txt">
-							在岗
+							<text v-if="tabIndex === 0">劳务人员总数</text>
+							<text v-if="tabIndex === 1">管理人员总数</text>
 						</view>
 						<view class="num">
 							{{tabIndex==0?statictisData.toaltPerson.lwPersonTotal:statictisData.toaltPerson.glPersonTotal}}
@@ -62,14 +63,16 @@
 				<view class="itemInner">
 					<view class="">
 						<view class="txt">
-							昨日出勤率
+							<text v-if="tabIndex === 0">劳务昨日出勤率</text>
+							<text v-if="tabIndex === 1">管理人员昨日出勤率</text>
+							
 						</view>
 						<view class="" v-if="statictisData.yesterdayAttendancePerson.totalPerson != 0">
 							<view class="num" v-show="tabIndex==0">
-								{{((statictisData.yesterdayAttendancePerson.lwPersonTotal/Number(statictisData.yesterdayAttendancePerson.totalPerson))*100).toFixed(2)}}%
+								{{((statictisData.yesterdayAttendancePerson.lwPersonTotal/Number(statictisData.toaltPerson.lwPersonTotal))*100).toFixed(2)}}%
 							</view>
 							<view class="num" v-show="tabIndex==1">
-								{{((statictisData.yesterdayAttendancePerson.glPersonTotal/Number(statictisData.yesterdayAttendancePerson.totalPerson))*100).toFixed(2)}}%
+								{{((statictisData.yesterdayAttendancePerson.glPersonTotal/Number(statictisData.toaltPerson.glPersonTotal))*100).toFixed(2)}}%
 							</view>
 							
 						</view>

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