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

Merge remote-tracking branch 'origin/pet' into pet

pull/11/head
liujun 2024-04-01 18:07:41 +08:00
parent 42800888f6 a74c6dc435
commit d370f5019d
3 changed files with 113 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/firefighting/checklist/components/edit.vue
View File

@ -1058,7 +1058,37 @@ export default {
},
// 移除选中项时触发的事件
handleRemove(selectedItems) {
this.form.USER_ID = []
console.log(this.form.USER_ID)
const currentUserId = this.form.USER_ID
requestFN(
'/user/listUserByCorp',
{
DEPARTMENT_ID: selectedItems.id
}
).then((data) => {
const userList = data.userList
if (userList) {
for (let i = 0; i < userList.length; i++) {
for (let j = 0; j < this.form.USER_ID.length; j++) {
if (userList[i].USER_ID === this.form.USER_ID[j]) {
for (let k = 0; k < currentUserId.length; k++) {
if (this.form.USER_ID[j] === currentUserId[k]) {
console.log(this.form.USER_ID[j])
currentUserId.splice(k, 1)
break
}
}
break
}
}
}
}
this.listLoading = false
// this.peopleList = data.userList
}).catch((e) => {
this.listLoading = false
})
this.form.USER_ID = currentUserId
// 移除选中项时同时移除全部子节点
if (this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.id)) {
this.form.INVOLVING_CORPS_DEPART_ID.splice(this.form.INVOLVING_CORPS_DEPART_ID.indexOf(selectedItems.id), 1)

3
src/views/firefighting/region/components/edit.vue
View File

@ -104,7 +104,8 @@ export default {
rules: {
FIRE_REGION_NAME: [{ required: true, message: '消防区域不为空', trigger: 'blur' }],
DEPARTMENT_ID: [{ required: true, message: '负责部门不为空', trigger: 'blur' }],
FIRE_REGION_CODE: [{ required: true, message: '区域编码不为空', trigger: 'blur' }]
FIRE_REGION_CODE: [{ required: true, message: '区域编码不为空', trigger: 'blur' }],
PHOTO_UPLOAD_METHOD: [{ required: true, message: '区域编码不为空', trigger: 'blur' }]
},
formLabelWidth: '120px',
OTHERLEVELID: '',

124
static/bi/index.html
View File

@ -403,31 +403,37 @@
本日应检查
</div>
</div>
<div class="task-text">
<div class="title">
待检查
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单待检查数量" placement="top">
<div class="task-text">
<div class="title">
待检查
</div>
<div class="color-blue f22">
{{listCountDay.denominator-listCountDay.molecule}}
</div>
</div>
<div class="color-blue f22">
{{listCountDay.denominator-listCountDay.molecule}}
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量" placement="top">
<div class="task-text">
<div class="title">
已检查
</div>
<div class="color-blue f22">
{{listCountDay.molecule}}
</div>
</div>
</div>
<div class="task-text">
<div class="title">
已检查
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量/(本周期隐患排查清单待检查数量+本周期隐患排查清单已检查数量)" placement="top">
<div class="task-text">
<div class="title">
本日完成率
</div>
<div class="color-org">
<span class="f22">{{listCountDay.percentage}}</span>
<span class="f14">%</span>
</div>
</div>
<div class="color-blue f22">
{{listCountDay.molecule}}
</div>
</div>
<div class="task-text">
<div class="title">
本日完成率
</div>
<div class="color-org">
<span class="f22">{{listCountDay.percentage}}</span>
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -438,31 +444,37 @@
本周应检查
</div>
</div>
<div class="task-text">
<div class="title">
待检查
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单待检查数量" placement="top">
<div class="task-text">
<div class="title">
待检查
</div>
<div class="color-blue f22">
{{listCountWeek.denominator-listCountWeek.molecule}}
</div>
</div>
<div class="color-blue f22">
{{listCountWeek.denominator-listCountWeek.molecule}}
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量" placement="top">
<div class="task-text">
<div class="title">
已检查
</div>
<div class="color-blue f22">
{{listCountWeek.molecule}}
</div>
</div>
</div>
<div class="task-text">
<div class="title">
已检查
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量/(本周期隐患排查清单待检查数量+本周期隐患排查清单已检查数量)" placement="top">
<div class="task-text">
<div class="title">
本周完成率
</div>
<div class="color-org">
<span class="f22">{{listCountWeek.percentage}}</span>
<span class="f14">%</span>
</div>
</div>
<div class="color-blue f22">
{{listCountWeek.molecule}}
</div>
</div>
<div class="task-text">
<div class="title">
本周完成率
</div>
<div class="color-org">
<span class="f22">{{listCountWeek.percentage}}</span>
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -473,6 +485,7 @@
本旬应检查
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单待检查数量" placement="top">
<div class="task-text">
<div class="title">
待检查
@ -481,6 +494,8 @@
{{listCountXun.denominator-listCountXun.molecule}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量" placement="top">
<div class="task-text">
<div class="title">
已检查
@ -489,6 +504,8 @@
{{listCountXun.molecule}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量/(本周期隐患排查清单待检查数量+本周期隐患排查清单已检查数量)" placement="top">
<div class="task-text">
<div class="title">
本旬完成率
@ -498,6 +515,7 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
</div>
<div class="swiper-slide">
@ -510,6 +528,7 @@
本月应检查
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单待检查数量" placement="top">
<div class="task-text">
<div class="title">
待检查
@ -518,6 +537,8 @@
{{listCountMonth.denominator-listCountMonth.molecule}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量" placement="top">
<div class="task-text">
<div class="title">
已检查
@ -526,6 +547,8 @@
{{listCountMonth.molecule}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量/(本周期隐患排查清单待检查数量+本周期隐患排查清单已检查数量)" placement="top">
<div class="task-text">
<div class="title">
本月完成率
@ -535,6 +558,7 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -545,6 +569,7 @@
本季应检查
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单待检查数量" placement="top">
<div class="task-text">
<div class="title">
待检查
@ -553,6 +578,8 @@
{{listCountQuarter.denominator-listCountQuarter.molecule}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量" placement="top">
<div class="task-text">
<div class="title">
已处理
@ -561,6 +588,8 @@
{{listCountQuarter.molecule}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量/(本周期隐患排查清单待检查数量+本周期隐患排查清单已检查数量)" placement="top">
<div class="task-text">
<div class="title">
本季完成率
@ -570,6 +599,7 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
<div class="task-item">
<div class="task-textsp">
@ -580,6 +610,7 @@
本年应检查
</div>
</div>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单待检查数量" placement="top">
<div class="task-text">
<div class="title">
待检查
@ -588,6 +619,8 @@
{{listCountYear.denominator-listCountYear.molecule}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量" placement="top">
<div class="task-text">
<div class="title">
已检查
@ -596,6 +629,8 @@
{{listCountYear.molecule}}
</div>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="本周期隐患排查清单已检查数量/(本周期隐患排查清单待检查数量+本周期隐患排查清单已检查数量)" placement="top">
<div class="task-text">
<div class="title">
本年完成率
@ -605,6 +640,7 @@
<span class="f14">%</span>
</div>
</div>
</el-tooltip>
</div>
</div>
</div>