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 @@ 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 @@ {{ item.PEOPLE_NAME }} {{ item.PEOPLE_PHONE }} - {{ item.PEOPLE_TYPE_NAME }} + {{ item.PEOPLE_TYPE_NAME + '-' + item.DITY_TYPE_NAME }} 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 @@ { @@ -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 @@ 搜索 - 重置 + 重置 @@ -25,16 +25,11 @@
-
- -
+