diff --git a/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue b/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue
index 9512f0e..c780fb7 100644
--- a/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue
@@ -2,8 +2,8 @@
   <div class="app-container">
     <div class="filter-container">
       <el-form inline>
-        <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 label="单位：" prop="UNIT">
+          <el-input v-model="UNIT" 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>
@@ -14,20 +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="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="UNIT" label="单位" width="180" />
+      <el-table-column prop="START_TIME" label="开始时间" show-overflow-tooltip="true" />
+      <el-table-column prop="END_TIME" label="结束时间" show-overflow-tooltip="true" />
+      <el-table-column prop="DUTY_PERSONNEL" label="值班人员" show-overflow-tooltip="true" />
+      <el-table-column prop="SHIFT_PERSONNEL" label="接班人员" show-overflow-tooltip="true" />
+      <el-table-column prop="DUTY_RECORD" label="值班记录" show-overflow-tooltip="true" />
+      <el-table-column prop="HANDLING_SITUATION" label="处理情况" show-overflow-tooltip="true" />
+      <el-table-column prop="HANDOVER_ITEMS" 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>
+        <template slot-scope="{ row }">
+          <el-button type="primary" icon="el-icon-download" size="mini" @click="confirmExport(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.RESCUE_TEAM_NAME)">删除</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.UNIT)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -40,713 +40,156 @@
       </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-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 label="单位" prop="UNIT">
+          <el-input v-model="form.UNIT" placeholder="请输入单位..." />
         </el-form-item>
-        <el-form-item label="地址" prop="RESCUE_TEAM_ADDRESS">
-          <el-input v-model="form.RESCUE_TEAM_ADDRESS" placeholder="请输入救援队地址..." />
+        <el-form-item label="开始时间" prop="START_TIME">
+          <el-date-picker v-model="form.START_TIME" type="datetime" placeholder="选择开始时间" style="width: 100%;" />
         </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 label="结束时间" prop="END_TIME">
+          <el-date-picker v-model="form.END_TIME" type="datetime" placeholder="选择结束时间" style="width: 100%;" />
         </el-form-item>
-        <el-form-item label="级别" prop="LEVEL">
-          <el-input v-model="form.LEVEL" placeholder="请输入级别..." />
+        <el-form-item label="值班记录" prop="DUTY_RECORD">
+          <el-input v-model="form.DUTY_RECORD" type="textarea" placeholder="请输入值班记录..." />
+        </el-form-item>
+        <el-form-item label="处理情况" prop="HANDLING_SITUATION">
+          <el-input v-model="form.HANDLING_SITUATION" type="textarea" placeholder="请输入处理情况..." />
+        </el-form-item>
+        <el-form-item label="交接事项" prop="HANDOVER_ITEMS">
+          <el-input v-model="form.HANDOVER_ITEMS" type="textarea" placeholder="请输入交接事项..." />
         </el-form-item>
         <el-row :gutter="20">
           <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_PERSONNEL">
+              <el-select v-model="form.DUTY_PERSONNEL" placeholder="请选择值班人员">
+                <el-option
+                  v-for="item in addressOptions"
+                  :key="item.ID"
+                  :label="item.NAME"
+                  :value="item.NAME"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="办公电话" prop="DUTY_PHONE">
-              <el-input v-model="form.DUTY_PHONE" placeholder="请输入办公电话..." />
+            <el-form-item label="接班人员" prop="SHIFT_PERSONNEL">
+              <el-select v-model="form.SHIFT_PERSONNEL" placeholder="请选择接班人员">
+                <el-option
+                  v-for="item in addressOptions"
+                  :key="item.ID"
+                  :label="item.NAME"
+                  :value="item.NAME"
+                />
+              </el-select>
             </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="LONGITUDE">
-              <el-input v-model="form.LONGITUDE" placeholder="请输入经度" disabled @focus="handleMap" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="纬度" prop="LATITUDE">
-              <div style="display: flex">
-                <el-input v-model="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-col :span="12">
-            <el-form-item label="负责人" prop="RESPONSIBLE_PERSON">
-              <el-input v-model="form.RESPONSIBLE_PERSON" placeholder="请输入负责人..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="负责人办公电话" prop="RESPONSIBLE_OFFICE_PHONE">
-              <el-input v-model="form.RESPONSIBLE_OFFICE_PHONE" placeholder="请输入负责人办公电话..." />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="负责人移动电话" prop="RESPONSIBLE_MOBILE_PHONE">
-              <el-input v-model="form.RESPONSIBLE_MOBILE_PHONE" placeholder="请输入负责人移动电话..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="负责人住宅电话" prop="RESPONSIBLE_HOME_PHONE">
-              <el-input v-model="form.RESPONSIBLE_HOME_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" placeholder="请输入联系人..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系人办公电话" prop="CONTACT_OFFICE_PHONE">
-              <el-input v-model="form.CONTACT_OFFICE_PHONE" placeholder="请输入联系人办公电话..." />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="联系人移动电话" prop="CONTACT_MOBILE_PHONE">
-              <el-input v-model="form.CONTACT_MOBILE_PHONE" placeholder="请输入联系人移动电话..." />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系人住宅电话" prop="CONTACT_HOME_PHONE">
-              <el-input v-model="form.CONTACT_HOME_PHONE" placeholder="请输入联系人住宅电话..." />
-            </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-form-item label="备注" prop="REMARK">
-          <el-input v-model="form.REMARK" 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>
       </div>
     </el-dialog>
-    <!-- 坐标选择 -->
-    <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
-      <baidu-map
-        v-loading="loadingMap"
-        :zoom="zoom"
-        :scroll-wheel-zoom="true"
-        :style="{height: clientHeight+'px'}"
-        @click="getClickInfo"
-        @ready="handler">
-        <bm-view style="width: 100%; height:100%; flex: 1" />
-        <bm-control ref="control" :offset="{width: 10, height: 10}" anchor="BMAP_ANCHOR_TOP_LEFT">
-          <div class="map-flex">
-
-            <div class="map-lable">关键词：</div>
-            <div style="flex:1;">
-              <el-autocomplete v-model="addressKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细地址" style="width:100%" @select="handleSelect" />
-            </div>
-          </div>
-        </bm-control>
-      </baidu-map>
-      <div slot="footer" class="dialog-footer">
-        <span>经度：</span>
-        <el-input v-model="LONGITUDE" style="width: 200px" placeholder="请输入内容" disabled />
-        <span>纬度：</span>
-        <el-input v-model="LATITUDE" style="width: 200px" placeholder="请输入内容" disabled />
-        <el-button @click="dialogFormMap = false">取 消</el-button>
-        <el-button type="primary" @click="setPosition">确 定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
-import { Treeselect } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { MessageBox, Message } from 'element-ui'
+
 export default {
-  components: { Treeselect, Pagination },
+  components: { Pagination },
   data() {
     return {
-      // 地图相关
-      CORPINFO_ID: this.$parent.CORPINFO_ID,
-      clientHeight: 600,
-      loadingMap: true,
       listLoading: false,
-      buttonloading: false,
-      BMap: '',
-      map: '',
-      showMap: false,
-      addressKeyword: '',
-      pointLngLat: '',
-      zoom: 10,
-      dialogFormMap: false,
-      LATITUDE: '',
-      LONGITUDE: '',
-      listQuery: {
-        page: 1,
-        limit: 10
-      },
-      total: 0,
-      varList: [],
-      KEYWORDS: '',
-      RESCUE_TEAM_NAME: '',
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      UNIT: '',
       form: {
-        RESCUE_TEAM_NAME: '',
-        RESCUE_TEAM_ADDRESS: '',
-        TYPE: '',
-        TYPE_NAME: '',
-        LEVEL: '',
-        LEVEL_NAME: '',
-        SECURITY_LEVEL: '',
-        SECURITY_LEVEL_NAME: '',
-        AREA: '',
-        AREA_NAME: '',
-        DUTY_PHONE: '',
-        FAX: '',
-        POSTAL_CODE: '',
-        LONGITUDE: '',
-        LATITUDE: '',
-        RESPONSIBLE_PERSON: '',
-        RESPONSIBLE_OFFICE_PHONE: '',
-        RESPONSIBLE_MOBILE_PHONE: '',
-        RESPONSIBLE_HOME_PHONE: '',
-        CONTACT_PERSON: '',
-        CONTACT_OFFICE_PHONE: '',
-        CONTACT_MOBILE_PHONE: '',
-        CONTACT_HOME_PHONE: '',
-        CONTACT_EMAIL: '',
-        TOTAL_PERSONNEL: '',
-        ESTABLISHMENT_DATE: '',
-        EMERGENCY_COMMUNICATION_MODE: '',
-        SUPERVISING_UNIT: '',
-        SUPERVISING_UNIT_NAME: '',
-        SUPERVISING_UNIT_ADDRESS: '',
-        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: ''
+        ID: '',
+        UNIT: '',
+        START_TIME: '',
+        END_TIME: '',
+        DUTY_PERSONNEL: '',
+        SHIFT_PERSONNEL: '',
+        DUTY_RECORD: '',
+        HANDLING_SITUATION: '',
+        HANDOVER_ITEMS: ''
       },
-      // rules: {
-      //   RESCUE_TEAM_NAME: [
-      //     { required: true, message: '救援队名称不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   RESCUE_TEAM_ADDRESS: [
-      //     { required: true, message: '救援队地址不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', 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' }
-      //   ],
-      //   SECURITY_LEVEL: [
-      //     { required: true, message: '密级不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   AREA: [
-      //     { required: true, message: '所属区域不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   LONGITUDE: [
-      //     { required: true, message: '经度不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   LATITUDE: [
-      //     { 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' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   RESPONSIBLE_OFFICE_PHONE: [
-      //     { required: true, message: '负责人办公电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
-      //   RESPONSIBLE_MOBILE_PHONE: [
-      //     { required: true, message: '负责人移动电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
-      //   RESPONSIBLE_HOME_PHONE: [
-      //     { required: true, message: '负责人住宅电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_PERSON: [
-      //     { required: true, message: '联系人不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_OFFICE_PHONE: [
-      //     { required: true, message: '联系人办公电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_MOBILE_PHONE: [
-      //     { required: true, message: '联系人移动电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_HOME_PHONE: [
-      //     { required: true, message: '联系人住宅电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_EMAIL: [
-      //     { required: true, message: '联系人电子邮箱不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', 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' }
-      //   ],
-      //   MAIN_DUTIES: [
-      //     { required: true, message: '主要职责不能为空', trigger: 'blur' },
-      //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', 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' }
-      //   ]
-      // },
-      FFILE: [],
-      caseSummaryList: [],
-      treeData: [],
-      DepartmentData: [],
-      yjTypeData: [],
-      normalizer(node) {
-        return {
-          id: node.DICTIONARIES_ID,
-          label: node.name,
-          children: node.nodes
-        }
+      total: 0,
+      varList: [],
+      addressOptions: [],
+      KEYWORDS_NAME: '',
+      listQuery: {
+        page: 1,
+        limit: 10
       }
     }
   },
   created() {
-    this.getyjTypeDataList()
     this.getList()
-    this.getTreeList()
-    this.getDepartmentList()
+    this.getAddressList()
   },
   methods: {
-    handleRegionChange(value) {
-      const selectedRegion = this.treeData.find(region => region.DICTIONARIES_ID === value)
-      if (selectedRegion) {
-        this.form.AREA_NAME = selectedRegion.name
-      }
-    },
-    handleTypeChange(value) {
-      const selectedType = this.yjTypeData.find(type => type.DICTIONARIES_ID === value)
-      if (selectedType) {
-        this.form.TYPE_NAME = selectedType.name
-      }
-    },
-    handleDepartmentChange(value) {
-      const selectedDepartment = this.DepartmentData.find(department => department.id === value)
-      if (selectedDepartment) {
-        this.form.SUPERVISING_UNIT_NAME = selectedDepartment.label
-      }
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
     },
     resetQuery() {
-      this.RESCUE_TEAM_NAME = ''
+      this.UNIT = ''
       this.getQuery()
     },
-    goList(page, CASE_ID, ticketType) {
-      this.$parent.activeName = page
-      this.$parent.CASE_ID = CASE_ID
-      this.$parent.ticketType = ticketType
+    showDetails(row) {
+      this.form = { ...row }
+      this.dialogFormShow = true
     },
-    getDepartmentList() {
-      requestFN('/department/listAll').then((data) => {
-        this.DepartmentData = data.list.map(item => ({
-          id: item.department_ID,
-          label: item.name
-        }))
-        console.log(this.DepartmentData)
-      }).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)
-      })
-    },
-    //* **************地图相关*****************
-    // 地图相关
-    mapOpen() {
-      this.top = this.getScrollTop()
-      if (this.top) {
-        this.setScrollTop(0)
-      }
-    },
-    // 关闭地图后调用
-    mapClose() {
-      this.setScrollTop(this.top)
-      this.top = 0
-      this.showMap = false
-    },
-    getScrollTop() {
-      let scrollTop = 0
-      if (document.documentElement && document.documentElement.scrollTop) {
-        scrollTop = document.documentElement.scrollTop
-      } else if (document.body) {
-        scrollTop = document.body.scrollTop
-      }
-      return scrollTop
-    },
-    setScrollTop(top) {
-      if (!isNaN(top)) {
-        if (document.documentElement && document.documentElement.scrollTop !== undefined) {
-          document.documentElement.scrollTop = top
-        } else if (document.body) {
-          document.body.scrollTop = top
-        }
-      }
-    },
-    // 地图初始化
-    handler({ BMap, map }) {
-      this.mapOpen()
-      this.BMap = BMap
-      this.map = map
-      this.loadingMap = true
-      var geolocation = new BMap.Geolocation()
-      const myGeo = new BMap.Geocoder()
-      var $this = this
-      // 调用百度地图api 中的获取当前位置接口
-      geolocation.getCurrentPosition(function(r) {
-        myGeo.getLocation(new BMap.Point(r.point.lng, r.point.lat), function(result) {
-          if (result) {
-            $this.loadingMap = false
-            $this.$set($this, 'pointLngLat', { lng: result.point.lng, lat: result.point.lat })
-            map.enableScrollWheelZoom(true) // 开启鼠标滚轮缩放,默认关闭
-            $this.setCenter({ BMap, map })
-          }
-        })
-      })
-    },
-    // 搜索地图
-    querySearch(queryString, cb) {
-      var options = {
-        onSearchComplete: function(results) {
-          if (local.getStatus() === 0) {
-            // 判断状态是否正确
-            var s = []
-            for (var i = 0; i < results.getCurrentNumPois(); i++) {
-              var x = results.getPoi(i)
-              var item = { value: x.address + x.title, point: x.point }
-              s.push(item)
-              cb(s)
-            }
-          } else {
-            cb()
-          }
-        }
-      }
-      var local = new this.BMap.LocalSearch(this.map, options)
-      local.search(queryString)
-    },
-    handleSelect(item) {
-      var { point } = item
-      this.map.clearOverlays() // 清除地图上所有覆盖物
-      this.map.centerAndZoom(point, this.zoom)
-      const marker = new this.BMap.Marker(point) // 创建标注
-      this.map.addOverlay(marker) // 将标注添加到地图中
-      marker.enableDragging() // 可拖拽
-      this.LONGITUDE = point.lng
-      this.LATITUDE = point.lat
-    },
-    // 设置打开中心位置
-    setCenter({ BMap, map }) {
-      var lng = ''
-      var lat = ''
-      if (this.form.LONGITUDE == '' || this.form.LATITUDE == '') {
-        lng = '119.525971'
-        lat = '39.894727'
-      } else {
-        lng = this.form.LONGITUDE
-        lat = this.form.LATITUDE
-      }
-      var point = new BMap.Point(lng, lat)
-      // var point = new BMap.Point(this.form.LONGITUDE, this.form.LATITUDE)
-      const zoom = map.getZoom()
-      setTimeout(() => {
-        map.centerAndZoom(point, zoom)
-      }, 0)
-      // var marker = new BMap.Marker(point) // 创建标注
-      // map.addOverlay(marker) // 将标注添加到地图中
-    },
-    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
-    },
-    //* *******************列表查询******************************
-
-    getList() {
-      this.listLoading = true
-      requestFN(
-        '/major/emergency/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
-        {
-          name: this.RESCUE_TEAM_NAME
-        }
-      ).then((data) => {
-        this.listLoading = false
-        this.varList = data.varList
-        this.total = data.page.totalResult
-      })
-        .catch((e) => {
-          this.listLoading = false
-        })
-    },
-    getyjTypeDataList() {
-      const params = {
-        PARENT_ID: '2bd21d9d4d254f179e79f75d6377f651'
-      }
-      requestFN('/dictionaries/listTree', params).then((data) => {
-        this.yjTypeData = JSON.parse(data.zTreeNodes)
-      }).catch((e) => {
-        console.error('获取树形数据失败', e)
-      })
-    },
-    //* ***************************数据保存**********************************
     handleEdit(id) {
       this.dialogFormEdit = true
       this.dialogType = 'editUser'
       this.getDetail(id) // 获取详情并回显
-      this.$refs.upload.clearFiles()
+    },
+    confirmExport(id) {
+      MessageBox.confirm('确定要导出数据吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.getExportExcel(id)
+      })
+    },
+    getExportExcel(id) {
+      const params = { Id: id }
+      requestFN('/major/dutylog/ExportExcel', params).then((response) => {
+        Message({
+          type: 'success',
+          message: '导出成功'
+        })
+      }).catch((e) => {
+        Message({
+          type: 'error',
+          message: '导出失败'
+        })
+        console.error('导出数据失败', e)
+      })
     },
     getDetail(id) {
-      const params = {
-        Id: id
-      }
-      requestFN('/major/emergency/detail', params).then((response) => {
+      const params = { Id: id }
+      requestFN('/major/dutylog/detail', params).then((response) => {
         const data = response.msg
-        console.log(data)
         this.form = {
-          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,
-          POSTAL_CODE: data.POSTAL_CODE,
-          LONGITUDE: data.LONGITUDE,
-          LATITUDE: data.LATITUDE,
-          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,
-          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,
-          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
+          Id: data.ID,
+          UNIT: data.UNIT,
+          START_TIME: data.START_TIME,
+          END_TIME: data.END_TIME,
+          DUTY_PERSONNEL: data.DUTY_PERSONNEL,
+          SHIFT_PERSONNEL: data.SHIFT_PERSONNEL,
+          DUTY_RECORD: data.DUTY_RECORD,
+          HANDLING_SITUATION: data.HANDLING_SITUATION,
+          HANDOVER_ITEMS: data.HANDOVER_ITEMS
         }
       }).catch((e) => {
         console.error('获取详情数据失败', e)
@@ -754,65 +197,59 @@ export default {
     },
     handleAdd() {
       this.dialogFormEdit = true
-      this.form = {}
-      this.form.LONGITUDE = ''
-      this.form.LATITUDE = ''
+      this.form = {
+        ID: '',
+        UNIT: '',
+        START_TIME: '',
+        END_TIME: '',
+        DUTY_PERSONNEL: '',
+        SHIFT_PERSONNEL: '',
+        DUTY_RECORD: '',
+        HANDLING_SITUATION: '',
+        HANDOVER_ITEMS: ''
+      }
       this.dialogType = 'saveUser'
-      this.$refs.upload.clearFiles()
     },
     confirm() {
       this.dataSave()
     },
     dataSave() {
       this.listLoading = true
-      requestFN('/major/emergency/save', this.form).then((data) => {
+      requestFN('/major/dutylog/save', this.form).then((data) => {
         this.listLoading = false
         this.dialogFormEdit = false
-        this.varList = []
-        this.listQuery.page = 1
         this.getList()
       }).catch((e) => {
         this.listLoading = false
       })
     },
-    //* *****************************删除********************************
-    handleDelete(id, RESCUE_TEAM_NAME) {
-      this.$confirm('确定要删除[' + RESCUE_TEAM_NAME + ']吗?', {
+    handleDelete(id, UNIT) {
+      this.$confirm('确定要删除[' + UNIT + ']吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.listLoading = true
-        requestFN(
-          '/major/emergency/delete',
-          {
-            id: id
-          }
-        ).then((data) => {
-          if (data.result == 'success') {
+        requestFN('/major/dutylog/delete', { id }).then((data) => {
+          if (data.result === 'success') {
             this.listLoading = false
             this.getList()
           }
         }).catch((e) => {
           this.listLoading = false
         })
-      }).catch(() => {
-      })
+      }).catch(() => { })
     },
     makeAll() {
       const _selectData = this.$refs.multipleTable.selection
-      console.info('_selectData')
-      console.info(_selectData)
-      if (_selectData == null || _selectData.length == 0) {
+      if (!_selectData || _selectData.length === 0) {
         this.$message({
           message: '请选中要删除的项...',
           type: 'error'
         })
         return false
       }
-      const ids = _selectData.map((item, index) => {
-        return item.ID
-      }).join(',')
+      const ids = _selectData.map(item => item.ID).join(',')
 
       this.$confirm('确定要删除选中的数据吗?', {
         confirmButtonText: '确定',
@@ -820,26 +257,44 @@ export default {
         type: 'warning'
       }).then(() => {
         this.listLoading = true
-        requestFN(
-          '/major/emergency/deleteAll',
-          {
-            ids: ids
-          }
-        ).then(() => {
+        requestFN('/major/dutylog/deleteAll', { ids }).then(() => {
           this.listLoading = false
-          this.varList = []
-          this.listQuery.page = 1
-          this.$refs.multipleTable.clearSelection()
           this.getList()
         }).catch((e) => {
           this.listLoading = false
         })
-      }).catch(() => {
+      }).catch(() => { })
+    },
+
+    getList() {
+      this.listLoading = true
+      requestFN('/major/dutylog/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          name: this.UNIT
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
       })
     },
-    getQuery() {
-      this.$refs.multipleTable.clearSelection()
-      this.getList()
+    getAddressList() {
+      this.listLoading = true
+      requestFN(
+        '/yjcommunicate/listAddressBook?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+      ).then((data) => {
+        this.listLoading = false
+        this.addressOptions = data.varList.map(item => ({
+          ID: item.ID,
+          NAME: item.NAME
+        }))
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
     }
   }
 }