From ed9dddde05f040bbe16c630a77480de1ba114e98 Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Wed, 20 Dec 2023 18:00:12 +0800
Subject: [PATCH] =?UTF-8?q?bug=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/ehsFloodDroughtWorker/index.vue | 9 +++++----
 ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue       | 3 ++-
 ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue      | 2 +-
 ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue   | 9 +++++----
 ruoyi-ui/src/views/index.vue                           | 6 ++++++
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue b/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue
index db3f64c..9567869 100644
--- a/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsFloodDroughtWorker/index.vue
@@ -174,14 +174,15 @@
 
     <!-- 添加或修改防汛抗旱队伍人员信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" :disabled="true" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 <!--        <el-form-item label="防汛抗旱队伍id" prop="teamId">
           <el-input v-model="form.teamId" placeholder="请输入防汛抗旱队伍id" />
         </el-form-item>-->
         <el-form-item label="队伍名称" prop="teamName">
-          <el-input v-model="form.teamName" placeholder="请输入防汛抗旱队伍名称" />
+          <el-input v-model="form.teamName" :readonly="true" placeholder="请输入防汛抗旱队伍名称" />
         </el-form-item>
-        <el-form label-width="80px" :model="form" :rules="rules">
+
+<!--        <el-form label-width="80px" :model="form" :rules="rules">-->
           <el-form-item label="人员姓名" prop="workerName">
             <el-input v-model="form.workerName" placeholder="请输入人员姓名" />
           </el-form-item>
@@ -218,7 +219,7 @@
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" placeholder="请输入备注" />
           </el-form-item>
-        </el-form>
+<!--        </el-form>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
index b60926d..df74517 100644
--- a/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue
@@ -711,6 +711,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openAssist = false;
       this.reset();
     },
     // 表单重置
@@ -738,7 +739,6 @@ export default {
         areaId:null,
         economicType:null,
         enterpriseScale:null,
-        hiddenDangerLabelArray:null,
       };
       this.resetForm("form");
     },
@@ -844,6 +844,7 @@ export default {
     },
     /** 协办 */
     handleAssist(row) {
+      this.reset();
       this.openAssist = true;
       this.currAssistHiddenDangerId = row.hiddenDangerId;
     },
diff --git a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
index d0fa260..507cb7b 100644
--- a/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsNoticeMessage/index.vue
@@ -10,7 +10,7 @@
         />
       </el-form-item>
       <el-form-item label="是否发布" prop="status" >
-        <el-select v-model="queryParams.deptId" placeholder="请选择状态" clearable>
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
           <el-option
             v-for="dict in statusList"
             :key="dict.value"
diff --git a/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue b/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
index f090940..8f3425e 100644
--- a/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsRescueTeamWorker/index.vue
@@ -199,14 +199,15 @@
 
     <!-- 添加或修改应急救援队人员信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="true">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 <!--        <el-form-item label="应急救援队伍id" prop="rescueTeamId">
           <el-input v-model="form.rescueTeamId" placeholder="请输入应急救援队伍id" />
         </el-form-item>-->
         <el-form-item label="队伍名称" prop="rescueTeamName">
-          <el-input v-model="form.rescueTeamName" placeholder="请输入应急救援队伍名称" />
+          <el-input v-model="form.rescueTeamName" :readonly="true" placeholder="请输入应急救援队伍名称" />
         </el-form-item>
-        <el-form label-width="80px" :model="form" :rules="rules">
+
+<!--        <el-form label-width="80px" :model="form" :rules="rules">-->
           <el-form-item label="人员姓名" prop="workerName">
             <el-input v-model="form.workerName" placeholder="请输入人员姓名" />
           </el-form-item>
@@ -243,7 +244,7 @@
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" placeholder="请输入备注" />
           </el-form-item>
-        </el-form>
+<!--        </el-form>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index e0b36fb..8ddee50 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -402,6 +402,12 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
+        this.queryParams.params.qxStartTime = null;
+        this.queryParams.params.qxEndTime = null;
+        this.queryParams.params.pcStartTime = null;
+        this.queryParams.params.pcEndTime = null;
+        this.queryParams.params.wcStartTime = null;
+        this.queryParams.params.wcEndTime = null;
         this.resetForm("queryForm");
         this.handleQuery();
       },