Merge remote-tracking branch 'origin/visu_emergency_01_siping_2.5d' into visu_emergency_01_siping_2.5d

src/views/eventdetailsdialog.vue

@@ -26,7 +26,8 @@
                       </el-carousel-item>
                     </el-carousel>
                   </div>
-                  <el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">预案调整
+                  <el-button size="mini" type="primary" class="yatz_button" @click="showUpdateYjYuAn">
+                    预案调整
                   </el-button>
                 </div>
                 <!-- 应急预案end -->
@@ -359,7 +360,7 @@
                class="top-dialog tz_tk">
       <el-form label-width="80px">
         <el-form-item label="关联预案">
-          <el-select v-model="sendGuanLianYuAn" placeholder="请选择关联预案！" clearable>
+          <el-select v-model="sendGuanLianYuAn" placeholder="请选择关联预案！" filterable clearable>
             <el-option
               v-for="item in guanLianYuAnList"
               :key="item.id"
@@ -2051,6 +2052,9 @@ export default {
       return data.label.indexOf(value) !== -1
     },
     sendEventLog() {
+      if( this.eventLog == '' || this.eventLog == null ){
+        return;
+      }
       //日志发送
       let param = { eventCode: this.eventCode, logContent: this.eventLog,operation:"bus_oper_type_2",operationType:"log_oper_type_1"}
       sendEventLog(param).then(res => {