Commit c92a10d0 authored by Kerwin_Cui's avatar Kerwin_Cui

1

parent b31c1235
...@@ -38,4 +38,5 @@ urlpatterns = [ ...@@ -38,4 +38,5 @@ urlpatterns = [
url(r'^del_alarm/$', del_alarm), url(r'^del_alarm/$', del_alarm),
url(r'^create_alarm_by_icube/$', create_alarm_by_icube), url(r'^create_alarm_by_icube/$', create_alarm_by_icube),
url(r'^search_user_group/$', search_user_group), url(r'^search_user_group/$', search_user_group),
url(r'^alarm_count_info/$', alarm_count_info),
] ]
...@@ -2283,9 +2283,10 @@ def edit_alarm_display(request): ...@@ -2283,9 +2283,10 @@ def edit_alarm_display(request):
show_src = 0 show_src = 0
else: else:
show_src = 1 show_src = 1
data = { data = {
'alarm_type':alarm.alarm_level if alarm.alarm_level else '', 'alarm_type':alarm.alarm_level if alarm.alarm_level else '',
'alarm_system':alarm.alarm_system if alarm.alarm_system else '', 'alarm_system':eval(alarm.alarm_system) if alarm.alarm_system else '',
'alarm_time': alarm.alarm_happen_time.strftime('%Y-%m-%d %H:%M:%S') if alarm.alarm_happen_time else '', 'alarm_time': alarm.alarm_happen_time.strftime('%Y-%m-%d %H:%M:%S') if alarm.alarm_happen_time else '',
'recover_time': alarm.alarm_recover_time.strftime('%Y-%m-%d %H:%M:%S') if alarm.alarm_recover_time else '', 'recover_time': alarm.alarm_recover_time.strftime('%Y-%m-%d %H:%M:%S') if alarm.alarm_recover_time else '',
'alarm_summary': alarm.alarm_summary if alarm.alarm_summary else '', 'alarm_summary': alarm.alarm_summary if alarm.alarm_summary else '',
...@@ -2338,6 +2339,7 @@ def edit_alarm(request): ...@@ -2338,6 +2339,7 @@ def edit_alarm(request):
auto_name = data['auto_name'] auto_name = data['auto_name']
other_autoname = data['other_autoname'] other_autoname = data['other_autoname']
monitor_name = data['monitor_name'] monitor_name = data['monitor_name']
cant_auto_info = data['cantautoinfo']
if_icube = data['if_icube'] if_icube = data['if_icube']
alarm_time = alarm_time.replace('T', ' ') alarm_time = alarm_time.replace('T', ' ')
# alarm_time = alarm_time[0:-5] # alarm_time = alarm_time[0:-5]
...@@ -2364,6 +2366,7 @@ def edit_alarm(request): ...@@ -2364,6 +2366,7 @@ def edit_alarm(request):
alarm.other_autoname = other_autoname alarm.other_autoname = other_autoname
alarm.monitor_name = monitor_name alarm.monitor_name = monitor_name
alarm.if_icube = if_icube alarm.if_icube = if_icube
cant_auto_info = cant_auto_info
alarm.save() alarm.save()
return render_json( return render_json(
{"result": True, {"result": True,
...@@ -2536,6 +2539,76 @@ def search_alarm(request): ...@@ -2536,6 +2539,76 @@ def search_alarm(request):
"data": {} "data": {}
} }
) )
def alarm_count_info(request):
try:
# req = json.loads(request.body)
alarm_list = Error_alarm.objects.all()
result = {}
for alarm in alarm_list:
sys_list = eval(alarm.alarm_system)
for sys in sys_list:
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
for v in value.values():
total += v
dic = {
"system":key,
"total":total,
"bad_work":value["bad_work"],
"main_work":value["main_work"],
"normal_work": value["normal_work"],
"bad_weekend": value["bad_weekend"],
"main_weekend": value["main_weekend"],
"normal_weekend": value["normal_weekend"],
}
data_list.append(dic)
if request.body == "":
current_page = 1
page_size = 10
else:
current_page = req.get("currentPage", 1)
page_size = req.get("pageSize", 10)
event_page = Paginator(data_list, page_size)
event_list = event_page.page(current_page).object_list
return render_json(
{
"result": True,
"code": 0,
"message": u"查询成功!",
"data": {}
}
)
except Exception as e:
return render_json(
{
"result": False,
"code": 1,
"message": u"未知错误:%s" % e,
"data": {}
}
)
# 同步事件 # 同步事件
def sync(request): def sync(request):
now_time = int(time.time()) now_time = int(time.time())
......
...@@ -42,21 +42,14 @@ ...@@ -42,21 +42,14 @@
ref="table" ref="table"
stripe.2 stripe.2
:header-cell-style="{background:'#409EFF',color:'white'}"> :header-cell-style="{background:'#409EFF',color:'white'}">
<el-table-column width="200" prop="event_number" label="系统" <el-table-column width="200" prop="system" label="系统" align="center"></el-table-column>
align="center"></el-table-column> <el-table-column prop="total" label="有效故障预警数" align="center"></el-table-column>
<el-table-column prop="summary" label="有效故障预警数" align="center"></el-table-column> <el-table-column prop="bad_work" label="严重故障预警数(交易日)" align="center"></el-table-column>
<el-table-column prop="priority" label="严重故障预警数(交易日)" <el-table-column prop="main_work" label="主要故障预警数(交易日)" align="center"></el-table-column>
align="center"></el-table-column> <el-table-column prop="normal_work" label="次要故障预警数(交易日)" align="center"></el-table-column>
<el-table-column prop="analy_state" label="主要故障预警数(交易日)" <el-table-column prop="bad_weekend" label="严重故障预警数(非交易日)" align="center"></el-table-column>
align="center"></el-table-column> <el-table-column prop="main_weekend" label="主要故障预警数(非交易日)" align="center"></el-table-column>
<el-table-column prop="analy_state" label="次要故障预警数(交易日)" <el-table-column prop="normal_weekend" label="次要故障预警数(非交易日)" align="center"></el-table-column>
align="center"></el-table-column>
<el-table-column prop="analy_state" label="严重故障预警数(非交易日)"
align="center"></el-table-column>
<el-table-column prop="analy_state" label="主要故障预警数(非交易日)"
align="center"></el-table-column>
<el-table-column prop="analy_state" label="次要故障预警数(非交易日)"
align="center"></el-table-column>
</el-table> </el-table>
</div> </div>
<div class="block" style="height: 50px; margin-top: 15px"> <div class="block" style="height: 50px; margin-top: 15px">
...@@ -89,13 +82,18 @@ ...@@ -89,13 +82,18 @@
} }
}, },
mounted() { mounted() {
this.getUserGroup() this.getUserGroup();
this.searchList()
}, },
methods: { methods: {
searchList(){ searchList(){
axios.get('${SITE_URL}alarm_count_info/',{'currentPage':this.currentPage,
'pageSize':pageSize}).then(res => {
this.AlarmCountData = res['data']
})
}, },
getUserGroup() { getUserGroup() {
axios.get('${SITE_URL}search_user_group/').then(res => { axios.get('${SITE_URL}search_user_group/').then(res => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment