diff --git a/pages.json b/pages.json index ee5066be..dd04438a 100644 --- a/pages.json +++ b/pages.json @@ -1716,78 +1716,78 @@ "navigationBarTitleText" : "修改密码" } }, + { + "path" : "pages/projectEnd/specialOperations/specialOperations", + "style" : + { + "navigationBarTitleText" : "" + } + }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWork", + "path" : "pages/projectEnd/specialOperations/fireWork/work", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/specialOperations", + "path" : "pages/projectEnd/specialOperations/fireWork/detail", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWorkDetail", + "path" : "pages/projectEnd/specialOperations/fireWork/plan", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWorkPlan", + "path" : "pages/projectEnd/specialOperations/fireWork/addPlan", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/addFireWorkPlan", + "path" : "pages/projectEnd/specialOperations/fireWork/safe", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWorkSafe", + "path" : "pages/projectEnd/specialOperations/fireWork/safeList", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWorkSafeList", + "path" : "pages/projectEnd/specialOperations/fireWork/side", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWorkSide", + "path" : "pages/projectEnd/specialOperations/fireWork/addSide", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/addFireWorkSide", + "path" : "pages/projectEnd/specialOperations/fireWork/workFinally", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWorkFinally", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/projectEnd/specialOperations/fireWork/addFireWorkFinally", + "path" : "pages/projectEnd/specialOperations/fireWork/addWorkFinally", "style" : { "navigationBarTitleText" : "" @@ -1801,14 +1801,21 @@ } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWorkCheck", + "path" : "pages/projectEnd/specialOperations/fireWork/check", "style" : { "navigationBarTitleText" : "" } }, { - "path" : "pages/projectEnd/specialOperations/fireWork/fireWorkCheckList", + "path" : "pages/projectEnd/specialOperations/fireWork/checkList", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/projectEnd/specialOperations/fireWork/safeMesure", "style" : { "navigationBarTitleText" : "" diff --git a/pages/projectEnd/dangerBigProject/addConstructionStation.vue b/pages/projectEnd/dangerBigProject/addConstructionStation.vue index bfeda70c..de2f83f5 100644 --- a/pages/projectEnd/dangerBigProject/addConstructionStation.vue +++ b/pages/projectEnd/dangerBigProject/addConstructionStation.vue @@ -169,6 +169,7 @@ this.formData.imgFileList.forEach(item=>{ arr.push(item.url) }) + data.type = 1 data.imageUrl = arr.join(',') // if(data.sideStationAddr == ""){ // uni.showToast({ diff --git a/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue b/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue index 97cf85e5..0eebb507 100644 --- a/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue +++ b/pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue @@ -144,6 +144,7 @@ acceptanceUnitId: this.enterpriseId, acceptanceUserId: this.acceptancePerson.userId, planTime: this.planTime, + type: 1 } console.log(data); if(!data.acceptanceUnitId){ diff --git a/pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue b/pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue index 02bcce54..ab06f0f0 100644 --- a/pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue +++ b/pages/projectEnd/dangerBigProject/addOrdinaryAcceptance.vue @@ -171,7 +171,8 @@ acceptanceRegion: this.formData.acceptanceRegion, acceptanceResult: this.formData.acceptanceResult, acceptanceType: this.formData.acceptanceType, - dangerousEngineeringId: this.formData.dangerousEngineeringId + dangerousEngineeringId: this.formData.dangerousEngineeringId, + type: 1 } data.createUser = JSON.parse(uni.getStorageSync('userInfo')).userId; let arr = [] diff --git a/pages/projectEnd/dangerBigProject/addPlan.vue b/pages/projectEnd/dangerBigProject/addPlan.vue index 72772b32..a46a2d2f 100644 --- a/pages/projectEnd/dangerBigProject/addPlan.vue +++ b/pages/projectEnd/dangerBigProject/addPlan.vue @@ -143,7 +143,8 @@ progressDescribe: this.formData.progressDescribe, engineeringId: this.formData.engineeringId, createUser: this.formData.createUser, - createUserName: this.formData.createUserName + createUserName: this.formData.createUserName, + type: 1 } let arr = [] this.formData.imgFileList.forEach(item=>{ diff --git a/pages/projectEnd/dangerBigProject/backlogList.vue b/pages/projectEnd/dangerBigProject/backlogList.vue index efdc5ad8..577f6fb3 100644 --- a/pages/projectEnd/dangerBigProject/backlogList.vue +++ b/pages/projectEnd/dangerBigProject/backlogList.vue @@ -59,7 +59,8 @@ method:'get', data:{ projectSn: this.projectSn, - acceptanceUserId: this.userInfo.userId + acceptanceUserId: this.userInfo.userId, + type:1 }, success:res=>{ uni.hideLoading() diff --git a/pages/projectEnd/dangerBigProject/constructionStation.vue b/pages/projectEnd/dangerBigProject/constructionStation.vue index 6d511a17..c0f606e8 100644 --- a/pages/projectEnd/dangerBigProject/constructionStation.vue +++ b/pages/projectEnd/dangerBigProject/constructionStation.vue @@ -52,7 +52,7 @@ this.sendRequest({ url:'xmgl/dangerousEngineeringSideStation/selectList', method:'post', - data: {engineeringId: this.detailId}, + data: {engineeringId: this.detailId,type:1}, success:res=>{ uni.hideLoading() if(res.code==200){ diff --git a/pages/projectEnd/dangerBigProject/details.vue b/pages/projectEnd/dangerBigProject/details.vue index 0b1852f9..361689a3 100644 --- a/pages/projectEnd/dangerBigProject/details.vue +++ b/pages/projectEnd/dangerBigProject/details.vue @@ -146,9 +146,14 @@ onShow(){ this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight; this.initData() - if(this.$refs['list'] && this.$refs['list'].initData){ - this.$refs['list'].initData() - } + let that = this; + setTimeout(function(){ + // console.log(that.$refs,777) + // console.log(that.$refs.list,777) + if(that.$refs['list'] && that.$refs['list'].initData){ + that.$refs['list'].initData() + } + },200) }, onLoad(val){ this.detailId = val.id @@ -196,6 +201,7 @@ data:{ engineeringId: this.detailData.id, projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn, + type:1 }, success:res=>{ uni.hideLoading() diff --git a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue index d86f13c1..6c7ccfa4 100644 --- a/pages/projectEnd/dangerBigProject/finallyAcceptance.vue +++ b/pages/projectEnd/dangerBigProject/finallyAcceptance.vue @@ -50,6 +50,7 @@ data:{ engineeringId: this.detailId, projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn, + type: 1 }, success:res=>{ uni.hideLoading() diff --git a/pages/projectEnd/dangerBigProject/planList.vue b/pages/projectEnd/dangerBigProject/planList.vue index 23c2bed6..398a3c5b 100644 --- a/pages/projectEnd/dangerBigProject/planList.vue +++ b/pages/projectEnd/dangerBigProject/planList.vue @@ -52,7 +52,7 @@ this.sendRequest({ url:'xmgl/dangerousEngineeringProgressRecord/list', method:'post', - data: {engineeringId: this.detailId}, + data: {engineeringId: this.detailId,type:1}, success:res=>{ uni.hideLoading() if(res.code==200){ diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue index 0be6e235..fa2e8c7a 100644 --- a/pages/projectEnd/safeSame/addIssue.vue +++ b/pages/projectEnd/safeSame/addIssue.vue @@ -582,7 +582,7 @@ this.form.itemId = option.itemId console.log(dateformat(new Date()), 777888) if(option.engineeringId) this.engineeringId = option.engineeringId - if(option.type) this.type = option.type + if(option.type) this.type = Number(option.type) }, @@ -1322,7 +1322,7 @@ data.creatorId = this.userInfo.userId data.dangerItemContent = this.issueName if(this.engineeringId) data.engineeringId = this.engineeringId - if(this.type) data.type = '2' + if(this.type) data.type = this.type let pointArr = [] for (let i = 0; i < this.pointList.length; i++) { let obj = @@ -1388,7 +1388,7 @@ } if(this.engineeringId) data2.engineeringId = this.engineeringId - if(this.type) data2.type = '2' + if(this.type) data2.type = this.type console.log(data.taskId); await this.sendRequest({ url: 'xmgl/xzSecurityQualityInspectionRecord/add', diff --git a/pages/projectEnd/specialOperations/fireWork/addFireWorkPlan.vue b/pages/projectEnd/specialOperations/fireWork/addPlan.vue similarity index 100% rename from pages/projectEnd/specialOperations/fireWork/addFireWorkPlan.vue rename to pages/projectEnd/specialOperations/fireWork/addPlan.vue diff --git a/pages/projectEnd/specialOperations/fireWork/addFireWorkSide.vue b/pages/projectEnd/specialOperations/fireWork/addSide.vue similarity index 100% rename from pages/projectEnd/specialOperations/fireWork/addFireWorkSide.vue rename to pages/projectEnd/specialOperations/fireWork/addSide.vue diff --git a/pages/projectEnd/specialOperations/fireWork/addFireWorkFinally.vue b/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue similarity index 100% rename from pages/projectEnd/specialOperations/fireWork/addFireWorkFinally.vue rename to pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue diff --git a/pages/projectEnd/specialOperations/fireWork/fireWorkCheck.vue b/pages/projectEnd/specialOperations/fireWork/check.vue similarity index 99% rename from pages/projectEnd/specialOperations/fireWork/fireWorkCheck.vue rename to pages/projectEnd/specialOperations/fireWork/check.vue index 419ff044..996308f0 100644 --- a/pages/projectEnd/specialOperations/fireWork/fireWorkCheck.vue +++ b/pages/projectEnd/specialOperations/fireWork/check.vue @@ -84,7 +84,7 @@ 提示：最终验收通过后，将闭合该动火作业计划，任何人不能再进行操作！ - 关闭危大工程 + 关闭 diff --git a/pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue b/pages/projectEnd/specialOperations/fireWork/checkList.vue similarity index 94% rename from pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue rename to pages/projectEnd/specialOperations/fireWork/checkList.vue index 0050eca9..a85e8e9d 100644 --- a/pages/projectEnd/specialOperations/fireWork/fireWorkCheckList.vue +++ b/pages/projectEnd/specialOperations/fireWork/checkList.vue @@ -8,7 +8,8 @@ - 危大工程名称：{{item.engineeringName}} + + 动火作业 待确认 合格 @@ -79,7 +80,7 @@ } checkRecord = item uni.navigateTo({ - url:'./fireWorkCheck?checkRecord='+encodeURIComponent(JSON.stringify(checkRecord)) + url:'./check?checkRecord='+encodeURIComponent(JSON.stringify(checkRecord)) }) } } diff --git a/pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue similarity index 67% rename from pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue rename to pages/projectEnd/specialOperations/fireWork/detail.vue index 96a2e7fe..a511c578 100644 --- a/pages/projectEnd/specialOperations/fireWork/fireWorkDetail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -51,51 +51,37 @@ 风险辨识结果：{{detailData.riskIdentificationResult}} + + 安全措施 + - - - 气体取样分析时间 + + + 气体取样分析时间 代表性气体 分析结果/% - - {{item.gasAnalyzeTime}} - {{item.representativeGas}} - {{item.analyzeResult}} + + {{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].gasAnalyzeTime:''}} + {{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].representativeGas:''}} + {{detailData.xzGasAnalyzeList[0]?detailData.xzGasAnalyzeList[0].analyzeResult:''}} + + + {{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].gasAnalyzeTime:''}} + {{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].representativeGas:''}} + {{detailData.xzGasAnalyzeList[1]?detailData.xzGasAnalyzeList[1].analyzeResult:''}} + + + {{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].gasAnalyzeTime:''}} + {{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].representativeGas:''}} + {{detailData.xzGasAnalyzeList[2]?detailData.xzGasAnalyzeList[2].analyzeResult:''}} - - - {{isShow ? "收起":"展开"}} + {{isShow ? "收起详情":"展开详情"}} @@ -112,10 +98,10 @@ - - - - + + + + @@ -132,23 +118,23 @@ diff --git a/pages/projectEnd/specialOperations/fireWork/fireWorkSide.vue b/pages/projectEnd/specialOperations/fireWork/side.vue similarity index 100% rename from pages/projectEnd/specialOperations/fireWork/fireWorkSide.vue rename to pages/projectEnd/specialOperations/fireWork/side.vue diff --git a/pages/projectEnd/specialOperations/fireWork/fireWork.vue b/pages/projectEnd/specialOperations/fireWork/work.vue similarity index 75% rename from pages/projectEnd/specialOperations/fireWork/fireWork.vue rename to pages/projectEnd/specialOperations/fireWork/work.vue index 53046148..7e9e3443 100644 --- a/pages/projectEnd/specialOperations/fireWork/fireWork.vue +++ b/pages/projectEnd/specialOperations/fireWork/work.vue @@ -7,8 +7,8 @@ - - + + @@ -53,7 +53,7 @@ listData:[], isLoadMore: false, loadStatus: 'more', - fireWorkList: [], + workList: [], } }, onShow(){ @@ -62,27 +62,27 @@ }, onLoad(){ this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn - this.initData() - this.getFireWorkList() + // this.initData() + this.getWorkList() }, onReachBottom() { console.log(1) if(!this.isLoadMore){ //此处判断，上锁，防止重复请求 this.isLoadMore=true this.pageNo+=1 - this.initData() - this.getFireWorkList() + // this.initData() + this.getWorkList() } }, onPullDownRefresh() { console.log(2) this.pageNo=1 this.listData=[] - this.initData() - this.getFireWorkList() + // this.initData() + this.getWorkList() }, methods:{ - getFireWorkList(){ + getWorkList(){ let data = { pageNo: this.pageNo, pageSize: this.pageSize, @@ -95,10 +95,10 @@ success:res=>{ uni.hideLoading() if(res.code==200){ - console.log("fireWorkList======================",res) + console.log("workList======================",res) // this.listData = res.result.records - // this.fireWorkList=this.fireWorkList.concat(res.result) - this.fireWorkList=this.fireWorkList.concat(res.result.records) + // this.workList=this.workList.concat(res.result) + this.workList=this.workList.concat(res.result.records) if(res.result.records.length{ - uni.hideLoading() - if(res.code==200){ - // this.listData = res.result.records - this.listData=this.listData.concat(res.result.records) - if(res.result.records.length{ + // uni.hideLoading() + // if(res.code==200){ + // // this.listData = res.result.records + // this.listData=this.listData.concat(res.result.records) + // if(res.result.records.length diff --git a/pages/projectEnd/specialOperations/fireWork/fireWorkFinally.vue b/pages/projectEnd/specialOperations/fireWork/workFinally.vue similarity index 100% rename from pages/projectEnd/specialOperations/fireWork/fireWorkFinally.vue rename to pages/projectEnd/specialOperations/fireWork/workFinally.vue diff --git a/pages/projectEnd/specialOperations/specialCheck.vue b/pages/projectEnd/specialOperations/specialCheck.vue index 3cf10a74..46dc952f 100644 --- a/pages/projectEnd/specialOperations/specialCheck.vue +++ b/pages/projectEnd/specialOperations/specialCheck.vue @@ -6,9 +6,13 @@ - - - 动火作业 + + + + + + 动火作业 + @@ -34,7 +38,7 @@ handleNavigateTo(val){ if(val === 1){ uni.navigateTo({ - url: "./fireWork/fireWorkCheckList" + url: "./fireWork/checkList" }) } } @@ -67,14 +71,29 @@ width: 220rpx; height: 274rpx; // background-color: darkblue; - image{ + .item-icon{ width: 220rpx; height: 220rpx; - } - text{ - text-align: center; display: flex; justify-content: center; + align-items: center; + image{ + width: 220rpx; + height: 220rpx; + } + } + .item-text{ + align-items: center; + width: 220rpx; + height: 54rpx; + display: flex; + justify-content: center; + align-items: center; + text{ + text-align: center; + display: flex; + justify-content: center; + } } } } diff --git a/pages/projectEnd/specialOperations/specialOperations.vue b/pages/projectEnd/specialOperations/specialOperations.vue index 5da8fd89..ae65cf86 100644 --- a/pages/projectEnd/specialOperations/specialOperations.vue +++ b/pages/projectEnd/specialOperations/specialOperations.vue @@ -6,9 +6,13 @@ - - - 动火作业 + + + + + + 动火作业 + @@ -34,7 +38,7 @@ handleNavigateTo(val){ if(val === 1){ uni.navigateTo({ - url: "./fireWork/fireWork" + url: "./fireWork/work" }) } } @@ -67,14 +71,29 @@ width: 220rpx; height: 274rpx; // background-color: darkblue; - image{ + .item-icon{ width: 220rpx; height: 220rpx; - } - text{ - text-align: center; display: flex; justify-content: center; + align-items: center; + image{ + width: 220rpx; + height: 220rpx; + } + } + .item-text{ + align-items: center; + width: 220rpx; + height: 54rpx; + display: flex; + justify-content: center; + align-items: center; + text{ + text-align: center; + display: flex; + justify-content: center; + } } } }