应急处置功能

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventInfo.java

@@ -37,8 +37,8 @@ public class TEventInfo extends BaseEntity
     private String eventLocation;
 
     /** 报案时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "报案时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "报案时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date reportTime;
 
     /** 报案人 */

gassafetyprogress-system/src/main/resources/mapper/system/TEventInfoMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportPerson != null  and reportPerson != ''"> and report_person like concat('%', #{reportPerson}, '%')</if>
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
         </where>
+        order by report_time
     </select>
     
     <select id="selectTEventInfoById" parameterType="Long" resultMap="TEventInfoResult">

gassafetyprogress-system/src/main/resources/mapper/system/TPlanInfoMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planLevel != null  and planLevel != ''"> and plan_level = #{planLevel}</if>
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectTPlanInfoById" parameterType="Long" resultMap="TPlanInfoResult">

gassafetyprogress-web/src/views/system/eventInfo/index.vue

@@ -111,13 +111,13 @@
       <el-table-column label="事件地点" align="center" prop="eventLocation" />
       <el-table-column label="报案时间" align="center" prop="reportTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="报案人" align="center" prop="reportPerson" />
       <el-table-column label="事件处置信息" align="center" prop="eventDeal" />
       <el-table-column label="事件评估信息" align="center" prop="eventAssessment" />
-      <el-table-column label="所属企业" align="center" prop="beyondEnterpriseId" />
+      <el-table-column label="所属企业" align="center" prop="beyondEnterpriseName" />
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -151,7 +151,7 @@
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
           <div class="division">
-            <div style="width: 50%">
+            <div style="width: 45%">
               <el-form-item label="事件名称" prop="eventTitle">
                 <el-input v-model="form.eventTitle" placeholder="请输入事件名称" />
               </el-form-item>
@@ -196,7 +196,7 @@
             </div>
             <div style="width: 50%">
               <el-form-item label="所属企业" prop="beyondEnterpriseId">
-                <el-select v-model="form.beyondEnterpriseId" placeholder="请选择预案等级"  @change="qiyechang">
+                <el-select v-model="form.beyondEnterpriseName" placeholder="请选择预案等级"  @change="qiyechang">
                   <el-option
                     v-for = "dict in enterpriseList"
                     :key = "dict.enterpriseId"
@@ -212,8 +212,8 @@
               <el-form-item label="报案时间" prop="reportTime">
                 <el-date-picker clearable size="small"
                                 v-model="form.reportTime"
-                                type="date"
-                                value-format="yyyy-MM-dd"
+                                type="datetime"
+                                value-format="yyyy-MM-dd HH:mm:ss"
                                 placeholder="选择报案时间">
                 </el-date-picker>
               </el-form-item>
@@ -222,10 +222,10 @@
               </el-form-item>
             </div>
           </div>
-          <el-form-item label="事件处置信息" prop="eventDeal">
+          <el-form-item label="事件处置信息" prop="eventDeal" style="width: 60%">
             <el-input v-model="form.eventDeal" type="textarea" placeholder="请输入事件处置信息" />
           </el-form-item>
-          <el-form-item label="事件评估信息" prop="eventAssessment">
+          <el-form-item label="事件评估信息" prop="eventAssessment" style="width: 60%">
           <el-input v-model="form.eventAssessment" type="textarea" placeholder="请输入事件评估信息" />
         </el-form-item>
 
@@ -367,6 +367,7 @@ export default {
         return item.enterpriseId === value;
     });
       this.form.beyondEnterpriseName = obj.enterpriseName;
+      this.form.beyondEnterpriseId = value;
     },
     // 事件类型：1.泄漏 2.火灾 3.爆炸字典翻译
     eventTypeFormat(row, column) {
@@ -508,3 +509,8 @@ export default {
     justify-content:flex-start;
   }
 </style>
+<style lang="scss" scoped>
+  ::v-deep .el-select{
+    width: 100%;
+  }
+</style>