admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain

Browse Source
This commit is contained in:
X_Rian 2024-06-06 18:22:03 +08:00
commit ed4e73ec8d
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/projectFront/laborManage/safeWorkManage/safeWorkAlarmRecord.vue
View File

@ -73,14 +73,14 @@
align="center" align="center"
:label="$t('message.personnelPosition.beaconManage.table.index')" :label="$t('message.personnelPosition.beaconManage.table.index')"
></el-table-column> ></el-table-column>
<el-table-column prop="type" label="安全履职规则类型" align="center"> <el-table-column prop="type" label="规则类型名称" align="center">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ scope.row.type | typeText(rulesTypeList) }}</span> <span>{{ scope.row.type | typeText(rulesTypeList) }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dayNum" prop="dayNum"
label="连续未履职天数" label="数值"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
@ -211,6 +211,18 @@ export default {
{ name: "一个月内缺勤超过", value: 3 }, { name: "一个月内缺勤超过", value: 3 },
{ name: "一个月内迟到超过", value: 4 }, { name: "一个月内迟到超过", value: 4 },
{ name: "同一企业同一隐患连续检查到(x)次", value: 5 }, { name: "同一企业同一隐患连续检查到(x)次", value: 5 },
{ name: "一级安全隐患未整改超过(x)分钟", value: 6 },
{ name: "一级安全隐患未复查超过(x)分钟", value: 7 },
{ name: "一级安全隐患未核验超过(x)分钟", value: 8 },
{ name: "二级安全隐患未整改超过(x)分钟", value: 9 },
{ name: "二级安全隐患未复查超过(x)分钟", value: 10 },
{ name: "二级安全隐患未核验超过(x)分钟", value: 11 },
{ name: "三级安全隐患未整改超过(x)分钟", value: 12 },
{ name: "三级安全隐患未复查超过(x)分钟", value: 13 },
{ name: "三级安全隐患未核验超过(x)分钟", value: 14 },
{ name: "四级安全隐患未整改超过(x)分钟", value: 15 },
{ name: "四级安全隐患未复查超过(x)分钟", value: 16 },
{ name: "四级安全隐患未核验超过(x)分钟", value: 17 },
], ],
timeRange: [], timeRange: [],
searchForm: { searchForm: {

12
src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
View File

@ -298,6 +298,18 @@ export default {
{ name: "一个月内缺勤超过", value: 3 }, { name: "一个月内缺勤超过", value: 3 },
{ name: "一个月内迟到超过", value: 4 }, { name: "一个月内迟到超过", value: 4 },
{ name: "同一企业同一隐患连续检查到(x)次", value: 5 }, { name: "同一企业同一隐患连续检查到(x)次", value: 5 },
{ name: "一级安全隐患未整改超过(x)分钟", value: 6 },
{ name: "一级安全隐患未复查超过(x)分钟", value: 7 },
{ name: "一级安全隐患未核验超过(x)分钟", value: 8 },
{ name: "二级安全隐患未整改超过(x)分钟", value: 9 },
{ name: "二级安全隐患未复查超过(x)分钟", value: 10 },
{ name: "二级安全隐患未核验超过(x)分钟", value: 11 },
{ name: "三级安全隐患未整改超过(x)分钟", value: 12 },
{ name: "三级安全隐患未复查超过(x)分钟", value: 13 },
{ name: "三级安全隐患未核验超过(x)分钟", value: 14 },
{ name: "四级安全隐患未整改超过(x)分钟", value: 15 },
{ name: "四级安全隐患未复查超过(x)分钟", value: 16 },
{ name: "四级安全隐患未核验超过(x)分钟", value: 17 },
], ],
pageInfo: { pageInfo: {
total: 0, total: 0,