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 4d219bc..c0127b0 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
@@ -28,19 +28,17 @@
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="EVENT_NAME" label="事件标题" width="180" />
+      <el-table-column prop="ACCESS_MODE" label="接入方式" width="180" />
       <el-table-column prop="OWNER_NAME" label="机主姓名" show-overflow-tooltip="true" />
       <el-table-column prop="INCOMING_PHONE" label="呼入电话" show-overflow-tooltip="true" />
-      <el-table-column prop="CALLER_ADDRESS" label="主叫地址" show-overflow-tooltip="true" />
-      <el-table-column prop="ACCESS_MODE" label="接入方式" show-overflow-tooltip="true" />
       <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 prop="REPORT_TIME" label="接报时间" show-overflow-tooltip="true" />
+      <el-table-column prop="OCCURRENCE_TIME" label="发生时间" show-overflow-tooltip="true" />
       <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="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, true)">生成专报</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>
@@ -57,93 +55,29 @@
     </div>
     <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="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="form.OWNER_NAME" placeholder="请输入机主姓名..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="呼入电话" prop="INCOMING_PHONE">
-              <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="form.CALLER_ADDRESS" placeholder="请输入主叫地址..." />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="接入方式" prop="ACCESS_MODE">
               <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="form.NAME" placeholder="请输入姓名..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="CONTACT_PHONE">
-              <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="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="form.UNIT_NAME" placeholder="请输入单位名称..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所在区域" prop="REGION">
-              <Treeselect
-                :options="regionData"
-                :normalizer="normalizer"
-                v-model="form.REGION"
-                placeholder="请选择所在区域"
-                no-options-text="暂无数据"
-                no-children-text="暂无数据"
-                @input="handleRegionChange"
-              />
+            <el-form-item label="机主姓名" prop="OWNER_NAME">
+              <el-input v-model="form.OWNER_NAME" placeholder="请输入机主姓名..." />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="单位地址" prop="UNIT_ADDRESS">
-              <el-input v-model="form.UNIT_ADDRESS" placeholder="请输入单位地址..." />
+            <el-form-item label="呼入电话" prop="INCOMING_PHONE">
+              <el-input v-model="form.INCOMING_PHONE" placeholder="请输入呼入电话..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="行业类型" prop="INDUSTRY_TYPE">
-              <el-input v-model="form.INDUSTRY_TYPE" placeholder="请输入行业类型..." />
+            <el-form-item label="事件类型" prop="EVENT_TYPE">
+              <el-input v-model="form.EVENT_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="form.ECONOMIC_TYPE" placeholder="请输入经济类型..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="重大危险源" prop="MAJOR_HAZARD">
-              <el-input v-model="form.MAJOR_HAZARD" placeholder="请输入重大危险源..." />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="接报时间" prop="REPORT_TIME">
               <el-date-picker
@@ -169,18 +103,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="事件类型" prop="EVENT_TYPE">
-              <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="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">
@@ -200,235 +122,240 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="接报类型" prop="REPORT_TYPE">
-              <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="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="form.ACCIDENT_LEVEL" placeholder="请输入事故级别..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="伤害类型" prop="INJURY_TYPE">
-              <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="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="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="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="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="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="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="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="form.DIRECT_ECONOMIC_LOSS" placeholder="请输入直接经济损失（万元）..." />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="简要经过" prop="BRIEF_PROCESS">
-          <el-input v-model="form.BRIEF_PROCESS" type="textarea" placeholder="请输入简要经过..." />
-        </el-form-item>
-        <el-form-item label="处置情况" prop="DISPOSAL_SITUATION">
-          <el-input v-model="form.DISPOSAL_SITUATION" type="textarea" placeholder="请输入处置情况..." />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormEdit = false">取 消</el-button>
-        <el-button type="primary" @click="confirm">确 定</el-button>
+        <el-button type="primary" @click="confirm('edit')">确 定</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 label="事件标题" prop="EVENT_NAME">
+          <el-input v-model="reportForm.EVENT_NAME" 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 label="机主姓名" prop="OWNER_NAME">
+              <el-input v-model="reportForm.OWNER_NAME" 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 label="呼入电话" prop="INCOMING_PHONE">
+              <el-input v-model="reportForm.INCOMING_PHONE" 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-form-item label="主叫地址" prop="CALLER_ADDRESS">
+              <el-input v-model="reportForm.CALLER_ADDRESS" placeholder="请输入主叫地址..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="接入方式" prop="ACCESS_MODE">
+              <el-input v-model="reportForm.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="reportForm.NAME" placeholder="请输入姓名..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="CONTACT_PHONE">
+              <el-input v-model="reportForm.CONTACT_PHONE" placeholder="请输入联系电话..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="其他信息" prop="OTHER_INFO">
+          <el-input v-model="reportForm.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="reportForm.UNIT_NAME" placeholder="请输入单位名称..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所在区域" prop="REGION">
+              <Treeselect
+                :options="regionData"
+                :normalizer="normalizer"
+                v-model="reportForm.REGION"
+                placeholder="请选择所在区域"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+                @input="handleRegionChange"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="单位地址" prop="UNIT_ADDRESS">
+              <el-input v-model="reportForm.UNIT_ADDRESS" placeholder="请输入单位地址..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="行业类型" prop="INDUSTRY_TYPE">
+              <el-input v-model="reportForm.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="reportForm.ECONOMIC_TYPE" placeholder="请输入经济类型..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="重大危险源" prop="MAJOR_HAZARD">
+              <el-input v-model="reportForm.MAJOR_HAZARD" placeholder="请输入重大危险源..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="接报时间" prop="REPORT_TIME">
               <el-date-picker
-                v-model="reportForm.ACCIDENT_REPORT_TIME"
-                type="date"
-                placeholder="请选择报告时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
+                v-model="reportForm.REPORT_TIME"
+                type="datetime"
+                placeholder="请选择接报时间"
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 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 label="发生时间" prop="OCCURRENCE_TIME">
+              <el-date-picker
+                v-model="reportForm.OCCURRENCE_TIME"
+                type="datetime"
+                placeholder="请选择发生时间"
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                style="width: 100%;"
+              />
             </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 label="事件类型" prop="EVENT_TYPE">
+              <el-input v-model="reportForm.EVENT_TYPE" 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 label="所在地址" prop="LOCATION_ADDRESS">
+              <el-input v-model="reportForm.LOCATION_ADDRESS" 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 label="经度" prop="LONGITUDE">
+              <el-input v-model="reportForm.LONGITUDE" placeholder="请输入经度" disabled @focus="handleMap" />
             </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 label="纬度" prop="LATITUDE">
+              <div style="display: flex">
+                <el-input v-model="reportForm.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" />
+                  </span>
+                </el-button>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="事故时间" prop="ACCIDENT_TIME">
-              <el-input v-model="reportForm.ACCIDENT_TIME" :disabled="true" />
+            <el-form-item label="接报类型" prop="REPORT_TYPE">
+              <el-input v-model="reportForm.REPORT_TYPE" placeholder="请输入接报类型..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所属区域" prop="REGION">
-              <el-input v-model="reportForm.REGION" :disabled="true" />
-            </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="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 label="事故标题" prop="ACCIDENT_TITLE">
+              <el-input v-model="reportForm.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="reportForm.ACCIDENT_LEVEL" :disabled="true" />
+              <el-input v-model="reportForm.ACCIDENT_LEVEL" placeholder="请输入事故级别..." />
             </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 label="伤害类型" prop="INJURY_TYPE">
+              <el-input v-model="reportForm.INJURY_TYPE" placeholder="请输入伤害类型..." />
             </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 label="事故类型" prop="ACCIDENT_TYPE">
+              <el-input v-model="reportForm.ACCIDENT_TYPE" placeholder="请输入事故类型..." />
             </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-input v-model="reportForm.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="reportForm.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="reportForm.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="reportForm.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="reportForm.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="reportForm.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="reportForm.DIRECT_ECONOMIC_LOSS" placeholder="请输入直接经济损失（万元）..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="简要经过" prop="BRIEF_PROCESS">
+          <el-input v-model="reportForm.BRIEF_PROCESS" type="textarea" placeholder="请输入简要经过..." />
+        </el-form-item>
+        <el-form-item label="处置情况" prop="DISPOSAL_SITUATION">
+          <el-input v-model="reportForm.DISPOSAL_SITUATION" type="textarea" placeholder="请输入处置情况..." />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogReportVisible = false">取消</el-button>
-        <el-button type="primary" @click="saveReport">确定</el-button>
+        <el-button type="primary" @click="confirm('report')">确定</el-button>
       </div>
     </el-dialog>
     <!-- 坐标选择 -->
@@ -542,30 +469,41 @@ export default {
         CREATOR: ''
       },
       reportForm: {
-        REPORT_UNIT: '',
-        AUDITOR: '',
-        ACCIDENT_REPORT_TIME: '',
-        REPORTER: '',
-        RESPONSIBLE_PERSON: '',
-        CONTACT_INFORMATION: '',
-        SAFETY_EVALUATION_LEVEL: '',
-        CERTIFICATE_STATUS: '',
-        ACCIDENT_TITLE: '',
-        ACCIDENT_TIME: '',
+        ID: '',
+        EVENT_NAME: '',
+        INCOMING_PHONE: '',
+        OWNER_NAME: '',
+        CALLER_ADDRESS: '',
+        ACCESS_MODE: '',
+        EVENT_TYPE: '',
+        NAME: '',
+        CONTACT_PHONE: '',
+        OTHER_INFO: '',
+        UNIT_NAME: '',
         REGION: '',
-        ACCIDENT_ADDRESS: '',
-        ACCIDENT_TYPE: '',
-        INJURY_TYPE: '',
-        ACCIDENT_LEVEL: '',
-        ACCIDENT_UNIT: '',
+        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: '',
-        TRAPPED_PEOPLE_COUNT: '',
-        MISSING_PEOPLE_COUNT: ''
+        DIRECT_ECONOMIC_LOSS: '',
+        BRIEF_PROCESS: '',
+        DISPOSAL_SITUATION: ''
       },
       // rules: {
       //   EVENT_NAME: [
@@ -888,11 +826,16 @@ export default {
         })
     },
     //* ***************************数据保存**********************************
-    handleEdit(id) {
-      this.dialogFormEdit = true
-      this.dialogType = 'editUser'
-      this.getDetail(id, 'accident')// 获取详情并回显
-      this.$refs.upload.clearFiles()
+    handleEdit(id, isReport = false) {
+      if (isReport) {
+        this.dialogReportVisible = true
+        this.getDetail(id, 'report')
+      } else {
+        this.dialogFormEdit = true
+        this.dialogType = 'editUser'
+        this.getDetail(id, 'accident') // 获取详情并回显
+        this.$refs.upload.clearFiles()
+      }
     },
     handleAddReport(id) {
       this.dialogReportVisible = true
@@ -903,87 +846,13 @@ export default {
       requestFN('/major/registration/detail', params).then((response) => {
         const data = response.msg
         if (type === 'accident') {
-          this.form = {
-            EVENT_NAME: data.EVENT_NAME,
-            INCOMING_PHONE: data.INCOMING_PHONE,
-            OWNER_NAME: data.OWNER_NAME,
-            CALLER_ADDRESS: data.CALLER_ADDRESS,
-            ACCESS_MODE: data.ACCESS_MODE,
-            EVENT_TYPE: data.EVENT_TYPE,
-            NAME: data.NAME,
-            CONTACT_PHONE: data.CONTACT_PHONE,
-            OTHER_INFO: data.OTHER_INFO,
-            UNIT_NAME: data.UNIT_NAME,
-            REGION: data.REGION,
-            UNIT_ADDRESS: data.UNIT_ADDRESS,
-            INDUSTRY_TYPE: data.INDUSTRY_TYPE,
-            ECONOMIC_TYPE: data.ECONOMIC_TYPE,
-            MAJOR_HAZARD: data.MAJOR_HAZARD,
-            REPORT_TIME: data.REPORT_TIME,
-            OCCURRENCE_TIME: data.OCCURRENCE_TIME,
-            LOCATION_ADDRESS: data.LOCATION_ADDRESS,
-            LONGITUDE: data.LONGITUDE,
-            LATITUDE: data.LATITUDE,
-            REPORT_TYPE: data.REPORT_TYPE,
-            ACCIDENT_TITLE: data.ACCIDENT_TITLE,
-            ACCIDENT_LEVEL: data.ACCIDENT_LEVEL,
-            INJURY_TYPE: data.INJURY_TYPE,
-            ACCIDENT_TYPE: data.ACCIDENT_TYPE,
-            TRAPPED_PEOPLE_COUNT: data.TRAPPED_PEOPLE_COUNT,
-            MISSING_PEOPLE_COUNT: data.MISSING_PEOPLE_COUNT,
-            DEATH_PEOPLE_COUNT: data.DEATH_PEOPLE_COUNT,
-            SERIOUS_INJURY_PEOPLE_COUNT: data.SERIOUS_INJURY_PEOPLE_COUNT,
-            MINOR_INJURY_PEOPLE_COUNT: data.MINOR_INJURY_PEOPLE_COUNT,
-            POISONING_PEOPLE_COUNT: data.POISONING_PEOPLE_COUNT,
-            DIRECT_ECONOMIC_LOSS: data.DIRECT_ECONOMIC_LOSS,
-            BRIEF_PROCESS: data.BRIEF_PROCESS,
-            DISPOSAL_SITUATION: data.DISPOSAL_SITUATION,
-            DEPARTMENT_ID: data.DEPARTMENT_ID,
-            ISDELETE: data.ISDELETE,
-            OPERATOR: data.OPERATOR,
-            OPERATETIME: data.OPERATETIME,
-            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)
-          })
+          this.form = { ...data, Id: id }
         } else if (type === 'report') {
-          this.reportForm = {
-            REPORT_UNIT: '',
-            AUDITOR: '',
-            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.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.UNIT_NAME,
-            INDUSTRY_TYPE: data.INDUSTRY_TYPE,
-            ECONOMIC_TYPE: data.ECONOMIC_TYPE,
-            DEATH_PEOPLE_COUNT: data.DEATH_PEOPLE_COUNT,
-            SERIOUS_INJURY_PEOPLE_COUNT: data.SERIOUS_INJURY_PEOPLE_COUNT,
-            MINOR_INJURY_PEOPLE_COUNT: data.MINOR_INJURY_PEOPLE_COUNT,
-            POISONING_PEOPLE_COUNT: data.POISONING_PEOPLE_COUNT,
-            TRAPPED_PEOPLE_COUNT: data.TRAPPED_PEOPLE_COUNT,
-            MISSING_PEOPLE_COUNT: data.MISSING_PEOPLE_COUNT
-          }
+          this.reportForm = { ...data, Id: id }
           this.handleRegionChange(data.REGION)
         }
-      }).catch((e) => {
-        console.error('获取详情数据失败', e)
+      }).catch((error) => {
+        console.error('获取详情数据失败', error)
       })
     },
     handleAdd() {
@@ -994,19 +863,29 @@ export default {
       this.dialogType = 'saveUser'
       this.$refs.upload.clearFiles()
     },
-    confirm() {
-      this.dataSave()
+    confirm(formType) {
+      const formRef = formType === 'report' ? 'reportForm' : 'form'
+      this.$refs[formRef].validate((valid) => {
+        if (valid) {
+          this.dataSave(formType, this[formRef].ID)
+        }
+      })
     },
-    dataSave() {
+    dataSave(formType, id) {
+      const data = formType === 'report' ? this.reportForm : this.form
+      data.Id = id
+
       this.listLoading = true
-      requestFN('/major/registration/save', this.form).then((data) => {
+      requestFN('/major/registration/save', data).then((response) => {
         this.listLoading = false
-        this.dialogFormEdit = false
+        if (formType === 'report') {
+          this.dialogReportVisible = false
+        } else {
+          this.dialogFormEdit = false
+        }
         this.varList = []
         this.listQuery.page = 1
         this.getList()
-      }).catch((e) => {
-        this.listLoading = false
       })
     },
     saveReport() {
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
index 9512f0e..f7f5423 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
@@ -42,26 +42,38 @@
     </div>
     <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="RESCUE_TEAM_NAME">
-          <el-input v-model="form.RESCUE_TEAM_NAME" placeholder="请输入救援队名称..." />
-        </el-form-item>
-        <el-form-item label="地址" prop="RESCUE_TEAM_ADDRESS">
-          <el-input v-model="form.RESCUE_TEAM_ADDRESS" placeholder="请输入救援队地址..." />
-        </el-form-item>
-        <el-form-item label="类型" prop="TYPE">
-          <Treeselect
-            :options="yjTypeData"
-            :normalizer="normalizer"
-            v-model="form.TYPE"
-            placeholder="请选择类型"
-            no-options-text="暂无数据"
-            no-children-text="暂无数据"
-            @input="handleTypeChange"
-          />
-        </el-form-item>
-        <el-form-item label="级别" prop="LEVEL">
-          <el-input v-model="form.LEVEL" placeholder="请输入级别..." />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="救援队名称" prop="RESCUE_TEAM_NAME">
+              <el-input v-model="form.RESCUE_TEAM_NAME" placeholder="请输入救援队名称..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="RESCUE_TEAM_ADDRESS">
+              <el-input v-model="form.RESCUE_TEAM_ADDRESS" placeholder="请输入救援队地址..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="类型" prop="TYPE">
+              <Treeselect
+                :options="yjTypeData"
+                :normalizer="normalizer"
+                v-model="form.TYPE"
+                placeholder="请选择类型"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+                @input="handleTypeChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="级别" prop="LEVEL">
+              <el-input v-model="form.LEVEL" placeholder="请输入级别..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="密级" prop="SECURITY_LEVEL">
@@ -74,18 +86,22 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="所属区域" prop="AREA">
-          <Treeselect
-            :options="treeData"
-            :normalizer="normalizer"
-            v-model="form.AREA"
-            :disable-branch-nodes="true"
-            placeholder="请选择所属区域"
-            no-options-text="暂无数据"
-            no-children-text="暂无数据"
-            @input="handleRegionChange"
-          />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所属区域" prop="AREA">
+              <Treeselect
+                :options="treeData"
+                :normalizer="normalizer"
+                v-model="form.AREA"
+                :disable-branch-nodes="true"
+                placeholder="请选择所属区域"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+                @input="handleRegionChange"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="经度" prop="LONGITUDE">
@@ -153,78 +169,132 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="联系人电子邮箱" prop="CONTACT_EMAIL">
-          <el-input v-model="form.CONTACT_EMAIL" placeholder="请输入联系人电子邮箱..." />
-        </el-form-item>
-        <el-form-item label="邮编" prop="POSTAL_CODE">
-          <el-input v-model="form.POSTAL_CODE" placeholder="请输入邮编..." />
-        </el-form-item>
-        <el-form-item label="传真" prop="FAX">
-          <el-input v-model="form.FAX" placeholder="请输入传真..." />
-        </el-form-item>
-        <el-form-item label="主管单位名称" prop="SUPERVISING_UNIT_NAME">
-          <Treeselect
-            :options="DepartmentData"
-            v-model="form.SUPERVISING_UNIT"
-            placeholder="请选择主管单位名称"
-            no-options-text="暂无数据"
-            no-children-text="暂无数据"
-            @input="handleDepartmentChange"
-          />
-        </el-form-item>
-        <el-form-item label="主管单位地址" prop="SUPERVISING_UNIT_ADDRESS">
-          <el-input v-model="form.SUPERVISING_UNIT_ADDRESS" placeholder="请输入主管单位地址..." />
-        </el-form-item>
-        <el-form-item label="总人数" prop="TOTAL_PERSONNEL">
-          <el-input v-model="form.TOTAL_PERSONNEL" placeholder="请输入总人数..." />
-        </el-form-item>
-        <el-form-item label="成立时间" prop="ESTABLISHMENT_DATE">
-          <el-date-picker
-            v-model="form.ESTABLISHMENT_DATE"
-            type="date"
-            placeholder="请选择成立时间"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            style="width: 100%;"
-          />
-        </el-form-item>
-        <el-form-item label="应急通信方式" prop="EMERGENCY_COMMUNICATION_MODE">
-          <el-input v-model="form.EMERGENCY_COMMUNICATION_MODE" placeholder="请输入应急通信方式..." />
-        </el-form-item>
-        <el-form-item label="主要职责" prop="MAIN_DUTIES">
-          <el-input v-model="form.MAIN_DUTIES" type="textarea" placeholder="请输入主要职责..." />
-        </el-form-item>
-        <el-form-item label="主要装备描述" prop="MAIN_EQUIPMENT_DESCRIPTION">
-          <el-input v-model="form.MAIN_EQUIPMENT_DESCRIPTION" type="textarea" placeholder="请输入主要装备描述..." />
-        </el-form-item>
-        <el-form-item label="专长描述" prop="SPECIALTY_DESCRIPTION">
-          <el-input v-model="form.SPECIALTY_DESCRIPTION" type="textarea" placeholder="请输入专长描述..." />
-        </el-form-item>
-        <el-form-item label="资质等级" prop="QUALIFICATION_LEVEL">
-          <el-input v-model="form.QUALIFICATION_LEVEL" placeholder="请输入资质等级..." />
-        </el-form-item>
-        <el-form-item label="应急救援经历" prop="EMERGENCY_RESCUE_EXPERIENCE">
-          <el-input v-model="form.EMERGENCY_RESCUE_EXPERIENCE" type="textarea" placeholder="请输入应急救援经历..." />
-        </el-form-item>
-        <el-form-item label="预计准备时间" prop="EXPECTED_PREPARATION_TIME">
-          <el-date-picker
-            v-model="form.EXPECTED_PREPARATION_TIME"
-            type="date"
-            placeholder="请选择预计准备时间"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            style="width: 100%;"
-          />
-        </el-form-item>
-        <el-form-item label="集合出发地点" prop="ASSEMBLY_DEPARTURE_LOCATION">
-          <el-input v-model="form.ASSEMBLY_DEPARTURE_LOCATION" placeholder="请输入集合出发地点..." />
-        </el-form-item>
-        <el-form-item label="自备交通工具" prop="SELF_PROVIDED_TRANSPORT">
-          <el-input v-model="form.SELF_PROVIDED_TRANSPORT" placeholder="请输入自备交通工具..." />
-        </el-form-item>
-        <el-form-item label="需要后备支援" prop="REQUIRES_BACKUP_SUPPORT">
-          <el-input v-model="form.REQUIRES_BACKUP_SUPPORT" placeholder="请输入是否需要后备支援..." />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="联系人电子邮箱" prop="CONTACT_EMAIL">
+              <el-input v-model="form.CONTACT_EMAIL" placeholder="请输入联系人电子邮箱..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="邮编" prop="POSTAL_CODE">
+              <el-input v-model="form.POSTAL_CODE" placeholder="请输入邮编..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="传真" prop="FAX">
+              <el-input v-model="form.FAX" placeholder="请输入传真..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="主管单位名称" prop="SUPERVISING_UNIT_NAME">
+              <Treeselect
+                :options="DepartmentData"
+                v-model="form.SUPERVISING_UNIT"
+                placeholder="请选择主管单位名称"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+                @input="handleDepartmentChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="主管单位地址" prop="SUPERVISING_UNIT_ADDRESS">
+              <el-input v-model="form.SUPERVISING_UNIT_ADDRESS" placeholder="请输入主管单位地址..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="总人数" prop="TOTAL_PERSONNEL">
+              <el-input v-model="form.TOTAL_PERSONNEL" placeholder="请输入总人数..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="成立时间" prop="ESTABLISHMENT_DATE">
+              <el-date-picker
+                v-model="form.ESTABLISHMENT_DATE"
+                type="date"
+                placeholder="请选择成立时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="应急通信方式" prop="EMERGENCY_COMMUNICATION_MODE">
+              <el-input v-model="form.EMERGENCY_COMMUNICATION_MODE" placeholder="请输入应急通信方式..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="主要职责" prop="MAIN_DUTIES">
+              <el-input v-model="form.MAIN_DUTIES" type="textarea" placeholder="请输入主要职责..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="主要装备描述" prop="MAIN_EQUIPMENT_DESCRIPTION">
+              <el-input v-model="form.MAIN_EQUIPMENT_DESCRIPTION" type="textarea" placeholder="请输入主要装备描述..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="专长描述" prop="SPECIALTY_DESCRIPTION">
+              <el-input v-model="form.SPECIALTY_DESCRIPTION" type="textarea" placeholder="请输入专长描述..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="资质等级" prop="QUALIFICATION_LEVEL">
+              <el-input v-model="form.QUALIFICATION_LEVEL" placeholder="请输入资质等级..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="应急救援经历" prop="EMERGENCY_RESCUE_EXPERIENCE">
+              <el-input v-model="form.EMERGENCY_RESCUE_EXPERIENCE" type="textarea" placeholder="请输入应急救援经历..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="预计准备时间" prop="EXPECTED_PREPARATION_TIME">
+              <el-date-picker
+                v-model="form.EXPECTED_PREPARATION_TIME"
+                type="date"
+                placeholder="请选择预计准备时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="集合出发地点" prop="ASSEMBLY_DEPARTURE_LOCATION">
+              <el-input v-model="form.ASSEMBLY_DEPARTURE_LOCATION" placeholder="请输入集合出发地点..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="自备交通工具" prop="SELF_PROVIDED_TRANSPORT">
+              <el-input v-model="form.SELF_PROVIDED_TRANSPORT" placeholder="请输入自备交通工具..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="需要后备支援" prop="REQUIRES_BACKUP_SUPPORT">
+              <el-input v-model="form.REQUIRES_BACKUP_SUPPORT" placeholder="请输入是否需要后备支援..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="备注" prop="REMARK">
           <el-input v-model="form.REMARK" type="textarea" placeholder="请输入备注..." />
         </el-form-item>
diff --git a/src/views/emergen_cyrescue/incident_management/index.vue b/src/views/emergen_cyrescue/incident_management/index.vue
new file mode 100644
index 0000000..98240ae
--- /dev/null
+++ b/src/views/emergen_cyrescue/incident_management/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>
diff --git a/src/views/emergen_cyrescue/resource_management/emergency_supplies/components/list.vue b/src/views/emergen_cyrescue/resource_management/emergency_supplies/components/supplies.vue
similarity index 100%
rename from src/views/emergen_cyrescue/resource_management/emergency_supplies/components/list.vue
rename to src/views/emergen_cyrescue/resource_management/emergency_supplies/components/supplies.vue
diff --git a/src/views/emergen_cyrescue/resource_management/emergency_supplies/components/detail.vue b/src/views/emergen_cyrescue/resource_management/emergency_supplies/components/suppliesInfo.vue
similarity index 100%
rename from src/views/emergen_cyrescue/resource_management/emergency_supplies/components/detail.vue
rename to src/views/emergen_cyrescue/resource_management/emergency_supplies/components/suppliesInfo.vue
diff --git a/src/views/emergen_cyrescue/resource_management/emergency_supplies/index.vue b/src/views/emergen_cyrescue/resource_management/emergency_supplies/index.vue
index ac13f74..f925992 100644
--- a/src/views/emergen_cyrescue/resource_management/emergency_supplies/index.vue
+++ b/src/views/emergen_cyrescue/resource_management/emergency_supplies/index.vue
@@ -5,8 +5,8 @@
   </div>
 </template>
 <script>
-import list from './components/list.vue'
-import detail from './components/detail.vue'
+import list from './components/supplies.vue'
+import detail from './components/suppliesInfo.vue'
 export default {
   components: { list, detail },
   data() {
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_facilities/components/detail.vue b/src/views/emergen_cyrescue/resource_management/equipment_facilities/components/facilitiesInfo.vue
similarity index 100%
rename from src/views/emergen_cyrescue/resource_management/equipment_facilities/components/detail.vue
rename to src/views/emergen_cyrescue/resource_management/equipment_facilities/components/facilitiesInfo.vue
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_facilities/index.vue b/src/views/emergen_cyrescue/resource_management/equipment_facilities/index.vue
index ac13f74..e1f130b 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_facilities/index.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_facilities/index.vue
@@ -6,7 +6,7 @@
 </template>
 <script>
 import list from './components/list.vue'
-import detail from './components/detail.vue'
+import detail from './components/facilitiesInfo.vue'
 export default {
   components: { list, detail },
   data() {
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/detail.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/detail.vue
deleted file mode 100644
index 3d19274..0000000
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/detail.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<template>
-  <div>
-    <div 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.ORG_NAME }}</td>
-            <td class="tbg">地址</td>
-            <td>{{ form.ADDRESS }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">通信机构类型</td>
-            <td>{{ form.ORG_TYPE_NAME }}</td>
-            <td class="tbg">通信机构级别</td>
-            <td>{{ form.ORG_LEVEL }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">邮编</td>
-            <td>{{ form.POSTAL_CODE }}</td>
-            <td class="tbg">机构密级</td>
-            <td>{{ form.SECURITY_LEVEL }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">值班电话</td>
-            <td>{{ form.DUTY_PHONE }}</td>
-            <td class="tbg">传真</td>
-            <td>{{ form.FAX }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">所属区域</td>
-            <td colspan="3">{{ form.ADMINISTRATIVE_REGION_NAME }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">经度</td>
-            <td>{{ form.LONGITUDE }}</td>
-            <td class="tbg">纬度</td>
-            <td>{{ form.LATITUDE }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">应急通讯车数</td>
-            <td>{{ form.EMERGENCY_COMMUNICATION_VEHICLES }}</td>
-            <td class="tbg">应急发电车数</td>
-            <td>{{ form.EMERGENCY_POWER_VEHICLES }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">卫星电话数</td>
-            <td>{{ form.SATELLITE_PHONES }}</td>
-            <td class="tbg">基站总数</td>
-            <td>{{ form.TOTAL_BASE_STATIONS }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">应急通讯方式</td>
-            <td colspan="3">{{ form.EMERGENCY_COMMUNICATION_MODE }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">负责人</td>
-            <td>{{ form.RESPONSIBLE_PERSON }}</td>
-            <td class="tbg">负责人办公电话</td>
-            <td>{{ form.RESPONSIBLE_OFFICE_PHONE }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">负责人移动电话</td>
-            <td>{{ form.RESPONSIBLE_MOBILE_PHONE }}</td>
-            <td class="tbg">负责人住宅电话</td>
-            <td>{{ form.RESPONSIBLE_HOME_PHONE }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">联系人</td>
-            <td>{{ form.CONTACT_PERSON }}</td>
-            <td class="tbg">联系人办公电话</td>
-            <td>{{ form.CONTACT_OFFICE_PHONE }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">联系人移动电话</td>
-            <td>{{ form.CONTACT_MOBILE_PHONE }}</td>
-            <td class="tbg">联系人住宅电话</td>
-            <td>{{ form.CONTACT_HOME_PHONE }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">联系人电子邮箱</td>
-            <td>{{ form.CONTACT_EMAIL }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">主管单位名称</td>
-            <td>{{ form.SUPERVISING_UNIT_NAME }}</td>
-            <td class="tbg">主管单位地址</td>
-            <td>{{ form.SUPERVISING_UNIT_ADDRESS }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">企业基本情况</td>
-            <td colspan="3">{{ form.COMPANY_OVERVIEW }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">应急能力描述</td>
-            <td colspan="3">{{ form.EMERGENCY_CAPACITY_DESCRIPTION }}</td>
-          </tr>
-          <tr>
-            <td class="tbg">备注</td>
-            <td colspan="3">{{ form.REMARK }}</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div class="ui-height" />
-    <div class="ui-foot">
-      <el-button type="primary" @click="goBack">返回基本信息</el-button>
-    </div>
-  </div>
-</template>
-<script>
-import { requestFN } from '@/utils/request'
-
-export default {
-  data() {
-    return {
-      form: {
-        ORG_NAME: '',
-        ORG_TYPE: '',
-        ORG_TYPE_NAME: '',
-        ORG_LEVEL: '',
-        ADDRESS: '',
-        POSTAL_CODE: '',
-        SECURITY_LEVEL: '',
-        DUTY_PHONE: '',
-        FAX: '',
-        ADMINISTRATIVE_REGION: '',
-        ADMINISTRATIVE_REGION_NAME: '',
-        LONGITUDE: '',
-        LATITUDE: '',
-        EMERGENCY_COMMUNICATION_VEHICLES: 0,
-        EMERGENCY_POWER_VEHICLES: 0,
-        SATELLITE_PHONES: 0,
-        TOTAL_BASE_STATIONS: 0,
-        EMERGENCY_COMMUNICATION_MODE: '',
-        RESPONSIBLE_PERSON: '',
-        RESPONSIBLE_OFFICE_PHONE: '',
-        RESPONSIBLE_MOBILE_PHONE: '',
-        RESPONSIBLE_HOME_PHONE: '',
-        CONTACT_PERSON: '',
-        CONTACT_OFFICE_PHONE: '',
-        CONTACT_MOBILE_PHONE: '',
-        CONTACT_HOME_PHONE: '',
-        CONTACT_EMAIL: '',
-        SUPERVISING_UNIT: '',
-        SUPERVISING_UNIT_NAME: '',
-        SUPERVISING_UNIT_ADDRESS: '',
-        COMPANY_OVERVIEW: '',
-        EMERGENCY_CAPACITY_DESCRIPTION: '',
-        REMARK: ''
-      },
-      Id: ''
-    }
-  },
-  created() {
-    console.log('this.$parent.CASE_ID', this.$parent.CASE_ID)
-    if (this.$parent.CASE_ID) {
-      this.Id = this.$parent.CASE_ID
-      this.getDetail(this.Id)
-    }
-    this.getTreeList()
-    this.getDepartmentList()
-  },
-  methods: {
-    goBack() {
-      this.$parent.activeName = 'list'
-    },
-    getTreeList() {
-      const params = {
-        PARENT_ID: '5a5d2809ed644aa6ba97a5240ff35484'
-      }
-      requestFN('/dictionaries/listTree', params).then((data) => {
-        this.treeData = JSON.parse(data.zTreeNodes)
-      }).catch((e) => {
-        console.error('获取树形数据失败', e)
-      })
-    },
-    getDepartmentList() {
-      requestFN('/department/listAll').then((data) => {
-        this.DepartmentData = data.list.map(item => ({
-          id: item.department_ID,
-          label: item.name
-        }))
-      }).catch((e) => {
-        console.error('获取主管单位数据失败', e)
-      })
-    },
-    getDetail(Id) {
-      const params = { Id }
-      requestFN('/major/communication/detail', params).then((response) => {
-        const data = response.msg
-        this.form = {
-          ORG_NAME: data.ORG_NAME,
-          ORG_TYPE: data.ORG_TYPE,
-          ORG_TYPE_NAME: data.ORG_TYPE_NAME,
-          ORG_LEVEL: data.ORG_LEVEL,
-          ADDRESS: data.ADDRESS,
-          POSTAL_CODE: data.POSTAL_CODE,
-          SECURITY_LEVEL: data.SECURITY_LEVEL,
-          DUTY_PHONE: data.DUTY_PHONE,
-          FAX: data.FAX,
-          ADMINISTRATIVE_REGION: data.ADMINISTRATIVE_REGION,
-          ADMINISTRATIVE_REGION_NAME: data.ADMINISTRATIVE_REGION_NAME,
-          LONGITUDE: data.LONGITUDE,
-          LATITUDE: data.LATITUDE,
-          EMERGENCY_COMMUNICATION_VEHICLES: data.EMERGENCY_COMMUNICATION_VEHICLES,
-          EMERGENCY_POWER_VEHICLES: data.EMERGENCY_POWER_VEHICLES,
-          SATELLITE_PHONES: data.SATELLITE_PHONES,
-          TOTAL_BASE_STATIONS: data.TOTAL_BASE_STATIONS,
-          EMERGENCY_COMMUNICATION_MODE: data.EMERGENCY_COMMUNICATION_MODE,
-          RESPONSIBLE_PERSON: data.RESPONSIBLE_PERSON,
-          RESPONSIBLE_OFFICE_PHONE: data.RESPONSIBLE_OFFICE_PHONE,
-          RESPONSIBLE_MOBILE_PHONE: data.RESPONSIBLE_MOBILE_PHONE,
-          RESPONSIBLE_HOME_PHONE: data.RESPONSIBLE_HOME_PHONE,
-          CONTACT_PERSON: data.CONTACT_PERSON,
-          CONTACT_OFFICE_PHONE: data.CONTACT_OFFICE_PHONE,
-          CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
-          CONTACT_HOME_PHONE: data.CONTACT_HOME_PHONE,
-          CONTACT_EMAIL: data.CONTACT_EMAIL,
-          SUPERVISING_UNIT: data.SUPERVISING_UNIT,
-          SUPERVISING_UNIT_NAME: data.SUPERVISING_UNIT_NAME,
-          SUPERVISING_UNIT_ADDRESS: data.SUPERVISING_UNIT_ADDRESS,
-          COMPANY_OVERVIEW: data.COMPANY_OVERVIEW,
-          EMERGENCY_CAPACITY_DESCRIPTION: data.EMERGENCY_CAPACITY_DESCRIPTION,
-          REMARK: data.REMARK,
-          Id: data.ID
-        }
-      }).catch((e) => {
-        console.error('获取详情数据失败', e)
-      })
-    }
-  }
-}
-</script>
-<style lang="sass" scoped>
-.table-ui
-  td
-    line-height: 34px
-  .tbg
-    width: 200px
-.ui-foot
-  text-align: center
-  margin-top: 20px
-</style>
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue
new file mode 100644
index 0000000..b923308
--- /dev/null
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue
@@ -0,0 +1,632 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+    </div>
+    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="EQUIP_NAME" label="装备名称" width="180" />
+      <el-table-column prop="TYPE_NAME" label="装备类别" show-overflow-tooltip="true" />
+      <el-table-column prop="CONTACT_PERSON" label="负责保管人" show-overflow-tooltip="true" />
+      <el-table-column prop="CONTACT_TELE_PHONE" label="负责保管人固定电话" show-overflow-tooltip="true" />
+      <el-table-column prop="CONTACT_MOBILE_PHONE" label="负责保管人移动电话" show-overflow-tooltip="true" />
+      <el-table-column prop="UPDATE_TIME_STRING" label="修改时间" show-overflow-tooltip="true" />
+      <el-table-column label="操作" align="center" width="300">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('equipmentInfo', row.EQUIP_ID, '1')">查看</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EQUIP_ID)">编辑</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EQUIP_ID,row.EQUIP_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="handleAdd">新增</el-button>
+          <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
+          <el-button type="default" icon="el-icon-arrow-left" @click="goBack">返回</el-button>
+        </template>
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+    <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px">
+      <el-form ref="form" :rules="rules" :model="form" label-width="180px">
+
+        <el-form-item label="资源名称" prop="EQUIP_NAME">
+          <el-input v-model="form.EQUIP_NAME" placeholder="请输入资源名称..." />
+        </el-form-item>
+
+        <el-form-item label="装备类别" prop="TYPE">
+          <Treeselect
+            :options="yjrescueEquipData"
+            :normalizer="normalizer"
+            v-model="form.TYPE"
+            placeholder="请选择装备类别"
+            no-options-text="暂无数据"
+            no-children-text="暂无数据"
+          />
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item :key="form.LONGITUDE" label="经度" prop="LONGITUDE">
+              <el-input v-model="form.LONGITUDE" placeholder="请输入内容" disabled @focus="handleMap" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :key="form.LATITUDE" label="纬度" prop="LATITUDE">
+              <div style="display: flex">
+                <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" />
+                  </span>
+                </el-button>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20"/>
+
+        <el-row :gutter="20">
+
+          <el-col :span="12">
+            <el-form-item label="负责保管人" prop="CONTACT_PERSON">
+              <el-input v-model="form.CONTACT_PERSON" placeholder="请输入负责保管人..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责保管人固定电话" prop="CONTACT_OFFICE_PHONE">
+              <el-input v-model="form.CONTACT_TELE_PHONE" placeholder="请输入负责保管人固定电话..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+
+          <el-col :span="12">
+            <el-form-item label="负责保管人移动电话" prop="CONTACT_PERSON">
+              <el-input v-model="form.CONTACT_MOBILE_PHONE" placeholder="请输入负责保管人移动电话..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"/>
+        </el-row>
+
+        <el-form-item label="企业名称" prop="REMARKS">
+          <el-input v-model="form.COMPANY" placeholder="请输入企业名称..." />
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所属区域" prop="ADMINISTRATIVE_REGION">
+              <Treeselect
+                :options="treeData"
+                :normalizer="normalizer"
+                v-model="form.REGION"
+                :disable-branch-nodes="true"
+                placeholder="请选择所属区域"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属单位" prop="SUPERVISING_AGENCY">
+              <Treeselect
+                :options="DepartmentData"
+                v-model="form.AFFILIATEDUNIT"
+                placeholder="请选择所属单位"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormEdit = false">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 坐标选择 -->
+    <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
+      <baidu-map
+        v-ISLOADing="ISLOADingMap"
+        :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="TYPEKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细设备类型" style="width:100%" @select="handleSelect" />
+            </div>
+            <!--            <el-input v-model="TYPEKeyword" style="width: 200px" placeholder="请输入内容" />-->
+            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
+          </div>
+        </bm-control>
+        <!--        <bm-local-search :keyword="TYPEKeyword" :auto-viewport="true"/>-->
+      </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'
+import { upload } from '@/utils/upload'
+export default {
+  components: { Treeselect, Pagination },
+  props: {
+    resourceLibraryId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+
+      // 地图相关
+      CORPINFO_ID: this.$parent.CORPINFO_ID,
+      clientHeight: 600,
+      ISLOADingMap: true,
+      listISLOADing: false,
+      buttonISLOADing: false,
+      BMap: '',
+      map: '',
+      showMap: false,
+      TYPEKeyword: '',
+      pointLngLat: '',
+      zoom: 10,
+      dialogFormMap: false,
+      LATITUDE: '',
+      LONGITUDE: '',
+
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      KEYWORDS: '',
+      dialogFormEdit: false,
+      dialogFormShow: false,
+      dialogType: 'add',
+      form: {
+        // 名称
+        EQUIP_NAME: '',
+        // 设备类型
+        TYPE: '',
+
+        // 经度
+        LONGITUDE: '',
+        // 纬度
+        LATITUDE: '',
+
+        // 负责保管人
+        CONTACT_PERSON: '',
+
+        // 负责保管人固定电话
+        CONTACT_TELE_PHONE: '',
+
+        // 负责保管人移动电话
+        CONTACT_MOBILE_PHONE: '',
+
+        // 详情地址
+        ADDRESS: '',
+        // 企业名称
+        COMPANY: '',
+        // 所属区域
+        REGION: '',
+        // 所属单位
+        AFFILIATEDUNIT: '',
+
+        LIBRARY_ID: ''
+
+      },
+
+      yjrescueEquipData: [],
+      treeData: [],
+      DepartmentData: [],
+      normalizer(node) {
+        return {
+          id: node.DICTIONARIES_ID,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      FFILE: []
+    }
+  },
+  created() {
+    this.getList()
+    this.getyjrescueEquipDataList()
+    this.getDepartmentList()
+    this.getTreeList()
+  },
+  methods: {
+
+    // **********************文件上传*********************
+    handleEditChange(file) {
+      file.MATERIALS_ID = Math.random()
+      const is5M = file.size / 1024 / 1024 < 5
+      if (is5M) this.FFILE.push(file)
+    },
+    handleRemove(file, fileList) {
+      this.FFILE = fileList
+    },
+    upload(fun) {
+      const formData = new FormData()
+
+      for (let i = 0; i < this.FFILE.length; i++) {
+        if (this.FFILE[i].raw) {
+          formData.append('FFILE', this.FFILE[i].raw)
+        }
+      }
+      upload(
+        '/file/upload',
+        formData
+      ).then((data) => {
+        fun(data.fileurl)
+      }).catch((e) => {
+      })
+    },
+    //* ****************************************
+    getDepartmentList() {
+      requestFN('/department/listAll').then((data) => {
+        this.DepartmentData = data.list.map(item => ({
+          id: item.department_ID,
+          label: item.name
+        }))
+      }).catch((e) => {
+        console.error('获取主管单位数据失败', e)
+      })
+    },
+    getTreeList() {
+      const params = {
+        PARENT_ID: '5a5d2809ed644aa6ba97a5240ff35484'
+      }
+      requestFN('/dictionaries/listTree', params).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        console.error('获取树形数据失败', e)
+      })
+    },
+    getyjrescueEquipDataList() {
+      const params = {
+        PARENT_ID: '73e875a1123443b69956cf6761f943de'
+      }
+      requestFN('/dictionaries/listTree', params).then((data) => {
+        this.yjrescueEquipData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        console.error('获取树形数据失败', e)
+      })
+    },
+    //* **************地图相关*****************
+    // 地图相关
+    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.ISLOADingMap = true
+      var geolocation = new BMap.Geolocation()
+      const myGeo = new BMap.Geocoder()
+      var $this = this
+      // 调用百度地图api 中的获取当前位置接口
+      geolocation.getCurrentPosition(function(r) {
+        myGeo.getLocation(new BMap.Point(r.point.lng, r.point.lat), function(result) {
+          if (result) {
+            $this.ISLOADingMap = 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.TYPE + 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) // 将标注添加到地图中
+    },
+    handleMap() {
+      this.dialogFormMap = true
+      this.LATITUDE = this.form.LATITUDE
+      this.LONGITUDE = this.form.LONGITUDE
+    },
+    getClickInfo(e) {
+      this.LONGITUDE = e.point.lng
+      this.LATITUDE = e.point.lat
+    },
+    setPosition() {
+      this.dialogFormMap = false
+      this.form.LATITUDE = this.LATITUDE
+      this.form.LONGITUDE = this.LONGITUDE
+    },
+    //* ***********************************
+    goList(page, CASE_ID, ticketType) {
+      this.$parent.activeName = page
+      this.$parent.CASE_ID = CASE_ID
+      this.$parent.ticketType = ticketType
+    },
+    goBack() {
+      this.$parent.activeName = 'list'
+    },
+    //* *******************列表查询******************************
+
+    getList() {
+      this.listISLOADing = true
+      requestFN(
+        '/rescueEquip/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          name: this.KEYWORDS,
+          LIBRARY_ID: this.resourceLibraryId
+        }
+      ).then((data) => {
+        this.listISLOADing = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listISLOADing = false
+        })
+    },
+    //* ***************************数据保存**********************************
+    handleEdit(id) {
+      this.dialogFormEdit = true
+      this.dialogType = 'editUser'
+      this.getDetail(id) // 获取详情并回显
+      this.$refs.upISLOAD.clearFiles()
+    },
+    getDetail(id) {
+      const params = {
+        id: id
+      }
+      requestFN('/rescueEquip/detail', params).then((response) => {
+        const data = response.data
+        console.log(data)
+        this.form = {
+          // 名称
+          EQUIP_NAME: data.EQUIP_NAME,
+          // 设备类型
+          TYPE: data.TYPE,
+
+          // 经度
+          LONGITUDE: data.LONGITUDE,
+          // 纬度
+          LATITUDE: data.LATITUDE,
+
+          // 负责保管人
+          CONTACT_PERSON: data.CONTACT_PERSON,
+
+          // 负责保管人固定电话
+          CONTACT_TELE_PHONE: data.CONTACT_TELE_PHONE,
+
+          // 负责保管人移动电话
+          CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
+
+          // 企业名称
+          COMPANY: data.COMPANY,
+          // 所属区域
+          REGION: data.REGION,
+          // 所属单位
+          AFFILIATEDUNIT: data.AFFILIATEDUNIT,
+          EQUIP_ID: data.EQUIP_ID
+
+        }
+      }).catch((e) => {
+        console.error('获取详情数据失败', e)
+      })
+    },
+    handleAdd() {
+      this.dialogFormEdit = true
+      this.form = {}
+      this.form.LONGITUDE = ''
+      this.form.LATITUDE = ''
+      this.dialogType = 'saveUser'
+      this.$refs.upISLOAD.clearFiles()
+      this.form.LIBRARY_ID = this.resourceLibraryId
+    },
+    confirm() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          if (this.FFILE.length > 0) {
+            this.upload((v) => {
+              this.form.FILE_URL = v
+              this.$refs.upload.clearFiles()
+              this.dataSave()
+            })
+          } else {
+            this.dataSave()
+          }
+        } else {
+          return false
+        }
+      })
+    },
+
+    dataSave() {
+      this.listISLOADing = true
+      this.form.LIBRARY_ID = this.resourceLibraryId
+      requestFN(
+        '/rescueEquip/save', this.form
+      ).then((data) => {
+        this.listISLOADing = false
+        this.dialogFormEdit = false
+        this.varList = []
+        this.listQuery.page = 1
+        this.getList()
+      }).catch((e) => {
+        this.listISLOADing = false
+      })
+    },
+    //* *****************************删除********************************
+    handleDelete(id, name) {
+      this.$confirm('确定要删除[' + name + ']吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listISLOADing = true
+        requestFN(
+          '/rescueEquip/delete',
+          {
+            id: id
+          }
+        ).then((data) => {
+          if (data.result == 'success') {
+            this.listISLOADing = false
+            this.getList()
+          }
+        }).catch((e) => {
+          this.listISLOADing = false
+        })
+      }).catch(() => {
+      })
+    },
+    makeAll() {
+      const _selectData = this.$refs.multipleTable.selection
+      console.info('_selectData')
+      console.info(_selectData)
+      if (_selectData == null || _selectData.length == 0) {
+        this.$message({
+          message: '请选中要删除的项...',
+          type: 'error'
+        })
+        return false
+      }
+      const ids = _selectData.map((item, index) => {
+        return item.EQUIP_ID
+      }).join(',')
+
+      this.$confirm('确定要删除选中的数据吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listISLOADing = true
+        requestFN(
+          '/rescueEquip/deleteAll',
+          {
+            ids: ids
+          }
+        ).then(() => {
+          this.listISLOADing = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.$refs.multipleTable.clearSelection()
+          this.getList()
+        }).catch((e) => {
+          this.listISLOADing = false
+        })
+      }).catch(() => {
+      })
+    },
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    }
+
+  }
+}
+</script>
+
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipmentInfo.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipmentInfo.vue
new file mode 100644
index 0000000..4e71d62
--- /dev/null
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipmentInfo.vue
@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <div class="app-container">
+      <div class="level-title">
+        <h1>应急救援装备111</h1>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <td class="tbg">装备名称</td>
+            <td>{{ form.EQUIP_NAME }}</td>
+            <td class="tbg">装备类别</td>
+            <td>{{ form.TYPE_NAME }}</td>
+          </tr>
+
+          <tr>
+            <td class="tbg">经度</td>
+            <td>{{ form.LONGITUDE }}</td>
+            <td class="tbg">纬度</td>
+            <td>{{ form.LATITUDE }}</td>
+          </tr>
+
+          <tr>
+            <td class="tbg">联系人</td>
+            <td>{{ form.CONTACT_PERSON }}</td>
+            <td class="tbg">联系人固定电话</td>
+            <td>{{ form.CONTACT_TELE_PHONE }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">联系人移动电话</td>
+            <td>{{ form.CONTACT_MOBILE_PHONE }}</td>
+            <td class="tbg"/>
+            <td/>
+          </tr>
+          <tr>
+            <td class="tbg">企业名称</td>
+            <td>{{ form.COMPANY }}</td>
+            <td class="tbg">所属区域</td>
+            <td>{{ form.REGION_NAME }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">采集单位</td>
+            <td>{{ form.AFFILIATEDUNIT_NAME }}</td>
+            <td class="tbg"/>
+            <td/>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <el-button type="primary" @click="goBack">返回基本信息</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { requestFN } from '@/utils/request'
+
+export default {
+  data() {
+    return {
+      form: {
+        // 装备名称
+        EQUIP_NAME: '',
+        // 装备类别
+        TYPE: '',
+
+        // 经度
+        LONGITUDE: '',
+        // 纬度
+        LATITUDE: '',
+
+        // 联系人
+        CONTACT_PERSON: '',
+
+        // 联系人固定电话
+        CONTACT_TELE_PHONE: '',
+
+        // 联系人移动电话
+        CONTACT_MOBILE_PHONE: '',
+
+        // 详情地址
+        ADDRESS: '',
+        // 企业装备名称
+        COMPANY: '',
+        // 所属区域
+        REGION: '',
+        // 采集单位
+        AFFILIATEDUNIT: ''
+      },
+      Id: ''
+    }
+  },
+  created() {
+    if (this.$parent.CASE_ID) {
+      this.Id = this.$parent.CASE_ID
+      this.getDetail(this.Id)
+    }
+  },
+  methods: {
+    goBack() {
+      this.$parent.activeName = 'equipment'
+    },
+    //* ************************下载**********************
+    download(obj) {
+      this.$confirm('确定要下载此文件吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.downloadUrl = config.fileUrl + obj.FILE_URL
+        const _this = this
+        setTimeout(function() {
+          window.open(_this.downloadUrl)
+        }, 200)
+      }).catch(() => {
+      })
+    },
+    //* **************************************
+    getDetail(id) {
+      const params = {
+        id: id
+      }
+      requestFN('/rescueEquip/detail', params).then((response) => {
+        const data = response.data
+        console.log(data)
+        this.form = {
+          // 装备名称
+          EQUIP_NAME: data.EQUIP_NAME,
+          // 装备类别
+          TYPE: data.TYPE,
+
+          // 经度
+          LONGITUDE: data.LONGITUDE,
+          // 纬度
+          LATITUDE: data.LATITUDE,
+
+          // 联系人
+          CONTACT_PERSON: data.CONTACT_PERSON,
+
+          // 联系人固定电话
+          CONTACT_TELE_PHONE: data.CONTACT_TELE_PHONE,
+
+          // 联系人移动电话
+          CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
+
+          // 企业装备名称
+          COMPANY: data.COMPANY,
+          // 所属区域
+          REGION: data.REGION,
+          // 采集单位
+          AFFILIATEDUNIT: data.AFFILIATEDUNIT,
+          EQUIP_ID: data.EQUIP_ID,
+
+          REGION_NAME: data.REGION_NAME,
+          AFFILIATEDUNIT_NAME: data.AFFILIATEDUNIT_NAME,
+          TYPE_NAME: data.TYPE_NAME
+
+        }
+      }).catch((e) => {
+        console.error('获取详情数据失败', e)
+      })
+    }
+  }
+}
+</script>
+<style lang="sass" scoped>
+.table-ui
+  td
+    line-height: 34px
+  .tbg
+    width: 200px
+.ui-foot
+  text-align: center
+  margin-top: 20px
+</style>
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue
new file mode 100644
index 0000000..a156beb
--- /dev/null
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue
@@ -0,0 +1,601 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+    </div>
+    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="FAC_NAME" label="名称" width="180" />
+      <el-table-column prop="TYPE_NAME" label="设备类型" show-overflow-tooltip="true" />
+      <el-table-column prop="CONTACT_PERSON" label="联系人" show-overflow-tooltip="true" />
+      <el-table-column prop="CONTACT_MOBILE_PHONE" label="联系人固定电话" show-overflow-tooltip="true" />
+      <el-table-column prop="UPDATE_TIME_STRING" label="修改时间" show-overflow-tooltip="true" />
+      <el-table-column label="操作" align="center" width="300">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('facilitiesInfo', row.FAC_ID)">查看</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.FAC_ID)">编辑</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.FAC_ID,row.FAC_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="handleAdd">新增</el-button>
+          <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
+          <el-button type="default" icon="el-icon-arrow-left" @click="goBack">返回</el-button>
+        </template>
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+    <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px">
+      <el-form ref="form" :rules="rules" :model="form" label-width="180px">
+
+        <el-form-item label="名称" prop="FAC_NAME">
+          <el-input v-model="form.FAC_NAME" placeholder="请输入名称名称..." />
+        </el-form-item>
+
+        <el-form-item label="设备类型" prop="TYPE">
+          <Treeselect
+            :options="yjEquipmentFacilitiesData"
+            :normalizer="normalizer"
+            v-model="form.TYPE"
+            placeholder="请选择设备类型"
+            no-options-text="暂无数据"
+            no-children-text="暂无数据"
+          />
+        </el-form-item>
+        <el-form-item label="所在位置" prop="LOCATION">
+          <el-input v-model="form.LOCATION" placeholder="请输入所在位置..." />
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item :key="form.LONGITUDE" label="经度" prop="LONGITUDE">
+              <el-input v-model="form.LONGITUDE" placeholder="请输入内容" disabled @focus="handleMap" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :key="form.LATITUDE" label="纬度" prop="LATITUDE">
+              <div style="display: flex">
+                <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" />
+                  </span>
+                </el-button>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20"/>
+
+        <el-row :gutter="20">
+
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="CONTACT_PERSON">
+              <el-input v-model="form.CONTACT_PERSON" placeholder="请输入联系人..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人电话" prop="CONTACT_OFFICE_PHONE">
+              <el-input v-model="form.CONTACT_MOBILE_PHONE" placeholder="请输入联系人电话..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+
+          <el-col :span="12">
+            <el-form-item label="第二联系人" prop="CONTACT_PERSON">
+              <el-input v-model="form.CONTACT_PERSON_TOW" placeholder="请输入第二联系人..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="第二联系人电话" prop="CONTACT_MOBILE_TOW_PHONE">
+              <el-input v-model="form.CONTACT_MOBILE_TOW_PHONE" placeholder="请输入第二联系人电话..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-form-item label="概述" prop="REMARKS">
+          <el-input v-model="form.OVERVIEW" type="textarea" placeholder="请输入概述..." />
+        </el-form-item>
+
+        <el-form-item label="附件">
+          <el-upload
+            ref="upload"
+            :on-change="handleEditChange"
+            :on-remove="handleRemove"
+            :auto-upload="false"
+            :limit="1"
+            action="#" >
+            <el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormEdit = false">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 坐标选择 -->
+    <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
+      <baidu-map
+        v-ISLOADing="ISLOADingMap"
+        :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="TYPEKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细设备类型" style="width:100%" @select="handleSelect" />
+            </div>
+            <!--            <el-input v-model="TYPEKeyword" style="width: 200px" placeholder="请输入内容" />-->
+            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
+          </div>
+        </bm-control>
+        <!--        <bm-local-search :keyword="TYPEKeyword" :auto-viewport="true"/>-->
+      </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'
+import { upload } from '@/utils/upload'
+export default {
+  components: { Treeselect, Pagination },
+  props: {
+    resourceLibraryId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+
+      // 地图相关
+      CORPINFO_ID: this.$parent.CORPINFO_ID,
+      clientHeight: 600,
+      ISLOADingMap: true,
+      listISLOADing: false,
+      buttonISLOADing: false,
+      BMap: '',
+      map: '',
+      showMap: false,
+      TYPEKeyword: '',
+      pointLngLat: '',
+      zoom: 10,
+      dialogFormMap: false,
+      LATITUDE: '',
+      LONGITUDE: '',
+
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      KEYWORDS: '',
+      dialogFormEdit: false,
+      dialogFormShow: false,
+      dialogType: 'add',
+      form: {
+        // 医疗名称
+        FAC_NAME: '',
+        // 设备类型
+        TYPE: '',
+
+        // 经度
+        LONGITUDE: '',
+        // 纬度
+        LATITUDE: '',
+
+        // 联系人
+        CONTACT_PERSON: '',
+
+        // 联系人移动电话
+        CONTACT_MOBILE_PHONE: '',
+
+        // 联系人
+        CONTACT_PERSON_TOW: '',
+
+        // 联系人移动电话
+        CONTACT_MOBILE_TOW_PHONE: '',
+
+        // 所在位置
+        LOCATION: '',
+        // 概述
+        OVERVIEW: '',
+        // 附件
+        FILE_URL: '',
+
+        LIBRARY_ID: ''
+
+      },
+
+      yjEquipmentFacilitiesData: [],
+      normalizer(node) {
+        return {
+          id: node.DICTIONARIES_ID,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      FFILE: []
+    }
+  },
+  created() {
+    this.getList()
+    this.getyjEquipmentFacilitiesDataList()
+  },
+  methods: {
+
+    // **********************文件上传*********************
+    handleEditChange(file) {
+      file.MATERIALS_ID = Math.random()
+      const is5M = file.size / 1024 / 1024 < 5
+      if (is5M) this.FFILE.push(file)
+    },
+    handleRemove(file, fileList) {
+      this.FFILE = fileList
+    },
+    upload(fun) {
+      const formData = new FormData()
+
+      for (let i = 0; i < this.FFILE.length; i++) {
+        if (this.FFILE[i].raw) {
+          formData.append('FFILE', this.FFILE[i].raw)
+        }
+      }
+      upload(
+        '/file/upload',
+        formData
+      ).then((data) => {
+        fun(data.fileurl)
+      }).catch((e) => {
+      })
+    },
+    //* ****************************************
+
+    getyjEquipmentFacilitiesDataList() {
+      const params = {
+        PARENT_ID: 'd2d163a49a1842a99b28067eee05884b'
+      }
+      requestFN('/dictionaries/listTree', params).then((data) => {
+        this.yjEquipmentFacilitiesData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        console.error('获取树形数据失败', e)
+      })
+    },
+    //* **************地图相关*****************
+    // 地图相关
+    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.ISLOADingMap = true
+      var geolocation = new BMap.Geolocation()
+      const myGeo = new BMap.Geocoder()
+      var $this = this
+      // 调用百度地图api 中的获取当前位置接口
+      geolocation.getCurrentPosition(function(r) {
+        myGeo.getLocation(new BMap.Point(r.point.lng, r.point.lat), function(result) {
+          if (result) {
+            $this.ISLOADingMap = 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.TYPE + 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) // 将标注添加到地图中
+    },
+    handleMap() {
+      this.dialogFormMap = true
+      this.LATITUDE = this.form.LATITUDE
+      this.LONGITUDE = this.form.LONGITUDE
+    },
+    getClickInfo(e) {
+      this.LONGITUDE = e.point.lng
+      this.LATITUDE = e.point.lat
+    },
+    setPosition() {
+      this.dialogFormMap = false
+      this.form.LATITUDE = this.LATITUDE
+      this.form.LONGITUDE = this.LONGITUDE
+    },
+    //* ***********************************
+    goList(page, CASE_ID, ticketType) {
+      this.$parent.activeName = page
+      this.$parent.CASE_ID = CASE_ID
+      this.$parent.ticketType = ticketType
+    },
+    goBack() {
+      this.$parent.activeName = 'list'
+    },
+    //* *******************列表查询******************************
+
+    getList() {
+      this.listISLOADing = true
+      requestFN(
+        '/equipmentfacilities/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          name: this.KEYWORDS,
+          LIBRARY_ID: this.resourceLibraryId
+        }
+      ).then((data) => {
+        this.listISLOADing = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listISLOADing = false
+        })
+    },
+    //* ***************************数据保存**********************************
+    handleEdit(id) {
+      this.dialogFormEdit = true
+      this.dialogType = 'editUser'
+      this.getDetail(id) // 获取详情并回显
+      this.$refs.upISLOAD.clearFiles()
+    },
+    getDetail(id) {
+      const params = {
+        id: id
+      }
+      requestFN('/equipmentfacilities/detail', params).then((response) => {
+        const data = response.data
+        console.log(data)
+        this.form = {
+          // 医疗名称
+          FAC_NAME: data.FAC_NAME,
+          FAC_ID: data.FAC_ID,
+          // 设备类型
+          TYPE: data.TYPE,
+
+          // 经度
+          LONGITUDE: data.LONGITUDE,
+          // 纬度
+          LATITUDE: data.LATITUDE,
+
+          // 联系人
+          CONTACT_PERSON: data.CONTACT_PERSON,
+
+          // 联系人移动电话
+          CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
+
+          // 联系人
+          CONTACT_PERSON_TOW: data.CONTACT_PERSON_TOW,
+
+          // 联系人移动电话
+          CONTACT_MOBILE_TOW_PHONE: data.CONTACT_MOBILE_TOW_PHONE,
+
+          // 所在位置
+          LOCATION: data.LOCATION,
+          // 概述
+          OVERVIEW: data.OVERVIEW,
+          // 附件
+          FILE_URL: data.FILE_URL
+
+        }
+      }).catch((e) => {
+        console.error('获取详情数据失败', e)
+      })
+    },
+    handleAdd() {
+      this.dialogFormEdit = true
+      this.form = {}
+      this.form.LONGITUDE = ''
+      this.form.LATITUDE = ''
+      this.dialogType = 'saveUser'
+      this.$refs.upISLOAD.clearFiles()
+      this.form.LIBRARY_ID = this.resourceLibraryId
+    },
+    confirm() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          if (this.FFILE.length > 0) {
+            this.upload((v) => {
+              this.form.FILE_URL = v
+              this.$refs.upload.clearFiles()
+              this.dataSave()
+            })
+          } else {
+            this.dataSave()
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    dataSave() {
+      this.listISLOADing = true
+      this.form.LIBRARY_ID = this.resourceLibraryId
+      requestFN(
+        '/equipmentfacilities/save', this.form
+      ).then((data) => {
+        this.listISLOADing = false
+        this.dialogFormEdit = false
+        this.varList = []
+        this.listQuery.page = 1
+        this.getList()
+      }).catch((e) => {
+        this.listISLOADing = false
+      })
+    },
+    //* *****************************删除********************************
+    handleDelete(id, name) {
+      this.$confirm('确定要删除[' + name + ']吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listISLOADing = true
+        requestFN(
+          '/equipmentfacilities/delete',
+          {
+            id: id
+          }
+        ).then((data) => {
+          if (data.result == 'success') {
+            this.listISLOADing = false
+            this.getList()
+          }
+        }).catch((e) => {
+          this.listISLOADing = false
+        })
+      }).catch(() => {
+      })
+    },
+    makeAll() {
+      const _selectData = this.$refs.multipleTable.selection
+      console.info('_selectData')
+      console.info(_selectData)
+      if (_selectData == null || _selectData.length == 0) {
+        this.$message({
+          message: '请选中要删除的项...',
+          type: 'error'
+        })
+        return false
+      }
+      const ids = _selectData.map((item, index) => {
+        return item.FAC_ID
+      }).join(',')
+
+      this.$confirm('确定要删除选中的数据吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listISLOADing = true
+        requestFN(
+          '/equipmentfacilities/deleteAll',
+          {
+            ids: ids
+          }
+        ).then(() => {
+          this.listISLOADing = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.$refs.multipleTable.clearSelection()
+          this.getList()
+        }).catch((e) => {
+          this.listISLOADing = false
+        })
+      }).catch(() => {
+      })
+    },
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    }
+
+  }
+}
+</script>
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilitiesInfo.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilitiesInfo.vue
new file mode 100644
index 0000000..cbfa475
--- /dev/null
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilitiesInfo.vue
@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <div 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.FAC_NAME }}</td>
+            <td class="tbg">设备类型</td>
+            <td>{{ form.TYPE_NAME }}</td>
+          </tr>
+
+          <tr>
+            <td class="tbg">所在位置</td>
+            <td colspan="3">{{ form.LOCATION }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">经度</td>
+            <td>{{ form.LONGITUDE }}</td>
+            <td class="tbg">纬度</td>
+            <td>{{ form.LATITUDE }}</td>
+          </tr>
+
+          <tr>
+            <td class="tbg">联系人</td>
+            <td>{{ form.CONTACT_PERSON }}</td>
+            <td class="tbg">联系人电话</td>
+            <td>{{ form.CONTACT_MOBILE_PHONE }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">第二联系人</td>
+            <td>{{ form.CONTACT_PERSON_TOW }}</td>
+            <td class="tbg">第二联系人电话</td>
+            <td>{{ form.CONTACT_MOBILE_TOW_PHONE }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">概述</td>
+            <td>{{ form.OVERVIEW }}</td>
+          </tr>
+          <tr v-if="form.FILE_URL">
+            <td class="tbg">附件</td>
+            <td><a @click="download(form)">下载</a></td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <el-button type="primary" @click="goBack">返回基本信息</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { requestFN } from '@/utils/request'
+
+export default {
+  data() {
+    return {
+      form: {
+        // 医疗名称
+        FAC_NAME: '',
+        // 设备类型
+        TYPE: '',
+
+        // 经度
+        LONGITUDE: '',
+        // 纬度
+        LATITUDE: '',
+
+        // 联系人
+        CONTACT_PERSON: '',
+
+        // 联系人移动电话
+        CONTACT_MOBILE_PHONE: '',
+
+        // 联系人
+        CONTACT_PERSON_TOW: '',
+
+        // 联系人移动电话
+        CONTACT_MOBILE_TOW_PHONE: '',
+
+        // 所在位置
+        LOCATION: '',
+        // 概述
+        OVERVIEW: '',
+        // 附件
+        FILE_URL: ''
+      },
+      Id: ''
+    }
+  },
+  created() {
+    if (this.$parent.CASE_ID) {
+      this.Id = this.$parent.CASE_ID
+      this.getDetail(this.Id)
+    }
+  },
+  methods: {
+    goBack() {
+      this.$parent.activeName = 'facilities'
+    },
+    //* ************************下载**********************
+    download(obj) {
+      this.$confirm('确定要下载此文件吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.downloadUrl = config.fileUrl + obj.FILE_URL
+        const _this = this
+        setTimeout(function() {
+          window.open(_this.downloadUrl)
+        }, 200)
+      }).catch(() => {
+      })
+    },
+    //* **************************************
+    getDetail(id) {
+      const params = {
+        id: id
+      }
+      requestFN('/equipmentfacilities/detail', params).then((response) => {
+        const data = response.data
+
+        this.form = {
+          // 医疗名称
+          FAC_NAME: data.FAC_NAME,
+          FAC_ID: data.FAC_ID,
+          // 设备类型
+          TYPE: data.TYPE,
+
+          // 经度
+          LONGITUDE: data.LONGITUDE,
+          // 纬度
+          LATITUDE: data.LATITUDE,
+
+          // 联系人
+          CONTACT_PERSON: data.CONTACT_PERSON,
+
+          // 联系人移动电话
+          CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
+
+          // 联系人
+          CONTACT_PERSON_TOW: data.CONTACT_PERSON_TOW,
+
+          // 联系人移动电话
+          CONTACT_MOBILE_TOW_PHONE: data.CONTACT_MOBILE_TOW_PHONE,
+
+          // 所在位置
+          LOCATION: data.LOCATION,
+          // 概述
+          OVERVIEW: data.OVERVIEW,
+          // 附件
+          FILE_URL: data.FILE_URL,
+          TYPE_NAME: data.TYPE_NAME
+        }
+      }).catch((e) => {
+        console.error('获取详情数据失败', e)
+      })
+    }
+  }
+}
+</script>
+<style lang="sass" scoped>
+.table-ui
+  td
+    line-height: 34px
+  .tbg
+    width: 200px
+.ui-foot
+  text-align: center
+  margin-top: 20px
+</style>
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue
index 444b23a..0388dcc 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue
@@ -29,8 +29,11 @@
       <el-table-column prop="CONTACT_MOBILE_PHONE" label="联系人手机号码" show-overflow-tooltip="true" />
       <el-table-column prop="COMPANY_NAME" label="企业名称" show-overflow-tooltip="true" />
 
-      <el-table-column label="操作" align="center" width="300">
+      <el-table-column label="操作" align="center" width="600">
         <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('facilities', row.ID, '1')">查看设备设施</el-button>
+          <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('equipment', row.ID)">查看救援装备</el-button>
+          <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('supplies', 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.RESOURCE_LIBRARY_NAME)">删除</el-button>
         </template>
@@ -172,6 +175,10 @@ export default {
     this.getList()
   },
   methods: {
+    goList(page, resourceLibraryId) {
+      this.$parent.activeName = page
+      this.$parent.resourceLibraryId = resourceLibraryId
+    },
     getList() {
       this.listLoading = true
       requestFN(
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue
new file mode 100644
index 0000000..5d50c90
--- /dev/null
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue
@@ -0,0 +1,631 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        搜索
+      </el-button>
+    </div>
+    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="SUPPLIES_NAME" label="物资名称" width="180" />
+      <el-table-column prop="TYPE_NAME" label="物资类别" show-overflow-tooltip="true" />
+      <el-table-column prop="CONTACT_PERSON" label="负责保管人" show-overflow-tooltip="true" />
+      <el-table-column prop="CONTACT_TELE_PHONE" label="负责保管人固定电话" show-overflow-tooltip="true" />
+      <el-table-column prop="CONTACT_MOBILE_PHONE" label="负责保管人移动电话" show-overflow-tooltip="true" />
+      <el-table-column prop="UPDATE_TIME_STRING" label="修改时间" show-overflow-tooltip="true" />
+      <el-table-column label="操作" align="center" width="300">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('suppliesInfo', row.SUPPLIES_ID, '1')">查看</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.SUPPLIES_ID)">编辑</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.SUPPLIES_ID,row.SUPPLIES_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="handleAdd">新增</el-button>
+          <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
+          <el-button type="default" icon="el-icon-arrow-left" @click="goBack">返回</el-button>
+        </template>
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+    <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px">
+      <el-form ref="form" :rules="rules" :model="form" label-width="180px">
+
+        <el-form-item label="资源名称" prop="SUPPLIES_NAME">
+          <el-input v-model="form.SUPPLIES_NAME" placeholder="请输入资源名称..." />
+        </el-form-item>
+
+        <el-form-item label="物资类别" prop="TYPE">
+          <Treeselect
+            :options="yjrescueSuppliesData"
+            :normalizer="normalizer"
+            v-model="form.TYPE"
+            placeholder="请选择物资类别"
+            no-options-text="暂无数据"
+            no-children-text="暂无数据"
+          />
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item :key="form.LONGITUDE" label="经度" prop="LONGITUDE">
+              <el-input v-model="form.LONGITUDE" placeholder="请输入内容" disabled @focus="handleMap" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :key="form.LATITUDE" label="纬度" prop="LATITUDE">
+              <div style="display: flex">
+                <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" />
+                  </span>
+                </el-button>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20"/>
+
+        <el-row :gutter="20">
+
+          <el-col :span="12">
+            <el-form-item label="负责保管人" prop="CONTACT_PERSON">
+              <el-input v-model="form.CONTACT_PERSON" placeholder="请输入负责保管人..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责保管人固定电话" prop="CONTACT_OFFICE_PHONE">
+              <el-input v-model="form.CONTACT_TELE_PHONE" placeholder="请输入负责保管人固定电话..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+
+          <el-col :span="12">
+            <el-form-item label="负责保管人移动电话" prop="CONTACT_PERSON">
+              <el-input v-model="form.CONTACT_MOBILE_PHONE" placeholder="请输入负责保管人移动电话..." />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12"/>
+        </el-row>
+
+        <el-form-item label="企业名称" prop="REMARKS">
+          <el-input v-model="form.COMPANY" placeholder="请输入企业名称..." />
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所属区域" prop="ADMINISTRATIVE_REGION">
+              <Treeselect
+                :options="treeData"
+                :normalizer="normalizer"
+                v-model="form.REGION"
+                :disable-branch-nodes="true"
+                placeholder="请选择所属区域"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采集单位" prop="SUPERVISING_AGENCY">
+              <Treeselect
+                :options="DepartmentData"
+                v-model="form.AFFILIATEDUNIT"
+                placeholder="请选择采集单位"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormEdit = false">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 坐标选择 -->
+    <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
+      <baidu-map
+        v-ISLOADing="ISLOADingMap"
+        :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="TYPEKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细设备类型" style="width:100%" @select="handleSelect" />
+            </div>
+            <!--            <el-input v-model="TYPEKeyword" style="width: 200px" placeholder="请输入内容" />-->
+            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
+          </div>
+        </bm-control>
+        <!--        <bm-local-search :keyword="TYPEKeyword" :auto-viewport="true"/>-->
+      </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'
+import { upload } from '@/utils/upload'
+export default {
+  components: { Treeselect, Pagination },
+  props: {
+    resourceLibraryId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+
+      // 地图相关
+      CORPINFO_ID: this.$parent.CORPINFO_ID,
+      clientHeight: 600,
+      ISLOADingMap: true,
+      listISLOADing: false,
+      buttonISLOADing: false,
+      BMap: '',
+      map: '',
+      showMap: false,
+      TYPEKeyword: '',
+      pointLngLat: '',
+      zoom: 10,
+      dialogFormMap: false,
+      LATITUDE: '',
+      LONGITUDE: '',
+
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      KEYWORDS: '',
+      dialogFormEdit: false,
+      dialogFormShow: false,
+      dialogType: 'add',
+      form: {
+        // 名称
+        SUPPLIES_NAME: '',
+        // 设备类型
+        TYPE: '',
+
+        // 经度
+        LONGITUDE: '',
+        // 纬度
+        LATITUDE: '',
+
+        // 负责保管人
+        CONTACT_PERSON: '',
+
+        // 负责保管人固定电话
+        CONTACT_TELE_PHONE: '',
+
+        // 负责保管人移动电话
+        CONTACT_MOBILE_PHONE: '',
+
+        // 详情地址
+        ADDRESS: '',
+        // 企业名称
+        COMPANY: '',
+        // 所属区域
+        REGION: '',
+        // 采集单位
+        AFFILIATEDUNIT: '',
+
+        LIBRARY_ID: ''
+
+      },
+
+      yjrescueSuppliesData: [],
+      treeData: [],
+      DepartmentData: [],
+      normalizer(node) {
+        return {
+          id: node.DICTIONARIES_ID,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      FFILE: []
+    }
+  },
+  created() {
+    this.getList()
+    this.getyjrescueSuppliesDataList()
+    this.getDepartmentList()
+    this.getTreeList()
+  },
+  methods: {
+
+    // **********************文件上传*********************
+    handleEditChange(file) {
+      file.MATERIALS_ID = Math.random()
+      const is5M = file.size / 1024 / 1024 < 5
+      if (is5M) this.FFILE.push(file)
+    },
+    handleRemove(file, fileList) {
+      this.FFILE = fileList
+    },
+    upload(fun) {
+      const formData = new FormData()
+
+      for (let i = 0; i < this.FFILE.length; i++) {
+        if (this.FFILE[i].raw) {
+          formData.append('FFILE', this.FFILE[i].raw)
+        }
+      }
+      upload(
+        '/file/upload',
+        formData
+      ).then((data) => {
+        fun(data.fileurl)
+      }).catch((e) => {
+      })
+    },
+    //* ****************************************
+    getDepartmentList() {
+      requestFN('/department/listAll').then((data) => {
+        this.DepartmentData = data.list.map(item => ({
+          id: item.department_ID,
+          label: item.name
+        }))
+      }).catch((e) => {
+        console.error('获取主管单位数据失败', e)
+      })
+    },
+    getTreeList() {
+      const params = {
+        PARENT_ID: '5a5d2809ed644aa6ba97a5240ff35484'
+      }
+      requestFN('/dictionaries/listTree', params).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        console.error('获取树形数据失败', e)
+      })
+    },
+    getyjrescueSuppliesDataList() {
+      const params = {
+        PARENT_ID: '73e875a1123443b69956cf6761f943de'
+      }
+      requestFN('/dictionaries/listTree', params).then((data) => {
+        this.yjrescueSuppliesData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        console.error('获取树形数据失败', e)
+      })
+    },
+    //* **************地图相关*****************
+    // 地图相关
+    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.ISLOADingMap = true
+      var geolocation = new BMap.Geolocation()
+      const myGeo = new BMap.Geocoder()
+      var $this = this
+      // 调用百度地图api 中的获取当前位置接口
+      geolocation.getCurrentPosition(function(r) {
+        myGeo.getLocation(new BMap.Point(r.point.lng, r.point.lat), function(result) {
+          if (result) {
+            $this.ISLOADingMap = 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.TYPE + 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) // 将标注添加到地图中
+    },
+    handleMap() {
+      this.dialogFormMap = true
+      this.LATITUDE = this.form.LATITUDE
+      this.LONGITUDE = this.form.LONGITUDE
+    },
+    getClickInfo(e) {
+      this.LONGITUDE = e.point.lng
+      this.LATITUDE = e.point.lat
+    },
+    setPosition() {
+      this.dialogFormMap = false
+      this.form.LATITUDE = this.LATITUDE
+      this.form.LONGITUDE = this.LONGITUDE
+    },
+    //* ***********************************
+    goList(page, CASE_ID, ticketType) {
+      this.$parent.activeName = page
+      this.$parent.CASE_ID = CASE_ID
+      this.$parent.ticketType = ticketType
+    },
+    goBack() {
+      this.$parent.activeName = 'list'
+    },
+    //* *******************列表查询******************************
+
+    getList() {
+      this.listISLOADing = true
+      requestFN(
+        '/rescueSupplies/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          name: this.KEYWORDS,
+          LIBRARY_ID: this.resourceLibraryId
+        }
+      ).then((data) => {
+        this.listISLOADing = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listISLOADing = false
+        })
+    },
+    //* ***************************数据保存**********************************
+    handleEdit(id) {
+      this.dialogFormEdit = true
+      this.dialogType = 'editUser'
+      this.getDetail(id) // 获取详情并回显
+      this.$refs.upISLOAD.clearFiles()
+    },
+    getDetail(id) {
+      const params = {
+        id: id
+      }
+      requestFN('/rescueSupplies/detail', params).then((response) => {
+        const data = response.data
+        console.log(data)
+        this.form = {
+          // 名称
+          SUPPLIES_NAME: data.SUPPLIES_NAME,
+          // 设备类型
+          TYPE: data.TYPE,
+
+          // 经度
+          LONGITUDE: data.LONGITUDE,
+          // 纬度
+          LATITUDE: data.LATITUDE,
+
+          // 负责保管人
+          CONTACT_PERSON: data.CONTACT_PERSON,
+
+          // 负责保管人固定电话
+          CONTACT_TELE_PHONE: data.CONTACT_TELE_PHONE,
+
+          // 负责保管人移动电话
+          CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
+
+          // 企业名称
+          COMPANY: data.COMPANY,
+          // 所属区域
+          REGION: data.REGION,
+          // 采集单位
+          AFFILIATEDUNIT: data.AFFILIATEDUNIT,
+          SUPPLIES_ID: data.SUPPLIES_ID
+
+        }
+      }).catch((e) => {
+        console.error('获取详情数据失败', e)
+      })
+    },
+    handleAdd() {
+      this.dialogFormEdit = true
+      this.form = {}
+      this.form.LONGITUDE = ''
+      this.form.LATITUDE = ''
+      this.dialogType = 'saveUser'
+      this.$refs.upISLOAD.clearFiles()
+      this.form.LIBRARY_ID = this.resourceLibraryId
+    },
+    confirm() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          if (this.FFILE.length > 0) {
+            this.upload((v) => {
+              this.form.FILE_URL = v
+              this.$refs.upload.clearFiles()
+              this.dataSave()
+            })
+          } else {
+            this.dataSave()
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    dataSave() {
+      this.listISLOADing = true
+      this.form.LIBRARY_ID = this.resourceLibraryId
+      requestFN(
+        '/rescueSupplies/save', this.form
+      ).then((data) => {
+        this.listISLOADing = false
+        this.dialogFormEdit = false
+        this.varList = []
+        this.listQuery.page = 1
+        this.getList()
+      }).catch((e) => {
+        this.listISLOADing = false
+      })
+    },
+    //* *****************************删除********************************
+    handleDelete(id, name) {
+      this.$confirm('确定要删除[' + name + ']吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listISLOADing = true
+        requestFN(
+          '/rescueSupplies/delete',
+          {
+            id: id
+          }
+        ).then((data) => {
+          if (data.result == 'success') {
+            this.listISLOADing = false
+            this.getList()
+          }
+        }).catch((e) => {
+          this.listISLOADing = false
+        })
+      }).catch(() => {
+      })
+    },
+    makeAll() {
+      const _selectData = this.$refs.multipleTable.selection
+      console.info('_selectData')
+      console.info(_selectData)
+      if (_selectData == null || _selectData.length == 0) {
+        this.$message({
+          message: '请选中要删除的项...',
+          type: 'error'
+        })
+        return false
+      }
+      const ids = _selectData.map((item, index) => {
+        return item.SUPPLIES_ID
+      }).join(',')
+
+      this.$confirm('确定要删除选中的数据吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listISLOADing = true
+        requestFN(
+          '/rescueSupplies/deleteAll',
+          {
+            ids: ids
+          }
+        ).then(() => {
+          this.listISLOADing = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.$refs.multipleTable.clearSelection()
+          this.getList()
+        }).catch((e) => {
+          this.listISLOADing = false
+        })
+      }).catch(() => {
+      })
+    },
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    }
+
+  }
+}
+</script>
+
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/suppliesInfo.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/suppliesInfo.vue
new file mode 100644
index 0000000..b6e3b09
--- /dev/null
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/suppliesInfo.vue
@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <div 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.SUPPLIES_NAME }}</td>
+            <td class="tbg">物资类别</td>
+            <td>{{ form.TYPE_NAME }}</td>
+          </tr>
+
+          <tr>
+            <td class="tbg">经度</td>
+            <td>{{ form.LONGITUDE }}</td>
+            <td class="tbg">纬度</td>
+            <td>{{ form.LATITUDE }}</td>
+          </tr>
+
+          <tr>
+            <td class="tbg">联系人</td>
+            <td>{{ form.CONTACT_PERSON }}</td>
+            <td class="tbg">联系人固定电话</td>
+            <td>{{ form.CONTACT_TELE_PHONE }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">联系人移动电话</td>
+            <td>{{ form.CONTACT_MOBILE_PHONE }}</td>
+            <td class="tbg"/>
+            <td/>
+          </tr>
+          <tr>
+            <td class="tbg">企业物资名称</td>
+            <td>{{ form.COMPANY }}</td>
+            <td class="tbg">所属区域</td>
+            <td>{{ form.REGION_NAME }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">所属单位</td>
+            <td>{{ form.AFFILIATEDUNIT_NAME }}</td>
+            <td class="tbg"/>
+            <td/>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <el-button type="primary" @click="goBack">返回基本信息</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { requestFN } from '@/utils/request'
+
+export default {
+  data() {
+    return {
+      form: {
+        // 物资名称
+        SUPPLIES_NAME: '',
+        // 物资类别
+        TYPE: '',
+
+        // 经度
+        LONGITUDE: '',
+        // 纬度
+        LATITUDE: '',
+
+        // 联系人
+        CONTACT_PERSON: '',
+
+        // 联系人固定电话
+        CONTACT_TELE_PHONE: '',
+
+        // 联系人移动电话
+        CONTACT_MOBILE_PHONE: '',
+
+        // 详情地址
+        ADDRESS: '',
+        // 企业物资名称
+        COMPANY: '',
+        // 所属区域
+        REGION: '',
+        // 所属单位
+        AFFILIATEDUNIT: ''
+      },
+      Id: ''
+    }
+  },
+  created() {
+    if (this.$parent.CASE_ID) {
+      this.Id = this.$parent.CASE_ID
+      this.getDetail(this.Id)
+    }
+  },
+  methods: {
+    goBack() {
+      this.$parent.activeName = 'supplies'
+    },
+    //* ************************下载**********************
+    download(obj) {
+      this.$confirm('确定要下载此文件吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.downloadUrl = config.fileUrl + obj.FILE_URL
+        const _this = this
+        setTimeout(function() {
+          window.open(_this.downloadUrl)
+        }, 200)
+      }).catch(() => {
+      })
+    },
+    //* **************************************
+    getDetail(id) {
+      const params = {
+        id: id
+      }
+      requestFN('/rescueSupplies/detail', params).then((response) => {
+        const data = response.data
+        console.log(data)
+        this.form = {
+          // 物资名称
+          SUPPLIES_NAME: data.SUPPLIES_NAME,
+          // 物资类别
+          TYPE: data.TYPE,
+
+          // 经度
+          LONGITUDE: data.LONGITUDE,
+          // 纬度
+          LATITUDE: data.LATITUDE,
+
+          // 联系人
+          CONTACT_PERSON: data.CONTACT_PERSON,
+
+          // 联系人固定电话
+          CONTACT_TELE_PHONE: data.CONTACT_TELE_PHONE,
+
+          // 联系人移动电话
+          CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
+
+          // 企业物资名称
+          COMPANY: data.COMPANY,
+          // 所属区域
+          REGION: data.REGION,
+          // 所属单位
+          AFFILIATEDUNIT: data.AFFILIATEDUNIT,
+          SUPPLIES_ID: data.SUPPLIES_ID,
+
+          REGION_NAME: data.REGION_NAME,
+          AFFILIATEDUNIT_NAME: data.AFFILIATEDUNIT_NAME,
+          TYPE_NAME: data.TYPE_NAME
+
+        }
+      }).catch((e) => {
+        console.error('获取详情数据失败', e)
+      })
+    }
+  }
+}
+</script>
+<style lang="sass" scoped>
+.table-ui
+  td
+    line-height: 34px
+  .tbg
+    width: 200px
+.ui-foot
+  text-align: center
+  margin-top: 20px
+</style>
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/index.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/index.vue
index ac13f74..149f8fe 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/index.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/index.vue
@@ -1,18 +1,54 @@
 <template>
   <div>
     <list v-show="activeName=='list'" ref="list" />
-    <detail v-if="activeName=='detail'"/>
+    <facilities v-if="activeName=='facilities'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetail"/>
+    <facilities-info v-if="activeName=='facilitiesInfo'" @goBack="handleGoBack"/>
+    <equipment v-if="activeName=='equipment'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetailEquip"/>
+    <equipment-info v-if="activeName=='equipmentInfo'" @goBack="handleGoBackFromEquipInfo"/>
+    <supplies v-if="activeName=='supplies'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetailSupplies"/>
+    <supplies-info v-if="activeName=='suppliesInfo'" @goBack="handleGoBackFromSupplies"/>
   </div>
 </template>
+
 <script>
 import list from './components/list.vue'
-import detail from './components/detail.vue'
+import facilities from './components/facilities.vue'
+import facilitiesInfo from './components/facilitiesInfo.vue'
+import equipment from './components/equipment.vue'
+import equipmentInfo from './components/equipmentInfo.vue'
+import supplies from './components/supplies.vue'
+import suppliesInfo from './components/suppliesInfo.vue'
+
 export default {
-  components: { list, detail },
+  components: { list, facilities, facilitiesInfo, equipment, equipmentInfo, supplies, suppliesInfo },
   data() {
     return {
       activeName: 'list',
-      CASE_ID: ''
+      CASE_ID: '',
+      resourceLibraryId: ''
+    }
+  },
+  methods: {
+    handleViewDetail(CASE_ID) {
+      this.CASE_ID = CASE_ID
+      this.activeName = 'facilitiesInfo'
+    },
+    handleGoBack() {
+      this.activeName = 'facilities'
+    },
+    handleViewDetailEquip(CASE_ID) {
+      this.CASE_ID = CASE_ID
+      this.activeName = 'equipmentInfo'
+    },
+    handleGoBackFromEquipInfo() {
+      this.activeName = 'equipment'
+    },
+    handleViewDetailSupplies(CASE_ID) {
+      this.CASE_ID = CASE_ID
+      this.activeName = 'suppliesInfo'
+    },
+    handleGoBackFromSupplies() {
+      this.activeName = 'supplies'
     }
   }
 }
diff --git a/src/views/emergen_cyrescue/resource_management/rescue_equipment/components/list.vue b/src/views/emergen_cyrescue/resource_management/rescue_equipment/components/equipment.vue
similarity index 99%
rename from src/views/emergen_cyrescue/resource_management/rescue_equipment/components/list.vue
rename to src/views/emergen_cyrescue/resource_management/rescue_equipment/components/equipment.vue
index 3abe5f3..b1690e9 100644
--- a/src/views/emergen_cyrescue/resource_management/rescue_equipment/components/list.vue
+++ b/src/views/emergen_cyrescue/resource_management/rescue_equipment/components/equipment.vue
@@ -439,7 +439,6 @@ export default {
       this.$parent.CASE_ID = CASE_ID
       this.$parent.ticketType = ticketType
     },
-
     //* *******************列表查询******************************
 
     getList() {
diff --git a/src/views/emergen_cyrescue/resource_management/rescue_equipment/components/detail.vue b/src/views/emergen_cyrescue/resource_management/rescue_equipment/components/equipmentInfo.vue
similarity index 100%
rename from src/views/emergen_cyrescue/resource_management/rescue_equipment/components/detail.vue
rename to src/views/emergen_cyrescue/resource_management/rescue_equipment/components/equipmentInfo.vue
diff --git a/src/views/emergen_cyrescue/resource_management/rescue_equipment/index.vue b/src/views/emergen_cyrescue/resource_management/rescue_equipment/index.vue
index ac13f74..94bd866 100644
--- a/src/views/emergen_cyrescue/resource_management/rescue_equipment/index.vue
+++ b/src/views/emergen_cyrescue/resource_management/rescue_equipment/index.vue
@@ -5,8 +5,8 @@
   </div>
 </template>
 <script>
-import list from './components/list.vue'
-import detail from './components/detail.vue'
+import list from './components/equipment.vue'
+import detail from './components/equipmentInfo.vue'
 export default {
   components: { list, detail },
   data() {