更新

event_analysis/models.py

@@ -275,7 +275,7 @@ class Error_alarm(models.Model):
     alarm_number = models.CharField(null=True, max_length=100, verbose_name="预警编号")
     alarm_summary = models.TextField(null=True, verbose_name="预警摘要")
     alarm_level = models.CharField(null=True, max_length=100, verbose_name="预警级别")
-    alarm_system = models.CharField(null=True, max_length=100, verbose_name="预警系统")
+    alarm_system = models.TextField(null=True, verbose_name="预警系统")
     alarm_happen_time = models.DateTimeField(null=True, verbose_name="预警发生时间")
     alarm_recover_time = models.DateTimeField(null=True, verbose_name="预警恢复时间")
     if_interpose = models.CharField(null=True, max_length=100, verbose_name="是否需要干预")

event_analysis/urls.py

@@ -34,4 +34,5 @@ urlpatterns = [
     url(r'^create_alarm/$', create_alarm),
     url(r'^edit_alarm/$', edit_alarm),
     url(r'^search_alarm/$', search_alarm),
+    url(r'^del_alarm/$', del_alarm),
 ]

event_analysis/views.py

@@ -2198,6 +2198,10 @@ def create_alarm(request):
         result = client.bk_login.get_user(parse)
         login_person = result['data']['chname']
 
+        if_exit = Error_alarm.objects.filter(alarm_number__contains=alarm_number)
+        alarm_number = alarm_number+'_'+str(len(if_exit))
+
+
         error_alarm = Error_alarm.objects.create(
             alarm_number = alarm_number,
             alarm_summary = alarm_summary,
@@ -2239,6 +2243,22 @@ def create_alarm(request):
 def edit_alarm(request):
     pass
 
+
+def del_alarm(request):
+    try:
+        id = json.loads(request.body)
+        a=1
+    except Exception as e:
+        return render_json(
+            {
+                "result": False,
+                "code": 1,
+                "message": u"未知错误:%s" % e,
+                "data": {}
+            }
+        )
+
+
 def search_alarm(request):
     try:
         req = json.loads(request.body)

templates/event_analysis/error_alarm.html

@@ -127,10 +127,12 @@
                                              align="center"></el-table-column>
                             <el-table-column width="130" label="操作" align="center">
                                 <template slot-scope="scope">
-                                    <el-button @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>
+                                    <el-button v-if="user==scope.row.user" @click="delAlarm(scope.row)" type="text" size="small">删除
+                                    </el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -395,6 +397,21 @@
             createNewAlarm(){
                 window.location.href = "${SITE_URL}alarm_edit"
             },
+            delAlarm(){
+                this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        let id = row.alarm_number;
+                        this.sureDelete(id)
+                    }).catch(() => {
+                        this.$message({
+                            type: 'info',
+                            message: '已取消删除'
+                        });
+                    });
+            },
             //查询
             searchList() {
                 this.currentPage = 1;
@@ -437,13 +454,6 @@
                 })
             },
 
-            //新建模板
-            createNewTask() {
-                //              window.localStorage.removeItem("event_number")
-                //             window.location.href = "${SITE_URL}event_edit"
-                this.batchNewVisible = true
-            },
-
             //编辑模板
             readRow(row) {
                 let data = {event_number: row.event_number};
@@ -453,10 +463,6 @@
                 })
             },
 
-            //同步执行
-            syncTask() {
-                window.location.href = "${SITE_URL}sync"
-            },
 
             handleSelectionChange(selection) {
                 this.selectData[this.currentPage] = [];
@@ -489,46 +495,22 @@
                 })
             },
 
-
-            //删除
-            deleteRow(row) {
-                let vm = this;
-                this.selectContent = row;
-                if (row.data_src == 1) {
-                    this.$message('当前选中记录为同步数据，不可删除！！！');
-                    return false
-                }
-                this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    let id = row.event_number;
-                    this.sureDelete(id)
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消删除'
-                    });
-                });
-            },
             sureDelete(id) {
                 let vm = this;
-                let data = {event_number: id};
-                axios.post('${SITE_URL}delete_event/', data).then(res => {
-                    vm.deleteState = res.data.deleteState;
-                    console.log(vm.deleteState);
-                    if (vm.deleteState == '0') {
-                        vm.$message({
+                let data = {alarm_number: id};
+                axios.post('${SITE_URL}del_alarm/', data).then(res => {
+                    if(res.code==0){
+                                this.$message({
                                 type: 'success',
-                            message: '删除成功!'
+                                message: res.message
                                 });
-                        vm.getTaskList()
-                    } else {
-                        vm.$message({
+                            this.getAlarmList()
+                            }else{
+                                this.$message({
                                 type: 'error',
-                            message: '该事件处理人与目前登录人不符，无法删除!'
+                                message: res.message
                                  });
+                                this.dellabelshow = false
                             }
                 }, err => {
                     vm.$message({