diff --git a/src/views/emergen_cyrescue/emergency_report/incident_report/components/detail.vue b/src/views/emergen_cyrescue/emergency_report/incident_report/components/detail.vue
index f7d36f3..bb9b5aa 100644
--- a/src/views/emergen_cyrescue/emergency_report/incident_report/components/detail.vue
+++ b/src/views/emergen_cyrescue/emergency_report/incident_report/components/detail.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="app-container">
       <div class="level-title">
-        <h1>救援队伍详情</h1>
+        <h1>事故详情</h1>
       </div>
       <div class="mb-20">
         <table class="table-ui">
@@ -111,6 +111,39 @@
         </table>
       </div>
     </div>
+    <div v-if="form.REPORT_UNIT !== null" class="app-container">
+      <div class="level-title">
+        <h1>专报详情</h1>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <td class="tbg">报告单位</td>
+            <td>{{ form.REPORT_UNIT }}</td>
+            <td class="tbg">审核人</td>
+            <td>{{ form.AUDITOR }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">报告人</td>
+            <td>{{ form.REPORTER }}</td>
+            <td class="tbg">报告时间</td>
+            <td>{{ form.REPORT_TIME }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">责任人</td>
+            <td>{{ form.RESPONSIBLE_PERSON }}</td>
+            <td class="tbg">联系方式</td>
+            <td>{{ form.CONTACT_INFORMATION }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">安全评价等级</td>
+            <td>{{ form.SAFETY_EVALUATION_LEVEL }}</td>
+            <td class="tbg">持证情况</td>
+            <td>{{ form.CERTIFICATE_STATUS }}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
     <div class="ui-height" />
     <div class="ui-foot">
       <el-button type="primary" @click="goBack">返回基本信息</el-button>
@@ -158,10 +191,13 @@ export default {
         DIRECT_ECONOMIC_LOSS: '',
         BRIEF_PROCESS: '',
         DISPOSAL_SITUATION: '',
-        OPERATOR: '',
-        OPERATETIME: '',
-        CREATETIME: '',
-        CREATOR: ''
+        REPORT_UNIT: '',
+        AUDITOR: '',
+        REPORTER: '',
+        RESPONSIBLE_PERSON: '',
+        CONTACT_INFORMATION: '',
+        SAFETY_EVALUATION_LEVEL: '',
+        CERTIFICATE_STATUS: ''
       },
       Id: ''
     }
@@ -181,6 +217,13 @@ export default {
       requestFN('/major/registration/detail', params).then((response) => {
         const data = response.msg
         this.form = {
+          REPORT_UNIT: data.REPORT_UNIT,
+          AUDITOR: data.AUDITOR,
+          REPORTER: data.REPORTER,
+          RESPONSIBLE_PERSON: data.RESPONSIBLE_PERSON,
+          CONTACT_INFORMATION: data.CONTACT_INFORMATION,
+          SAFETY_EVALUATION_LEVEL: data.SAFETY_EVALUATION_LEVEL,
+          CERTIFICATE_STATUS: data.CERTIFICATE_STATUS,
           EVENT_NAME: data.EVENT_NAME,
           INCOMING_PHONE: data.INCOMING_PHONE,
           OWNER_NAME: data.OWNER_NAME,
diff --git a/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue b/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue
index 9d8debf..4d219bc 100644
--- a/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue
@@ -3,7 +3,7 @@
     <div class="filter-container">
       <el-form inline>
         <el-form-item label="事件标题：" prop="EVENT_NAME">
-          <el-input v-model="EVENT_NAME" placeholder="事件标题" class="filter-item" style="width: 200px;" />
+          <el-input v-model="EVENT_NAME" placeholder="事件编号" class="filter-item" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="事件类型：" prop="EVENT_TYPE">
           <el-input v-model="EVENT_TYPE" placeholder="事件类型" class="filter-item" style="width: 200px;" />
@@ -36,75 +36,73 @@
       <el-table-column prop="EVENT_TYPE" label="事件类型" show-overflow-tooltip="true" />
       <el-table-column prop="NAME" label="姓名" show-overflow-tooltip="true" />
       <el-table-column prop="CONTACT_PHONE" label="联系电话" show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" width="450">
+      <el-table-column label="操作" align="center" width="500">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('detail', row.ID, '1')">查看</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleAddReport(row.ID)">添加事故报告</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEditAccident(row.ID)">编辑</el-button>
-          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.EVENT_NAME)">删除</el-button>
+          <el-button type="info" icon="el-icon-location" size="mini" @click="viewMap(row.ID)">查看地图</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleAddReport(row.ID)">生成专报</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.EVENT_NAME)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="page-btn-group">
       <div>
         <template>
-          <el-button type="primary" icon="el-icon-plus" @click="handleAddAccident">新增</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
           <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
         </template>
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
-
-    <!-- 新增/编辑事故弹窗 -->
-    <el-dialog :visible.sync="dialogAccidentVisible" :title="dialogType === 'editAccident' ? '修改事故' : '新增事故'" width="1000px">
-      <el-form ref="accidentForm" :model="accidentForm" label-width="250px">
-        <!-- 原新增事故表单内容 -->
+    <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px">
+      <el-form ref="form" :rules="rules" :model="form" label-width="250px">
         <el-form-item label="事件标题" prop="EVENT_NAME">
-          <el-input v-model="accidentForm.EVENT_NAME" placeholder="请输入事件标题..." />
+          <el-input v-model="form.EVENT_NAME" placeholder="请输入事件标题..." />
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="机主姓名" prop="OWNER_NAME">
-              <el-input v-model="accidentForm.OWNER_NAME" placeholder="请输入机主姓名..." />
+              <el-input v-model="form.OWNER_NAME" placeholder="请输入机主姓名..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="呼入电话" prop="INCOMING_PHONE">
-              <el-input v-model="accidentForm.INCOMING_PHONE" placeholder="请输入呼入电话..." />
+              <el-input v-model="form.INCOMING_PHONE" placeholder="请输入呼入电话..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="主叫地址" prop="CALLER_ADDRESS">
-              <el-input v-model="accidentForm.CALLER_ADDRESS" placeholder="请输入主叫地址..." />
+              <el-input v-model="form.CALLER_ADDRESS" placeholder="请输入主叫地址..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="接入方式" prop="ACCESS_MODE">
-              <el-input v-model="accidentForm.ACCESS_MODE" placeholder="请输入接入方式..." />
+              <el-input v-model="form.ACCESS_MODE" placeholder="请输入接入方式..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="姓名" prop="NAME">
-              <el-input v-model="accidentForm.NAME" placeholder="请输入姓名..." />
+              <el-input v-model="form.NAME" placeholder="请输入姓名..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="CONTACT_PHONE">
-              <el-input v-model="accidentForm.CONTACT_PHONE" placeholder="请输入联系电话..." />
+              <el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="其他信息" prop="OTHER_INFO">
-          <el-input v-model="accidentForm.OTHER_INFO" type="textarea" placeholder="请输入其他信息..." />
+          <el-input v-model="form.OTHER_INFO" type="textarea" placeholder="请输入其他信息..." />
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="单位名称" prop="UNIT_NAME">
-              <el-input v-model="accidentForm.UNIT_NAME" placeholder="请输入单位名称..." />
+              <el-input v-model="form.UNIT_NAME" placeholder="请输入单位名称..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -112,7 +110,7 @@
               <Treeselect
                 :options="regionData"
                 :normalizer="normalizer"
-                v-model="accidentForm.REGION"
+                v-model="form.REGION"
                 placeholder="请选择所在区域"
                 no-options-text="暂无数据"
                 no-children-text="暂无数据"
@@ -124,24 +122,24 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="单位地址" prop="UNIT_ADDRESS">
-              <el-input v-model="accidentForm.UNIT_ADDRESS" placeholder="请输入单位地址..." />
+              <el-input v-model="form.UNIT_ADDRESS" placeholder="请输入单位地址..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="行业类型" prop="INDUSTRY_TYPE">
-              <el-input v-model="accidentForm.INDUSTRY_TYPE" placeholder="请输入行业类型..." />
+              <el-input v-model="form.INDUSTRY_TYPE" placeholder="请输入行业类型..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="经济类型" prop="ECONOMIC_TYPE">
-              <el-input v-model="accidentForm.ECONOMIC_TYPE" placeholder="请输入经济类型..." />
+              <el-input v-model="form.ECONOMIC_TYPE" placeholder="请输入经济类型..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="重大危险源" prop="MAJOR_HAZARD">
-              <el-input v-model="accidentForm.MAJOR_HAZARD" placeholder="请输入重大危险源..." />
+              <el-input v-model="form.MAJOR_HAZARD" placeholder="请输入重大危险源..." />
             </el-form-item>
           </el-col>
         </el-row>
@@ -149,7 +147,7 @@
           <el-col :span="12">
             <el-form-item label="接报时间" prop="REPORT_TIME">
               <el-date-picker
-                v-model="accidentForm.REPORT_TIME"
+                v-model="form.REPORT_TIME"
                 type="datetime"
                 placeholder="请选择接报时间"
                 format="yyyy-MM-dd HH:mm:ss"
@@ -161,7 +159,7 @@
           <el-col :span="12">
             <el-form-item label="发生时间" prop="OCCURRENCE_TIME">
               <el-date-picker
-                v-model="accidentForm.OCCURRENCE_TIME"
+                v-model="form.OCCURRENCE_TIME"
                 type="datetime"
                 placeholder="请选择发生时间"
                 format="yyyy-MM-dd HH:mm:ss"
@@ -174,25 +172,25 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="事件类型" prop="EVENT_TYPE">
-              <el-input v-model="accidentForm.EVENT_TYPE" placeholder="请输入事件类型..." />
+              <el-input v-model="form.EVENT_TYPE" placeholder="请输入事件类型..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="所在地址" prop="LOCATION_ADDRESS">
-              <el-input v-model="accidentForm.LOCATION_ADDRESS" placeholder="请输入所在地址..." />
+              <el-input v-model="form.LOCATION_ADDRESS" placeholder="请输入所在地址..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="经度" prop="LONGITUDE">
-              <el-input v-model="accidentForm.LONGITUDE" placeholder="请输入经度" disabled @focus="handleMap" />
+              <el-input v-model="form.LONGITUDE" placeholder="请输入经度" disabled @focus="handleMap" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="纬度" prop="LATITUDE">
               <div style="display: flex">
-                <el-input v-model="accidentForm.LATITUDE" placeholder="请输入纬度" disabled style="width: 100%" @focus="handleMap"/>
+                <el-input v-model="form.LATITUDE" placeholder="请输入纬度" disabled style="width: 100%" @focus="handleMap"/>
                 <el-button style="margin-left:10px" @click="handleMap">
                   <span class="svg-container">
                     <svg-icon icon-class="international" />
@@ -205,113 +203,148 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="接报类型" prop="REPORT_TYPE">
-              <el-input v-model="accidentForm.REPORT_TYPE" placeholder="请输入接报类型..." />
+              <el-input v-model="form.REPORT_TYPE" placeholder="请输入接报类型..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="事故标题" prop="ACCIDENT_TITLE">
-              <el-input v-model="accidentForm.ACCIDENT_TITLE" placeholder="请输入事故标题..." />
+              <el-input v-model="form.ACCIDENT_TITLE" placeholder="请输入事故标题..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="事故级别" prop="ACCIDENT_LEVEL">
-              <el-input v-model="accidentForm.ACCIDENT_LEVEL" placeholder="请输入事故级别..." />
+              <el-input v-model="form.ACCIDENT_LEVEL" placeholder="请输入事故级别..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="伤害类型" prop="INJURY_TYPE">
-              <el-input v-model="accidentForm.INJURY_TYPE" placeholder="请输入伤害类型..." />
+              <el-input v-model="form.INJURY_TYPE" placeholder="请输入伤害类型..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="事故类型" prop="ACCIDENT_TYPE">
-              <el-input v-model="accidentForm.ACCIDENT_TYPE" placeholder="请输入事故类型..." />
+              <el-input v-model="form.ACCIDENT_TYPE" placeholder="请输入事故类型..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="被困人数" prop="TRAPPED_PEOPLE_COUNT">
-              <el-input v-model="accidentForm.TRAPPED_PEOPLE_COUNT" placeholder="请输入被困人数..." />
+              <el-input v-model="form.TRAPPED_PEOPLE_COUNT" placeholder="请输入被困人数..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="失踪人数" prop="MISSING_PEOPLE_COUNT">
-              <el-input v-model="accidentForm.MISSING_PEOPLE_COUNT" placeholder="请输入失踪人数..." />
+              <el-input v-model="form.MISSING_PEOPLE_COUNT" placeholder="请输入失踪人数..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="死亡人数" prop="DEATH_PEOPLE_COUNT">
-              <el-input v-model="accidentForm.DEATH_PEOPLE_COUNT" placeholder="请输入死亡人数..." />
+              <el-input v-model="form.DEATH_PEOPLE_COUNT" placeholder="请输入死亡人数..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="重伤人数" prop="SERIOUS_INJURY_PEOPLE_COUNT">
-              <el-input v-model="accidentForm.SERIOUS_INJURY_PEOPLE_COUNT" placeholder="请输入重伤人数..." />
+              <el-input v-model="form.SERIOUS_INJURY_PEOPLE_COUNT" placeholder="请输入重伤人数..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="轻伤人数" prop="MINOR_INJURY_PEOPLE_COUNT">
-              <el-input v-model="accidentForm.MINOR_INJURY_PEOPLE_COUNT" placeholder="请输入轻伤人数..." />
+              <el-input v-model="form.MINOR_INJURY_PEOPLE_COUNT" placeholder="请输入轻伤人数..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="中毒人数" prop="POISONING_PEOPLE_COUNT">
-              <el-input v-model="accidentForm.POISONING_PEOPLE_COUNT" placeholder="请输入中毒人数..." />
+              <el-input v-model="form.POISONING_PEOPLE_COUNT" placeholder="请输入中毒人数..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="直接经济损失（万元）" prop="DIRECT_ECONOMIC_LOSS">
-              <el-input v-model="accidentForm.DIRECT_ECONOMIC_LOSS" placeholder="请输入直接经济损失（万元）..." />
+              <el-input v-model="form.DIRECT_ECONOMIC_LOSS" placeholder="请输入直接经济损失（万元）..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="简要经过" prop="BRIEF_PROCESS">
-          <el-input v-model="accidentForm.BRIEF_PROCESS" type="textarea" placeholder="请输入简要经过..." />
+          <el-input v-model="form.BRIEF_PROCESS" type="textarea" placeholder="请输入简要经过..." />
         </el-form-item>
         <el-form-item label="处置情况" prop="DISPOSAL_SITUATION">
-          <el-input v-model="accidentForm.DISPOSAL_SITUATION" type="textarea" placeholder="请输入处置情况..." />
+          <el-input v-model="form.DISPOSAL_SITUATION" type="textarea" placeholder="请输入处置情况..." />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAccidentVisible = false">取消</el-button>
-        <el-button type="primary" @click="saveAccident">确定</el-button>
+        <el-button @click="dialogFormEdit = false">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
       </div>
     </el-dialog>
-
     <!-- 添加事故报告弹窗 -->
     <el-dialog :visible.sync="dialogReportVisible" title="添加事故报告" width="1000px">
       <el-form ref="reportForm" :model="reportForm" label-width="250px">
         <el-form-item label="事故标题" prop="ACCIDENT_TITLE">
           <el-input v-model="reportForm.ACCIDENT_TITLE" :disabled="true" />
         </el-form-item>
-        <!-- 用于输入的字段 -->
-        <el-form-item label="报告单位" prop="REPORT_UNIT">
-          <el-input v-model="reportForm.REPORT_UNIT" placeholder="请输入报告单位..." />
-        </el-form-item>
-        <el-form-item label="审核人" prop="AUDITOR">
-          <el-input v-model="reportForm.AUDITOR" placeholder="请输入审核人..." />
-        </el-form-item>
-        <el-form-item label="报告时间" prop="REPORT_TIME">
-          <el-input v-model="reportForm.REPORT_TIME" placeholder="请输入报告时间..." />
-        </el-form-item>
-        <el-form-item label="报告人" prop="REPORTER">
-          <el-input v-model="reportForm.REPORTER" placeholder="请输入报告人..." />
-        </el-form-item>
-        <el-form-item label="责任人" prop="RESPONSIBLE_PERSON">
-          <el-input v-model="reportForm.RESPONSIBLE_PERSON" placeholder="请输入责任人..." />
-        </el-form-item>
-        <el-form-item label="联系方式" prop="CONTACT_INFORMATION">
-          <el-input v-model="reportForm.CONTACT_INFORMATION" placeholder="请输入联系方式..." />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="报告单位" prop="REPORT_UNIT">
+              <el-input v-model="reportForm.REPORT_UNIT" placeholder="请输入报告单位..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审核人" prop="AUDITOR">
+              <el-input v-model="reportForm.AUDITOR" placeholder="请输入审核人..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="报告时间" prop="ACCIDENT_REPORT_TIME">
+              <el-date-picker
+                v-model="reportForm.ACCIDENT_REPORT_TIME"
+                type="date"
+                placeholder="请选择报告时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="报告人" prop="REPORTER">
+              <el-input v-model="reportForm.REPORTER" placeholder="请输入报告人..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="责任人" prop="RESPONSIBLE_PERSON">
+              <el-input v-model="reportForm.RESPONSIBLE_PERSON" placeholder="请输入责任人..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系方式" prop="CONTACT_INFORMATION">
+              <el-input v-model="reportForm.CONTACT_INFORMATION" placeholder="请输入联系方式..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安全评价等级" prop="SAFETY_EVALUATION_LEVEL">
+              <el-input v-model="reportForm.SAFETY_EVALUATION_LEVEL" placeholder="请输入安全评价等级..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="持证情况" prop="CERTIFICATE_STATUS">
+              <el-input v-model="reportForm.CERTIFICATE_STATUS" placeholder="请输入持证情况..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="事故时间" prop="ACCIDENT_TIME">
@@ -324,68 +357,136 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="安全评价等级" prop="SAFETY_EVALUATION_LEVEL">
-          <el-input v-model="reportForm.SAFETY_EVALUATION_LEVEL" placeholder="请输入安全评价等级..." />
-        </el-form-item>
-        <el-form-item label="持证情况" prop="CERTIFICATE_STATUS">
-          <el-input v-model="reportForm.CERTIFICATE_STATUS" placeholder="请输入持证情况..." />
-        </el-form-item>
-        <el-form-item label="事故地址" prop="ACCIDENT_ADDRESS">
-          <el-input v-model="reportForm.ACCIDENT_ADDRESS" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="事故类型" prop="ACCIDENT_TYPE">
-          <el-input v-model="reportForm.ACCIDENT_TYPE" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="伤害类型" prop="INJURY_TYPE">
-          <el-input v-model="reportForm.INJURY_TYPE" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="事故级别" prop="ACCIDENT_LEVEL">
-          <el-input v-model="reportForm.ACCIDENT_LEVEL" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="事故单位" prop="ACCIDENT_UNIT">
-          <el-input v-model="reportForm.ACCIDENT_UNIT" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="行业类型" prop="INDUSTRY_TYPE">
-          <el-input v-model="reportForm.INDUSTRY_TYPE" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="经济类型" prop="ECONOMIC_TYPE">
-          <el-input v-model="reportForm.ECONOMIC_TYPE" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="死亡人数" prop="DEATH_PEOPLE_COUNT">
-          <el-input v-model="reportForm.DEATH_PEOPLE_COUNT" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="重伤人数" prop="SERIOUS_INJURY_PEOPLE_COUNT">
-          <el-input v-model="reportForm.SERIOUS_INJURY_PEOPLE_COUNT" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="轻伤人数" prop="MINOR_INJURY_PEOPLE_COUNT">
-          <el-input v-model="reportForm.MINOR_INJURY_PEOPLE_COUNT" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="中毒人数" prop="POISONING_PEOPLE_COUNT">
-          <el-input v-model="reportForm.POISONING_PEOPLE_COUNT" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="被困人数" prop="TRAPPED_PEOPLE_COUNT">
-          <el-input v-model="reportForm.TRAPPED_PEOPLE_COUNT" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="失踪人数" prop="MISSING_PEOPLE_COUNT">
-          <el-input v-model="reportForm.MISSING_PEOPLE_COUNT" :disabled="true" />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="事故类型" prop="ACCIDENT_TYPE">
+              <el-input v-model="reportForm.ACCIDENT_TYPE" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="伤害类型" prop="INJURY_TYPE">
+              <el-input v-model="reportForm.INJURY_TYPE" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="事故级别" prop="ACCIDENT_LEVEL">
+              <el-input v-model="reportForm.ACCIDENT_LEVEL" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="事故单位" prop="ACCIDENT_UNIT">
+              <el-input v-model="reportForm.ACCIDENT_UNIT" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="行业类型" prop="INDUSTRY_TYPE">
+              <el-input v-model="reportForm.INDUSTRY_TYPE" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="经济类型" prop="ECONOMIC_TYPE">
+              <el-input v-model="reportForm.ECONOMIC_TYPE" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="死亡人数" prop="DEATH_PEOPLE_COUNT">
+              <el-input v-model="reportForm.DEATH_PEOPLE_COUNT" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="重伤人数" prop="SERIOUS_INJURY_PEOPLE_COUNT">
+              <el-input v-model="reportForm.SERIOUS_INJURY_PEOPLE_COUNT" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="轻伤人数" prop="MINOR_INJURY_PEOPLE_COUNT">
+              <el-input v-model="reportForm.MINOR_INJURY_PEOPLE_COUNT" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="中毒人数" prop="POISONING_PEOPLE_COUNT">
+              <el-input v-model="reportForm.POISONING_PEOPLE_COUNT" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="被困人数" prop="TRAPPED_PEOPLE_COUNT">
+              <el-input v-model="reportForm.TRAPPED_PEOPLE_COUNT" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="失踪人数" prop="MISSING_PEOPLE_COUNT">
+              <el-input v-model="reportForm.MISSING_PEOPLE_COUNT" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogReportVisible = false">取消</el-button>
         <el-button type="primary" @click="saveReport">确定</el-button>
       </div>
     </el-dialog>
+    <!-- 坐标选择 -->
+    <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
+      <baidu-map
+        v-loading="loadingMap"
+        :zoom="zoom"
+        :scroll-wheel-zoom="true"
+        :style="{height: clientHeight+'px'}"
+        @click="getClickInfo"
+        @ready="handler">
+        <bm-view style="width: 100%; height:100%; flex: 1" />
+        <bm-control ref="control" :offset="{width: 10, height: 10}" anchor="BMAP_ANCHOR_TOP_LEFT">
+          <div class="map-flex">
+            <div class="map-lable">关键词：</div>
+            <div style="flex:1;">
+              <el-autocomplete v-model="addressKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细地址" style="width:100%" @select="handleSelect" />
+            </div>
+          </div>
+        </bm-control>
+      </baidu-map>
+      <div slot="footer" class="dialog-footer">
+        <span>经度：</span>
+        <el-input v-model="LONGITUDE" style="width: 200px" placeholder="请输入内容" disabled />
+        <span>纬度：</span>
+        <el-input v-model="LATITUDE" style="width: 200px" placeholder="请输入内容" disabled />
+        <el-button @click="dialogFormMap = false">取 消</el-button>
+        <el-button type="primary" @click="setPosition">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
-
+import { Treeselect } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  components: { Pagination },
+  components: { Treeselect, Pagination },
   data() {
     return {
+      // 地图相关
+      CORPINFO_ID: this.$parent.CORPINFO_ID,
+      clientHeight: 600,
+      loadingMap: true,
+      listLoading: false,
+      buttonloading: false,
+      dialogReportVisible: false,
+      BMap: '',
+      map: '',
+      showMap: false,
+      addressKeyword: '',
+      pointLngLat: '',
+      zoom: 10,
+      dialogFormMap: false,
+      LATITUDE: '',
+      LONGITUDE: '',
       listQuery: {
         page: 1,
         limit: 10
@@ -395,11 +496,10 @@ export default {
       EVENT_NAME: '',
       EVENT_TYPE: '',
       OCCURRENCE_TIME: [],
-      dialogAccidentVisible: false,
-      dialogReportVisible: false,
+      dialogFormEdit: false,
+      dialogFormShow: false,
       dialogType: 'add',
-      accidentForm: {
-        // 新增事故表单字段
+      form: {
         EVENT_NAME: '',
         INCOMING_PHONE: '',
         OWNER_NAME: '',
@@ -442,10 +542,9 @@ export default {
         CREATOR: ''
       },
       reportForm: {
-        // 添加事故报告表单字段
         REPORT_UNIT: '',
         AUDITOR: '',
-        REPORT_TIME: '',
+        ACCIDENT_REPORT_TIME: '',
         REPORTER: '',
         RESPONSIBLE_PERSON: '',
         CONTACT_INFORMATION: '',
@@ -467,13 +566,135 @@ export default {
         POISONING_PEOPLE_COUNT: '',
         TRAPPED_PEOPLE_COUNT: '',
         MISSING_PEOPLE_COUNT: ''
+      },
+      // rules: {
+      //   EVENT_NAME: [
+      //     { required: true, message: '事件标题不能为空', trigger: 'blur' }
+      //   ],
+      //   INCOMING_PHONE: [
+      //     { required: true, message: '呼入电话不能为空', trigger: 'blur' }
+      //   ],
+      //   OWNER_NAME: [
+      //     { required: true, message: '机主姓名不能为空', trigger: 'blur' }
+      //   ],
+      //   CALLER_ADDRESS: [
+      //     { required: true, message: '主叫地址不能为空', trigger: 'blur' }
+      //   ],
+      //   ACCESS_MODE: [
+      //     { required: true, message: '接入方式不能为空', trigger: 'blur' }
+      //   ],
+      //   EVENT_TYPE: [
+      //     { required: true, message: '事件类型不能为空', trigger: 'blur' }
+      //   ],
+      //   NAME: [
+      //     { required: true, message: '姓名不能为空', trigger: 'blur' }
+      //   ],
+      //   CONTACT_PHONE: [
+      //     { required: true, message: '联系电话不能为空', trigger: 'blur' }
+      //   ],
+      //   REGION: [
+      //     { required: true, message: '所在区域不能为空', trigger: 'blur' }
+      //   ],
+      //   UNIT_NAME: [
+      //     { required: true, message: '单位名称不能为空', trigger: 'blur' }
+      //   ],
+      //   UNIT_ADDRESS: [
+      //     { required: true, message: '单位地址不能为空', trigger: 'blur' }
+      //   ],
+      //   INDUSTRY_TYPE: [
+      //     { required: true, message: '行业类型不能为空', trigger: 'blur' }
+      //   ],
+      //   ECONOMIC_TYPE: [
+      //     { required: true, message: '经济类型不能为空', trigger: 'blur' }
+      //   ],
+      //   MAJOR_HAZARD: [
+      //     { required: true, message: '重大危险源不能为空', trigger: 'blur' }
+      //   ],
+      //   REPORT_TIME: [
+      //     { required: true, message: '接报时间不能为空', trigger: 'blur' }
+      //   ],
+      //   OCCURRENCE_TIME: [
+      //     { required: true, message: '发生时间不能为空', trigger: 'blur' }
+      //   ],
+      //   LOCATION_ADDRESS: [
+      //     { required: true, message: '所在地址不能为空', trigger: 'blur' }
+      //   ],
+      //   REPORT_TYPE: [
+      //     { required: true, message: '接报类型不能为空', trigger: 'blur' }
+      //   ],
+      //   ACCIDENT_TITLE: [
+      //     { required: true, message: '事故标题不能为空', trigger: 'blur' }
+      //   ],
+      //   ACCIDENT_LEVEL: [
+      //     { required: true, message: '事故级别不能为空', trigger: 'blur' }
+      //   ],
+      //   INJURY_TYPE: [
+      //     { required: true, message: '伤害类型不能为空', trigger: 'blur' }
+      //   ],
+      //   ACCIDENT_TYPE: [
+      //     { required: true, message: '事故类型不能为空', trigger: 'blur' }
+      //   ],
+      //   TRAPPED_PEOPLE_COUNT: [
+      //     { required: true, message: '被困人数不能为空', trigger: 'blur' }
+      //   ],
+      //   MISSING_PEOPLE_COUNT: [
+      //     { required: true, message: '失踪人数不能为空', trigger: 'blur' }
+      //   ],
+      //   DEATH_PEOPLE_COUNT: [
+      //     { required: true, message: '死亡人数不能为空', trigger: 'blur' }
+      //   ],
+      //   SERIOUS_INJURY_PEOPLE_COUNT: [
+      //     { required: true, message: '重伤人数不能为空', trigger: 'blur' }
+      //   ],
+      //   MINOR_INJURY_PEOPLE_COUNT: [
+      //     { required: true, message: '轻伤人数不能为空', trigger: 'blur' }
+      //   ],
+      //   POISONING_PEOPLE_COUNT: [
+      //     { required: true, message: '中毒人数不能为空', trigger: 'blur' }
+      //   ],
+      //   DIRECT_ECONOMIC_LOSS: [
+      //     { required: true, message: '直接经济损失不能为空', trigger: 'blur' }
+      //   ],
+      //   BRIEF_PROCESS: [
+      //     { required: true, message: '简要经过不能为空', trigger: 'blur' }
+      //   ],
+      //   DISPOSAL_SITUATION: [
+      //     { required: true, message: '处置情况不能为空', trigger: 'blur' }
+      //   ],
+      //   OPERATOR: [
+      //     { required: true, message: '修改人不能为空', trigger: 'blur' }
+      //   ],
+      //   CREATETIME: [
+      //     { required: true, message: '添加时间不能为空', trigger: 'blur' }
+      //   ],
+      //   CREATOR: [
+      //     { required: true, message: '添加人不能为空', trigger: 'blur' }
+      //   ]
+      // },
+      FFILE: [],
+      caseSummaryList: [],
+      regionData: [],
+      normalizer(node) {
+        return {
+          id: node.DICTIONARIES_ID,
+          label: node.name,
+          children: node.nodes
+        }
       }
     }
   },
   created() {
+    this.getRegionDataList()
     this.getList()
   },
   methods: {
+    handleRegionChange(value) {
+      const selectedRegion = this.regionData.find(region => region.DICTIONARIES_ID === value)
+      if (selectedRegion) {
+        this.form.REGION_NAME = selectedRegion.name
+        this.reportForm.REGION = selectedRegion.name
+      }
+    },
     getQuery() {
       const date = this.OCCURRENCE_TIME.length === 2 ? this.OCCURRENCE_TIME.join(',') : ''
       const queryParams = {
@@ -495,6 +716,163 @@ export default {
       this.$parent.CASE_ID = CASE_ID
       this.$parent.ticketType = ticketType
     },
+    getRegionDataList() {
+      const params = {
+        PARENT_ID: '5a5d2809ed644aa6ba97a5240ff35484'
+      }
+      requestFN('/dictionaries/listTree', params).then((data) => {
+        this.regionData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        console.error('获取树形数据失败', e)
+      })
+    },
+    //* **************地图相关*****************
+    // 查看地图方法
+    viewMap(id) {
+      this.getDetail(id, 'map')
+    },
+    // 地图相关
+    mapOpen() {
+      this.top = this.getScrollTop()
+      if (this.top) {
+        this.setScrollTop(0)
+      }
+    },
+    // 关闭地图后调用
+    mapClose() {
+      this.setScrollTop(this.top)
+      this.top = 0
+      this.showMap = false
+    },
+    getScrollTop() {
+      let scrollTop = 0
+      if (document.documentElement && document.documentElement.scrollTop) {
+        scrollTop = document.documentElement.scrollTop
+      } else if (document.body) {
+        scrollTop = document.body.scrollTop
+      }
+      return scrollTop
+    },
+    setScrollTop(top) {
+      if (!isNaN(top)) {
+        if (document.documentElement && document.documentElement.scrollTop !== undefined) {
+          document.documentElement.scrollTop = top
+        } else if (document.body) {
+          document.body.scrollTop = top
+        }
+      }
+    },
+    // 地图初始化
+    handler({ BMap, map }) {
+      this.mapOpen()
+      this.BMap = BMap
+      this.map = map
+      this.loadingMap = true
+      var geolocation = new BMap.Geolocation()
+      const myGeo = new BMap.Geocoder()
+      map.enableScrollWheelZoom(true)
+      var $this = this
+      // 调用百度地图api 中的获取当前位置接口
+      geolocation.getCurrentPosition(function(r) {
+        myGeo.getLocation(new BMap.Point(r.point.lng, r.point.lat), function(result) {
+          if (result) {
+            $this.loadingMap = false
+            $this.$set($this, 'pointLngLat', { lng: result.point.lng, lat: result.point.lat })
+            map.enableScrollWheelZoom(true) // 开启鼠标滚轮缩放,默认关闭
+            $this.setCenter({ BMap, map })
+          }
+        })
+      })
+    },
+    // 搜索地图
+    querySearch(queryString, cb) {
+      var options = {
+        onSearchComplete: function(results) {
+          if (local.getStatus() === 0) {
+            // 判断状态是否正确
+            var s = []
+            for (var i = 0; i < results.getCurrentNumPois(); i++) {
+              var x = results.getPoi(i)
+              var item = { value: x.address + x.title, point: x.point }
+              s.push(item)
+              cb(s)
+            }
+          } else {
+            cb()
+          }
+        }
+      }
+      var local = new this.BMap.LocalSearch(this.map, options)
+      local.search(queryString)
+    },
+    handleSelect(item) {
+      var { point } = item
+      this.map.clearOverlays() // 清除地图上所有覆盖物
+      this.map.centerAndZoom(point, this.zoom)
+      const marker = new this.BMap.Marker(point) // 创建标注
+      this.map.addOverlay(marker) // 将标注添加到地图中
+      marker.enableDragging() // 可拖拽
+      this.LONGITUDE = point.lng
+      this.LATITUDE = point.lat
+    },
+    // 设置打开中心位置
+    setCenter({ BMap, map }) {
+      var lng = ''
+      var lat = ''
+      if (this.form.LONGITUDE == '' || this.form.LATITUDE == '') {
+        lng = '119.525971'
+        lat = '39.894727'
+      } else {
+        lng = this.form.LONGITUDE
+        lat = this.form.LATITUDE
+      }
+      var point = new BMap.Point(lng, lat)
+      // var point = new BMap.Point(this.form.LONGITUDE, this.form.LATITUDE)
+      const zoom = map.getZoom()
+      setTimeout(() => {
+        map.centerAndZoom(point, zoom)
+      }, 0)
+      // var marker = new BMap.Marker(point) // 创建标注
+      // map.addOverlay(marker) // 将标注添加到地图中
+    },
+    setMapCenter(lng, lat, eventName) {
+      if (this.map && this.BMap && lng && lat) {
+        const point = new this.BMap.Point(lng, lat)
+        this.map.clearOverlays() // 清除地图上所有覆盖物
+        this.map.centerAndZoom(point, 15) // 设置地图中心和缩放级别
+        const marker = new this.BMap.Marker(point)
+        this.map.addOverlay(marker)
+        const label = new this.BMap.Label(eventName, {
+          position: point,
+          offset: new this.BMap.Size(20, -10)
+        })
+        marker.setLabel(label)
+        marker.addEventListener('dragend', (e) => {
+          this.LONGITUDE = e.point.lng
+          this.LATITUDE = e.point.lat
+        })
+      }
+    },
+    handleMap() {
+      this.dialogFormMap = true
+      this.LATITUDE = this.form.LATITUDE
+      this.LONGITUDE = this.form.LONGITUDE
+      this.$nextTick(() => {
+        this.setCenter({ BMap: this.BMap, map: this.map })
+      })
+    },
+    getClickInfo(e) {
+      if (!this.isZooming) { // 检查是否是缩放引起的事件
+        this.LONGITUDE = e.point.lng
+        this.LATITUDE = e.point.lat
+      }
+    },
+    setPosition() {
+      this.dialogFormMap = false
+      this.form.LATITUDE = this.LATITUDE
+      this.form.LONGITUDE = this.LONGITUDE
+    },
+    //* *******************列表查询******************************
     getList(queryParams) {
       this.listLoading = true
       requestFN(
@@ -504,61 +882,17 @@ export default {
         this.listLoading = false
         this.varList = data.varList
         this.total = data.page.totalResult
-      }).catch((e) => {
-        this.listLoading = false
       })
+        .catch((e) => {
+          this.listLoading = false
+        })
     },
-    handleAddAccident() {
-      this.dialogAccidentVisible = true
-      this.dialogType = 'addAccident'
-      this.accidentForm = {
-        // 重置新增事故表单字段
-        EVENT_NAME: '',
-        INCOMING_PHONE: '',
-        OWNER_NAME: '',
-        CALLER_ADDRESS: '',
-        ACCESS_MODE: '',
-        EVENT_TYPE: '',
-        NAME: '',
-        CONTACT_PHONE: '',
-        OTHER_INFO: '',
-        UNIT_NAME: '',
-        REGION: '',
-        UNIT_ADDRESS: '',
-        INDUSTRY_TYPE: '',
-        ECONOMIC_TYPE: '',
-        MAJOR_HAZARD: '',
-        REPORT_TIME: '',
-        OCCURRENCE_TIME: '',
-        LOCATION_ADDRESS: '',
-        LONGITUDE: '',
-        LATITUDE: '',
-        REPORT_TYPE: '',
-        ACCIDENT_TITLE: '',
-        ACCIDENT_LEVEL: '',
-        INJURY_TYPE: '',
-        ACCIDENT_TYPE: '',
-        TRAPPED_PEOPLE_COUNT: '',
-        MISSING_PEOPLE_COUNT: '',
-        DEATH_PEOPLE_COUNT: '',
-        SERIOUS_INJURY_PEOPLE_COUNT: '',
-        MINOR_INJURY_PEOPLE_COUNT: '',
-        POISONING_PEOPLE_COUNT: '',
-        DIRECT_ECONOMIC_LOSS: '',
-        BRIEF_PROCESS: '',
-        DISPOSAL_SITUATION: '',
-        DEPARTMENT_ID: '',
-        ISDELETE: '',
-        OPERATOR: '',
-        OPERATETIME: '',
-        CREATETIME: '',
-        CREATOR: ''
-      }
-    },
-    handleEditAccident(id) {
-      this.dialogAccidentVisible = true
-      this.dialogType = 'editAccident'
-      this.getDetail(id, 'accident')
+    //* ***************************数据保存**********************************
+    handleEdit(id) {
+      this.dialogFormEdit = true
+      this.dialogType = 'editUser'
+      this.getDetail(id, 'accident')// 获取详情并回显
+      this.$refs.upload.clearFiles()
     },
     handleAddReport(id) {
       this.dialogReportVisible = true
@@ -569,7 +903,7 @@ export default {
       requestFN('/major/registration/detail', params).then((response) => {
         const data = response.msg
         if (type === 'accident') {
-          this.accidentForm = {
+          this.form = {
             EVENT_NAME: data.EVENT_NAME,
             INCOMING_PHONE: data.INCOMING_PHONE,
             OWNER_NAME: data.OWNER_NAME,
@@ -611,24 +945,32 @@ export default {
             CREATETIME: data.CREATETIME,
             CREATOR: data.CREATOR
           }
+        } else if (type === 'map') {
+          this.LONGITUDE = data.LONGITUDE
+          this.LATITUDE = data.LATITUDE
+          this.EVENT_NAME = data.EVENT_NAME
+          this.dialogFormMap = true
+          this.$nextTick(() => {
+            this.setMapCenter(data.LONGITUDE, data.LATITUDE, data.EVENT_NAME)
+          })
         } else if (type === 'report') {
           this.reportForm = {
             REPORT_UNIT: '',
             AUDITOR: '',
-            REPORT_TIME: '',
+            ACCIDENT_REPORT_TIME: '',
             REPORTER: '',
             RESPONSIBLE_PERSON: '',
             CONTACT_INFORMATION: '',
             SAFETY_EVALUATION_LEVEL: '',
             CERTIFICATE_STATUS: '',
+            REGISTRATION_ID: data.ID,
             ACCIDENT_TITLE: data.ACCIDENT_TITLE,
-            ACCIDENT_TIME: data.ACCIDENT_TIME,
-            REGION: data.REGION,
+            ACCIDENT_TIME: data.OCCURRENCE_TIME,
             ACCIDENT_ADDRESS: data.ACCIDENT_ADDRESS,
             ACCIDENT_TYPE: data.ACCIDENT_TYPE,
             INJURY_TYPE: data.INJURY_TYPE,
             ACCIDENT_LEVEL: data.ACCIDENT_LEVEL,
-            ACCIDENT_UNIT: data.ACCIDENT_UNIT,
+            ACCIDENT_UNIT: data.UNIT_NAME,
             INDUSTRY_TYPE: data.INDUSTRY_TYPE,
             ECONOMIC_TYPE: data.ECONOMIC_TYPE,
             DEATH_PEOPLE_COUNT: data.DEATH_PEOPLE_COUNT,
@@ -638,16 +980,30 @@ export default {
             TRAPPED_PEOPLE_COUNT: data.TRAPPED_PEOPLE_COUNT,
             MISSING_PEOPLE_COUNT: data.MISSING_PEOPLE_COUNT
           }
+          this.handleRegionChange(data.REGION)
         }
       }).catch((e) => {
         console.error('获取详情数据失败', e)
       })
     },
-    saveAccident() {
+    handleAdd() {
+      this.dialogFormEdit = true
+      this.form = {}
+      this.form.LONGITUDE = ''
+      this.form.LATITUDE = ''
+      this.dialogType = 'saveUser'
+      this.$refs.upload.clearFiles()
+    },
+    confirm() {
+      this.dataSave()
+    },
+    dataSave() {
       this.listLoading = true
-      requestFN('/major/registration/save', this.accidentForm).then((data) => {
+      requestFN('/major/registration/save', this.form).then((data) => {
         this.listLoading = false
-        this.dialogAccidentVisible = false
+        this.dialogFormEdit = false
+        this.varList = []
+        this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
         this.listLoading = false
@@ -663,40 +1019,57 @@ export default {
         this.listLoading = false
       })
     },
-    handleDelete(id, eventName) {
-      this.$confirm(`确定要删除[${eventName}]吗?`, {
+    //* *****************************删除********************************
+    handleDelete(id, EVENT_NAME) {
+      this.$confirm('确定要删除[' + EVENT_NAME + ']吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.listLoading = true
-        requestFN('/major/registration/delete', { id }).then((data) => {
-          if (data.result === 'success') {
+        requestFN(
+          '/major/registration/delete',
+          {
+            id: id
+          }
+        ).then((data) => {
+          if (data.result == 'success') {
             this.listLoading = false
             this.getList()
           }
         }).catch((e) => {
           this.listLoading = false
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     makeAll() {
-      const selectedData = this.$refs.multipleTable.selection
-      if (!selectedData.length) {
+      const _selectData = this.$refs.multipleTable.selection
+      console.info('_selectData')
+      console.info(_selectData)
+      if (_selectData == null || _selectData.length == 0) {
         this.$message({
           message: '请选中要删除的项...',
           type: 'error'
         })
-        return
+        return false
       }
-      const ids = selectedData.map(item => item.ID).join(',')
+      const ids = _selectData.map((item, index) => {
+        return item.ID
+      }).join(',')
+
       this.$confirm('确定要删除选中的数据吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.listLoading = true
-        requestFN('/major/registration/deleteAll', { ids }).then(() => {
+        requestFN(
+          '/major/registration/deleteAll',
+          {
+            ids: ids
+          }
+        ).then(() => {
           this.listLoading = false
           this.varList = []
           this.listQuery.page = 1
@@ -705,7 +1078,8 @@ export default {
         }).catch((e) => {
           this.listLoading = false
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     }
   }
 }