Merge branch 'master' of https://git.zorkdata.com/cuiyixiong/event-analysis

templates/event_analysis/alarm_edit.html

@@ -62,14 +62,14 @@
                         <el-form-item label="预警时间:" label-width="200px" class="normal"
                                       style="display:inline-block; ">
                             <el-date-picker v-model="formLine.alarm_time" type="datetime"
-                                            placeholder="必填" style="width:200px;" :disabled="editStatus">
+                                            placeholder="必填" style="width:200px;" value-format="yyyy-MM-dd HH:mm:ss" :disabled="editStatus">
                             </el-date-picker>
                         </el-form-item>
 
                         <el-form-item label="恢复时间:" label-width="200px" class="normal" style="display:inline-block; ">
                             <el-date-picker
                                     v-model="formLine.recover_time"
-                                    type="datetime" style="width:200px;" :disabled="editStatus">
+                                    type="datetime" style="width:200px;" value-format="yyyy-MM-dd HH:mm:ss" :disabled="editStatus">
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="处置时长:" label-width="200px" class="normal" style="display:inline-block; ">
@@ -286,7 +286,7 @@
                     alarmDisplay: [],
                     formLine: {
                         alarm_type:'',
-                        alarm_system:'',
+                        alarm_system:[],
                         alarm_time:'',
                         recover_time:'',
                         alarm_summary:'',
@@ -314,7 +314,7 @@
 
             mounted() {
                 let vm = this;
-                let data = JSON.parse(window.localStorage.getItem('alarm_info'));
+                let data = window.localStorage.getItem('alarm_info')?JSON.parse(window.localStorage.getItem('alarm_info')):'';
                 if (!!data) {
                     this.type = "edit"
                     if (data.show_src == 1) {
@@ -379,7 +379,9 @@
                 getSubDate() {
                     let result = "无"
                     if (this.formLine.recover_time && this.formLine.alarm_time) {
-                        let dateDiff = this.formLine.recover_time - this.formLine.alarm_time;//时间差的毫秒数
+                        let date1 = new Date(this.formLine.recover_time)
+                        let date2 = new Date(this.formLine.alarm_time)
+                        let dateDiff = date1.getTime() - date2.getTime();//时间差的毫秒数
                         let dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000));//计算出相差天数
                         let leave1 = dateDiff % (24 * 3600 * 1000) //计算天数后剩余的毫秒数
                         let hours = Math.floor(leave1 / (3600 * 1000))//计算出小时数//计算相差分钟数