diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/detail.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/detail.vue
index 70b0371..67a68ee 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/detail.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/detail.vue
@@ -2,27 +2,27 @@
   <div>
     <div class="app-container">
       <div class="level-title">
-        <h1>运输保障机构详情</h1>
+        <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.RESCUE_TEAM_NAME }}</td>
             <td class="tbg">地址</td>
-            <td>{{ form.ADDRESS }}</td>
+            <td>{{ form.RESCUE_TEAM_ADDRESS }}</td>
           </tr>
           <tr>
-            <td class="tbg">运输机构类型</td>
-            <td>{{ form.ORG_TYPE }}</td>
-            <td class="tbg">运输机构级别</td>
-            <td>{{ form.ORG_LEVEL }}</td>
+            <td class="tbg">类型</td>
+            <td>{{ form.TYPE_NAME }}</td>
+            <td class="tbg">级别</td>
+            <td>{{ form.LEVEL }}</td>
           </tr>
           <tr>
-            <td class="tbg">邮编</td>
-            <td>{{ form.POSTAL_CODE }}</td>
-            <td class="tbg">机构密级</td>
+            <td class="tbg">密级</td>
             <td>{{ form.SECURITY_LEVEL }}</td>
+            <td class="tbg">所属区域</td>
+            <td>{{ form.AREA_NAME }}</td>
           </tr>
           <tr>
             <td class="tbg">值班电话</td>
@@ -31,8 +31,10 @@
             <td>{{ form.FAX }}</td>
           </tr>
           <tr>
-            <td class="tbg">所属区域</td>
-            <td colspan="3">{{ form.ADMINISTRATIVE_REGION_NAME }}</td>
+            <td class="tbg">邮编</td>
+            <td>{{ form.POSTAL_CODE }}</td>
+            <td class="tbg">成立时间</td>
+            <td>{{ form.ESTABLISHMENT_DATE }}</td>
           </tr>
           <tr>
             <td class="tbg">经度</td>
@@ -40,10 +42,6 @@
             <td class="tbg">纬度</td>
             <td>{{ form.LATITUDE }}</td>
           </tr>
-          <tr>
-            <td class="tbg">应急运输方式</td>
-            <td colspan="3">{{ form.EMERGENCY_TRANSPORT_MODE }}</td>
-          </tr>
           <tr>
             <td class="tbg">负责人</td>
             <td>{{ form.RESPONSIBLE_PERSON }}</td>
@@ -79,18 +77,36 @@
             <td>{{ form.SUPERVISING_UNIT_ADDRESS }}</td>
           </tr>
           <tr>
-            <td class="tbg">企业基本情况</td>
-            <td colspan="3">{{ form.COMPANY_OVERVIEW }}</td>
+            <td class="tbg">总人数</td>
+            <td>{{ form.TOTAL_PERSONNEL }}</td>
+            <td class="tbg">应急通信方式</td>
+            <td>{{ form.EMERGENCY_COMMUNICATION_MODE }}</td>
           </tr>
           <tr>
-            <td class="tbg">客运能力</td>
-            <td>{{ form.PASSENGER_TRANSPORT_CAPACITY }}</td>
-            <td class="tbg">货运能力</td>
-            <td>{{ form.CARGO_TRANSPORT_CAPACITY }}</td>
+            <td class="tbg">预计准备时间</td>
+            <td>{{ form.EXPECTED_PREPARATION_TIME }}</td>
+            <td class="tbg">集合出发地点</td>
+            <td>{{ form.ASSEMBLY_DEPARTURE_LOCATION }}</td>
           </tr>
           <tr>
-            <td class="tbg">应急能力描述</td>
-            <td colspan="3">{{ form.EMERGENCY_CAPACITY_DESCRIPTION }}</td>
+            <td class="tbg">主要职责</td>
+            <td colspan="3">{{ form.MAIN_DUTIES }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">主要装备描述</td>
+            <td colspan="3">{{ form.MAIN_EQUIPMENT_DESCRIPTION }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">专长描述</td>
+            <td colspan="3">{{ form.SPECIALTY_DESCRIPTION }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">资质等级</td>
+            <td colspan="3">{{ form.QUALIFICATION_LEVEL }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">应急救援经历</td>
+            <td colspan="3">{{ form.EMERGENCY_RESCUE_EXPERIENCE }}</td>
           </tr>
           <tr>
             <td class="tbg">备注</td>
@@ -105,6 +121,7 @@
     </div>
   </div>
 </template>
+
 <script>
 import { requestFN } from '@/utils/request'
 
@@ -112,19 +129,21 @@ export default {
   data() {
     return {
       form: {
-        ORG_NAME: '',
-        ORG_TYPE: '',
-        ORG_LEVEL: '',
-        ADDRESS: '',
-        POSTAL_CODE: '',
+        RESCUE_TEAM_NAME: '',
+        RESCUE_TEAM_ADDRESS: '',
+        TYPE: '',
+        TYPE_NAME: '',
+        LEVEL: '',
+        LEVEL_NAME: '',
         SECURITY_LEVEL: '',
+        SECURITY_LEVEL_NAME: '',
+        AREA: '',
+        AREA_NAME: '',
         DUTY_PHONE: '',
         FAX: '',
-        ADMINISTRATIVE_REGION: '',
-        ADMINISTRATIVE_REGION_NAME: '',
+        POSTAL_CODE: '',
         LONGITUDE: '',
         LATITUDE: '',
-        EMERGENCY_TRANSPORT_MODE: '',
         RESPONSIBLE_PERSON: '',
         RESPONSIBLE_OFFICE_PHONE: '',
         RESPONSIBLE_MOBILE_PHONE: '',
@@ -134,13 +153,18 @@ export default {
         CONTACT_MOBILE_PHONE: '',
         CONTACT_HOME_PHONE: '',
         CONTACT_EMAIL: '',
-        SUPERVISING_UNIT: '',
+        TOTAL_PERSONNEL: '',
+        ESTABLISHMENT_DATE: '',
+        EMERGENCY_COMMUNICATION_MODE: '',
         SUPERVISING_UNIT_NAME: '',
         SUPERVISING_UNIT_ADDRESS: '',
-        COMPANY_OVERVIEW: '',
-        PASSENGER_TRANSPORT_CAPACITY: '',
-        CARGO_TRANSPORT_CAPACITY: '',
-        EMERGENCY_CAPACITY_DESCRIPTION: '',
+        MAIN_DUTIES: '',
+        MAIN_EQUIPMENT_DESCRIPTION: '',
+        SPECIALTY_DESCRIPTION: '',
+        QUALIFICATION_LEVEL: '',
+        EMERGENCY_RESCUE_EXPERIENCE: '',
+        EXPECTED_PREPARATION_TIME: '',
+        ASSEMBLY_DEPARTURE_LOCATION: '',
         REMARK: ''
       },
       Id: ''
@@ -158,22 +182,24 @@ export default {
     },
     getDetail(Id) {
       const params = { Id }
-      requestFN('/major/transportation/detail', params).then((response) => {
+      requestFN('/major/emergency/detail', params).then((response) => {
         const data = response.msg
         this.form = {
-          ORG_NAME: data.ORG_NAME,
-          ORG_TYPE: data.ORG_TYPE,
-          ORG_LEVEL: data.ORG_LEVEL,
-          ADDRESS: data.ADDRESS,
-          POSTAL_CODE: data.POSTAL_CODE,
+          RESCUE_TEAM_NAME: data.RESCUE_TEAM_NAME,
+          RESCUE_TEAM_ADDRESS: data.RESCUE_TEAM_ADDRESS,
+          TYPE: data.TYPE,
+          TYPE_NAME: data.TYPE_NAME,
+          LEVEL: data.LEVEL,
+          LEVEL_NAME: data.LEVEL_NAME,
           SECURITY_LEVEL: data.SECURITY_LEVEL,
+          SECURITY_LEVEL_NAME: data.SECURITY_LEVEL_NAME,
+          AREA: data.AREA,
+          AREA_NAME: data.AREA_NAME,
           DUTY_PHONE: data.DUTY_PHONE,
           FAX: data.FAX,
-          ADMINISTRATIVE_REGION: data.ADMINISTRATIVE_REGION,
-          ADMINISTRATIVE_REGION_NAME: data.ADMINISTRATIVE_REGION_NAME,
+          POSTAL_CODE: data.POSTAL_CODE,
           LONGITUDE: data.LONGITUDE,
           LATITUDE: data.LATITUDE,
-          EMERGENCY_TRANSPORT_MODE: data.EMERGENCY_TRANSPORT_MODE,
           RESPONSIBLE_PERSON: data.RESPONSIBLE_PERSON,
           RESPONSIBLE_OFFICE_PHONE: data.RESPONSIBLE_OFFICE_PHONE,
           RESPONSIBLE_MOBILE_PHONE: data.RESPONSIBLE_MOBILE_PHONE,
@@ -183,14 +209,20 @@ export default {
           CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
           CONTACT_HOME_PHONE: data.CONTACT_HOME_PHONE,
           CONTACT_EMAIL: data.CONTACT_EMAIL,
-          SUPERVISING_UNIT: data.SUPERVISING_UNIT,
+          TOTAL_PERSONNEL: data.TOTAL_PERSONNEL,
+          ESTABLISHMENT_DATE: data.ESTABLISHMENT_DATE,
+          EMERGENCY_COMMUNICATION_MODE: data.EMERGENCY_COMMUNICATION_MODE,
           SUPERVISING_UNIT_NAME: data.SUPERVISING_UNIT_NAME,
           SUPERVISING_UNIT_ADDRESS: data.SUPERVISING_UNIT_ADDRESS,
-          COMPANY_OVERVIEW: data.COMPANY_OVERVIEW,
-          PASSENGER_TRANSPORT_CAPACITY: data.PASSENGER_TRANSPORT_CAPACITY,
-          CARGO_TRANSPORT_CAPACITY: data.CARGO_TRANSPORT_CAPACITY,
-          EMERGENCY_CAPACITY_DESCRIPTION: data.EMERGENCY_CAPACITY_DESCRIPTION,
-          REMARK: data.REMARK
+          MAIN_DUTIES: data.MAIN_DUTIES,
+          MAIN_EQUIPMENT_DESCRIPTION: data.MAIN_EQUIPMENT_DESCRIPTION,
+          SPECIALTY_DESCRIPTION: data.SPECIALTY_DESCRIPTION,
+          QUALIFICATION_LEVEL: data.QUALIFICATION_LEVEL,
+          EMERGENCY_RESCUE_EXPERIENCE: data.EMERGENCY_RESCUE_EXPERIENCE,
+          EXPECTED_PREPARATION_TIME: data.EXPECTED_PREPARATION_TIME,
+          ASSEMBLY_DEPARTURE_LOCATION: data.ASSEMBLY_DEPARTURE_LOCATION,
+          REMARK: data.REMARK,
+          Id: data.ID
         }
       }).catch((e) => {
         console.error('获取详情数据失败', e)
@@ -199,6 +231,7 @@ export default {
   }
 }
 </script>
+
 <style lang="sass" scoped>
 .table-ui
   td
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 d7cf08f..bfc9692 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
@@ -2,11 +2,8 @@
   <div class="app-container">
     <div class="filter-container">
       <el-form inline>
-        <el-form-item label="机构名称：" prop="KEYWORDS_ORG_NAME">
-          <el-input v-model="KEYWORDS_ORG_NAME" placeholder="机构名称" class="filter-item" style="width: 200px;" />
-        </el-form-item>
-        <el-form-item label="机构类型：" prop="KEYWORDS_ORG_TYPE">
-          <el-input v-model="KEYWORDS_ORG_TYPE" placeholder="机构类型" class="filter-item" style="width: 200px;" />
+        <el-form-item label="机构名称：" prop="RESCUE_TEAM_NAME">
+          <el-input v-model="RESCUE_TEAM_NAME" placeholder="机构名称" class="filter-item" style="width: 200px;" />
         </el-form-item>
         <el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
@@ -17,17 +14,20 @@
     <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="ORG_NAME" label="运输机构名称" width="180" />
-      <el-table-column prop="ORG_TYPE_NAME" label="运输机构类型" show-overflow-tooltip="true" />
-      <el-table-column prop="ORG_LEVEL" label="运输机构级别" show-overflow-tooltip="true" />
-      <el-table-column prop="ADDRESS" label="地址" show-overflow-tooltip="true" />
-      <el-table-column prop="DUTY_PHONE" label="值班电话" show-overflow-tooltip="true" />
+      <el-table-column prop="RESCUE_TEAM_NAME" label="队伍名称" width="180" />
+      <el-table-column prop="TYPE_NAME" label="队伍类型" show-overflow-tooltip="true" />
+      <el-table-column prop="LEVEL" label="队伍级别" show-overflow-tooltip="true" />
+      <el-table-column prop="RESCUE_TEAM_ADDRESS" label="队伍地址" show-overflow-tooltip="true" />
+      <el-table-column prop="RESPONSIBLE_OFFICE_PHONE" label="负责人办公电话" show-overflow-tooltip="true" />
+      <el-table-column prop="RESPONSIBLE_MOBILE_PHONE" label="负责人移动电话" show-overflow-tooltip="true" />
+      <el-table-column prop="RESPONSIBLE_HOME_PHONE" label="负责人固定电话" show-overflow-tooltip="true" />
+      <el-table-column prop="OPERATETIME" 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('detail', row.ID, '1')">查看</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.ORG_NAME)">删除</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.RESCUE_TEAM_NAME)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -42,55 +42,43 @@
     </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="ORG_NAME">
-          <el-input v-model="form.ORG_NAME" placeholder="请输入运输机构名称..." />
+        <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="ORG_TYPE">
+        <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="yjorgTypeData"
+            :options="yjTypeData"
             :normalizer="normalizer"
-            v-model="form.ORG_TYPE"
-            placeholder="请选择机构类型"
+            v-model="form.TYPE"
+            placeholder="请选择类型"
             no-options-text="暂无数据"
             no-children-text="暂无数据"
-            @input="handleOrgTypeChange"
+            @input="handleTypeChange"
           />
         </el-form-item>
-        <el-form-item label="运输机构级别" prop="ORG_LEVEL">
-          <el-input v-model="form.ORG_LEVEL" placeholder="请输入运输机构级别..." />
-        </el-form-item>
-        <el-form-item label="地址" prop="ADDRESS">
-          <el-input v-model="form.ADDRESS" placeholder="请输入地址..." />
+        <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="POSTAL_CODE">
-              <el-input v-model="form.POSTAL_CODE" placeholder="请输入邮编..." />
+            <el-form-item label="密级" prop="SECURITY_LEVEL">
+              <el-input v-model="form.SECURITY_LEVEL" placeholder="请输入密级..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="机构密级" prop="SECURITY_LEVEL">
-              <el-input v-model="form.SECURITY_LEVEL" placeholder="请输入机构密级..." />
+            <el-form-item label="办公电话" prop="DUTY_PHONE">
+              <el-input v-model="form.DUTY_PHONE" placeholder="请输入办公电话..." />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="值班电话" prop="DUTY_PHONE">
-              <el-input v-model="form.DUTY_PHONE" placeholder="请输入值班电话..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="应急运输方式" prop="EMERGENCY_TRANSPORT_MODE">
-              <el-input v-model="form.EMERGENCY_TRANSPORT_MODE" placeholder="请输入应急运输方式..." />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="所属区域" prop="ADMINISTRATIVE_REGION">
+        <el-form-item label="所属区域" prop="AREA">
           <Treeselect
             :options="treeData"
             :normalizer="normalizer"
-            v-model="form.ADMINISTRATIVE_REGION"
+            v-model="form.AREA"
             :disable-branch-nodes="true"
             placeholder="请选择所属区域"
             no-options-text="暂无数据"
@@ -100,14 +88,14 @@
         </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 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">
+            <el-form-item label="纬度" prop="LATITUDE">
               <div style="display: flex">
-                <el-input v-model="form.LATITUDE" placeholder="请输入内容" disabled style="width: 100%" @focus="handleMap"/>
+                <el-input v-model="form.LATITUDE" placeholder="请输入纬度" disabled style="width: 100%" @focus="handleMap"/>
                 <el-button style="margin-left:10px" @click="handleMap">
                   <span class="svg-container">
                     <svg-icon icon-class="international" />
@@ -168,11 +156,17 @@
         <el-form-item label="联系人电子邮箱" prop="CONTACT_EMAIL">
           <el-input v-model="form.CONTACT_EMAIL" placeholder="请输入联系人电子邮箱..." />
         </el-form-item>
-        <el-form-item label="主管单位" prop="SUPERVISING_UNIT">
+        <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="请选择主管单位"
+            placeholder="请选择主管单位名称"
             no-options-text="暂无数据"
             no-children-text="暂无数据"
             @input="handleDepartmentChange"
@@ -181,23 +175,55 @@
         <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="COMPANY_OVERVIEW">
-          <el-input v-model="form.COMPANY_OVERVIEW" type="textarea" placeholder="请输入企业基本情况..." />
+        <el-form-item label="总人数" prop="TOTAL_PERSONNEL">
+          <el-input v-model="form.TOTAL_PERSONNEL" placeholder="请输入总人数..." />
         </el-form-item>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="客运能力" prop="PASSENGER_TRANSPORT_CAPACITY">
-              <el-input v-model="form.PASSENGER_TRANSPORT_CAPACITY" placeholder="请输入客运能力..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="货运能力" prop="CARGO_TRANSPORT_CAPACITY">
-              <el-input v-model="form.CARGO_TRANSPORT_CAPACITY" placeholder="请输入货运能力..." />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="应急能力描述" prop="EMERGENCY_CAPACITY_DESCRIPTION">
-          <el-input v-model="form.EMERGENCY_CAPACITY_DESCRIPTION" type="textarea" placeholder="请输入应急能力描述..." />
+        <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-form-item label="备注" prop="REMARK">
           <el-input v-model="form.REMARK" type="textarea" placeholder="请输入备注..." />
@@ -225,11 +251,8 @@
             <div style="flex:1;">
               <el-autocomplete v-model="addressKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细地址" style="width:100%" @select="handleSelect" />
             </div>
-            <!--            <el-input v-model="addressKeyword" style="width: 200px" placeholder="请输入内容" />-->
-            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
           </div>
         </bm-control>
-        <!--        <bm-local-search :keyword="addressKeyword" :auto-viewport="true"/>-->
       </baidu-map>
       <div slot="footer" class="dialog-footer">
         <span>经度：</span>
@@ -274,25 +297,26 @@ export default {
       total: 0,
       varList: [],
       KEYWORDS: '',
-      KEYWORDS_ORG_NAME: '',
-      KEYWORDS_ORG_TYPE: '',
+      RESCUE_TEAM_NAME: '',
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
       form: {
-        ORG_NAME: '',
-        ORG_TYPE: '',
-        ORG_TYPE_NAME: '',
-        ORG_LEVEL: '',
-        ADDRESS: '',
-        POSTAL_CODE: '',
+        RESCUE_TEAM_NAME: '',
+        RESCUE_TEAM_ADDRESS: '',
+        TYPE: '',
+        TYPE_NAME: '',
+        LEVEL: '',
+        LEVEL_NAME: '',
         SECURITY_LEVEL: '',
+        SECURITY_LEVEL_NAME: '',
+        AREA: '',
+        AREA_NAME: '',
         DUTY_PHONE: '',
-        ADMINISTRATIVE_REGION: '',
-        ADMINISTRATIVE_REGION_NAME: '',
+        FAX: '',
+        POSTAL_CODE: '',
         LONGITUDE: '',
         LATITUDE: '',
-        EMERGENCY_TRANSPORT_MODE: '',
         RESPONSIBLE_PERSON: '',
         RESPONSIBLE_OFFICE_PHONE: '',
         RESPONSIBLE_MOBILE_PHONE: '',
@@ -302,45 +326,45 @@ export default {
         CONTACT_MOBILE_PHONE: '',
         CONTACT_HOME_PHONE: '',
         CONTACT_EMAIL: '',
+        TOTAL_PERSONNEL: '',
+        ESTABLISHMENT_DATE: '',
+        EMERGENCY_COMMUNICATION_MODE: '',
         SUPERVISING_UNIT: '',
         SUPERVISING_UNIT_NAME: '',
         SUPERVISING_UNIT_ADDRESS: '',
-        COMPANY_OVERVIEW: '',
-        PASSENGER_TRANSPORT_CAPACITY: '',
-        CARGO_TRANSPORT_CAPACITY: '',
-        EMERGENCY_CAPACITY_DESCRIPTION: '',
+        MAIN_DUTIES: '',
+        MAIN_EQUIPMENT_DESCRIPTION: '',
+        SPECIALTY_DESCRIPTION: '',
+        QUALIFICATION_LEVEL: '',
+        EMERGENCY_RESCUE_EXPERIENCE: '',
+        EXPECTED_PREPARATION_TIME: '',
+        ASSEMBLY_DEPARTURE_LOCATION: '',
+        SELF_PROVIDED_TRANSPORT: '',
+        REQUIRES_BACKUP_SUPPORT: '',
         REMARK: ''
       },
       // rules: {
-      //   ORG_NAME: [
-      //     { required: true, message: '运输机构名称不能为空', trigger: 'blur' },
+      //   RESCUE_TEAM_NAME: [
+      //     { required: true, message: '救援队名称不能为空', trigger: 'blur' },
       //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
       //   ],
-      //   ORG_TYPE: [
-      //     { required: true, message: '运输机构类型不能为空', trigger: 'blur' },
+      //   RESCUE_TEAM_ADDRESS: [
+      //     { required: true, message: '救援队地址不能为空', trigger: 'blur' },
       //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
       //   ],
-      //   ORG_LEVEL: [
-      //     { required: true, message: '运输机构级别不能为空', trigger: 'blur' },
+      //   TYPE: [
+      //     { required: true, message: '类型不能为空', trigger: 'blur' },
+      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+      //   ],
+      //   LEVEL: [
+      //     { required: true, message: '级别不能为空', trigger: 'blur' },
       //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
       //   ],
-      //   ADDRESS: [
-      //     { required: true, message: '地址不能为空', trigger: 'blur' },
-      //     { min: 5, max: 255, message: '长度在 5 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   POSTAL_CODE: [
-      //     { required: true, message: '邮编不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
       //   SECURITY_LEVEL: [
-      //     { required: true, message: '机构密级不能为空', trigger: 'blur' },
+      //     { required: true, message: '密级不能为空', trigger: 'blur' },
       //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
       //   ],
-      //   DUTY_PHONE: [
-      //     { required: true, message: '值班电话不能为空', trigger: 'blur' },
-      //     { min: 5, max: 255, message: '长度在 5 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   ADMINISTRATIVE_REGION: [
+      //   AREA: [
       //     { required: true, message: '所属区域不能为空', trigger: 'blur' },
       //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
       //   ],
@@ -352,9 +376,9 @@ export default {
       //     { required: true, message: '纬度不能为空', trigger: 'blur' },
       //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
       //   ],
-      //   EMERGENCY_TRANSPORT_MODE: [
-      //     { required: true, message: '应急运输方式不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+      //   DUTY_PHONE: [
+      //     { required: true, message: '值班电话不能为空', trigger: 'blur' },
+      //     { min: 5, max: 50, message: '长度在 5 到 50 个字符', trigger: 'blur' }
       //   ],
       //   RESPONSIBLE_PERSON: [
       //     { required: true, message: '负责人不能为空', trigger: 'blur' },
@@ -392,30 +416,62 @@ export default {
       //     { required: true, message: '联系人电子邮箱不能为空', trigger: 'blur' },
       //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
       //   ],
-      //   SUPERVISING_UNIT: [
-      //     { required: true, message: '主管单位不能为空', trigger: 'blur' },
+      //   TOTAL_PERSONNEL: [
+      //     { required: true, message: '总人数不能为空', trigger: 'blur' },
+      //     { min: 1, max: 11, message: '长度在 1 到 11 个字符', trigger: 'blur' }
+      //   ],
+      //   ESTABLISHMENT_DATE: [
+      //     { required: true, message: '成立时间不能为空', trigger: 'blur' },
+      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+      //   ],
+      //   EMERGENCY_COMMUNICATION_MODE: [
+      //     { required: true, message: '应急通信方式不能为空', trigger: 'blur' },
+      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+      //   ],
+      //   SUPERVISING_UNIT_NAME: [
+      //     { required: true, message: '主管单位名称不能为空', trigger: 'blur' },
       //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
       //   ],
       //   SUPERVISING_UNIT_ADDRESS: [
       //     { required: true, message: '主管单位地址不能为空', trigger: 'blur' },
       //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
       //   ],
-      //   COMPANY_OVERVIEW: [
-      //     { required: true, message: '企业基本情况不能为空', trigger: 'blur' },
+      //   MAIN_DUTIES: [
+      //     { required: true, message: '主要职责不能为空', trigger: 'blur' },
       //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
       //   ],
-      //   PASSENGER_TRANSPORT_CAPACITY: [
-      //     { required: true, message: '客运能力不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   CARGO_TRANSPORT_CAPACITY: [
-      //     { required: true, message: '货运能力不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   EMERGENCY_CAPACITY_DESCRIPTION: [
-      //     { required: true, message: '应急能力描述不能为空', trigger: 'blur' },
+      //   MAIN_EQUIPMENT_DESCRIPTION: [
+      //     { required: true, message: '主要装备描述不能为空', trigger: 'blur' },
       //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
       //   ],
+      //   SPECIALTY_DESCRIPTION: [
+      //     { required: true, message: '专长描述不能为空', trigger: 'blur' },
+      //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
+      //   ],
+      //   QUALIFICATION_LEVEL: [
+      //     { required: true, message: '资质等级不能为空', trigger: 'blur' },
+      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+      //   ],
+      //   EMERGENCY_RESCUE_EXPERIENCE: [
+      //     { required: true, message: '应急救援经历不能为空', trigger: 'blur' },
+      //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
+      //   ],
+      //   EXPECTED_PREPARATION_TIME: [
+      //     { required: true, message: '预计准备时间不能为空', trigger: 'blur' },
+      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+      //   ],
+      //   ASSEMBLY_DEPARTURE_LOCATION: [
+      //     { required: true, message: '集合出发地点不能为空', trigger: 'blur' },
+      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+      //   ],
+      //   SELF_PROVIDED_TRANSPORT: [
+      //     { required: true, message: '自备交通工具不能为空', trigger: 'blur' },
+      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+      //   ],
+      //   REQUIRES_BACKUP_SUPPORT: [
+      //     { required: true, message: '是否需要后备支援不能为空', trigger: 'blur' },
+      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+      //   ],
       //   REMARK: [
       //     { required: true, message: '备注不能为空', trigger: 'blur' },
       //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
@@ -425,7 +481,7 @@ export default {
       caseSummaryList: [],
       treeData: [],
       DepartmentData: [],
-      yjorgTypeData: [],
+      yjTypeData: [],
       normalizer(node) {
         return {
           id: node.DICTIONARIES_ID,
@@ -436,7 +492,7 @@ export default {
     }
   },
   created() {
-    this.getyjorgTypeDataList()
+    this.getyjTypeDataList()
     this.getList()
     this.getTreeList()
     this.getDepartmentList()
@@ -445,13 +501,13 @@ export default {
     handleRegionChange(value) {
       const selectedRegion = this.treeData.find(region => region.DICTIONARIES_ID === value)
       if (selectedRegion) {
-        this.form.ADMINISTRATIVE_REGION_NAME = selectedRegion.name
+        this.form.AREA_NAME = selectedRegion.name
       }
     },
-    handleOrgTypeChange(value) {
-      const selectedOrgType = this.yjorgTypeData.find(type => type.DICTIONARIES_ID === value)
-      if (selectedOrgType) {
-        this.form.ORG_TYPE_NAME = selectedOrgType.name
+    handleTypeChange(value) {
+      const selectedType = this.yjTypeData.find(type => type.DICTIONARIES_ID === value)
+      if (selectedType) {
+        this.form.TYPE_NAME = selectedType.name
       }
     },
     handleDepartmentChange(value) {
@@ -461,8 +517,7 @@ export default {
       }
     },
     resetQuery() {
-      this.KEYWORDS_ORG_NAME = ''
-      this.KEYWORDS_ORG_TYPE = ''
+      this.RESCUE_TEAM_NAME = ''
       this.getQuery()
     },
     goList(page, CASE_ID, ticketType) {
@@ -476,6 +531,7 @@ export default {
           id: item.department_ID,
           label: item.name
         }))
+        console.log(this.DepartmentData)
       }).catch((e) => {
         console.error('获取主管单位数据失败', e)
       })
@@ -613,10 +669,9 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/major/transportation/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/major/emergency/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          ORG_NAME: this.KEYWORDS_ORG_NAME,
-          ORG_TYPE: this.KEYWORDS_ORG_TYPE
+          name: this.RESCUE_TEAM_NAME
         }
       ).then((data) => {
         this.listLoading = false
@@ -627,12 +682,12 @@ export default {
           this.listLoading = false
         })
     },
-    getyjorgTypeDataList() {
+    getyjTypeDataList() {
       const params = {
         PARENT_ID: '2bd21d9d4d254f179e79f75d6377f651'
       }
       requestFN('/dictionaries/listTree', params).then((data) => {
-        this.yjorgTypeData = JSON.parse(data.zTreeNodes)
+        this.yjTypeData = JSON.parse(data.zTreeNodes)
       }).catch((e) => {
         console.error('获取树形数据失败', e)
       })
@@ -648,23 +703,25 @@ export default {
       const params = {
         id: id
       }
-      requestFN('/major/transportation/detail', params).then((response) => {
+      requestFN('/major/emergency/detail', params).then((response) => {
         const data = response.msg
         console.log(data)
         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,
+          RESCUE_TEAM_NAME: data.RESCUE_TEAM_NAME,
+          RESCUE_TEAM_ADDRESS: data.RESCUE_TEAM_ADDRESS,
+          TYPE: data.TYPE,
+          TYPE_NAME: data.TYPE_NAME,
+          LEVEL: data.LEVEL,
+          LEVEL_NAME: data.LEVEL_NAME,
           SECURITY_LEVEL: data.SECURITY_LEVEL,
+          SECURITY_LEVEL_NAME: data.SECURITY_LEVEL_NAME,
+          AREA: data.AREA,
+          AREA_NAME: data.AREA_NAME,
           DUTY_PHONE: data.DUTY_PHONE,
-          ADMINISTRATIVE_REGION: data.ADMINISTRATIVE_REGION,
-          ADMINISTRATIVE_REGION_NAME: data.ADMINISTRATIVE_REGION_NAME,
+          FAX: data.FAX,
+          POSTAL_CODE: data.POSTAL_CODE,
           LONGITUDE: data.LONGITUDE,
           LATITUDE: data.LATITUDE,
-          EMERGENCY_TRANSPORT_MODE: data.EMERGENCY_TRANSPORT_MODE,
           RESPONSIBLE_PERSON: data.RESPONSIBLE_PERSON,
           RESPONSIBLE_OFFICE_PHONE: data.RESPONSIBLE_OFFICE_PHONE,
           RESPONSIBLE_MOBILE_PHONE: data.RESPONSIBLE_MOBILE_PHONE,
@@ -674,13 +731,20 @@ export default {
           CONTACT_MOBILE_PHONE: data.CONTACT_MOBILE_PHONE,
           CONTACT_HOME_PHONE: data.CONTACT_HOME_PHONE,
           CONTACT_EMAIL: data.CONTACT_EMAIL,
-          SUPERVISING_UNIT: data.SUPERVISING_UNIT,
+          TOTAL_PERSONNEL: data.TOTAL_PERSONNEL,
+          ESTABLISHMENT_DATE: data.ESTABLISHMENT_DATE,
+          EMERGENCY_COMMUNICATION_MODE: data.EMERGENCY_COMMUNICATION_MODE,
           SUPERVISING_UNIT_NAME: data.SUPERVISING_UNIT_NAME,
           SUPERVISING_UNIT_ADDRESS: data.SUPERVISING_UNIT_ADDRESS,
-          COMPANY_OVERVIEW: data.COMPANY_OVERVIEW,
-          PASSENGER_TRANSPORT_CAPACITY: data.PASSENGER_TRANSPORT_CAPACITY,
-          CARGO_TRANSPORT_CAPACITY: data.CARGO_TRANSPORT_CAPACITY,
-          EMERGENCY_CAPACITY_DESCRIPTION: data.EMERGENCY_CAPACITY_DESCRIPTION,
+          MAIN_DUTIES: data.MAIN_DUTIES,
+          MAIN_EQUIPMENT_DESCRIPTION: data.MAIN_EQUIPMENT_DESCRIPTION,
+          SPECIALTY_DESCRIPTION: data.SPECIALTY_DESCRIPTION,
+          QUALIFICATION_LEVEL: data.QUALIFICATION_LEVEL,
+          EMERGENCY_RESCUE_EXPERIENCE: data.EMERGENCY_RESCUE_EXPERIENCE,
+          EXPECTED_PREPARATION_TIME: data.EXPECTED_PREPARATION_TIME,
+          ASSEMBLY_DEPARTURE_LOCATION: data.ASSEMBLY_DEPARTURE_LOCATION,
+          SELF_PROVIDED_TRANSPORT: data.SELF_PROVIDED_TRANSPORT,
+          REQUIRES_BACKUP_SUPPORT: data.REQUIRES_BACKUP_SUPPORT,
           REMARK: data.REMARK,
           Id: data.ID
         }
@@ -701,7 +765,7 @@ export default {
     },
     dataSave() {
       this.listLoading = true
-      requestFN('/major/transportation/save', this.form).then((data) => {
+      requestFN('/major/emergency/save', this.form).then((data) => {
         this.listLoading = false
         this.dialogFormEdit = false
         this.varList = []
@@ -712,15 +776,15 @@ export default {
       })
     },
     //* *****************************删除********************************
-    handleDelete(id, ORG_NAME) {
-      this.$confirm('确定要删除[' + ORG_NAME + ']吗?', {
+    handleDelete(id, RESCUE_TEAM_NAME) {
+      this.$confirm('确定要删除[' + RESCUE_TEAM_NAME + ']吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.listLoading = true
         requestFN(
-          '/major/transportation/delete',
+          '/major/emergency/delete',
           {
             id: id
           }
@@ -757,7 +821,7 @@ export default {
       }).then(() => {
         this.listLoading = true
         requestFN(
-          '/major/transportation/deleteAll',
+          '/major/emergency/deleteAll',
           {
             ids: ids
           }
@@ -777,8 +841,6 @@ export default {
       this.$refs.multipleTable.clearSelection()
       this.getList()
     }
-
   }
 }
 </script>
-