From 33d62c9703e25e3bb10f2e00228eb20be9b0450b Mon Sep 17 00:00:00 2001 From: Vce Date: Wed, 15 May 2024 18:15:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=E5=88=9D?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/projectEnd/safeSame/addIssue.vue | 9 +- .../fireWork/addFireWorkFinally.vue | 5 +- .../fireWork/addFireWorkPlan.vue | 1 + .../fireWork/addFireWorkSide.vue | 1 + .../specialOperations/fireWork/fireWork.vue | 53 +++++- .../fireWork/fireWorkCheck.vue | 8 +- .../fireWork/fireWorkCheckList.vue | 3 +- .../fireWork/fireWorkDetail.vue | 156 ++++++++++++++---- .../fireWork/fireWorkFinally.vue | 4 +- .../fireWork/fireWorkPlan.vue | 6 +- .../fireWork/fireWorkSafe.vue | 1 + .../fireWork/fireWorkSafeList.vue | 1 + .../fireWork/fireWorkSide.vue | 2 +- .../specialOperations/specialOperations.vue | 2 +- static/specialOperations/fireWork.png | Bin 0 -> 1365 bytes 15 files changed, 192 insertions(+), 60 deletions(-) create mode 100644 static/specialOperations/fireWork.png diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue index 33db2d9b..0be6e235 100644 --- a/pages/projectEnd/safeSame/addIssue.vue +++ b/pages/projectEnd/safeSame/addIssue.vue @@ -562,6 +562,7 @@ reviewList: [], areaData: {}, engineeringId: '', + type: '', } }, onLoad(option) { @@ -580,9 +581,8 @@ this.form.taskId = option.taskId this.form.itemId = option.itemId console.log(dateformat(new Date()), 777888) - if(option.engineeringId){ - this.engineeringId = option.engineeringId - } + if(option.engineeringId) this.engineeringId = option.engineeringId + if(option.type) this.type = option.type }, @@ -1322,6 +1322,7 @@ data.creatorId = this.userInfo.userId data.dangerItemContent = this.issueName if(this.engineeringId) data.engineeringId = this.engineeringId + if(this.type) data.type = '2' let pointArr = [] for (let i = 0; i < this.pointList.length; i++) { let obj = @@ -1385,7 +1386,9 @@ taskId: this.taskId || null, // 任务ID itemId: this.itemId || null, // 任务子ID } + if(this.engineeringId) data2.engineeringId = this.engineeringId + if(this.type) data2.type = '2' console.log(data.taskId); await this.sendRequest({ url: 'xmgl/xzSecurityQualityInspectionRecord/add', diff --git a/pages/projectEnd/specialOperations/fireWork/addFireWorkFinally.vue b/pages/projectEnd/specialOperations/fireWork/addFireWorkFinally.vue index 97cf85e5..77b51522 100644 --- a/pages/projectEnd/specialOperations/fireWork/addFireWorkFinally.vue +++ b/pages/projectEnd/specialOperations/fireWork/addFireWorkFinally.vue @@ -8,8 +8,8 @@ - 危大工程 - {{engineeringName}} + 动火作业 + *验收单位 @@ -144,6 +144,7 @@ acceptanceUnitId: this.enterpriseId, acceptanceUserId: this.acceptancePerson.userId, planTime: this.planTime, + type:2 } console.log(data); if(!data.acceptanceUnitId){ diff --git a/pages/projectEnd/specialOperations/fireWork/addFireWorkPlan.vue b/pages/projectEnd/specialOperations/fireWork/addFireWorkPlan.vue index 72772b32..2a456036 100644 --- a/pages/projectEnd/specialOperations/fireWork/addFireWorkPlan.vue +++ b/pages/projectEnd/specialOperations/fireWork/addFireWorkPlan.vue @@ -139,6 +139,7 @@ }, saveForm(){ let data = { + type: 2, dutyRegion: this.formData.dutyRegion, progressDescribe: this.formData.progressDescribe, engineeringId: this.formData.engineeringId, diff --git a/pages/projectEnd/specialOperations/fireWork/addFireWorkSide.vue b/pages/projectEnd/specialOperations/fireWork/addFireWorkSide.vue index bfeda70c..1cfe1132 100644 --- a/pages/projectEnd/specialOperations/fireWork/addFireWorkSide.vue +++ b/pages/projectEnd/specialOperations/fireWork/addFireWorkSide.vue @@ -164,6 +164,7 @@ buildSituation: this.formData.buildSituation, dangerousEngineeringId: this.formData.dangerousEngineeringId, createUser: JSON.parse(uni.getStorageSync('userInfo')).userId, + type:2 } let arr = [] this.formData.imgFileList.forEach(item=>{ diff --git a/pages/projectEnd/specialOperations/fireWork/fireWork.vue b/pages/projectEnd/specialOperations/fireWork/fireWork.vue index 97bce790..53046148 100644 --- a/pages/projectEnd/specialOperations/fireWork/fireWork.vue +++ b/pages/projectEnd/specialOperations/fireWork/fireWork.vue @@ -7,24 +7,26 @@ - - + + + - 未销项{{item.hiddenDangerNum}} - {{item.engineeringName}} + + 动火地点和动火部位：{{item.fireLocationAndFirePart}} - + - 类别：{{item.engineeringTypeName}} - 超危 + + 动火人：{{item.firemanName}} + @@ -50,7 +52,8 @@ projectSn: "", listData:[], isLoadMore: false, - loadStatus: 'more' + loadStatus: 'more', + fireWorkList: [], } }, onShow(){ @@ -60,6 +63,7 @@ onLoad(){ this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn this.initData() + this.getFireWorkList() }, onReachBottom() { console.log(1) @@ -67,6 +71,7 @@ this.isLoadMore=true this.pageNo+=1 this.initData() + this.getFireWorkList() } }, onPullDownRefresh() { @@ -74,8 +79,38 @@ this.pageNo=1 this.listData=[] this.initData() + this.getFireWorkList() }, methods:{ + getFireWorkList(){ + let data = { + pageNo: this.pageNo, + pageSize: this.pageSize, + projectSn: this.projectSn + } + this.sendRequest({ + url:'xmgl/xzSpecialOperationFireSafety/page', + method:'get', + data:data, + success:res=>{ + uni.hideLoading() + if(res.code==200){ + console.log("fireWorkList======================",res) + // this.listData = res.result.records + // this.fireWorkList=this.fireWorkList.concat(res.result) + this.fireWorkList=this.fireWorkList.concat(res.result.records) + if(res.result.records.length - 危大工程名称：{{checkRecord.engineeringName}} + + 动火作业 计划执行时间：{{checkRecord.planTime}} 申请验收单位：{{checkRecord.applyAcceptanceUnitName}} 申请验收人：{{checkRecord.applyAcceptanceUserName}} @@ -81,7 +82,7 @@ - 提示：最终验收通过后，将闭合整个危大任务计划，任何人不能再进行操作！ + 提示：最终验收通过后，将闭合该动火作业计划，任何人不能再进行操作！ 关闭危大工程 @@ -244,7 +245,8 @@ id: this.checkRecord.id, acceptanceResult: this.formData.acceptanceResult, //验收结果 acceptanceDesc: this.formData.acceptanceDescribe, //验收描述 - photo: this.formData.imgFileList[0].url + photo: this.formData.imgFileList[0].url, + type:2 } // data.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId; // let arr = [] diff --git a/pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue b/pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue index 064d532a..0050eca9 100644 --- a/pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue +++ b/pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue @@ -59,7 +59,8 @@ method:'get', data:{ projectSn: this.projectSn, - acceptanceUserId: this.userInfo.userId + acceptanceUserId: this.userInfo.userId, + type:2 }, success:res=>{ uni.hideLoading() diff --git a/pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue b/pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue index eb0ff91e..96a2e7fe 100644 --- a/pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue +++ b/pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue @@ -9,6 +9,66 @@ + 动火人：{{detailData.firemanName}} + + + 动火方式：{{detailData.hotMethod}} + + + 动火实施时间：{{detailData.hotWorkExecutionBeginTime+'-'+detailData.hotWorkExecutionEndTime}} + + + 动火地点和动火部位：{{detailData.fireLocationAndFirePart}} + + + + 作业内容：{{detailData.jobContent}} + + + 作业单位：{{detailData.operatingUnitName}} + + + 动火作业级别：{{detailData.hotWorkLevel}} + + + 作业负责人：{{detailData.assignmentPersonInChargeName}} + + + 作业申请单位：{{detailData.jobApplicationUnitName}} + + + 作业申请时间：{{detailData.jobApplicationTime}} + + + 关联的其他特殊作业：{{detailData.otherRelatedSpecialTask}} + + + 证书编号：{{detailData.certificateNo}} + + + 安全作业票编号：{{detailData.safetyWorkTicketCode}} + + + 风险辨识结果：{{detailData.riskIdentificationResult}} + + + + + 气体取样分析时间 + 代表性气体 + 分析结果/% + + + {{item.gasAnalyzeTime}} + {{item.representativeGas}} + {{item.analyzeResult}} + + + + + + + 负责人：{{detailData.personLiable ? detailData.personLiable : "无"}} 责任分包：{{detailData.responsibilityCompany ? detailData.responsibilityCompany : "无"}} - + --> {{isShow ? "收起":"展开"}} @@ -55,19 +112,10 @@ - + - - @@ -88,28 +136,13 @@ import fireWorkSafe from './fireWorkSafe.vue' import fireWorkSide from './fireWorkSide.vue' import fireWorkFinally from './fireWorkFinally.vue' - // import safeList from './safeList.vue' - // import control from './control.vue' - // import planList from './planList.vue' - // import constructionStation from './constructionStation.vue' - // import ordinaryAcceptance from './ordinaryAcceptance.vue' - // import engineeringData from './engineeringData.vue' - // import verifyTableList from './verifyTableList.vue' - // import finallyAcceptance from './finallyAcceptance.vue' + export default { components:{ fireWorkPlan, fireWorkSafe, fireWorkSide, fireWorkFinally, - // safeList, - // control, - // planList, - // constructionStation, - // ordinaryAcceptance, - // engineeringData, - // verifyTableList, - // finallyAcceptance }, data(){ return{ @@ -143,10 +176,17 @@ }, onShow(){ this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; - this.initData() - if(this.$refs['list'] && this.$refs['list'].initData){ - this.$refs['list'].initData() - } + // this.initData() + this.getFireWork() + let that = this; + setTimeout(function(){ + console.log(that.$refs,777) + console.log(that.$refs.listBox,777) + if(that.$refs['list'] && that.$refs['list'].initData){ + console.log(777888) + that.$refs['list'].initData() + } + },200) }, onLoad(val){ this.detailId = val.id @@ -156,11 +196,40 @@ mounted() { }, methods:{ + getFireWork(){ + this.sendRequest({ + url:'xmgl/xzSpecialOperationFireSafety/queryById', + method:'get', + data:{id:this.detailId}, + success:res=>{ + uni.hideLoading() + // if(res.code==200){ + // this.listData = res.result.records + // } + this.detailData = res.result + // let str = ''; + // if(res.result.chooseTypeDescribeList){ + // this.detailData.describeName + // res.result.chooseTypeDescribeList.map((item,index) => { + // if(index == res.result.chooseTypeDescribeList.length - 1){ + // str = str + item.describeName + // } else { + // str = str + item.describeName + ',' + // } + // }) + // console.log(str,123456789) + // this.detailData.describeName = str; + // } + console.log("fireWork=======================",this.detailData) + this.getApply() + } + }) + }, initData(){ this.sendRequest({ url:'xmgl/dangerousEngineeringRecord/queryById', method:'post', - data:{id:this.detailId}, + data:{id:this.detailId,type:2}, success:res=>{ uni.hideLoading() // if(res.code==200){ @@ -194,6 +263,7 @@ data:{ engineeringId: this.detailData.id, projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn, + type:2 }, success:res=>{ uni.hideLoading() @@ -235,7 +305,7 @@ } uni.navigateTo({ // url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck' - url:'../../safeSame/addIssue?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck' + url:'../../safeSame/addIssue?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck&type=2' }) } else if(this.activeIndex == 3){ uni.navigateTo({ @@ -260,6 +330,20 @@