预警统计逻辑修改

event_analysis/views.py

@@ -2611,7 +2611,8 @@ def alarm_count_info(request):
             for sys in sysList:
                 for i in alarm_list_all:
                     if sys in eval(i.alarm_system):
-                         new_list.append(i)
+                        if i not in new_list:
+                            new_list.append(i)
             alarm_list = new_list
         else:
             alarm_list = alarm_list_all
@@ -2620,23 +2621,43 @@ def alarm_count_info(request):
             sys_list = eval(alarm.alarm_system)
             for sys in sys_list:
                 sys = sys.decode('utf-8')
-                if result.has_key(sys):
-                    pass
-                else:
-                    result[sys] = {'bad_work':0,'main_work':0,'normal_work':0,
+                if sysList:
+                    if sys in sysList:
+                        if result.has_key(sys):
+                            pass
+                        else:
+                            result[sys] = {'bad_work':0,'main_work':0,'normal_work':0,
                                     'bad_weekend':0,'main_weekend':0,'normal_weekend':0}
-                if alarm.alarm_level == u'严重' and alarm.if_workday == u'3':
-                    result[sys]['bad_work'] += 1
-                elif alarm.alarm_level == u'主要' and alarm.if_workday == u'3':
-                    result[sys]['main_work'] += 1
-                elif alarm.alarm_level == u'次要' and alarm.if_workday == u'3':
-                    result[sys]['normal_work'] += 1
-                elif alarm.alarm_level == u'严重' and alarm.if_workday == u'4':
-                    result[sys]['bad_weekend'] += 1
-                elif alarm.alarm_level == u'主要' and alarm.if_workday == u'4':
-                    result[sys]['main_weekend'] += 1
-                elif alarm.alarm_level == u'次要' and alarm.if_workday == u'4':
-                    result[sys]['normal_weekend'] += 1
+                        if alarm.alarm_level == u'严重' and alarm.if_workday == u'3':
+                            result[sys]['bad_work'] += 1
+                        elif alarm.alarm_level == u'主要' and alarm.if_workday == u'3':
+                            result[sys]['main_work'] += 1
+                        elif alarm.alarm_level == u'次要' and alarm.if_workday == u'3':
+                            result[sys]['normal_work'] += 1
+                        elif alarm.alarm_level == u'严重' and alarm.if_workday == u'4':
+                            result[sys]['bad_weekend'] += 1
+                        elif alarm.alarm_level == u'主要' and alarm.if_workday == u'4':
+                            result[sys]['main_weekend'] += 1
+                        elif alarm.alarm_level == u'次要' and alarm.if_workday == u'4':
+                            result[sys]['normal_weekend'] += 1
+                else:
+                    if result.has_key(sys):
+                        pass
+                    else:
+                        result[sys] = {'bad_work': 0, 'main_work': 0, 'normal_work': 0,
+                                       'bad_weekend': 0, 'main_weekend': 0, 'normal_weekend': 0}
+                    if alarm.alarm_level == u'严重' and alarm.if_workday == u'3':
+                        result[sys]['bad_work'] += 1
+                    elif alarm.alarm_level == u'主要' and alarm.if_workday == u'3':
+                        result[sys]['main_work'] += 1
+                    elif alarm.alarm_level == u'次要' and alarm.if_workday == u'3':
+                        result[sys]['normal_work'] += 1
+                    elif alarm.alarm_level == u'严重' and alarm.if_workday == u'4':
+                        result[sys]['bad_weekend'] += 1
+                    elif alarm.alarm_level == u'主要' and alarm.if_workday == u'4':
+                        result[sys]['main_weekend'] += 1
+                    elif alarm.alarm_level == u'次要' and alarm.if_workday == u'4':
+                        result[sys]['normal_weekend'] += 1
         data_list = []
         for key,value in result.items():
             total = 0

templates/event_analysis/alarm_count.html

@@ -96,7 +96,6 @@
                     }
                 }
                 }
-                console.log(finallist)
                 let newdata = {
                     currentPage: this.currentPage,
                     pageSize: this.pageSize,
@@ -105,7 +104,8 @@
                 axios.post('${SITE_URL}alarm_count_info/', newdata).then(res => {
                     this.AlarmCountData = res.data.results;
                     this.total = res.data.count
-                })
+                });
+                console.log(this.AlarmCountData)
             },
             async listOut(){
                 console.log(!this.AlarmCountData.length)