bug

templates/event_analysis/alarm_count.html

@@ -10,7 +10,7 @@
                     <div class="panel-body">
                         <div class="king-wrapper clearfix">
                             选择用户组:
-                            <el-select style="width:300px;" clearable
+                            <el-select style="width:300px;margin-right: 100px" clearable
                                        v-model="userGroup">
                                 <el-option v-for="item in userGroupOp"
                                            :key="item.value"
@@ -18,9 +18,19 @@
                                            :value="item.label">
                                 </el-option>
                             </el-select>
+                            查询时间:
+                            <el-date-picker
+                                    v-model="time"
+                                    type="daterange"
+                                    style="width:250px;"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期">
+                            </el-date-picker>
+                            <el-button size="medium" id="search" type="primary"
+                                       @click="searchList()"
+                                       style="float: right;margin-right:12px">查询
+                            </el-button>
 
-                            <el-input v-model="keyword" placeholder="请输入关键字搜索"
-                                      style="width:400px;float:right"></el-input>
                         </div>
                     </div>
                     <div style="height:100%;min-height: 500px;padding:0 15px;">
@@ -70,16 +80,17 @@
             return {
                 userGroupOp: [
                     {
-                    label: '网络',
-                    value: '3',
-                },
+                        label: '网络',
+                        value: '3',
+                    },
                 ],
-                userGroup:'',
+                userGroup: '',
                 keyword: "",
                 AlarmCountData: [],
                 loading: false,
                 currentPage: 1,
                 pageSize: 10,
+                time: ''
             }
         },
         mounted() {
@@ -88,21 +99,24 @@
 
 
         methods: {
-            getUserGroup(){
+            searchList(){
+
+            },
+            getUserGroup() {
                 axios.get('${SITE_URL}search_user_group/').then(res => {
                     res = res.data;
                     this.systemList = res
                 })
             },
             handleCurrentChange(val) {
-                    console.log("当前页" + val);
-                    if (this.currentPage != val) {
-                        this.currentPage = val
-                        this.getTaskList(() => {
-                            this.handleCurPageChange()
-                        })
-                    }
-                },
+                console.log("当前页" + val);
+                if (this.currentPage != val) {
+                    this.currentPage = val
+                    this.getTaskList(() => {
+                        this.handleCurPageChange()
+                    })
+                }
+            },
         },
 
     })

templates/event_analysis/alarm_edit.html

@@ -412,8 +412,8 @@
             methods: {
                 getSubDate() {
                     let result = "无"
-                    if (this.formLine.event_happened_time && this.formLine.user_reporting_time) {
-                        let dateDiff = this.formLine.user_reporting_time - this.formLine.event_happened_time;//时间差的毫秒数
+                    if (this.formLine.recover_time && this.formLine.alarm_time) {
+                        let dateDiff = this.formLine.recover_time - this.formLine.alarm_time;//时间差的毫秒数
                         let dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000));//计算出相差天数
                         let leave1 = dateDiff % (24 * 3600 * 1000) //计算天数后剩余的毫秒数
                         let hours = Math.floor(leave1 / (3600 * 1000))//计算出小时数//计算相差分钟数
@@ -752,18 +752,15 @@
                                 type: 'success',
                                 message: res.message
                                 });
-                            this.dellabelshow = false
-                            this.getLabel()
+                                window.location.href = "${SITE_URL}error_alarm"
                             }else{
                                 this.$message({
                                 type: 'error',
                                 message: res.message
                                  });
-                                this.dellabelshow = false
                             }
 
                         })
-                        window.history.go(-1)
                     }
                 },
             }