pc端发送指令功能补全

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

@@ -13,6 +13,7 @@
       </p>
     </div>
     <div class="order">
+      <button style="text-align: right" @click="endRescue">结束救援</button>
       <button @click="sendOrderBtn">发送指令</button>
     </div>
   </div>
@@ -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) => {

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)

src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue

@@ -130,9 +130,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row v-if="false" :gutter="20">
           <el-col :span="12">
-            <el-form-item label="是否救援" prop="ISRESCUE">
+            <el-form-item label="是否执预案" prop="ISRESCUE">
               <el-radio-group v-model="form.ISRESCUE">
                 <el-radio :label="'true'">是</el-radio>
                 <el-radio :label="'false'">否</el-radio>
@@ -175,8 +175,25 @@
     <!-- 是否救援弹窗 -->
     <el-dialog :visible.sync="dialogRescueVisible" title="是否救援">
       <el-form ref="rescueForm" :model="rescueForm" label-width="120px">
+
         <el-row :gutter="20">
           <el-col :span="12">
+            <el-form-item label="是否执救援:" prop="ISRESCUE">
+              <el-radio-group v-model="rescueForm.ISRESCUE">
+                <el-radio :label="'true'">是</el-radio>
+                <el-radio :label="'false'">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否执预案:" prop="ISRESCUE">
+              <el-radio-group v-model="rescueForm.EVENT_SITUATION">
+                <el-radio :label="'1'">是</el-radio>
+                <el-radio :label="'0'">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="rescueForm.EVENT_SITUATION === '1'" :span="12">
             <el-form-item label="应急预案" prop="FIRERESERVEPLAN_ID">
               <el-select v-model="rescueForm.FIRERESERVEPLAN_ID" placeholder="请选择应急预案..." @change="handlePlanChange">
                 <el-option
@@ -188,7 +205,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col v-if="rescueForm.EVENT_SITUATION === '1'" :span="12">
             <el-form-item label="响应级别" prop="HIERARCHICALRESPONSE_ID">
               <el-select v-model="rescueForm.HIERARCHICALRESPONSE_ID" placeholder="请选择响应级别...">
                 <el-option
@@ -500,7 +517,8 @@ export default {
       dialogRescueVisible: false,
       rescueForm: {
         FIRERESERVEPLAN_ID: '',
-        HIERARCHICALRESPONSE_ID: ''
+        HIERARCHICALRESPONSE_ID: '',
+        EVENT_SITUATION: ''
       },
       total: 0,
       varList: [],