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

修改首页面未处理高危作业数统计 

修改动火作业流程，未进行安全措施确认不允许监护人，安全交底人和接受交底人签字
bug优化0603
WenShiJun 2024-06-11 16:16:20 +08:00
parent 9d408ab866
commit 79db9ce7dd
5 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,6 +460,14 @@
goSubmit(){
var _this = this;
let required = true
if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) {
uni.showToast({
icon: 'none',
title: '未进行安全措施确认，不能签字',
duration: 2000
});
return;
}
uni.showLoading({
title: '请稍候'
})

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

@ -559,6 +559,14 @@
goSubmit(){
var _this = this;
let required = true
if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) {
uni.showToast({
icon: 'none',
title: '未进行安全措施确认，不能签字',
duration: 2000
});
return;
}
uni.showLoading({
title: '请稍候'
})

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

@ -495,6 +495,14 @@
goSubmit(){
var _this = this;
let required = true
if (_this.pd.safetyList && _this.pd.safetyList.some(item => item.APPROVAL_STATUS === '0')) {
uni.showToast({
icon: 'none',
title: '未进行安全措施确认，不能签字',
duration: 2000
});
return;
}
uni.showLoading({
title: '请稍候'
})

18
pages/basics/home.vue
View File

@ -407,7 +407,6 @@
// setTimeout(() => {
// this.triggered = true;
// }, 1000)
},
// onPullDownRefresh() {
// console.log('refresh');
@ -429,7 +428,7 @@
},
async downCallback(page) {
this.getSumCount();
await this.getWork();
await this.getHiddenData()
await this.getSafetyEnvironmentalCount()
@ -607,14 +606,15 @@
// });
},
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');
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;
this.totalUnreadCount = hotWorkCount + highWorkCount + blindBoardCount + hoistingCount + confinedSpaceCount + electricityCount;
this.$forceUpdate();
},
getCount(url) {
return new Promise((resolve, reject) => {

7
pages/index/index.vue
View File

@ -1,6 +1,6 @@
<template>
<view>
<basics v-if="PageCur=='basics'" id="basics"></basics>
<basics v-if="PageCur=='basics'" ref="basics" id="basics"></basics>
<application v-if="PageCur=='application'"></application>
<works v-if="PageCur=='works'" id = "works"></works>
<my v-if="PageCur=='my'"></my>
@ -112,6 +112,11 @@
// this.checkUpdate("android");
},
onShow() {
console.log(this.$refs.basics,1515)
// 刷新数据
if(this.$refs.basics){
this.$refs.basics.getSumCount()
}
var _this = this;
_this.$nextTick(() => { //等待组件渲染结束才调用
if(_this.initflag) {