From 782517f27ba911d139cf2299d15d028a5ca0f018 Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Tue, 26 Mar 2024 11:29:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=9A=90=E6=82=A3=E7=BA=A7=E5=88=AB=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=202.=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E4=BC=98=E5=8C=96=203.=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=88=A0=E9=99=A4bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue      | 6 +++---
 ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue     | 6 +++---
 ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
index ae35927..7961984 100644
--- a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
@@ -794,10 +794,10 @@ export default {
         checkType: [ {  required: true,message: "排查方式必须选择", trigger: 'blur'}],
        /* isTowns: [ {  required: true,message: "是否乡镇（街道必须选择", trigger: 'blur'}],*/
         status: [ {  required: true,message: "整改进度必须选择", trigger: 'blur'}],
-        /*rectifyMeasure: [ { type: 'string',required: true,message: "整改措施必填", trigger: 'blur'}],
-        rectifyTime: [ { type: 'date',required: true,message: "整改时间必填", trigger: 'blur'}],
+        // rectifyMeasure: [ { type: 'string',required: true,message: "整改措施必填", trigger: 'blur'}],
+        // rectifyTime: [ { type: 'date',required: true,message: "整改时间必填", trigger: 'blur'}],
         hiddenDangerGrade: [ { type: 'string',required: true,message: "隐患级别必填", trigger: 'blur'}],
-        hiddenDangerType: [ { type: 'string',required: true,message: "隐患类型必填", trigger: 'blur'}],*/
+        // hiddenDangerType: [ { type: 'string',required: true,message: "隐患类型必填", trigger: 'blur'}],
         rectifyMoney: [ {
           pattern: /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/,
           message: "请输入合法的金额数字，最多两位小数",
diff --git a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
index 45d22a2..93f34b7 100644
--- a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
@@ -124,21 +124,21 @@
           <el-button v-show="scope.row.status==0"
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-s-tools"
             @click="handleIssueNews(scope.row)"
             v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:issueNews']"
           >发布</el-button>
           <el-button v-show="scope.row.status==1"
              size="mini"
              type="text"
-             icon="el-icon-delete"
+             icon="el-icon-s-data"
                @click="handleListFile(scope.row)"
              v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:total']"
           >统计</el-button>
           <el-button
                      size="mini"
                      type="text"
-                     icon="el-icon-delete"
+                     icon="el-icon-tickets"
                      @click="handleDetail(scope.row)"
                      v-hasPermi="['ehsNoticeMessage:ehsNoticeMessage:displayDetail']"
           >显示</el-button>
diff --git a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue
index f561095..e66002b 100644
--- a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue
+++ b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/indexDept.vue
@@ -462,7 +462,7 @@ export default {
       }, `ehsNoticeMessage_${new Date().getTime()}.xlsx`)
     },
     /** 发布 */
-    handleDelete(row) {
+    release(row) {
       this.$modal.confirm('是否确认发布此通知？').then(function() {
         return issueNews({"noticeMessageId":row.noticeMessageId});
       }).then(() => {