应急演练 调整

zh-baseversion-system/src/main/java/com/zehong/system/domain/TEmergencyDrills.java

@@ -32,16 +32,25 @@ public class TEmergencyDrills extends BaseEntity
     @Excel(name = "地点")
     private String fPlace;
 
-    /** 参与演练人员与部门 */
-    @Excel(name = "参与演练人员与部门")
+    /** 参与演练人员 */
+    @Excel(name = "参与演练人员")
     private String fPerDep;
 
+    /**  参与演练部门 */
+    @Excel(name = "参与演练部门")
+    private String fDrillDepartment;
+
+    public String getfDrillDepartment() {
+        return fDrillDepartment;
+    }
+
+    public void setfDrillDepartment(String fDrillDepartment) {
+        this.fDrillDepartment = fDrillDepartment;
+    }
+
     /** 演练内容 */
-    @Excel(name = "演练内容")
     private String fDrillsContent;
 
-    /** 演练图片 */
-    private String fDrillsPicture;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -111,15 +120,6 @@ public class TEmergencyDrills extends BaseEntity
     {
         return fDrillsContent;
     }
-    public void setfDrillsPicture(String fDrillsPicture) 
-    {
-        this.fDrillsPicture = fDrillsPicture;
-    }
-
-    public String getfDrillsPicture() 
-    {
-        return fDrillsPicture;
-    }
     public void setfCreateTime(Date fCreateTime) 
     {
         this.fCreateTime = fCreateTime;
@@ -166,7 +166,7 @@ public class TEmergencyDrills extends BaseEntity
             .append("fPlace", getfPlace())
             .append("fPerDep", getfPerDep())
             .append("fDrillsContent", getfDrillsContent())
-            .append("fDrillsPicture", getfDrillsPicture())
+            .append("fDrillDepartment", getfDrillDepartment())
             .append("fCreateTime", getfCreateTime())
             .append("fUpdateTime", getfUpdateTime())
             .append("fIsDel", getfIsDel())

zh-baseversion-system/src/main/resources/mapper/system/TEmergencyDrillsMapper.xml

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fPlace"    column="f_place"    />
         <result property="fPerDep"    column="f_per_dep"    />
         <result property="fDrillsContent"    column="f_drills_content"    />
-        <result property="fDrillsPicture"    column="f_drills_picture"    />
+        <result property="fDrillDepartment"    column="f_drill_department"    />
         <result property="fCreateTime"    column="f_create_time"    />
         <result property="fUpdateTime"    column="f_update_time"    />
         <result property="fIsDel"    column="f_is_del"    />
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTEmergencyDrillsVo">
-        select f_drills_id, f_drills_time, f_event, f_place, f_per_dep, f_drills_content, f_drills_picture, f_create_time, f_update_time, f_is_del, f_remarks from t_emergency_drills
+        select f_drills_id, f_drills_time, f_event, f_place, f_per_dep, f_drills_content, f_drill_department, f_create_time, f_update_time, f_is_del, f_remarks from t_emergency_drills
     </sql>
 
     <select id="selectTEmergencyDrillsList" parameterType="TEmergencyDrills" resultMap="TEmergencyDrillsResult">
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fPlace != null  and fPlace != ''"> and f_place = #{fPlace}</if>
             <if test="fPerDep != null  and fPerDep != ''"> and f_per_dep = #{fPerDep}</if>
             <if test="fDrillsContent != null  and fDrillsContent != ''"> and f_drills_content = #{fDrillsContent}</if>
-            <if test="fDrillsPicture != null  and fDrillsPicture != ''"> and f_drills_picture = #{fDrillsPicture}</if>
+            <if test="fDrillDepartment != null  and fDrillDepartment != ''"> and f_drill_department = #{fDrillDepartment}</if>
             <if test="fCreateTime != null "> and f_create_time = #{fCreateTime}</if>
             <if test="fUpdateTime != null "> and f_update_time = #{fUpdateTime}</if>
             <if test="fIsDel != null  and fIsDel != ''"> and f_is_del = #{fIsDel}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fPlace != null">f_place,</if>
             <if test="fPerDep != null">f_per_dep,</if>
             <if test="fDrillsContent != null">f_drills_content,</if>
-            <if test="fDrillsPicture != null">f_drills_picture,</if>
+            <if test="fDrillDepartment != null">f_drill_department,</if>
             <if test="fCreateTime != null">f_create_time,</if>
             <if test="fUpdateTime != null">f_update_time,</if>
             <if test="fIsDel != null">f_is_del,</if>
@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fPlace != null">#{fPlace},</if>
             <if test="fPerDep != null">#{fPerDep},</if>
             <if test="fDrillsContent != null">#{fDrillsContent},</if>
-            <if test="fDrillsPicture != null">#{fDrillsPicture},</if>
+            <if test="fDrillDepartment != null">#{fDrillDepartment},</if>
             <if test="fCreateTime != null">#{fCreateTime},</if>
             <if test="fUpdateTime != null">#{fUpdateTime},</if>
             <if test="fIsDel != null">#{fIsDel},</if>
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fPlace != null">f_place = #{fPlace},</if>
             <if test="fPerDep != null">f_per_dep = #{fPerDep},</if>
             <if test="fDrillsContent != null">f_drills_content = #{fDrillsContent},</if>
-            <if test="fDrillsPicture != null">f_drills_picture = #{fDrillsPicture},</if>
+            <if test="fDrillDepartment != null">f_drill_department = #{fDrillDepartment},</if>
             <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
             <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
             <if test="fIsDel != null">f_is_del = #{fIsDel},</if>

zh-baseversion-web/src/views/emergencydrills/record/index.vue

@@ -77,9 +77,8 @@
       <el-table-column label="演练时间" align="center" prop="fDrillsTime" />
       <el-table-column label="事件" align="center" prop="fEvent" />
       <el-table-column label="地点" align="center" prop="fPlace" />
-      <el-table-column label="参与演练人员或部门" align="center" prop="fPerDep" />
-      <el-table-column label="演练内容" align="center" prop="fDrillsContent" />
-      </el-table-column>
+      <el-table-column label="参与演练人员" align="center" prop="fPerDep" />
+      <el-table-column label="参与演练部门" align="center" prop="fDrillDepartment" />
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -111,7 +110,7 @@
 
     <!-- 添加或修改应急演练对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="演练时间" prop="fDrillsTime">
           <el-date-picker clearable size="small" style="width: 100%"
             v-model="form.fDrillsTime"
@@ -127,21 +126,25 @@
           <el-input v-model="form.fPlace" placeholder="请输入地点" />
         </el-form-item>
         
-        <el-form-item label="参与演练人员或部门" prop="fPerDep">
-          <el-input v-model="form.fPerDep" placeholder="请输入参与演练人员与部门" />
+        <el-form-item label="参与演练人员" prop="fPerDep">
+          <el-input v-model="form.fPerDep" placeholder="请输入参与演练人员" />
+        </el-form-item>
+
+        <el-form-item label="参与演练部门" prop="fDrillDepartment">
+          <el-input v-model="form.fDrillDepartment" placeholder="请输入参与演练部门" />
         </el-form-item>
 
         <el-form-item label="演练内容">
-          <el-input  v-model="form.fDrillsContent" type="textarea" placeholder="请输入演练内容" />
+          <editor  v-if="open"  v-model="form.fDrillsContent" type="textarea" placeholder="请输入演练内容" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="演练图片" prop="fDrillsPicture">
+        <!-- <el-form-item label="演练图片" prop="fDrillsPicture">
           <FileUpload
             listType="picture"
             @resFun="getFileInfo"
             @remove="listRemove"
             :fileArr="fileList">
           </FileUpload>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>