From c562fa2e66f4972ae23fa57ef7412da6e18991ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 12 七月 2022 14:31:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

---
 src/views/doublePreventAction/riskLevelManage/controlAction/index.vue |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
index fcd773a..92f2af4 100644
--- a/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/controlAction/index.vue
@@ -224,7 +224,7 @@
                 classifyOneList:[],
                 classifyTwoList:[],
                 riskControlMeasureIdList:[],
-                timeUnitList:[{id:1,name:'天'},{id:1,name:'周'},{id:1,name:'月'},],
+                timeUnitList:[{id:1,name:'小时'},{id:1,name:'天'},{id:1,name:'周'},{id:1,name:'月'},],
                 listLoading: false,
                 showCurrent:true,
                 showOther:false,
@@ -244,7 +244,6 @@
                     riskMeasureDesc: [{ required: true, message: '管控方式描述不能为空', trigger: 'blur' }],
                     classify1: [{ required: true, message: '管控措施分类1不能为空', trigger: 'change' }],
                     classify2: [{ required: true, message: '管控措施分类2不能为空', trigger: 'change' }],
-                    classify3: [{ required: true, message: '管控措施分类3不能为空', trigger: 'blur' }],
                     troubleshootContent: [{ required: true, message: '隐患排查内容不能为空', trigger: 'change' }],
                     timeEffect: [{ required: true, message: '周期不能为空', trigger: 'blur' }],
                     timeUnit: [{ required: true, message: '单位不能为空', trigger: 'change' }],

--
Gitblit v1.9.2