guoyuepeng
/
qa-prevention-gwj-first-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

高危作业申请提交后，下一步的操作人员账号中在主界面和高危作业界面中都没有相应的提示。

bug优化0603
WenShiJun 2024-06-05 15:04:52 +08:00
parent fcc5d47399
commit f4f91b834c
20 changed files with 1128 additions and 842 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pages/application/gf-eight-work/high-work/home.vue
View File

@ -181,7 +181,6 @@
if ("success" == res.data.result) {
_this.count = res.data.count;
}
}
})
},

137
pages/application/high-risk-work/home.vue
View File

@ -10,6 +10,12 @@
<navigator class="a" hover-class="none" :url="item.url">
<view class="image">
<image :src="item.image" mode=""></image>
<view v-if="item.hotWorkCount > 0" class="badge">{{ item.hotWorkCount }}</view>
<view v-if="item.hightWorkCount > 0" class="badge">{{ item.hightWorkCount }}</view>
<view v-if="item.blindBoardCount > 0" class="badge">{{ item.blindBoardCount }}</view>
<view v-if="item.HoistingCount > 0" class="badge">{{ item.HoistingCount }}</view>
<view v-if="item.confinedSpaceCount > 0" class="badge">{{ item.confinedSpaceCount }}</view>
<view v-if="item.electricityCount > 0" class="badge">{{ item.electricityCount }}</view>
</view>
<view class="title">
<text>{{ item.title }}</text>
@ -22,51 +28,126 @@
</template>
<script>
import { basePath, loginUser } from '@/common/tool.js';
export default {
data() {
return {
highRiskList:[
highRiskList: [
{
title:'动火作业',
url:'/pages/application/eight-assignments/index',
image:require('../../../static/new_images/i1.png'),
},
// {
// title: '新动火作业',
// url:'/pages/application/hotwork_cfd/home',
// image:require('../../../static/new_images/i1.png'),
// },
{
title:'高处作业',
url:'/pages/application/gf-eight-work/high-work/home',
image:require('../../../static/new_images/i2.png'),
title: '动火作业',
url: '/pages/application/eight-assignments/index',
image: require('../../../static/new_images/i1.png'),
hotWorkCount: 0,
},
{
title:'盲板作业',
url:'/pages/application/gf-eight-work/blind-board/home',
image:require('../../../static/new_images/i3.png'),
title: '高处作业',
url: '/pages/application/gf-eight-work/high-work/home',
image: require('../../../static/new_images/i2.png'),
hightWorkCount: 0,
},
{
title:'吊装作业',
url:'/pages/application/gf-eight-work/hoisting/home',
image:require('../../../static/new_images/i4.png'),
title: '盲板作业',
url: '/pages/application/gf-eight-work/blind-board/home',
image: require('../../../static/new_images/i3.png'),
blindBoardCount: 0,
},
{
title:'有限空间安全作业',
url:'/pages/application/gf-eight-work/confinedspace/home',
image:require('../../../static/new_images/i5.png'),
title: '吊装作业',
url: '/pages/application/gf-eight-work/hoisting/home',
image: require('../../../static/new_images/i4.png'),
HoistingCount: 0,
},
{
title:'临时用电安全作业',
url:'/pages/application/gf-eight-work/electricity/home',
image:require('../../../static/new_images/i6.png'),
title: '有限空间安全作业',
url: '/pages/application/gf-eight-work/confinedspace/home',
image: require('../../../static/new_images/i5.png'),
confinedSpaceCount: 0,
},
{
title: '临时用电安全作业',
url: '/pages/application/gf-eight-work/electricity/home',
image: require('../../../static/new_images/i6.png'),
electricityCount: 0,
},
],
}
};
},
}
onShow() {
this.updateWorkCounts('/app/hotwork/cfd/countCheck', '动火作业', 'hotWorkCount');
this.updateWorkCounts('/app/gfHighwork/countCheck', '高处作业', 'hightWorkCount');
this.updateWorkCounts('/app/gfBlindBoard/countCheck', '盲板作业', 'blindBoardCount');
this.updateWorkCounts('/app/gfHoisting/countCheck', '吊装作业', 'blindBoardCount');
this.updateWorkCounts('/app/gfConfinedSpace/countCheck', '有限空间安全作业', 'blindBoardCount');
this.updateWorkCounts('//app/gfElectricity/countCheck', '临时用电安全作业', 'electricityCount');
},
methods: {
updateWorkCounts(url, title, countKey) {
uni.showLoading({ title: "加载中..." }); // 加载中动画
uni.request({
url: basePath + url,
method: 'POST',
dataType: 'json',
header: { 'Content-type': 'application/x-www-form-urlencoded' },
data: {
tm: new Date().getTime(),
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
uni.hideLoading(); // 结束加载中动画
if (res.data.result === "success") {
let totalCount = res.data.count.SUMCOUNT;
this.highRiskList = this.highRiskList.map(item => {
if (item.title === title) {
return { ...item, [countKey]: totalCount };
}
return item;
});
}
}
});
}
}
};
</script>
<style>
.new-apps-box {
padding: 20upx;
}
.new-apps-warp {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.new-apps-item {
position: relative;
width: 30%;
margin-bottom: 20upx;
text-align: center;
}
.new-apps-item .image {
position: relative;
width: 100%;
height: 100upx;
}
.new-apps-item .badge {
position: absolute;
top: -10px;
right: 0;
background-color: #dd514c;
color: white;
border-radius: 50%;
padding: 2px 5px;
font-size: 12px;
}
.new-apps-item .title {
margin-top: -5upx;
}
</style>

2
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail.vue
View File

@ -454,7 +454,7 @@
<!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view v-if="pd.APPROVAL_SIGNATURE">
<view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>

1541
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
View File

File diff suppressed because it is too large Load Diff

2
pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
View File

@ -88,10 +88,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}

2
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail.vue
View File

@ -446,7 +446,7 @@
</view>
</view>
</view>
<view v-if="pd.APPROVAL_SIGNATURE">
<view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>

53
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
View File

@ -107,10 +107,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}
@ -247,10 +249,10 @@
</view>
</view>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业负责人</view>
@ -260,11 +262,22 @@
<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view>
<view class="cu-form-group" >
<view class="title">项目主管部门负责人</view>
{{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">属地监管单位负责人</view>
@ -275,10 +288,10 @@
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">安全管理部门负责人</view>
@ -409,6 +422,20 @@
imgList:[],
}
},
computed: {
formattedConfirmContent() {
return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
},
formattedExamineApprovalOpinions() {
return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
},
formattedLeaderContent() {
return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
},
formattedAuditContent() {
return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;

2
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail.vue
View File

@ -454,7 +454,7 @@
<!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view v-if="pd.APPROVAL_SIGNATURE">
<view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>

45
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
View File

@ -131,10 +131,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}
@ -269,10 +271,10 @@
</view>
</view>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;;">-->
<!-- <view class="title">作业负责人</view>-->
<!-- {{pd.CONFIRM_USER_NAME}} {{pd.CONFIRM_USER_SIGNER_TIME}}-->
@ -295,11 +297,23 @@
<!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view>
<view class="cu-form-group" >
<view class="title">项目主管部门负责人</view>
{{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view>
</view>
<view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view>
<!-- <view class="cu-form-group" style="border-bottom: 1px solid #eee;border-top: 1px dashed #eee;;">-->
<!-- <view class="title">动火点属地监管单位负责人</view>-->
<!-- {{pd.LEADER_USER_NAME}} {{pd.LEADER_USER_SIGNER_TIME}}-->
@ -313,7 +327,7 @@
<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view>
</view>
</view>
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" v-model="pd.CONTENT" placeholder="请输入意见"></textarea>
@ -432,6 +446,17 @@
imgList:[],
}
},
computed: {
formattedConfirmContent() {
return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
},
formattedExamineApprovalOpinions() {
return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
},
formattedLeaderContent() {
return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;

2
pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail.vue
View File

@ -131,10 +131,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}

2
pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail.vue
View File

@ -442,7 +442,7 @@
</view>
</view>
</view>
<view v-if="pd.APPROVAL_SIGNATURE">
<view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>

2
pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
View File

@ -102,10 +102,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 80px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}

2
pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail.vue
View File

@ -107,10 +107,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}

2
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail.vue
View File

@ -659,7 +659,7 @@
return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
},
formattedAuditContent() {
return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '' ? this.pd.AUDIT_CONTENT : '同意';
return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
},
formattedApproveContent() {
return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';

21
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
View File

@ -102,10 +102,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}
@ -264,10 +266,9 @@
</view>
</view>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
@ -278,9 +279,11 @@
<image :src="baseImgPath + pd.CONFIRM_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFIRM_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
@ -410,6 +413,14 @@
imgList:[],
}
},
computed: {
formattedConfirmContent() {
return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
},
formattedExamineApprovalOpinions() {
return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;

4
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail.vue
View File

@ -136,10 +136,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据" >
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}
@ -452,7 +454,7 @@
<!-- <view class="title">监护人</view>-->
<!-- {{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}-->
<!-- </view>-->
<view v-if="pd.APPROVAL_SIGNATURE">
<view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>

69
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
View File

@ -262,10 +262,10 @@
</view>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业负责人</view>
@ -276,24 +276,23 @@
</view>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.BELONGING_OPINIONS"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view v-if="pd.EXAMINE_APPROVAL_SIGNATURE">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedExamineApprovalOpinions"></textarea>
</view>
</view>
<view class="cu-form-group" >
<view class="title">项目主管部门负责人</view>
{{pd.BELONGING_USER_NAME}} {{pd.BELONGING_SIGNATURE_TIME}}
</view>
<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
<image :src="baseImgPath + pd.BELONGING_SIGNATURE" mode="aspectFill" @click="previewImage(baseImgPath + pd.BELONGING_SIGNATURE)" style="height: 100%;"></image>
{{pd.EXAMINE_USER_NAME}} {{pd.EXAMINE_APPROVAL_CREATE_TIME}}
</view>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.LEADER_CONTENT"></textarea>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">属地监管单位意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedLeaderContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">属地监管单位负责人</view>
@ -303,11 +302,12 @@
<image :src="baseImgPath + pd.LEADER_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.LEADER_USER_SIGNER_PATH)" style="height: 100%;"></image>
</view>
</view>
</view>
<view v-if="pd.AUDIT_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.AUDIT_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedAuditContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">安全管理部门负责人</view>
@ -319,10 +319,10 @@
</view>
</view>
<view v-if="pd.APPROVE_USER_SIGNER_PATH">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.APPROVE_CONTENT"></textarea>
</view>
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="formattedApproveContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">动火审批人</view>
@ -453,6 +453,23 @@
imgList:[],
}
},
computed: {
formattedConfirmContent() {
return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
},
formattedExamineApprovalOpinions() {
return this.pd.EXAMINE_APPROVAL_OPINIONS && this.pd.EXAMINE_APPROVAL_OPINIONS !== '' ? this.pd.EXAMINE_APPROVAL_OPINIONS : '同意';
},
formattedLeaderContent() {
return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
},
formattedAuditContent() {
return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
},
formattedApproveContent() {
return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;

4
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-alldetail.vue
View File

@ -446,7 +446,7 @@
</view>
</view>
</view>
<view v-if="pd.APPROVAL_SIGNATURE">
<view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">项目主管部门负责意见</view>
@ -659,7 +659,7 @@
return this.pd.LEADER_CONTENT && this.pd.LEADER_CONTENT !== '无' ? this.pd.LEADER_CONTENT : '同意';
},
formattedAuditContent() {
return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '' ? this.pd.AUDIT_CONTENT : '同意';
return this.pd.AUDIT_CONTENT && this.pd.AUDIT_CONTENT !== '无' ? this.pd.AUDIT_CONTENT : '同意';
},
formattedApproveContent() {
return this.pd.APPROVE_CONTENT && this.pd.APPROVE_CONTENT !== '无' ? this.pd.APPROVE_CONTENT : '同意';

9
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
View File

@ -102,10 +102,12 @@
<uni-table name='measuresList' border stripe emptyText="暂无更多数据">
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">序&nbsp;号</uni-th>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">操作</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-td align="center">{{ index + 1 }}</uni-td>
<uni-td>
<view style="margin-bottom: 20upx;">
{{ item.PROTECTIVE_MEASURES }}
@ -274,7 +276,7 @@
<view class="wui-form-list">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="pd.CONFIRM_CONTENT"></textarea>
<textarea maxlength="255" disabled="disabled" v-model="formattedConfirmContent"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
@ -409,6 +411,11 @@ export default {
imgList: [],
}
},
computed: {
formattedConfirmContent() {
return this.pd.CONFIRM_CONTENT && this.pd.CONFIRM_CONTENT !== '无' ? this.pd.CONFIRM_CONTENT : '同意';
}
},
onLoad(event) {
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;

68
pages/basics/home.vue
View File

@ -20,6 +20,7 @@
<navigator class="a" hover-class="none" :url="item.url">
<view class="image">
<image :src="item.image" mode=""></image>
<view v-if="item.title === '高危作业' && totalUnreadCount > 0" class="badge">{{ totalUnreadCount }}</view>
</view>
<view class="title">
<text>{{ item.title }}</text>
@ -274,6 +275,7 @@
mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
data() {
return {
totalUnreadCount: 0,
girdList:[
{
title:'基本资料',
@ -398,6 +400,7 @@
this.getData()
this.getHiddenData()
this.getSafetyEnvironmentalCount()
this.getSumCount();
// this.getListData()
console.info(loginUser)
// this._freshing = false;
@ -603,6 +606,42 @@
// }
// });
},
async getSumCount() {
const hotWorkCount = await this.getCount('/app/hotwork/cfd/countCheck');
const highWorkCount = await this.getCount('/app/gfHighwork/countCheck');
const blindBoardCount = await this.getCount('/app/gfBlindBoard/countCheck');
const hoistingCount = await this.getCount('/app/gfHoisting/countCheck');
const confinedSpaceCount = await this.getCount('/app/gfConfinedSpace/countCheck');
const electricityCount = await this.getCount('/app/gfElectricity/countCheck');
this.totalUnreadCount = hotWorkCount + highWorkCount + blindBoardCount + hoistingCount + confinedSpaceCount + electricityCount;
},
getCount(url) {
return new Promise((resolve, reject) => {
uni.request({
url: basePath + url,
method: 'POST',
dataType: 'json',
header: { 'Content-type': 'application/x-www-form-urlencoded' },
data: {
tm: new Date().getTime(),
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
if (res.data.result === "success") {
resolve(res.data.count.SUMCOUNT || 0);
} else {
resolve(0);
}
},
fail: (err) => {
console.error(err);
resolve(0);
},
});
});
},
// 隐患播报
getHiddenData() {
return new Promise((resolve, reject) => {
@ -812,17 +851,17 @@
</script>
<style lang="scss" scoped>
.status_bar {
height: var(--status-bar-height);
width: 100%;
background-color: #022267;
height: var(--status-bar-height);
width: 100%;
background-color: #022267;
}
.top_view {
height: var(--status-bar-height);
width: 100%;
position: fixed;
background-color: #022267;
top: 0;
z-index: 999;
height: var(--status-bar-height);
width: 100%;
position: fixed;
background-color: #022267;
top: 0;
z-index: 999;
}
.banner{
background-image: url("/static/new_images/banner.png");
@ -851,10 +890,21 @@
.image{
flex-basis: 100%;
text-align: center;
position: relative; // 添加相对定位
image{
width: 84upx;
height: 84upx;
}
.badge {
position: absolute;
top: -10px; // 调整位置
right: 0; // 调整位置
background-color: #dd514c;
color: white;
border-radius: 50%;
padding: 2px 5px;
font-size: 12px;
}
}
.title{
flex-basis: 100%;