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

# Conflicts:
#	templates/event_analysis/error_alarm.html

templates/event_analysis/error_alarm.html

 <%inherit file="/base_index.html"/>
 <%block name='content'>
 <style>
-    .colorSucStyle {
-        color: #44b549;
 
-    }
-
-    .colorErrStyle {
-        color: orangered;
-    }
-
-    .lable_color {
-        color: rgba(0, 0, 0, 0.70);
-    }
 </style>
 <div class="tab-content mb20">
-    <div id="scanTask">
-        <div class="scanTask" v-cloak>
+    <div id="errorAlarm">
+        <div class="errorAlarm" v-cloak>
             <div class="tab-pane fade active in">
                 <div class="panel panel-default table7_demo king-table7-demo3" style="border:none;">
                     <div class="panel-body">
@@ -30,7 +19,8 @@
                                                        @click="createNewTask()">通过告警新建
                                             </el-button>
                                             <el-button type="primary" size="medium"
-                                                       @click="createNewAlarm()" style=" float:right;margin-right:12px">新建
+                                                       @click="createNewAlarm()" style=" float:right;margin-right:12px">
+                                                新建
                                             </el-button>
                                         </el-col>
                                     </el-row>
@@ -120,18 +110,22 @@
                                              align="left"></el-table-column>
                             <el-table-column prop="alarm_summary" label="故障预警摘要" header-align="center" align="left"
                                              show-overflow-tooltip></el-table-column>
-                            <el-table-column width="130" prop="alarm_level" label="预警级别" align="center"></el-table-column>
+                            <el-table-column width="130" prop="alarm_level" label="预警级别"
+                                             align="center"></el-table-column>
                             <el-table-column width="130" prop="alarm_system" label="预警系统"
                                              align="center"></el-table-column>
                             <el-table-column width="130" prop="user" label="处理人"
                                              align="center"></el-table-column>
                             <el-table-column width="130" label="操作" align="center">
                                 <template slot-scope="scope">
-                                    <el-button v-if="user!=scope.row.user" @click="readRow(scope.row)" type="text" size="small">查看
+                                    <el-button v-if="user!=scope.row.user" @click="readRow(scope.row)" type="text"
+                                               size="small">查看
                                     </el-button>
-                                    <el-button v-if="user==scope.row.user" @click="readRow(scope.row)" type="text" size="small">编辑
+                                    <el-button v-if="user==scope.row.user" @click="readRow(scope.row)" type="text"
+                                               size="small">编辑
                                     </el-button>
-                                    <el-button v-if="user==scope.row.user" @click="delAlarm(scope.row)" type="text" size="small">删除
+                                    <el-button v-if="user==scope.row.user" @click="delAlarm(scope.row)" type="text"
+                                               size="small">删除
                                     </el-button>
                                 </template>
                             </el-table-column>
@@ -332,7 +326,7 @@
     };
 
     var vm = new Vue({
-        el: "#scanTask",
+        el: "#errorAlarm",
         data() {
             return {
                 dateoutflag: false,
@@ -398,6 +392,7 @@
                     this.systemList = res
                 })
             },
+<<<<<<< HEAD
             searchAlarm(){
                 if (this.formLine.failure_analysis.alarm_type && this.formLine.failure_analysis.start_time
                         && this.formLine.failure_analysis.end_time) {
@@ -448,6 +443,25 @@
                             type: 'info',
                             message: '已取消删除'
                         });
+=======
+            createNewAlarm() {
+                window.location.href = "${SITE_URL}alarm_edit"
+            },
+            delAlarm(row) {
+                let vm = this
+                vm.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+                    cancelButtonText: '取消',
+                    confirmButtonText: '确定',
+                    type: 'warning'
+                }).then(() => {
+                    let id = row.alarm_number;
+                    this.sureDelete(id)
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+>>>>>>> b9670ad79ebce4d627128543ad1aa9ae0d773d17
+                    });
                 });
             },
             //查询
@@ -537,13 +551,13 @@
                 let vm = this;
                 let data = {alarm_number: id};
                 axios.post('${SITE_URL}del_alarm/', data).then(res => {
-                    if(res.code==0){
+                    if (res.code == 0) {
                         this.$message({
                             type: 'success',
                             message: res.message
                         });
                         this.getAlarmList()
-                            }else{
+                    } else {
                         this.$message({
                             type: 'error',
                             message: res.message

templates/event_analysis/event_edit.html

@@ -30,8 +30,8 @@
 </style>
 <div class="tab-content mb20">
 
-    <div id="scanTask">
-        <div class="scanTask" v-cloak>
+    <div id="eventEdit">
+        <div class="eventEdit" v-cloak>
             <div style=" padding-left: 20px;" >
                 <el-form label-width="90px"  :model="formLine" >
                     <div class="bk-panel" style="padding-bottom: 10px; padding-top: 25px">
@@ -729,7 +729,7 @@ var unique= function (array) {
         }
 
         var vm = new Vue({
-            el: "#scanTask",
+            el: "#eventEdit",
             data() {
                 return {
                     taskData2: {