From 165f469190925a7817ba448fab7a9ed5a149cc24 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 16 May 2024 16:55:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A8=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/projectEnd/specialOperations/fireWork/detail.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 1ae40ca2..762f1b97 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -8,6 +8,9 @@ + + 动火作业票编号：{{detailData.workTicketCode}} + 动火人：{{detailData.firemanName}} From 586e1486c9ae20535e16cbb35bb20e02c14f5756 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 16 May 2024 17:06:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 4 ++-- .../specialOperations/fireWork/detail.vue | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/main.js b/main.js index 5cbd1e2a..9e9d6403 100644 --- a/main.js +++ b/main.js @@ -38,9 +38,9 @@ if (process.env.NODE_ENV === 'development') { // 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://182.90.224.237:51234/' //雄哥内网穿透地址 + 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' // 工作流线上地址 diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 762f1b97..7c8b18e8 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -78,6 +78,9 @@ + + 查看安全措施 + @@ -94,9 +97,6 @@ {{detailData.guardianName}} - - 查看安全措施 - @@ -311,7 +311,8 @@ .other-safe{ background-color: #fff; // margin-top: 50rpx; - padding: 0 15rpx; + padding: 15rpx 15rpx; + line-height: 40rpx; .other-head{ display: flex; .other-icon{ @@ -325,6 +326,7 @@ } } .other-content{ + font-size: 22rpx; width: auto; height: 50rpx; // background-color: darkred; @@ -333,17 +335,17 @@ margin-top: 15rpx; display: flex; .content-1{ - width: 25%; + width: 22%; } .content-2{ - width: 18%; + width: 24%; } .content-3{ - width: 26%; + width: 23%; margin-left: 10%; } .content-4{ - width: 22%; + width: 26%; } } From 198fb92369c4d9d1fd0a5a3903a52402bece0bb5 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 16 May 2024 17:32:53 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A8=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/projectEnd/specialOperations/fireWork/check.vue | 2 +- pages/projectEnd/specialOperations/fireWork/checkList.vue | 6 ++++-- pages/projectEnd/specialOperations/fireWork/detail.vue | 2 +- pages/projectEnd/specialOperations/fireWork/work.vue | 2 +- pages/projectEnd/specialOperations/fireWork/workFinally.vue | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pages/projectEnd/specialOperations/fireWork/check.vue b/pages/projectEnd/specialOperations/fireWork/check.vue index e5ea5dc9..a2a81b22 100644 --- a/pages/projectEnd/specialOperations/fireWork/check.vue +++ b/pages/projectEnd/specialOperations/fireWork/check.vue @@ -9,7 +9,7 @@ - 动火作业票编号：{{checkRecord.workTicketCode}} + 作业票编号：{{checkRecord.workTicketCode}} 计划执行时间：{{checkRecord.planTime}} 申请验收单位：{{checkRecord.applyAcceptanceUnitName}} 申请验收人：{{checkRecord.applyAcceptanceUserName}} diff --git a/pages/projectEnd/specialOperations/fireWork/checkList.vue b/pages/projectEnd/specialOperations/fireWork/checkList.vue index f84cd549..3b2dded8 100644 --- a/pages/projectEnd/specialOperations/fireWork/checkList.vue +++ b/pages/projectEnd/specialOperations/fireWork/checkList.vue @@ -9,7 +9,8 @@ - 动火作业票编号：{{item.workTicketCode}} + 作业票编号：{{item.engineeringName}} + 待确认 合格 @@ -96,7 +97,8 @@ .backlogList-admin { margin: 10px; background-color: #fff; - height: 160px; + // height: 160px; + height: auto; padding: 15px; .backlogList { diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 7c8b18e8..6c8fc28c 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -9,7 +9,7 @@ - 动火作业票编号：{{detailData.workTicketCode}} + 作业票编号：{{detailData.workTicketCode}} 动火人：{{detailData.firemanName}} diff --git a/pages/projectEnd/specialOperations/fireWork/work.vue b/pages/projectEnd/specialOperations/fireWork/work.vue index 364f1d1a..ad0785fb 100644 --- a/pages/projectEnd/specialOperations/fireWork/work.vue +++ b/pages/projectEnd/specialOperations/fireWork/work.vue @@ -13,7 +13,7 @@ 未销项{{item.hiddenDangerNum}} - 动火作业票编号：{{item.workTicketCode}} + 作业票编号：{{item.workTicketCode}} {{item.engineeringState == 1 ? "未开始" : item.engineeringState == 2 ? "在施" : item.engineeringState == 3 ? "超期" : item.engineeringState == 4 ? "已完工" : ""}} diff --git a/pages/projectEnd/specialOperations/fireWork/workFinally.vue b/pages/projectEnd/specialOperations/fireWork/workFinally.vue index cc9feb9c..20fd8a59 100644 --- a/pages/projectEnd/specialOperations/fireWork/workFinally.vue +++ b/pages/projectEnd/specialOperations/fireWork/workFinally.vue @@ -3,7 +3,7 @@ - 动火作业票编号：{{item.workTicketCode}} + 作业票编号：{{item.workTicketCode}} From e1ecea990ab87b30c98963c9d1163c12d81c489a Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 16 May 2024 17:33:36 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A8=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/projectEnd/specialOperations/fireWork/checkList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/projectEnd/specialOperations/fireWork/checkList.vue b/pages/projectEnd/specialOperations/fireWork/checkList.vue index 3b2dded8..c8639250 100644 --- a/pages/projectEnd/specialOperations/fireWork/checkList.vue +++ b/pages/projectEnd/specialOperations/fireWork/checkList.vue @@ -37,7 +37,7 @@ export default { data() { return { - title: "查看待办", + title: "动火验收", listData: [], projectSn: '', userInfo: {}, From d21f1668878feaca8ca9e8894a42393f54341493 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 16 May 2024 17:34:35 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=B1=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/projectEnd/dangerBigProject/backlogList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/projectEnd/dangerBigProject/backlogList.vue b/pages/projectEnd/dangerBigProject/backlogList.vue index 577f6fb3..b9467ee6 100644 --- a/pages/projectEnd/dangerBigProject/backlogList.vue +++ b/pages/projectEnd/dangerBigProject/backlogList.vue @@ -35,7 +35,7 @@ export default { data() { return { - title: "查看待办", + title: "危大验收", listData: [], projectSn: '', userInfo: {}, From 77beb80abb0284fac09016733ec45732dfb24c75 Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 16 May 2024 17:37:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A8=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/projectEnd/specialOperations/fireWork/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 6c8fc28c..53238919 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -342,7 +342,7 @@ } .content-3{ width: 23%; - margin-left: 10%; + // margin-left: 10%; } .content-4{ width: 26%; From 2e5ae5693c01d43cbfffc5bf4cd1d9000f00c6bc Mon Sep 17 00:00:00 2001 From: Vce Date: Thu, 16 May 2024 17:40:47 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8A=A8=E7=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialOperations/fireWork/addWorkFinally.vue | 6 +++--- pages/projectEnd/specialOperations/fireWork/detail.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue b/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue index e8c57fbd..67be7e64 100644 --- a/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue +++ b/pages/projectEnd/specialOperations/fireWork/addWorkFinally.vue @@ -8,8 +8,8 @@ - 动火作业 - + + 作业票编号：{{workTicketCode}} *验收单位 @@ -92,7 +92,7 @@ this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) this.engineeringId = val.id - this.engineeringName = val.name + this.workTicketCode = val.workTicketCode this.getEnterpriseInfoList() }, watch:{ diff --git a/pages/projectEnd/specialOperations/fireWork/detail.vue b/pages/projectEnd/specialOperations/fireWork/detail.vue index 53238919..2879b683 100644 --- a/pages/projectEnd/specialOperations/fireWork/detail.vue +++ b/pages/projectEnd/specialOperations/fireWork/detail.vue @@ -42,9 +42,9 @@ 作业申请时间：{{detailData.jobApplicationTime}} - + 证书编号：{{detailData.certificateNo}} @@ -292,7 +292,7 @@ } else if(this.activeIndex == 4){ if(this.isShowBtn){ uni.navigateTo({ - url:'./addWorkFinally?id='+this.detailId+'&name='+this.detailData.engineeringName + url:'./addWorkFinally?id='+this.detailId+'&workTicketCode='+this.detailData.workTicketCode }) }else{ uni.showToast({