diff --git a/main.js b/main.js
index 5f35f937..9b2b38c0 100644
--- a/main.js
+++ b/main.js
@@ -93,11 +93,14 @@ if (process.env.NODE_ENV === 'development') {
} else {
// 生产环境
console.log('生产环境')
+ Vue.prototype.url_config = 'http://121.37.106.37:9840/'
+ // Vue.prototype.url_config = 'http://jxjzw.zhgdyun.com:100/' // 演示平台
+ // Vue.prototype.work_url = 'http://jxj.zhgdyun.com:33983'// 工作流地址 演示平台
// Vue.prototype.url_config = 'http://117.146.73.156:9809/'// 中新建项目
// Vue.prototype.work_url = 'http://117.146.73.156:19997'// 工作流地址 通用
// Vue.prototype.url_config = 'http://121.37.106.37:9809/' // 测试环境
- Vue.prototype.url_config = 'http://101.43.164.214:11111/'
- Vue.prototype.work_url = 'http://101.43.164.214:11131'// 工作流地址 通用
+ // Vue.prototype.url_config = 'http://101.43.164.214:11111/'
+ // Vue.prototype.work_url = 'http://101.43.164.214:11131'// 工作流地址 通用
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
diff --git a/manifest.json b/manifest.json
index 8ac99f7e..23fd6c91 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,9 +2,10 @@
"name" : "智慧安全", //中建四局
"appid" : "__UNI__4AA4101",
"description" : "",
- "versionName" : "1.3.8",
- "versionCode" : 138,
+ "versionName" : "1.4.1",
+ "versionCode" : 141,
"transformPx" : false,
+ "sassImplementationName" : "node-sass",
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
diff --git a/pages/projectEnd/laborManage/index.vue b/pages/projectEnd/laborManage/index.vue
index 0d4c44a9..a38a6a7c 100644
--- a/pages/projectEnd/laborManage/index.vue
+++ b/pages/projectEnd/laborManage/index.vue
@@ -143,14 +143,14 @@
-
+
diff --git a/pages/projectEnd/laborManage/queryStaff.vue b/pages/projectEnd/laborManage/queryStaff.vue
index d4324021..2781e61d 100644
--- a/pages/projectEnd/laborManage/queryStaff.vue
+++ b/pages/projectEnd/laborManage/queryStaff.vue
@@ -49,6 +49,7 @@
+
@@ -57,10 +58,19 @@
export default {
data() {
return {
+ list: [{
+ label: "人员ID",
+ value: 1,
+ }, {
+ label: "定位标签",
+ value: 2
+ }],
+ showSelect: false,
inputVal: "",
showValue: false,
projectSn: '',
listData: [],
+ scanId: null
}
},
onLoad() {
@@ -101,11 +111,26 @@
uni.scanCode({
onlyFromCamera: true,
success: function(res) {
- that.showDetailsBtn(res.result)
+ that.scanId = res.result;
+ const id = that.scanId.split(':')[1]
+ // that.showSelect = true;
+ that.showDetailsBtn('', id)
},
fail: function(error) {}
});
},
+ handleConfirm(val) {
+ console.info(val, '======')
+ let id = '';
+ let otherId = '';
+ const value = val[0].value
+ if(value === 1) {
+ id = this.scanId
+ } else {
+ otherId = this.scanId.split(':')[1]
+ }
+ this.showDetailsBtn(id, otherId)
+ },
//输入框失去焦点时
blur() {
if (this.inputVal == '') {
@@ -113,9 +138,10 @@
}
},
- showDetailsBtn(id) {
+ showDetailsBtn(id, otherId) {
+ console.info(id, '=========', otherId)
uni.navigateTo({
- url: './searchTeam/personDetail?id=' + id
+ url: './searchTeam/personDetail?id=' + id + '&otherId=' + otherId
})
},
}
diff --git a/pages/projectEnd/laborManage/safetyEducationManage/add.vue b/pages/projectEnd/laborManage/safetyEducationManage/add.vue
index ab378602..45c43d26 100644
--- a/pages/projectEnd/laborManage/safetyEducationManage/add.vue
+++ b/pages/projectEnd/laborManage/safetyEducationManage/add.vue
@@ -54,7 +54,7 @@
*培训人
-
@@ -105,7 +105,7 @@
培训课时(分钟)
-
@@ -445,7 +445,6 @@
})
return false;
}
-
if (this.form.eduClasshour==0) {
uni.showToast({
title: '培训课时不能为零',
diff --git a/pages/projectEnd/laborManage/searchTeam/personDetail.vue b/pages/projectEnd/laborManage/searchTeam/personDetail.vue
index 607abd19..5745a97c 100644
--- a/pages/projectEnd/laborManage/searchTeam/personDetail.vue
+++ b/pages/projectEnd/laborManage/searchTeam/personDetail.vue
@@ -339,6 +339,7 @@
pdgroundColor: '#000',
qrUrl: '此二维码仅供展示',
workerId: 0,
+ otherId: null,
operateType: false,
originWorkerInfo: {}, // 原始基本信息
workerInfo: {}, //基本信息
@@ -363,15 +364,16 @@
},
onLoad(options) {
this.workerId = options.id;
+ this.otherId = options.otherId;
this.btnAuth = this.checkBtnPermission({
key: 'assist_attendance',
menuPath: '/project/labor/attendanceManage'
})
// this.getDetailsData();
},
- onShow() {
- this.getDetailsData();
- this.getSafeScoreDetail();
+ async onShow() {
+ await this.getDetailsData();
+ await this.getSafeScoreDetail();
},
methods: {
goTo() {
@@ -441,18 +443,23 @@
},
//获取详情数据
getDetailsData() {
+ console.info("otherId", this.otherId)
this.sendRequest({
url: 'xmgl/workerInfo/viewWorkerInfoDetail',
method: 'post',
data: {
- workerId: this.workerId,
+ workerId: this.workerId || undefined,
+ locationCardno: this.otherId || undefined,
+ projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn
},
success: res => {
+ console.log('res', res)
if (res.code == 200) {
this.originWorkerInfo = {
...res.result.workerInfo
};
this.workerInfo = res.result.workerInfo;
+ this.workerId = this.workerInfo.id;
console.info(res.result)
this.productRecord(res.result.workerInfo)
//获取证书附件
diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue
index 07efb28a..daacba72 100644
--- a/pages/projectEnd/projectIndex/projectIndex.vue
+++ b/pages/projectEnd/projectIndex/projectIndex.vue
@@ -149,7 +149,7 @@
closeBle
} from '@/static/js/BLEConn.js'
import {
- getBottomLevelData
+ getBottomLevelData, exitApp
} from "@/utils/tool.js"
export default {
diff --git a/pages/videoManage/playVideo.vue b/pages/videoManage/playVideo.vue
index 2d4232c5..d5577c05 100644
--- a/pages/videoManage/playVideo.vue
+++ b/pages/videoManage/playVideo.vue
@@ -6,8 +6,8 @@
-
-
+
+
@@ -21,7 +21,6 @@
>
-
{{videoInfo.videoName}}
@@ -72,6 +71,7 @@
};
},
onLoad(options) {
+ this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
//videoType 1萤石云，2乐橙，3ISC，4大华，5宇视，6国标
// this.url = options.url
this.videoInfo=uni.getStorageSync('videoInfo')
@@ -100,6 +100,7 @@
return this.url
},
isYsy(){
+ console.info(this.videoInfo?.videoType, '======')
return this.videoInfo?.videoType == 1
},
ysyPlayUrl() {