diff --git a/pages/realName/index/pages/personDetail.vue b/pages/realName/index/pages/personDetail.vue
index f37551b..4540232 100644
--- a/pages/realName/index/pages/personDetail.vue
+++ b/pages/realName/index/pages/personDetail.vue
@@ -20,7 +20,9 @@
{{ detailData.name }}
- {{ detailData.lightStatus }}
+ {{detailData.lightStatus}}
+ {{detailData.lightStatus}}
+ {{detailData.lightStatus}}
{
this.timeStr=this.timeFormat(null,'yyyy-mm-dd hh:MM:ss')
}, 1000);
- },
+ },
//获取定位
getLocation(){
uni.getLocation({
- type: "gcj02", //默认为 wgs84 返回 gps 坐标
+ type: "wgs84", //默认为 wgs84 返回 gps 坐标
isHighAccuracy: true, // 开启高精度定位
success: e => {
this.longitude=e.longitude;
@@ -264,7 +264,7 @@ export default {
const c = 2 * Math.asin(Math.sqrt(a));
const distance = R * c; // 距离,单位为千米
- return distance.toFixed(2);
+ return distance.toFixed(2)-1;
},
//打卡
handleAttendance(type){
diff --git a/pages/realName/workAttendance/managementClock/index.vue b/pages/realName/workAttendance/managementClock/index.vue
index ce4fe72..0e9162b 100644
--- a/pages/realName/workAttendance/managementClock/index.vue
+++ b/pages/realName/workAttendance/managementClock/index.vue
@@ -174,7 +174,7 @@ export default {
//获取定位
getLocation(){
uni.getLocation({
- type: "gcj02", //默认为 wgs84 返回 gps 坐标
+ type: "wgs84", //默认为 wgs84 返回 gps 坐标
isHighAccuracy: true, // 开启高精度定位
success: e => {
this.longitude=e.longitude;
diff --git a/pages/realName/workAttendance/tempClock/index.vue b/pages/realName/workAttendance/tempClock/index.vue
index b0dafb4..222f6dd 100644
--- a/pages/realName/workAttendance/tempClock/index.vue
+++ b/pages/realName/workAttendance/tempClock/index.vue
@@ -165,7 +165,7 @@ export default {
//获取定位
getLocation(){
uni.getLocation({
- type: "gcj02", //默认为 wgs84 返回 gps 坐标
+ type: "wgs84", //默认为 wgs84 返回 gps 坐标
isHighAccuracy: true, // 开启高精度定位
success: e => {
this.longitude=e.longitude;
diff --git a/pages/realName/workbench/appearApply/index.vue b/pages/realName/workbench/appearApply/index.vue
index 386560f..5d62e51 100644
--- a/pages/realName/workbench/appearApply/index.vue
+++ b/pages/realName/workbench/appearApply/index.vue
@@ -38,7 +38,7 @@
-
+
@@ -249,9 +249,9 @@ export default {
// 单选
checkSelect(chosen){
this.listData.forEach(item=>{
- if(item.id==chosen.id){
+ if(item.idNumber==chosen.idNumber){
if(item.checked.length==0){
- item.checked=[item.id]
+ item.checked=[item.idNumber]
}else{
item.checked=[]
}
@@ -259,17 +259,18 @@ export default {
})
},
// 全选
- checkedAll(){
+ checkedAll(){
this.isCheckAll=!this.isCheckAll
if(this.isCheckAll){
- this.listData.forEach(item=>{
- item.checked=[item.id]
+ this.listData.forEach(item=>{
+ item.checked=[item.idNumber]
})
}else{
this.listData.forEach(item=>{
item.checked=[]
})
}
+
},
handlebatchSign(){
let paramsList = []
diff --git a/pages/realName/workbench/contractWitness/index.vue b/pages/realName/workbench/contractWitness/index.vue
index 256aa03..baf9f8c 100644
--- a/pages/realName/workbench/contractWitness/index.vue
+++ b/pages/realName/workbench/contractWitness/index.vue
@@ -75,7 +75,7 @@
合同签订日期
-
+
@@ -83,7 +83,7 @@
合同终止日期
-
+
diff --git a/pages/realName/workbench/electronicContract/contractFill.vue b/pages/realName/workbench/electronicContract/contractFill.vue
index d88a634..4963843 100644
--- a/pages/realName/workbench/electronicContract/contractFill.vue
+++ b/pages/realName/workbench/electronicContract/contractFill.vue
@@ -123,7 +123,7 @@
生效日期
-
+
@@ -199,7 +199,7 @@
合同终止日期
-
+
diff --git a/pages/realName/workbench/outPerson/index.vue b/pages/realName/workbench/outPerson/index.vue
index 18e49a0..3e01a8f 100644
--- a/pages/realName/workbench/outPerson/index.vue
+++ b/pages/realName/workbench/outPerson/index.vue
@@ -26,7 +26,7 @@
-
+
@@ -292,9 +292,9 @@ export default {
// 单选
checkSelect(chosen){
this.listData.forEach(item=>{
- if(item.id==chosen.id){
+ if(item.idNumber==chosen.idNumber){
if(item.checked.length==0){
- item.checked=[item.id]
+ item.checked=[item.idNumber]
}else{
item.checked=[]
}
@@ -306,7 +306,7 @@ export default {
this.isCheckAll=!this.isCheckAll
if(this.isCheckAll){
this.listData.forEach(item=>{
- item.checked=[item.id]
+ item.checked=[item.idNumber]
})
}else{
this.listData.forEach(item=>{
diff --git a/pages/realName/workbench/outPerson/outList.vue b/pages/realName/workbench/outPerson/outList.vue
index 02d6816..604c27e 100644
--- a/pages/realName/workbench/outPerson/outList.vue
+++ b/pages/realName/workbench/outPerson/outList.vue
@@ -27,7 +27,7 @@
-
+
@@ -153,10 +153,11 @@ export default {
},
// 单选
checkSelect(chosen){
+ console.log(chosen)
this.listData.forEach(item=>{
- if(item.id==chosen.id){
+ if(item.idNumber==chosen.idNumber){
if(item.checked.length==0){
- item.checked=[item.id]
+ item.checked=[item.idNumber]
}else{
item.checked=[]
}
diff --git a/pages/realName/workbench/peopleLibrary/detail.vue b/pages/realName/workbench/peopleLibrary/detail.vue
index 59cc974..ee6f18d 100644
--- a/pages/realName/workbench/peopleLibrary/detail.vue
+++ b/pages/realName/workbench/peopleLibrary/detail.vue
@@ -117,7 +117,7 @@
生效日期*
-
+
@@ -125,7 +125,7 @@
失效日期*
-
+
@@ -428,7 +428,7 @@
合同签订日期
-
+
@@ -436,7 +436,7 @@
合同终止日期
-
+
diff --git a/pages/realName/workbench/peopleLibrary/idCard.vue b/pages/realName/workbench/peopleLibrary/idCard.vue
index 9faa593..88d9c7e 100644
--- a/pages/realName/workbench/peopleLibrary/idCard.vue
+++ b/pages/realName/workbench/peopleLibrary/idCard.vue
@@ -69,7 +69,7 @@
开始有效期*
-
+
@@ -77,7 +77,7 @@
结束有效期*
-
+
@@ -113,7 +113,7 @@ export default {
}
},
onLoad() {
- console.log('🚀 ~ mounted ~ mounted-index:');
+ console.log('?? ~ mounted ~ mounted-index:');
},
onShow() {
@@ -127,7 +127,7 @@ export default {
sizeType: ['compressed'],
sourceType: ['camera'],
success: res => {
- console.log('🚀 ~ res-拍照:', res)
+ console.log('?? ~ res-拍照:', res)
this.imgToBase64(res.tempFilePaths[0]).then(base64 => {
let param={
type:'1',
@@ -161,7 +161,7 @@ export default {
})
},
fail: err => {
- console.log('🚀 ~ err:', err)
+ console.log('?? ~ err:', err)
}
})
},
@@ -173,7 +173,7 @@ export default {
sizeType: ['compressed'],
sourceType: ['camera'],
success: res => {
- console.log('🚀 ~ res-拍照:', res)
+ console.log('?? ~ res-拍照:', res)
this.imgToBase64(res.tempFilePaths[0]).then(base64 => {
let param={
type:'1',
@@ -203,7 +203,7 @@ export default {
})
},
fail: err => {
- console.log('🚀 ~ err:', err)
+ console.log('?? ~ err:', err)
}
})
},
diff --git a/pages/realName/workbench/personEnter/addPeople.vue b/pages/realName/workbench/personEnter/addPeople.vue
index 4ef5db1..12b3c2b 100644
--- a/pages/realName/workbench/personEnter/addPeople.vue
+++ b/pages/realName/workbench/personEnter/addPeople.vue
@@ -97,7 +97,7 @@
生效日期
-
+
@@ -105,7 +105,7 @@
失效日期
-
+
@@ -418,7 +418,7 @@
合同签订日期
-
+
@@ -426,7 +426,7 @@
合同终止日期
-
+
@@ -1063,7 +1063,7 @@ export default {
sizeType: ['compressed'],
sourceType: ['camera'],
success: res => {
- console.log('🚀 ~ res-拍照:', res)
+ console.log('?? ~ res-拍照:', res)
this.imgToBase64(res.tempFilePaths[0]).then(base64 => {
let param={
type:'1',
@@ -1096,7 +1096,7 @@ export default {
})
},
fail: err => {
- console.log('🚀 ~ err:', err)
+ console.log('?? ~ err:', err)
}
})
},
@@ -1108,7 +1108,7 @@ export default {
sizeType: ['compressed'],
sourceType: ['camera'],
success: res => {
- console.log('🚀 ~ res-拍照:', res)
+ console.log('?? ~ res-拍照:', res)
this.imgToBase64(res.tempFilePaths[0]).then(base64 => {
let param={
type:'1',
@@ -1138,7 +1138,7 @@ export default {
})
},
fail: err => {
- console.log('🚀 ~ err:', err)
+ console.log('?? ~ err:', err)
}
})
},
diff --git a/pages/realName/workbench/personEnter/editPeople.vue b/pages/realName/workbench/personEnter/editPeople.vue
index 8a105eb..ba9fd5f 100644
--- a/pages/realName/workbench/personEnter/editPeople.vue
+++ b/pages/realName/workbench/personEnter/editPeople.vue
@@ -98,7 +98,7 @@
生效日期
-
+
@@ -106,7 +106,7 @@
失效日期
-
+
@@ -419,7 +419,7 @@
合同签订日期
-
+
@@ -427,7 +427,7 @@
合同终止日期
-
+
diff --git a/pages/realName/workbench/personEnter/facePeople.vue b/pages/realName/workbench/personEnter/facePeople.vue
index 666eb34..c956e0e 100644
--- a/pages/realName/workbench/personEnter/facePeople.vue
+++ b/pages/realName/workbench/personEnter/facePeople.vue
@@ -98,7 +98,7 @@
生效日期
-
+
@@ -106,7 +106,7 @@
失效日期
-
+
@@ -419,7 +419,7 @@
合同签订日期
-
+
@@ -427,7 +427,7 @@
合同终止日期
-
+
diff --git a/pages/realName/workbench/qualifications/detail.vue b/pages/realName/workbench/qualifications/detail.vue
index 17259e1..3e3ac7f 100644
--- a/pages/realName/workbench/qualifications/detail.vue
+++ b/pages/realName/workbench/qualifications/detail.vue
@@ -14,7 +14,9 @@
{{detailData.name}}
- {{detailData.lightStatus}}
+ {{detailData.lightStatus}}
+ {{detailData.lightStatus}}
+ {{detailData.lightStatus}}