From 73ce314f24f79f049942900b114152212db24e65 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 22 Aug 2024 14:56:03 +0800
Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A=20599=20app=E6=8E=A5=E6=8A=A5?=
 =?UTF-8?q?=E7=9A=84=E6=95=91=E6=8F=B4=E4=B9=8B=E5=90=8E=E4=B9=9F=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8E=A5=E6=8A=A5=E6=97=B6=E9=97=B4=20593=20=E6=95=91?=
 =?UTF-8?q?=E6=8F=B4=E5=88=97=E8=A1=A8=20=E6=9C=89=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=90=97=20=E7=8E=B0=E5=9C=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD=E4=B9=9F=E6=98=AF=E4=B8=8D=E5=A5=BD?=
 =?UTF-8?q?=E4=BD=BF=E7=9A=84=20=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9A=20598=20=E6=95=B0=E6=8D=AE=E7=9B=B8=E5=90=8C=E7=9C=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=87=BA=E6=9D=A5=E5=8C=BA=E5=88=AB=20=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=8A=A0=E4=B8=AA=E6=8A=A5=E8=AD=A6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9D=A5=E5=8C=BA=E5=88=86=20=E5=A6=82=E6=9E=9C=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E5=A5=BD=E7=9A=84=E5=8A=9E=E6=B3=95=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E4=B9=9F=E8=A1=8C=20596=20=E5=A6=82=E6=9E=9C=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=81=8C=E4=BD=8D=E9=87=8D=E5=A4=8D=E4=BA=86=20=E8=A6=81?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=88=A4=E9=87=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                      |  2 +-
 .../emergency_map/components/baseTable.vue       |  2 +-
 .../rescue_team/components/list.vue              | 16 ++++++++++++----
 .../process_management/components/list.vue       |  9 ++-------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c02d36b..b2efb78 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view/>
   </div>
 </template>
 
diff --git a/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue b/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue
index c9f1033..b1a5e1a 100644
--- a/src/views/emergen_cyrescue/emergency_map/components/baseTable.vue
+++ b/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>
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 cf44d5b..b208de7 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
@@ -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'
diff --git a/src/views/emergen_cyrescue/incident_management/process_management/components/list.vue b/src/views/emergen_cyrescue/incident_management/process_management/components/list.vue
index d9f8727..4856bf1 100644
--- a/src/views/emergen_cyrescue/incident_management/process_management/components/list.vue
+++ b/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>
-        <template>
-          <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
-        </template>
-      </div>
+      <div/>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
   </div>