bug：

599 app接报的救援之后也没有接报时间
593 救援列表 有删除权限吗 现在删除功能也是不好使的
功能优化：
598 数据相同看不出来区别 应该加个报警时间来区分 如果有更好的办法区分也行
596 如果人员职位重复了 要不要判重显示

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view/>
   </div>
 </template>
 

src/views/emergen_cyrescue/emergency_map/components/baseTable.vue

@@ -13,7 +13,7 @@
         <tr v-for="(item, index) in showInfomationType" :key="index" class="infomation_table_tbody_tr">
           <td>{{ item.PEOPLE_NAME }}</td>
           <td>{{ item.PEOPLE_PHONE }}</td>
-          <td>{{ item.PEOPLE_TYPE_NAME }}</td>
+          <td>{{ item.PEOPLE_TYPE_NAME + '-' + item.DITY_TYPE_NAME }}</td>
         </tr>
       </tbody>
     </table>

src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue

@@ -220,6 +220,7 @@
               <Treeselect
                 :options="DepartmentData"
                 v-model="form.SUPERVISING_UNIT"
+                :normalizer="normalizerDe"
                 placeholder="请选择主管单位名称"
                 no-options-text="暂无数据"
                 no-children-text="暂无数据"
@@ -476,6 +477,13 @@ export default {
           label: node.name,
           children: node.nodes
         }
+      },
+      normalizerDe(node) {
+        return {
+          id: node.id,
+          label: node.label,
+          children: node.nodes
+        }
       }
     }
   },
@@ -685,7 +693,7 @@ export default {
       this.dialogFormEdit = true
       this.dialogType = 'editUser'
       this.getDetail(id) // 获取详情并回显
-      this.$refs.upload.clearFiles()
+      // this.$refs.upload.clearFiles()
     },
     getDetail(id) {
       const params = {
@@ -746,7 +754,7 @@ export default {
       this.form.LONGITUDE = ''
       this.form.LATITUDE = ''
       this.dialogType = 'saveUser'
-      this.$refs.upload.clearFiles()
+      // this.$refs.upload.clearFiles()
     },
     confirm() {
       this.$refs.form.validate(valid => {
@@ -783,7 +791,7 @@ export default {
             id: id
           }
         ).then((data) => {
-          if (data.result == 'success') {
+          if (data.result === 'success') {
             this.listLoading = false
             this.getList()
           }
@@ -797,7 +805,7 @@ export default {
       const _selectData = this.$refs.multipleTable.selection
       console.info('_selectData')
       console.info(_selectData)
-      if (_selectData == null || _selectData.length == 0) {
+      if (_selectData == null || _selectData.length === 0) {
         this.$message({
           message: '请选中要删除的项...',
           type: 'error'

src/views/emergen_cyrescue/incident_management/process_management/components/list.vue

@@ -7,7 +7,7 @@
         </el-form-item>
         <el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
-          <el-button class="filter-item" type="default" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          <el-button class="filter-item" type="info" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -25,16 +25,11 @@
         <template slot-scope="{ row }">
           <el-button type="text" icon="el-icon-document" size="mini" @click="goList('detail', row.ID, '1')">查看</el-button>
           <el-button v-if="row.RESCUE_SITUATION === '1'" type="text" icon="el-icon-document" size="mini" @click="command(row)">指挥</el-button>
-          <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.NAME)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="page-btn-group">
-      <div>
+      <div/>
-        <template>
-          <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
-        </template>
-      </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
   </div>