From 92a700d3d46b0cfaab23b0e30db62f4e66ff3db3 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 9 May 2024 16:43:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 8 +-- .../laborManage/searchTeam/personDetail.vue | 9 +++ pages/projectEnd/qualityManage/addIssue.vue | 29 ++++++++++ pages/projectEnd/safeSame/addIssue.vue | 29 ++++++++++ pages/projectEnd/scan/saoSao.vue | 58 ++++++++++++++----- 5 files changed, 114 insertions(+), 19 deletions(-) diff --git a/main.js b/main.js index b9b85946..a00c6d10 100644 --- a/main.js +++ b/main.js @@ -85,13 +85,13 @@ if (process.env.NODE_ENV === 'development') { // 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/' // 鞍钢线上地址（弃用） - Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址 - // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址 + // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址 + Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段 // Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） - Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 + Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 // Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址 // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 // Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南 diff --git a/pages/projectEnd/laborManage/searchTeam/personDetail.vue b/pages/projectEnd/laborManage/searchTeam/personDetail.vue index 592728d9..6feb71c9 100644 --- a/pages/projectEnd/laborManage/searchTeam/personDetail.vue +++ b/pages/projectEnd/laborManage/searchTeam/personDetail.vue @@ -441,6 +441,15 @@ this.contractList = res.result.contractList; //合同 this.physicalsList = res.result.physicalsList; //体检列表 this.safeEducationList = res.result.safeEducationList; //安全教育 + // 修改工号和身份证展示格式 + if(this.workerInfo.idCard){ + let str = "***************" + this.workerInfo.idCard = this.workerInfo.idCard.substring(0,3)+str+this.workerInfo.idCard.substring(16) + } + if(this.workerInfo.attendanceNumber){ + let str = "***************" + this.workerInfo.attendanceNumber = this.workerInfo.attendanceNumber.substring(0,3)+str+this.workerInfo.attendanceNumber.substring(16) + } if (this.workerInfo) { this.setCodeColor(this.workerInfo.safeScore) } else { diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue index 8005fada..7a332103 100644 --- a/pages/projectEnd/qualityManage/addIssue.vue +++ b/pages/projectEnd/qualityManage/addIssue.vue @@ -758,6 +758,18 @@ } }) }, + dealFalseCheck(arr){ + arr.map(item => { + if(item.children){ + item.checked = false; + item.orChecked = false; + this.dealFalseCheck(item.children) + } else { + item.checked = false; + item.orChecked = false; + } + }) + }, //确定选中--回显 checkPointBtn(val, type) { this.form.level = '' @@ -1422,6 +1434,23 @@ this.subsectionIndex = -1 this.subentryIndex = -1 this.changePeopleIndex = null + // 重置检查部位 + this.dealFalseCheck(this.checkPointList); + this.$refs.locationTree._reTreeList(); + // 分包单位数据拿取 + this.subpackageLsit = [] + // 整改人数据拿取 + this.personUpdateList = [] + let index = this.personList.findIndex(item => { + return item.userId == this.userInfo.userId; + }) + if (index != -1) { + this.verifyManIndex = index; + this.form.verifyManId = this.personList[index].userId; + } else { + this.defaultAuditPerson = this.userInfo.realName; + this.form.verifyManId = this.userInfo.userId; + } } } } diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue index 7a9fe2c2..d95808b0 100644 --- a/pages/projectEnd/safeSame/addIssue.vue +++ b/pages/projectEnd/safeSame/addIssue.vue @@ -758,6 +758,18 @@ } }) }, + dealFalseCheck(arr){ + arr.map(item => { + if(item.children){ + item.checked = false; + item.orChecked = false; + this.dealFalseCheck(item.children) + } else { + item.checked = false; + item.orChecked = false; + } + }) + }, //确定选中--回显 checkPointBtn(val, type) { this.form.level = '' @@ -786,6 +798,9 @@ this.form.changeId = val[0].dutyId; this.notifier = val[0].intendanceNames; this.form.notifyPerson = val[0].intendanceIds; + // 重置检查部位 + this.dealFalseCheck(this.checkPointList); + this.$refs.locationTree._reTreeList(); // 分包单位数据拿取 this.subpackageLsit = val[0].enterpriseInfos // 整改人数据拿取 @@ -1422,6 +1437,20 @@ this.subsectionIndex = -1 this.subentryIndex = -1 this.changePeopleIndex = null + // 分包单位数据拿取 + this.subpackageLsit = [] + // 整改人数据拿取 + this.personUpdateList = [] + let index = this.personList.findIndex(item => { + return item.userId == this.userInfo.userId; + }) + if (index != -1) { + this.verifyManIndex = index; + this.form.verifyManId = this.personList[index].userId; + } else { + this.defaultAuditPerson = this.userInfo.realName; + this.form.verifyManId = this.userInfo.userId; + } } } } diff --git a/pages/projectEnd/scan/saoSao.vue b/pages/projectEnd/scan/saoSao.vue index b42d6e29..50e9c949 100644 --- a/pages/projectEnd/scan/saoSao.vue +++ b/pages/projectEnd/scan/saoSao.vue @@ -49,7 +49,7 @@ - + @@ -79,25 +79,29 @@ form: { alarmDetails: "", //异常详情 alarmImage: "", //异常图片 - inPointName: "巡检点", //巡检点名称 + inPointName: "", //巡检点名称 inPointId: 0, //巡检点名称 - posiTion: "777563", // 巡检点位置 - createUserName: "创建人", //创建人 - createData: "创建时间", //创建时间 + posiTion: "", // 巡检点位置 + createUserName: "", //创建人 + createData: "", //创建时间 templateList: [], status: 1, - }, fileList: [], status: false, saoData: "", longitude: 0, latitude: 0, + sendData: "" } }, onLoad(e) { this.checkOpenGPSServiceByAndroid() console.log(e.data,'我的测试数据') + this.sendData = JSON.parse(e.data); + uni.showLoading({ + title: "获取数据中" + }) this.getnow(e.data) }, methods: { @@ -126,6 +130,7 @@ } }, getnow(Val) { + let that = this; uni.getLocation({ // type: 'wgs84', type: 'gcj02', @@ -194,13 +199,23 @@ // } }) - this.form.inPointName = data.checkingPointName - this.form.createUserName = data.createUserName - this.form.posiTion = data.position - this.form.inPointId = data.checkingPointId - this.form.templateList = JSON.parse(data.template) - console.log('this.form.templateList 数据 ' + JSON.parse(data.template)[0].title); - + this.sendRequest({ + url: "xmgl/checkingPoint/queryById", + data: { + id: data.checkingPointId + }, + method: "GET", + success(res) { + console.log('responseData-----------', res); + let responseData = res.result || {}; + that.form.inPointName = responseData.checkingPointName + that.form.createUserName = responseData.createUserName + that.form.posiTion = responseData.position + that.form.inPointId = responseData.checkingPointId + that.form.templateList = JSON.parse(responseData.template) + uni.hideLoading() + } + }) }, fail: function(msg) { console.log("获取位置失败", msg) @@ -270,12 +285,12 @@ data: { alarmDetails: this.form.alarmDetails, alarmImage: JSON.stringify(this.fileList), - checkingPointId: this.form.inPointId, + // checkingPointId: this.form.inPointId, checkingPointName: this.form.inPointName, checkingPointUserId: userInfo.userId, checkingPointUserName: userInfo.account, createDate: "", - id: 0, + checkingPointId: this.sendData?this.sendData.checkingPointId:"", position: this.form.posiTion, status: this.form.status, template: JSON.stringify(this.form.templateList), @@ -306,6 +321,19 @@ }, //确定提交 addBtn() { + if(!this.form.alarmDetails && this.form.status == 2){ + uni.showModal({ + title: '提示', + content: "异常详情不能为空", + confirmColor: '#ee6666', //确定字体颜色 + showCancel: false, //没有取消按钮的弹框 + buttonText: '确定', + success: function(res) { + + }, + }); + return; + } if (this.form.templateList.length >= 1) { let check = true this.form.templateList.forEach(res => { From 3d5b121c7799b443718434c5fccb4d0041d1927d Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 9 May 2024 20:29:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 8 ++--- pages/messageCenter/messageCenter.vue | 2 +- .../addConstructionStation.vue | 8 ++--- pages/projectEnd/qualityManage/addIssue.vue | 26 +++++++++++---- pages/projectEnd/safeSame/addIssue.vue | 32 +++++++++++++------ 5 files changed, 50 insertions(+), 26 deletions(-) diff --git a/main.js b/main.js index 907ed53d..b609bfbf 100644 --- a/main.js +++ b/main.js @@ -37,15 +37,15 @@ if (process.env.NODE_ENV === 'development') { console.log('开发环境') // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用） // Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址 - Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 + // Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 - // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 + Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） // Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址 - Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 - // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 + // Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址 + Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里 diff --git a/pages/messageCenter/messageCenter.vue b/pages/messageCenter/messageCenter.vue index 0e46163c..1af2bf8c 100644 --- a/pages/messageCenter/messageCenter.vue +++ b/pages/messageCenter/messageCenter.vue @@ -14,7 +14,7 @@ + placeholder="请输入标题" /> diff --git a/pages/projectEnd/dangerBigProject/addConstructionStation.vue b/pages/projectEnd/dangerBigProject/addConstructionStation.vue index bae1700c..89b73cbd 100644 --- a/pages/projectEnd/dangerBigProject/addConstructionStation.vue +++ b/pages/projectEnd/dangerBigProject/addConstructionStation.vue @@ -8,12 +8,12 @@ - *验收部位 - + *检查部位 + - 施工情况 -