Merge branch 'liujun0703-新项目开发' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj-vue into liujun0703-新项目开发

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

@@ -568,7 +568,6 @@ export default {
       }
       this.webSocket.onclose = () => {
         console.log('指挥调度的webSocket链接关闭')
-        console.log(this.goBackFlag)
         if (this.goBackFlag) {
           this.$router.push('/emergen_cyrescue/incident_management')
         } else {

src/views/emergen_cyrescue/emergency_map/dialog/sendMessage.vue

@@ -17,8 +17,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="执行人:" prop="USER_ID">
+          <el-form-item label="执行人:" prop="EM_USER_ID">
-            <el-select v-model="form.USER_ID" prop="USER_ID" placeholder="请选择执行人" style="width: 400px">
+            <el-select v-model="form.EM_USER_ID" prop="USER_ID" placeholder="请选择执行人" style="width: 400px">
               <el-option
                 v-for="item in userList"
                 :key="item.ID"
@@ -87,7 +87,8 @@ export default {
         INSTRUCTION_TYPE: null,
         INSTRUCTION_CONTENT: null,
         CORP_ID: null,
-        USER_ID: null
+        USER_ID: null,
+        EM_USER_ID: null
       },
       rule: {
         INSTRUCTION_CONTENT: [
@@ -96,7 +97,7 @@ export default {
         CORP_ID: [
           { required: true, message: '请选择机构', trigger: 'blur' }
         ],
-        USER_ID: [
+        EM_USER_ID: [
           { required: true, message: '请选择执行人', trigger: 'blur' }
         ]
       },
@@ -119,7 +120,6 @@ export default {
   },
   methods: {
     handleSelect(value) {
-      console.log(value)
       this.getUser(value.id)
     },
     getCorp() {
@@ -154,8 +154,8 @@ export default {
             '/bi/emergency/creatInstruct', {
               FIRERESERVEPLAN_ID: this.info.FIRERESERVEPLAN_ID,
               REPORT_ID: this.info.REPORT_ID,
-              USER_ID: this.form.USER_ID,
+              USER_ID: this.userList.find(item => item.ID === this.form.EM_USER_ID).USER_ID,
-              USER_NAME: this.userList.find(item => item.ID === this.form.USER_ID).USER_NAME,
+              USER_NAME: this.userList.find(item => item.ID === this.form.EM_USER_ID).USER_NAME,
               MESSAGE: this.form.INSTRUCTION_CONTENT
             }
           ).then((data) => {

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

@@ -45,7 +45,7 @@
       <el-table-column :show-overflow-tooltip="true" prop="EVENT_SITUATION_NAME" label="预案是否启动"/>
       <el-table-column label="操作" align="center" width="500">
         <template slot-scope="{row}">
-          <el-button v-if="row.RESCUE_SITUATION !== '1'" type="primary" size="mini" @click="handleRescue(row.ID)">
+          <el-button v-if="row.RESCUE_SITUATION === '2'" type="primary" size="mini" @click="handleRescue(row.ID)">
             是否救援
           </el-button>
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('detail', row.ID, '1')">查看
@@ -194,7 +194,6 @@
     <!-- 是否救援弹窗 -->
     <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">
@@ -713,7 +712,7 @@ export default {
       requestFN('/major/registration/sendSMS',
         {
           planId: e.FIRERESERVEPLAN_ID,
-          responseId: e.FIRERESERVEPLAN_ID,
+          responseId: e.HIERARCHICALRESPONSE_ID,
           registrationId: e.REGISTRATION_ID,
           eventSituation: e.EVENT_SITUATION,
           rescueSituation: e.RESCUE_SITUATION