From b6a04edec9cf4e8f3a8bf3cb56630b3041076129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 22 Jan 2024 11:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/work/emergencyDrill.js        |  9 +++++++++
 .../emergencyDrill/emergencyDrillDrawer.vue    |  4 ++--
 .../src/views/work/emergencyDrill/index.vue    | 18 +++++++++---------
 ruoyi-ui/src/views/work/workTrain/index.vue    |  2 +-
 .../views/work/workTrain/workTrainDrawer.vue   |  2 +-
 .../controller/EmergencyDrillController.java   | 11 +++++++++++
 6 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/ruoyi-ui/src/api/work/emergencyDrill.js b/ruoyi-ui/src/api/work/emergencyDrill.js
index 8b852418..c49cb23b 100644
--- a/ruoyi-ui/src/api/work/emergencyDrill.js
+++ b/ruoyi-ui/src/api/work/emergencyDrill.js
@@ -43,6 +43,15 @@ export function delWorkTrain(id) {
   })
 }
 
+// 修改演练培训
+export function updateWorkTrainDataType(data) {
+  return request({
+    url: '/work/emergencyDrill/editDataType',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询演练培训列表
 export function listProjectUnit(query) {
   return request({
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
index b21de4ec..94fdfeec 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
@@ -306,11 +306,11 @@ export default {
       // 表单校验
       rules: {
         mainImage: [{ required: true, message: "请上传演练主图", trigger: "blur" }],
-        dataType: [{ required: false, message: "请选择演练类型", trigger: "blur" }],
+        dataType: [{ required: true, message: "请选择演练类型", trigger: "blur" }],
         beginDate: [{ required: true, message: "请选择演练时间", trigger: "blur" }],
         trainTitle: [
           { required: true, message: "请输入演练标题", trigger: "blur" },
-          { max: 30, message: "培训标题最多30个字符", trigger: "blur" },
+          { max: 30, message: "演练标题最多30个字符", trigger: "blur" },
         ],
         trainParticipants: [
           { required: true, message: "请输入参与人数", trigger: "blur" },
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
index f6be8b72..118e473d 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
@@ -141,13 +141,13 @@
           ></el-image>
         </template>
       </el-table-column>
-      <el-table-column label="培训类型" align="center" prop="dataType">
+      <el-table-column label="演练类型" align="center" prop="dataType">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.dataType"
-            placeholder="请选择培训类型"
+            placeholder="请选择演练类型"
             style="width: 100%"
-            @change="setDataType(scope.row, $event)"
+            @change="setDataType(scope.row.id, $event)"
           >
             <el-option
               v-for="dict in dict.type.work_train_data_type"
@@ -275,8 +275,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="培训标题" prop="trainTitle">
-          <el-input placeholder="请输入培训标题" v-model="form.trainTitle"></el-input>
+        <el-form-item label="演练标题" prop="trainTitle">
+          <el-input placeholder="请输入演练标题" v-model="form.trainTitle"></el-input>
         </el-form-item>
         <el-form-item label="参与人数" prop="trainParticipants">
           <el-input
@@ -397,11 +397,11 @@ export default {
       // 表单校验
       rules: {
         mainImage: [{ required: true, message: "请上传演练主图", trigger: "blur" }],
-        dataType: [{ required: false, message: "请选择演练类型", trigger: "blur" }],
+        dataType: [{ required: true, message: "请选择演练类型", trigger: "blur" }],
         beginDate: [{ required: true, message: "请选择演练时间", trigger: "blur" }],
         trainTitle: [
           { required: true, message: "请输入演练标题", trigger: "blur" },
-          { max: 30, message: "培训标题最多30个字符", trigger: "blur" },
+          { max: 30, message: "演练标题最多30个字符", trigger: "blur" },
         ],
         trainParticipants: [
           { required: true, message: "请输入参与人数", trigger: "blur" },
@@ -423,8 +423,8 @@ export default {
     });
   },
   methods: {
-    setDataType(row,val){
-      updateWorkTrainDataType({id:row.id,dataType:val});
+    setDataType(rowid,val){
+      updateWorkTrainDataType({id:rowid,dataType:val});
     },
     getImageUrl(url) {
       return process.env.VUE_APP_BASE_API + url + ".min.jpg";
diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue
index 2adbe71e..368a9079 100644
--- a/ruoyi-ui/src/views/work/workTrain/index.vue
+++ b/ruoyi-ui/src/views/work/workTrain/index.vue
@@ -390,7 +390,7 @@ export default {
       // 表单校验
       rules: {
         mainImage: [{ required: true, message: "请上传培训主图", trigger: "blur" }],
-        dataType: [{ required: false, message: "请选择培训类型", trigger: "blur" }],
+        dataType: [{ required: true, message: "请选择培训类型", trigger: "blur" }],
         beginDate: [{ required: true, message: "请选择培训时间", trigger: "blur" }],
         trainTitle: [
           { required: true, message: "请输入培训标题", trigger: "blur" },
diff --git a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
index 84effd4e..c9922163 100644
--- a/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
+++ b/ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
@@ -306,7 +306,7 @@ export default {
       // 表单校验
       rules: {
         mainImage: [{ required: true, message: "请上传培训主图", trigger: "blur" }],
-        dataType: [{ required: false, message: "请选择培训类型", trigger: "blur" }],
+        dataType: [{ required: true, message: "请选择培训类型", trigger: "blur" }],
         beginDate: [{ required: true, message: "请选择培训时间", trigger: "blur" }],
         trainTitle: [
           { required: true, message: "请输入培训标题", trigger: "blur" },
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java
index 94b6adcc..3a6d410b 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/EmergencyDrillController.java
@@ -119,6 +119,17 @@ public class EmergencyDrillController extends BaseController
         return toAjax(workTrainService.updateWorkTrain(workTrain));
     }
 
+    /**
+     * 修改演练培训
+     */
+    @PreAuthorize("@ss.hasPermi('work:emergencyDrill:edit')")
+    @Log(title = "演练培训", businessType = BusinessType.UPDATE)
+    @PostMapping("/editDataType")
+    public AjaxResult editDataType(@RequestBody WorkTrain workTrain)
+    {
+        return toAjax(workTrainService.updateWorkTrainDataType(workTrain));
+    }
+
     /**
      * 删除演练培训
      */