From 6636f04ed456a43e1dab02117ac937f104be5bcb Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 6 Jun 2024 18:13:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safeWorkManage/safeWorkAlarmRecord.vue       | 16 ++++++++++++++--
 .../laborManage/safeWorkManage/safeWorkRules.vue | 12 ++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/views/projectFront/laborManage/safeWorkManage/safeWorkAlarmRecord.vue b/src/views/projectFront/laborManage/safeWorkManage/safeWorkAlarmRecord.vue
index 47f580f4..0b0d954a 100644
--- a/src/views/projectFront/laborManage/safeWorkManage/safeWorkAlarmRecord.vue
+++ b/src/views/projectFront/laborManage/safeWorkManage/safeWorkAlarmRecord.vue
@@ -73,14 +73,14 @@
           align="center"
           :label="$t('message.personnelPosition.beaconManage.table.index')"
         ></el-table-column>
-        <el-table-column prop="type" label="安全履职规则类型" align="center">
+        <el-table-column prop="type" label="规则类型名称" align="center">
           <!-- <template slot-scope="scope">
             <span>{{ scope.row.type | typeText(rulesTypeList) }}</span>
           </template> -->
         </el-table-column>
         <el-table-column
           prop="dayNum"
-          label="连续未履职天数"
+          label="数值"
           align="center"
         ></el-table-column>
         <el-table-column
@@ -211,6 +211,18 @@ export default {
         { name: "一个月内缺勤超过", value: 3 },
         { name: "一个月内迟到超过", value: 4 },
         { 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: [],
       searchForm: {
diff --git a/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue b/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
index 07b824af..e7254e0b 100644
--- a/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
+++ b/src/views/projectFront/laborManage/safeWorkManage/safeWorkRules.vue
@@ -298,6 +298,18 @@ export default {
         { name: "一个月内缺勤超过", value: 3 },
         { name: "一个月内迟到超过", value: 4 },
         { 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: {
         total: 0,