Skip to content

E
event-analysis
Commit 068990c3 authored by shiwr's avatar shiwr
Browse files
Options

事件分析前端问题修复

parent fb8cb1cd
Hide whitespace changes
Inline Side-by-side
Showing with 848 additions and 786 deletions
templates/base_index.html
View file @ 068990c3
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<div style="display: inline-block;float: left;padding-top:12px;margin-right:-5px;"> <div style="float: left;padding-top:12px;">
<img src="../static/img/logoGT.png" alt=""> <img src="../static/img/logoGT.png" alt="">
</div> </div>
<a class="navbar-brand" href="${SITE_URL}"> <a class="navbar-brand" href="${SITE_URL}">
...@@ -137,8 +137,9 @@ ...@@ -137,8 +137,9 @@
　　 console.log(window.location.href) //待调用的函数 　　 console.log(window.location.href) //待调用的函数
if(window.location.href.indexOf('error_alarm')>-1) { if(window.location.href.indexOf('error_alarm')>-1) {
document.getElementById('meu2').className = 'active' document.getElementById('meu2').className = 'active'
} }else if(window.location.href.indexOf('alarm_count')>-1) {
if(window.location.href.indexOf('')>-1) { document.getElementById('meu3').className = 'active'
}else {
document.getElementById('meu1').className = 'active' document.getElementById('meu1').className = 'active'
} }
　　　　}); 　　　　});
......
templates/event_analysis/alarm_count.html
View file @ 068990c3
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<el-table-column prop="normal_weekend" label="次要故障预警数（非交易日）" align="center"></el-table-column> <el-table-column prop="normal_weekend" label="次要故障预警数（非交易日）" align="center"></el-table-column>
</el-table> </el-table>
</div> </div>
<div class="block" style="height: 50px; margin-top: 15px"> <div v-if="total" class="block" style="height: 50px; margin-top: 15px">
<el-pagination <el-pagination
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
......
templates/event_analysis/error_alarm.html
View file @ 068990c3
<%inherit file="/base_index.html"/> <%inherit file="/base_index.html"/>
<%block name='content'> <%block name='content'>
<style> <style>
.el-tooltip__popper {
max-width: 30%
}
</style> </style>
<div class="tab-content mb20"> <div class="tab-content mb20">
<div id="errorAlarm"> <div id="errorAlarm">
...@@ -106,13 +108,17 @@ ...@@ -106,13 +108,17 @@
:header-cell-style="{background:'#409EFF',color:'white'}"> :header-cell-style="{background:'#409EFF',color:'white'}">
<el-table-column width="300" prop="alarm_number" label="预警编号" header-align="center" <el-table-column width="300" prop="alarm_number" label="预警编号" header-align="center"
align="left"></el-table-column> align="center"></el-table-column>
<el-table-column prop="alarm_summary" label="故障预警摘要" header-align="center" align="left" <el-table-column prop="alarm_summary" label="故障预警摘要" header-align="center" align="left"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column width="130" prop="alarm_level" label="预警级别" <el-table-column width="130" prop="alarm_level" label="预警级别"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column width="130" prop="alarm_system" label="预警系统" <el-table-column width="130" label="预警系统"
align="center"></el-table-column> align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.alarm_system.join(',') }}</span>
</template>
</el-table-column>
<el-table-column width="130" prop="user" label="处理人" <el-table-column width="130" prop="user" label="处理人"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column width="130" label="操作" align="center"> <el-table-column width="130" label="操作" align="center">
...@@ -130,7 +136,7 @@ ...@@ -130,7 +136,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="block" style="height: 50px; margin-top: 15px"> <div v-if="total" class="block" style="height: 50px; margin-top: 15px">
<el-pagination <el-pagination
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
...@@ -330,7 +336,7 @@ ...@@ -330,7 +336,7 @@
data() { data() {
return { return {
dateoutflag: false, dateoutflag: false,
systemListCmdb:[], systemListCmdb: [],
user: '', user: '',
gridData: [], gridData: [],
priorityOp: keyArray.priority, priorityOp: keyArray.priority,
...@@ -394,32 +400,35 @@ ...@@ -394,32 +400,35 @@
this.systemList = res this.systemList = res
}) })
}, },
system_cmdb(){ system_cmdb() {
axios.get('${SITE_URL}system_cmdb/').then(res => { axios.get('${SITE_URL}system_cmdb/').then(res => {
res = res.data; res = res.data;
this.systemListCmdb = res this.systemListCmdb = res
}) })
}, },
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.selectData =selection this.selectData = selection
}, },
createAlarmByIcube(){ createAlarmByIcube() {
let alarmList = []; let alarmList = [];
let vm = this; let vm = this;
//for (let i in this.selectData) { //for (let i in this.selectData) {
// alarmList = alarmList.concat(this.selectData[i]) // alarmList = alarmList.concat(this.selectData[i])
//} //}
console.log(this.selectData); console.log(this.selectData);
if (this.selectData.length == 0) { if (this.selectData.length == 0) {
vm.$message({ vm.$message({
type: 'error', type: 'error',
message: '请选择告警！' message: '请选择告警！'
}); });
} else { } else {
axios.post('${SITE_URL}create_alarm_by_icube/', {'info':this.selectData,'system':this.formLine.failure_analysis.system_code}).then(res => { axios.post('${SITE_URL}create_alarm_by_icube/', {
if (res.code==0) { 'info': this.selectData,
'system': this.formLine.failure_analysis.system_code
}).then(res => {
if (res.code == 0) {
this.$message({ this.$message({
type: "success", type: "success",
message: '新建预警成功' message: '新建预警成功'
...@@ -435,7 +444,7 @@ ...@@ -435,7 +444,7 @@
} }
}); });
} }
}, },
searchAlarm() { searchAlarm() {
if (this.formLine.failure_analysis.alarm_type && this.formLine.failure_analysis.start_time if (this.formLine.failure_analysis.alarm_type && this.formLine.failure_analysis.start_time
...@@ -444,7 +453,6 @@ ...@@ -444,7 +453,6 @@
let data = this.formLine; let data = this.formLine;
vm.popshow = true; vm.popshow = true;
axios.post('${SITE_URL}search/', data).then(res => { axios.post('${SITE_URL}search/', data).then(res => {
vm.gridData = [];
vm.gridData = res.data; vm.gridData = res.data;
if (res.result) { if (res.result) {
this.$message({ this.$message({
...@@ -474,6 +482,13 @@ ...@@ -474,6 +482,13 @@
createNewTask() { createNewTask() {
// window.localStorage.removeItem("event_number") // window.localStorage.removeItem("event_number")
// window.location.href = "${SITE_URL}event_edit" // window.location.href = "${SITE_URL}event_edit"
this.formLine.failure_analysis.system_code = ''
this.formLine.failure_analysis.alarm_type = ''
this.formLine.failure_analysis.host_computer = ''
this.formLine.failure_analysis.start_time = ''
this.formLine.failure_analysis.end_time = ''
this.formLine.failure_analysis.key_word = ''
this.gridData = []
this.batchNewVisible = true this.batchNewVisible = true
}, },
delAlarm(row) { delAlarm(row) {
...@@ -490,133 +505,130 @@ ...@@ -490,133 +505,130 @@
message: '已取消删除' message: '已取消删除'
}); });
}); });
}, },
//查询 //查询
searchList() searchList() {
{ this.currentPage = 1;
this.currentPage = 1; this.count = 0;
this.count = 0; this.getAlarmList()
this.getAlarmList() }
} ,
,
//获取任务列表
//获取任务列表 getAlarmList() {
getAlarmList() this.loading = true;
{ let vm = this;
this.loading = true; let newdata = {
let vm = this; currentPage: vm.currentPage,
let newdata = { pageSize: vm.pageSize,
currentPage: vm.currentPage, data: vm.formLine
pageSize: vm.pageSize, };
data: vm.formLine console.log(newdata);
}; axios.post('${SITE_URL}search_alarm/', newdata).then(res => {
console.log(newdata); vm.total = res.results.count;
axios.post('${SITE_URL}search_alarm/', newdata).then(res => { vm.taskData = res.results.results;
vm.total = res.results.count; vm.loading = false;
vm.taskData = res.results.results; }, err => {
vm.loading = false; vm.loading = false;
}, err => { vm.$message(
vm.loading = false; {
vm.$message( type: 'error',
{ message: "数据显示失败!"
type: 'error', }
message: "数据显示失败!" )
},
this.storage = this.formLine.priority)
}
,
setmainuser() {
axios.get('${SITE_URL}getuser/').then(res => {
res = res.data;
this.user = res
})
},
//编辑模板
readRow(row) {
let data = {alarm_number: row.alarm_number};
window.localStorage.setItem("alarm_number", row.alarm_number);
axios.post("${SITE_URL}edit_alarm_display/", data).then(res => {
window.localStorage.setItem("alarm_info", JSON.stringify(res.results));
window.location.href = "${SITE_URL}alarm_edit"
})
},
handleCurPageChange() {
let arr = [];
if (!!this.selectData[this.currentPage]) {
this.selectData[this.currentPage].map(item => {
arr = arr.concat(this.taskData.filter(item2 => {
return item2.event_number == item
}))
})
}
this.toggleSelection(arr)
},
toggleSelection(rows) {
this.$nextTick(() => {
if (rows) {
rows.forEach(row => {
this.$refs.table.toggleRowSelection(row)
})
} else {
this.$refs.table.clearSelection();
} }
) })
}, },
this.storage = this.formLine.priority)
} sureDelete(id) {
, let vm = this;
let data = {alarm_number: id};
setmainuser() { axios.post('${SITE_URL}del_alarm/', data).then(res => {
axios.get('${SITE_URL}getuser/').then(res => { if (res.code == 0) {
res = res.data; this.$message({
this.user = res type: 'success',
}) message: res.message
}, });
this.getAlarmList()
//编辑模板 } else {
readRow(row) { this.$message({
let data = {alarm_number: row.alarm_number}; type: 'error',
window.localStorage.setItem("alarm_number", row.alarm_number); message: res.message
axios.post("${SITE_URL}edit_alarm_display/", data).then(res => { });
window.localStorage.setItem("alarm_info", JSON.stringify(res.results)); this.dellabelshow = false
window.location.href = "${SITE_URL}alarm_edit" }
}) }, err => {
}, vm.$message({
type: 'error',
handleCurPageChange() { message: '删除失败!'
let arr = []; });
if (!!this.selectData[this.currentPage]) {
this.selectData[this.currentPage].map(item => {
arr = arr.concat(this.taskData.filter(item2 => {
return item2.event_number == item
}))
})
}
this.toggleSelection(arr)
},
toggleSelection(rows) {
this.$nextTick(() => {
if (rows) {
rows.forEach(row => {
this.$refs.table.toggleRowSelection(row)
}) })
} else {
this.$refs.table.clearSelection(); },
}
}) //清除事件搜索条件
}, emptySearch() {
this.formLine.alarm_number = '';
sureDelete(id) { this.formLine.priority = '';
let vm = this; this.formLine.alarm_system = '';
let data = {alarm_number: id}; this.formLine.dateoutinfo = '';
axios.post('${SITE_URL}del_alarm/', data).then(res => { this.formLine.event_state = '';
if (res.code == 0) { this.formLine.hardware = '';
this.$message({ this.formLine.event_number = '';
type: 'success', this.formLine.all_fields = '';
message: res.message this.formLine.event_label = '';
}); },
handleCurrentChange(val) {
this.currentPage = val
this.getAlarmList() this.getAlarmList()
} else { },
this.$message({
type: 'error',
message: res.message },
});
this.dellabelshow = false
}
}, err => {
vm.$message({
type: 'error',
message: '删除失败!'
});
})
},
//清除事件搜索条件
emptySearch() {
this.formLine.alarm_number = '';
this.formLine.priority = '';
this.formLine.alarm_system = '';
this.formLine.dateoutinfo = '';
this.formLine.event_state = '';
this.formLine.hardware = '';
this.formLine.event_number = '';
this.formLine.all_fields = '';
this.formLine.event_label = '';
},
handleCurrentChange(val)
{
this.currentPage = val
this.getAlarmList()
},
},
}) })
......
templates/event_analysis/event_edit.html
View file @ 068990c3
This source diff could not be displayed because it is too large. You can view the blob instead.
templates/event_analysis/eventmanagement_display.html
View file @ 068990c3
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
color: #44b549; color: #44b549;
} }
.el-tooltip__popper {
max-width:30%
}
.colorErrStyle { .colorErrStyle {
color: orangered; color: orangered;
} }
...@@ -76,11 +78,11 @@ ...@@ -76,11 +78,11 @@
<span style="font-weight:600;font-size:15.6px;">事件查询:</span> <span style="font-weight:600;font-size:15.6px;">事件查询:</span>
</div> </div>
<div style="padding-bottom: 15px;padding-top: 10px"> <div style="padding-bottom: 15px;padding-top: 10px">
<el-form-item label="处理人" style="display:inline-block;" label-width="70px"> <el-form-item label="处理人" style="display:inline-block;" label-width="160px">
<el-input style="width:140px;" v-model="formLine.relate_me"></el-input> <el-input style="width:140px;" v-model="formLine.relate_me"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="优先级" style="display:inline-block; " label-width="130px"> <el-form-item label="优先级" style="display:inline-block; " label-width="160px">
<el-select style="width:100px;" clearable v-model="formLine.priority" > <el-select style="width:140px;" clearable v-model="formLine.priority" >
<el-option v-for="item in priorityOp" <el-option v-for="item in priorityOp"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
...@@ -89,7 +91,7 @@ ...@@ -89,7 +91,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="事件一级分类" label-width="160px" style="display:inline-block; "> <el-form-item label="事件一级分类" label-width="160px" style="display:inline-block; ">
<el-select style="width:145px;" clearable v-model="formLine.event_first_cat" > <el-select style="width:140px;" clearable v-model="formLine.event_first_cat" >
<el-option v-for="item in eventFirstCatOp" <el-option v-for="item in eventFirstCatOp"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
...@@ -98,7 +100,7 @@ ...@@ -98,7 +100,7 @@
</el-form-item> </el-form-item>
<el-form-item label="全局事件搜索" style="display:inline-block; " label-width="160px"> <el-form-item label="全局事件搜索" style="display:inline-block; " label-width="160px">
<el-input style="width:160px;" v-model="formLine.all_fields"></el-input> <el-input style="width:140px;" v-model="formLine.all_fields"></el-input>
</el-form-item> </el-form-item>
<el-popover placement="top-start" <el-popover placement="top-start"
title="支持全局搜索字段" title="支持全局搜索字段"
...@@ -110,7 +112,7 @@ ...@@ -110,7 +112,7 @@
</el-popover> </el-popover>
</div> </div>
<div> <div>
<el-form-item label="事件编号" style="display:inline-block;" label-width="70px"> <el-form-item label="事件编号" style="display:inline-block;" label-width="160px">
<el-input style="width:140px;" v-model="formLine.event_number"> <el-input style="width:140px;" v-model="formLine.event_number">
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -123,14 +125,14 @@ ...@@ -123,14 +125,14 @@
<el-date-picker <el-date-picker
v-model="formLine.event_hap_time" v-model="formLine.event_hap_time"
type="daterange" type="daterange"
style="margin-right: 20px;padding: 0 15px;width: 300px" style="padding: 0 15px;width: 300px"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</div> </div>
<div style="padding-top: 15px"> <div style="padding-top: 15px">
<el-form-item label="事件状态" label-width="70px" style="display:inline-block;"> <el-form-item label="事件状态" label-width="160px" style="display:inline-block;">
<el-select style="width:140px;" clearable v-model="formLine.event_state"> <el-select style="width:140px;" clearable v-model="formLine.event_state">
<el-option v-for="item in eventStateOp" <el-option v-for="item in eventStateOp"
:key="item.value" :key="item.value"
...@@ -139,8 +141,8 @@ ...@@ -139,8 +141,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="事件标签" label-width="145px" style="display:inline-block; "> <el-form-item label="事件标签" label-width="160px" style="display:inline-block; ">
<el-select style="width:145px;" clearable v-model="formLine.event_label" <el-select style="width:140px;" clearable v-model="formLine.event_label"
multiple filterable> multiple filterable>
<el-option v-for="item in labelList" <el-option v-for="item in labelList"
:key="item.value" :key="item.value"
...@@ -198,7 +200,7 @@ ...@@ -198,7 +200,7 @@
</el-table> </el-table>
</div> </div>
<div class="block" style="height: 35px; padding-top: 15px"> <div v-if="total" class="block" style="height: 35px; padding-top: 15px">
<el-pagination <el-pagination
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
......
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