用户组接口

event_analysis/urls.py

@@ -35,4 +35,6 @@ urlpatterns = [
     url(r'^edit_alarm/$', edit_alarm),
     url(r'^search_alarm/$', search_alarm),
     url(r'^del_alarm/$', del_alarm),
+    url(r'^create_alarm_by_icube/$', create_alarm_by_icube),
+    url(r'^search_user_group/$', search_user_group),
 ]

event_analysis/views.py

@@ -2140,11 +2140,26 @@ def del_label(request):
         )
 
 
-def serch_user_group(request):
+def search_user_group(request):
     try:
         gruop_data = requests.get('http://192.168.1.246:8001/webapi/relationshipInstances/172?pageNum=1&pageSize=100')
         gruop_data = gruop_data.text
-        gruop_data = eval(gruop_data)
+        gruop_data = json.loads(gruop_data)
+        gruop_data = gruop_data['data']['list']
+        group_list = []
+        group_user_list = []
+        group_system_list = []
+        for i in gruop_data:
+            newdic = {}
+            newdic['label'] = i[u'名称']
+            newdic['value'] = i[u'名称']
+            group_list.append(newdic)
+        return render_json({
+            "result": True,
+            "code": 0,
+            "message": u"搜索成功",
+            "data": {'group_list':group_list}
+        })
     except Exception as e:
         return render_json(
             {
@@ -2280,7 +2295,12 @@ def del_alarm(request):
 
 def create_alarm_by_icube(request):
     try:
-        pass
+        return render_json(
+            {"result": True,
+             "code": 0,
+             "message": u"预警删除成功！",
+             "data": ''
+             })
     except Exception as e:
         return render_json(
             {
@@ -2295,12 +2315,19 @@ def search_alarm(request):
     try:
         req = json.loads(request.body)
         alarm_list = Error_alarm.objects.all().order_by('-alarm_happen_time')
+        if req['data']['alarm_system']:
+            alarm_list = alarm_list.filter(alarm_system__contains=req['data']['alarm_system'])
+        if req['data']['priority']:
+            alarm_list = alarm_list.filter(alarm_level=req['data']['priority'])
+        # if req['dateoutinfo']:
+        #     pass
+        if req['data']['alarm_number']:
+            alarm_list = alarm_list.filter(alarm_number__contains=req['data']['alarm_number'])
 
         if request.body == "":
             current_page = 1
             page_size = 10
         else:
-            req = json.loads(request.body)
             current_page = req.get("currentPage", 1)
             page_size = req.get("pageSize", 10)
         event_page = Paginator(alarm_list, page_size)
@@ -2308,11 +2335,12 @@ def search_alarm(request):
 
         result_list = []
         for i in alarm_list:
+            # alarm_system = i.alarm_system
             data = {
                 "alarm_number": i.alarm_number,
                 'alarm_summary': i.alarm_summary,
                 'alarm_level': i.alarm_level,
-                'alarm_system': i.alarm_level,
+                'alarm_system': eval(i.alarm_system),
                 'user': i.user
             }
             result_list.append(data)

templates/event_analysis/alarm_count.html

@@ -78,12 +78,7 @@
         el: "#alarmCount",
         data() {
             return {
-                userGroupOp: [
-                    {
-                        label: '网络',
-                        value: '3',
-                    },
-                ],
+                userGroupOp: [],
                 userGroup: '',
                 keyword: "",
                 AlarmCountData: [],
@@ -94,7 +89,7 @@
             }
         },
         mounted() {
-
+            this.getUserGroup()
         },
 
 
@@ -104,8 +99,8 @@
             },
             getUserGroup() {
                 axios.get('${SITE_URL}search_user_group/').then(res => {
-                    res = res.data;
-                    this.systemList = res
+                    res = res.data['group_list'];
+                    this.userGroupOp = res
                 })
             },
             handleCurrentChange(val) {

templates/event_analysis/error_alarm.html

@@ -34,7 +34,7 @@
                                             <el-form-item label="查询时间:" style="display:inline-block;width:100%;"
                                                           label-width="100px">
                                                 <el-date-picker
-                                                        v-model="dateoutinfo"
+                                                        v-model="formLine.dateoutinfo"
                                                         type="daterange"
                                                         style="width:80%;min-width:150px;"
                                                         start-placeholder="开始日期"
@@ -74,7 +74,7 @@
                                             <el-form-item label="预警编号:" style="display:inline-block;width:100%;"
                                                           label-width="100px">
                                                 <el-input style="min-width:150px;width:80%;"
-                                                          v-model="formLine.event_number">
+                                                          v-model="formLine.alarm_number">
                                                 </el-input>
                                             </el-form-item>
                                         </el-col>
@@ -231,6 +231,7 @@
                             <div style="line-height: 50px ;">
                                 <template>
                                     <el-table :data="gridData" style="width:100%"
+                                              @select="handleSelectionChange"
                                               max-height="300">
                                         <el-table-column type="selection" width="30"></el-table-column>
                                         <el-table-column fixed prop="alarm_title" label="告警标题" width="300"
@@ -245,7 +246,7 @@
                         </el-row>
                         <span slot="footer" class="dialog-footer">
                             <el-button @click="batchNewVisible = false">取 消</el-button>
-                            <el-button type="primary" @click="batchNewVisible = false">确 定</el-button>
+                            <el-button type="primary" @click=createAlarmByIcube()>确 定</el-button>
                         </span>
                     </el-dialog>
                 </div>
@@ -330,7 +331,7 @@
         data() {
             return {
                 dateoutflag: false,
-                dateoutinfo: "",
+
                 user: '',
                 gridData: [],
                 priorityOp: keyArray.priority,
@@ -339,12 +340,13 @@
                 systemList: [],
                 hardwareop: keyArray.hardwareop,
                 formLine: {
+                    dateoutinfo: "",
                     priority: "",//优先级
                     relate_me: '',//与我相关
                     alarm_system: "",
                     event_hap_time: "",
                     hardware: '',
-                    event_number: '',
+                    alarm_number: '',
                     all_fields: '',
                     event_label: "",
                     failure_analysis: {
@@ -392,7 +394,46 @@
                     this.systemList = res
                 })
             },
+            handleSelectionChange(selection) {
+                    //this.selectData[this.currentPage] = [];
+                    selection.map((item, index) => {
+                        this.selectData.push(item.alarm_title)
+                    })
+                },
+            createAlarmByIcube(){
+                let alarmList = [];
+                    let vm = this;
+                    //for (let i in this.selectData) {
+                     //   alarmList = alarmList.concat(this.selectData[i])
+                    //}
+                    console.log(this.selectData);
+                    if (this.selectData.length == 0) {
+                        vm.$message({
+                            type: 'error',
+                            message: '请选择告警！'
+                        });
+                    } else {
+                        axios.post('${SITE_URL}create_alarm_by_icube/', alarmList).then(res => {
+                        if (res.code==0) {
+                            this.$message({
+                                type: "success",
+                                message: '查询成功'
+                            });
+                        } else {
+                            this.$message({
+                                type: "error",
+                                message: '查询失败' + res.message
+                            });
+                            this.formLine = data
+                        }
+                    })
+                        vm.$message({
+                                    type: 'success',
+                                    message: '下载成功'
+                                });
 
+                    }
+            },
             searchAlarm() {
                 if (this.formLine.failure_analysis.alarm_type && this.formLine.failure_analysis.start_time
                     && this.formLine.failure_analysis.end_time) {
@@ -451,6 +492,7 @@
         this.currentPage = 1;
         this.count = 0;
         this.getAlarmList()
+        console.log(111)
     }
     ,
 
@@ -464,6 +506,8 @@
             pageSize: vm.pageSize,
             data: vm.formLine
         };
+        console.log(newdata)
+        console.log(222)
         axios.post('${SITE_URL}search_alarm/', newdata).then(res => {
                 vm.total = res.results.count;
                 vm.taskData = res.results.results;
@@ -573,10 +617,10 @@
     //清除事件搜索条件
     emptySearch()
     {
-        this.formLine.relate_me = '';
+        this.formLine.alarm_number = '';
         this.formLine.priority = '';
-        this.formLine.event_first_cat = '';
-        this.formLine.event_hap_time = '';
+        this.formLine.alarm_system = '';
+        this.formLine.dateoutinfo = '';
         this.formLine.event_state = '';
         this.formLine.hardware = '';
         this.formLine.event_number = '';