admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改BUG

Browse Source
This commit is contained in:
Vce 2024-05-18 03:34:25 +08:00
parent 0995e40e65
commit a61fe32713
26 changed files with 66 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.js
View File

@ -44,8 +44,8 @@ if (process.env.NODE_ENV === 'development') {
// 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/' // 湖里

6
pages/projectEnd/specialOperations/bindPlatePlug/detail.vue
View File

@ -15,7 +15,7 @@
作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
</view>
<view class="list-info">
作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
</view>
<view class="list-info">
作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
@ -58,9 +58,9 @@
</text>
</text>
</view> -->
<view class="list-info">
<!-- <view class="list-info">
监护人：<text class="detail-data">{{detailData.guardianName}}</text>
</view>
</view> -->
<view class="list-info">
盲板编号：<text class="detail-data">{{detailData.blindPlateNo}}</text>
</view>

2
pages/projectEnd/specialOperations/bindPlatePlug/safeMesure.vue
View File

@ -111,8 +111,8 @@
z-index: 2;
}
.safe-mesure-container{
margin-top: 150rpx;
padding: 0 30rpx;
padding-top: 88rpx;
padding-bottom: 100rpx;
// background-color: darkred;
.safe-mesure-header{

6
pages/projectEnd/specialOperations/bindPlatePlug/work.vue
View File

@ -16,9 +16,11 @@
作业票编号：{{item.workTicketCode}}
</view>
<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 4 ? "已完工" : "在施"}}
</view>
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}

2
pages/projectEnd/specialOperations/fireWork/safeMesure.vue
View File

@ -111,8 +111,8 @@
z-index: 2;
}
.safe-mesure-container{
margin-top: 150rpx;
padding: 0 30rpx;
padding-top: 88rpx;
padding-bottom: 100rpx;
// background-color: darkred;
.safe-mesure-header{

6
pages/projectEnd/specialOperations/fireWork/work.vue
View File

@ -16,9 +16,11 @@
作业票编号：{{item.workTicketCode}}
</view>
<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 4 ? "已完工" : "在施"}}
</view>
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}

6
pages/projectEnd/specialOperations/groundSafe/detail.vue
View File

@ -15,7 +15,7 @@
作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
</view>
<view class="list-info">
作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
</view>
<view class="list-info">
作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
@ -30,9 +30,9 @@
<view class="list-info">
作业内容：<text class="detail-data">{{detailData.jobContent}}</text>
</view>
<view class="list-info">
<!-- <view class="list-info">
监护人：<text class="detail-data">{{detailData.guardianName}}</text>
</view>
</view> -->
<view class="list-info">
关联的其他特殊作业及安全作业编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
</view>

2
pages/projectEnd/specialOperations/groundSafe/safeMesure.vue
View File

@ -111,8 +111,8 @@
z-index: 2;
}
.safe-mesure-container{
margin-top: 150rpx;
padding: 0 30rpx;
padding-top: 88rpx;
padding-bottom: 100rpx;
// background-color: darkred;
.safe-mesure-header{

6
pages/projectEnd/specialOperations/groundSafe/work.vue
View File

@ -16,9 +16,11 @@
作业票编号：{{item.workTicketCode}}
</view>
<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 4 ? "已完工" : "在施"}}
</view>
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}

9
pages/projectEnd/specialOperations/highJob/detail.vue
View File

@ -36,18 +36,21 @@
<view class="list-info">
作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
</view>
<view class="list-info">
监护人：<text class="detail-data">{{detailData.guardianName}}</text>
</view>
<view class="list-info">
作业人：<text class="detail-data">{{detailData.jobPersonName}}</text>
</view>
<!-- <view class="list-info">
监护人：<text class="detail-data">{{detailData.guardianName}}</text>
</view> -->
<view class="list-info">
风险辨识结果：<text class="detail-data">{{detailData.riskIdentificationResult}}</text>
</view>
<view class="list-info">
关联的其他特殊作业及安全作业票编号：<text class="detail-data">{{detailData.otherRelatedSpecialTask}}</text>
</view>
<view class="list-info">
作业实施时间：<text class="detail-data" v-if="detailData.workExecutionBeginTime && detailData.workExecutionEndTime">{{detailData.workExecutionBeginTime+'-'+detailData.workExecutionEndTime}}</text>
</view>
<!-- <view class="list-info">
安全作业票编号：<text class="detail-data">{{detailData.safetyWorkTicketCode}}</text>
</view> -->

2
pages/projectEnd/specialOperations/highJob/safeMesure.vue
View File

@ -111,8 +111,8 @@
z-index: 2;
}
.safe-mesure-container{
margin-top: 150rpx;
padding: 0 30rpx;
padding-top: 88rpx;
padding-bottom: 100rpx;
// background-color: darkred;
.safe-mesure-header{

6
pages/projectEnd/specialOperations/highJob/work.vue
View File

@ -16,9 +16,11 @@
作业票编号：{{item.workTicketCode}}
</view>
<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 4 ? "已完工" : "在施"}}
</view>
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}

4
pages/projectEnd/specialOperations/hoistSafe/detail.vue
View File

@ -39,9 +39,9 @@
<view class="list-info">
司索人：<text class="detail-data">{{detailData.siSuoPersonName}}</text>
</view>
<view class="list-info">
<!-- <view class="list-info">
监护人：<text class="detail-data">{{detailData.guardianName}}</text>
</view>
</view> -->
<view class="list-info">
指挥人员：<text class="detail-data">{{detailData.commanderName}}</text>
</view>

2
pages/projectEnd/specialOperations/hoistSafe/safeMesure.vue
View File

@ -111,8 +111,8 @@
z-index: 2;
}
.safe-mesure-container{
margin-top: 150rpx;
padding: 0 30rpx;
padding-top: 88rpx;
padding-bottom: 100rpx;
// background-color: darkred;
.safe-mesure-header{

6
pages/projectEnd/specialOperations/hoistSafe/work.vue
View File

@ -16,9 +16,11 @@
作业票编号：{{item.workTicketCode}}
</view>
<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 4 ? "已完工" : "在施"}}
</view>
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}

6
pages/projectEnd/specialOperations/limitSpaceWork/detail.vue
View File

@ -25,7 +25,7 @@
受限空间内原有介质名称：<text class="detail-data">{{detailData.limitSpaceMediumName}}</text>
</view>
<view class="list-info">
受限空间作业名称：<text class="detail-data">{{detailData.limitSpaceName}}</text>
受限空间名称：<text class="detail-data">{{detailData.limitSpaceName}}</text>
</view>
<view class="list-info">
作业人：<text class="detail-data">{{detailData.jobPersonName}}</text>
@ -49,9 +49,9 @@
</text>
</text>
</view>
<view class="list-info">
<!-- <view class="list-info">
监护人：<text class="detail-data">{{detailData.guardianName}}</text>
</view>
</view> -->
<view class="list-info">
作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>
</view>

4
pages/projectEnd/specialOperations/limitSpaceWork/safeMesure.vue
View File

@ -111,8 +111,8 @@
z-index: 2;
}
.safe-mesure-container{
margin-top: 150rpx;
padding: 0 30rpx;
padding-top: 88rpx;
padding-bottom: 100rpx;
// background-color: darkred;
.safe-mesure-header{
@ -178,4 +178,4 @@
}
}
}
</style>
</style>

6
pages/projectEnd/specialOperations/limitSpaceWork/work.vue
View File

@ -16,9 +16,11 @@
作业票编号：{{item.workTicketCode}}
</view>
<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 4 ? "已完工" : "在施"}}
</view>
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}

2
pages/projectEnd/specialOperations/openCircuit/detail.vue
View File

@ -15,7 +15,7 @@
作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
</view> -->
<view class="list-info">
作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
</view>
<view class="list-info">
作业单位：<text class="detail-data">{{detailData.operatingUnitName}}</text>

2
pages/projectEnd/specialOperations/openCircuit/safeMesure.vue
View File

@ -111,8 +111,8 @@
z-index: 2;
}
.safe-mesure-container{
margin-top: 150rpx;
padding: 0 30rpx;
padding-top: 88rpx;
padding-bottom: 100rpx;
// background-color: darkred;
.safe-mesure-header{

6
pages/projectEnd/specialOperations/openCircuit/work.vue
View File

@ -16,9 +16,11 @@
作业票编号：{{item.workTicketCode}}
</view>
<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 4 ? "已完工" : "在施"}}
</view>
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}

2
pages/projectEnd/specialOperations/specialCheck.vue
View File

@ -109,7 +109,7 @@
}
.sp-menu{
margin: 0 38rpx;
margin-top: 138rpx;
padding-top: 200rpx;
// height: 1200rpx;
// height: 1000rpx;
// background-color: darkred;

2
pages/projectEnd/specialOperations/specialOperations.vue
View File

@ -109,7 +109,7 @@
}
.sp-menu{
margin: 0 38rpx;
margin-top: 138rpx;
padding-top: 200rpx;
// height: 1200rpx;
// height: 1000rpx;
// background-color: darkred;

6
pages/projectEnd/specialOperations/tempElectricity/detail.vue
View File

@ -15,7 +15,7 @@
作业申请时间：<text class="detail-data">{{detailData.jobApplicationTime}}</text>
</view>
<view class="list-info">
作业申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
申请单位：<text class="detail-data">{{detailData.jobApplicationUnitName}}</text>
</view>
<view class="list-info">
作业负责人：<text class="detail-data">{{detailData.assignmentPersonInChargeName}}</text>
@ -51,9 +51,9 @@
<view class="list-info">
额定功率 ：<text class="detail-data">{{detailData.ratedPower}}</text>
</view>
<view class="list-info">
<!-- <view class="list-info">
监护人：<text class="detail-data">{{detailData.guardianName}}</text>
</view>
</view> -->
<view class="list-info">
用电人：<text class="detail-data">{{detailData.electricityCustomerName}}</text>
</view>

2
pages/projectEnd/specialOperations/tempElectricity/safeMesure.vue
View File

@ -111,8 +111,8 @@
z-index: 2;
}
.safe-mesure-container{
margin-top: 150rpx;
padding: 0 30rpx;
padding-top: 88rpx;
padding-bottom: 100rpx;
// background-color: darkred;
.safe-mesure-header{

6
pages/projectEnd/specialOperations/tempElectricity/work.vue
View File

@ -16,9 +16,11 @@
作业票编号：{{item.workTicketCode}}
</view>
<!-- <view :class="{'status2': item.engineeringState === 2,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}">
<!-- <view :class="{'status2': item.engineeringState === 2 || item.engineeringState === 3,'status4': item.engineeringState === 4}"> -->
<view :class="{'status2': item.engineeringState !== 4, 'status4': item.engineeringState === 4}">
<!-- {{item.engineeringState === 2 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}}
<!-- {{item.engineeringState === 1 ? "在施" : item.engineeringState === 2 ? "在施" : item.engineeringState === 3 ? "在施" : item.engineeringState === 4 ? "已完工" : ""}} -->
{{item.engineeringState === 4 ? "已完工" : "在施"}}
</view>
<!-- <view :class="{'status1': item.finalAcceptanceStatus == 1,'status2': item.finalAcceptanceStatus == 2}">
{{item.finalAcceptanceStatus == 1 ? "在施" : item.finalAcceptanceStatus == 2 ? "已完工" : ""}}