diff --git a/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue b/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue index 9bbb8a4..a58812b 100644 --- a/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue +++ b/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue @@ -13,6 +13,7 @@

+
@@ -38,6 +39,20 @@ export default { sendOrderBtn() { this.$emit('orderMessage', '') }, + endRescue() { + this.$confirm('确定是否结束救援?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$router.push('/emergen_cyrescue/accid') + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消' + }) + }) + }, confirmReceipt(answer) { requestFN('/bi/emergency/readInstruct', { ID: answer.ID }) .then((data) => { diff --git a/src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue b/src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue index 5ac0db3..866340c 100644 --- a/src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue +++ b/src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue @@ -160,6 +160,12 @@ export default { ).then((data) => { if (data.result === 'success') { this.$emit('close', false) + this.form = { + INSTRUCTION_TYPE: null, + INSTRUCTION_CONTENT: null, + CORP_ID: null, + USER_ID: null + } } }).catch((e) => { console.log(e) diff --git a/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue b/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue index e2d56df..ef2516c 100644 --- a/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue +++ b/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue @@ -130,9 +130,9 @@ - + - + @@ -175,8 +175,25 @@ + + + + + + + + + + + + + + + + + - +