Skip to content

E
event-analysis
Commit 5809d778 authored by Kerwin_Cui's avatar Kerwin_Cui
Browse files
Options

123

parent e17a963c
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 258 deletions
event_analysis/views.py
View file @ 5809d778
......@@ -2247,7 +2247,26 @@ def edit_alarm(request):
def del_alarm(request):
try:
id = json.loads(request.body)
a=1
alarm_number = id['alarm_number']
alarm = Error_alarm.objects.filter(alarm_number=alarm_number)
if alarm:
alarm = alarm[0]
alarm.delete()
return render_json(
{"result": True,
"code": 0,
"message": u"预警删除成功！",
"data": ''
})
else:
return render_json(
{
"result": False,
"code": 1,
"message": u"删除失败！",
"data": {}
}
)
except Exception as e:
return render_json(
{
......@@ -2259,6 +2278,18 @@ def del_alarm(request):
)
def create_alarm_by_icube(request):
try:
pass
except Exception as e:
return render_json(
{
"result": False,
"code": 1,
"message": u"未知错误:%s" % e,
"data": {}
}
)
def search_alarm(request):
try:
......
templates/event_analysis/error_alarm.html
View file @ 5809d778
......@@ -245,7 +245,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="batchNewVisible = false">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -303,10 +303,10 @@
{label: '次要', value: '3',},
],
alarmType: [
{label: '日志告警', value: '2'},
{label: '指标告警', value: '1'},
{label: '日志和指标告警', value: '0'},
],
{label: '日志告警', value: '2'},
{label: '指标告警', value: '1'},
{label: '日志和指标告警', value: '0'},
],
};
var formatToId = function (item, itemArray) {
for (let i of itemArray) {
......@@ -392,37 +392,37 @@
this.systemList = res
})
},
<<<<<<< HEAD
searchAlarm(){
searchAlarm() {
if (this.formLine.failure_analysis.alarm_type && this.formLine.failure_analysis.start_time
&& this.formLine.failure_analysis.end_time) {
let vm = this;
let data = this.formLine;
vm.popshow = true;
axios.post('${SITE_URL}search/', data).then(res => {
vm.gridData = [];
vm.gridData = res.data;
if (res.result) {
this.$message({
type: "success",
message: '查询成功'
});
} else {
this.$message({
type: "error",
message: '查询失败' + res.message
});
this.formLine = data
}
})
} else {
vm.$message({
type: 'error',
message: '查询失败，请完善必填项'
});
}
&& this.formLine.failure_analysis.end_time) {
let vm = this;
let data = this.formLine;
vm.popshow = true;
axios.post('${SITE_URL}search/', data).then(res => {
vm.gridData = [];
vm.gridData = res.data;
if (res.result) {
this.$message({
type: "success",
message: '查询成功'
});
} else {
this.$message({
type: "error",
message: '查询失败' + res.message
});
this.formLine = data
}
})
} else {
vm.$message({
type: 'error',
message: '查询失败，请完善必填项'
});
}
},
createNewAlarm(){
createNewAlarm() {
window.location.href = "${SITE_URL}alarm_edit"
},
createNewTask() {
......@@ -430,28 +430,10 @@
// window.location.href = "${SITE_URL}event_edit"
this.batchNewVisible = true
},
delAlarm(){
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let id = row.alarm_number;
this.sureDelete(id)
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
=======
createNewAlarm() {
window.location.href = "${SITE_URL}alarm_edit"
},
delAlarm(row) {
let vm = this
vm.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
cancelButtonText: '取消',
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let id = row.alarm_number;
......@@ -460,222 +442,253 @@
this.$message({
type: 'info',
message: '已取消删除'
>>>>>>> b9670ad79ebce4d627128543ad1aa9ae0d773d17
});
});
},
//查询
searchList() {
this.currentPage = 1;
this.count = 0;
this.getAlarmList()
},
//获取任务列表
getAlarmList(fn) {
this.loading = true;
let vm = this;
let newdata = {
currentPage: vm.currentPage,
pageSize: vm.pageSize,
data: vm.formLine
};
axios.post('${SITE_URL}search_alarm/', newdata).then(res => {
vm.total = res.results.count;
vm.taskData = res.results.results;
vm.loading = false;
if (!!fn) {
fn()
}
}, err => {
vm.loading = false;
vm.$message(
{
type: 'error',
message: "数据显示失败!"
}
)
},
storage = this.formLine.priority)
},
setmainuser() {
axios.get('${SITE_URL}getuser/').then(res => {
res = res.data;
this.user = res
})
},
//编辑模板
readRow(row) {
let data = {event_number: row.event_number};
axios.post("${SITE_URL}event_edit_display/", data).then(res => {
window.localStorage.setItem("event_number", JSON.stringify(res.results));
window.location.href = "${SITE_URL}event_edit"
})
},
handleSelectionChange(selection) {
this.selectData[this.currentPage] = [];
selection.map((item, index) => {
this.selectData[this.currentPage].push(item.event_number)
})
},
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
}))
})
},
//查询
searchList()
{
this.currentPage = 1;
this.count = 0;
this.getAlarmList()
}
,
//获取任务列表
getAlarmList(fn)
{
this.loading = true;
let vm = this;
let newdata = {
currentPage: vm.currentPage,
pageSize: vm.pageSize,
data: vm.formLine
};
axios.post('${SITE_URL}search_alarm/', newdata).then(res => {
vm.total = res.results.count;
vm.taskData = res.results.results;
vm.loading = false;
if (!!fn) {
fn()
}
this.toggleSelection(arr)
},
toggleSelection(rows) {
this.$nextTick(() => {
if (rows) {
rows.forEach(row => {
this.$refs.table.toggleRowSelection(row)
})
} else {
this.$refs.table.clearSelection();
}, err => {
vm.loading = false;
vm.$message(
{
type: 'error',
message: "数据显示失败!"
}
})
)
},
sureDelete(id) {
let vm = this;
let data = {alarm_number: id};
axios.post('${SITE_URL}del_alarm/', data).then(res => {
if (res.code == 0) {
this.$message({
type: 'success',
message: res.message
});
this.getAlarmList()
} else {
this.$message({
type: 'error',
message: res.message
});
this.dellabelshow = false
}
}, err => {
vm.$message({
type: 'error',
message: '删除失败!'
});
storage = this.formLine.priority)
}
,
setmainuser()
{
axios.get('${SITE_URL}getuser/').then(res => {
res = res.data;
this.user = res
})
}
,
//编辑模板
readRow(row)
{
let data = {event_number: row.event_number};
axios.post("${SITE_URL}event_edit_display/", data).then(res => {
window.localStorage.setItem("event_number", JSON.stringify(res.results));
window.location.href = "${SITE_URL}event_edit"
})
}
,
handleSelectionChange(selection)
{
this.selectData[this.currentPage] = [];
selection.map((item, index) => {
this.selectData[this.currentPage].push(item.event_number)
})
}
,
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();
}
})
}
,
sureDelete(id)
{
let vm = this;
let data = {alarm_number: id};
axios.post('${SITE_URL}del_alarm/', data).then(res => {
if (res.code == 0) {
this.$message({
type: 'success',
message: res.message
});
this.getAlarmList()
} else {
this.$message({
type: 'error',
message: res.message
});
this.dellabelshow = false
}
}, err => {
vm.$message({
type: 'error',
message: '删除失败!'
});
})
}
,
//清除事件搜索条件
emptySearch()
{
this.formLine.relate_me = '';
this.formLine.priority = '';
this.formLine.event_first_cat = '';
this.formLine.event_hap_time = '';
this.formLine.event_state = '';
this.formLine.hardware = '';
this.formLine.event_number = '';
this.formLine.all_fields = '';
this.formLine.event_label = '';
}
,
//选择事件导出文件
async checkedColums()
{
let eventList = [];
let vm = this;
for (let i in this.selectData) {
eventList = eventList.concat(this.selectData[i])
}
if (eventList.length == 0) {
vm.$message({
type: 'error',
message: '请选择需要导出的事件'
});
} else {
await
this.check(eventList);
vm.$message({
type: 'success',
message: '下载成功'
});
this.download()
},
//清除事件搜索条件
emptySearch() {
this.formLine.relate_me = '';
this.formLine.priority = '';
this.formLine.event_first_cat = '';
this.formLine.event_hap_time = '';
this.formLine.event_state = '';
this.formLine.hardware = '';
this.formLine.event_number = '';
this.formLine.all_fields = '';
this.formLine.event_label = '';
},
//选择事件导出文件
async checkedColums() {
let eventList = [];
let vm = this;
for (let i in this.selectData) {
eventList = eventList.concat(this.selectData[i])
}
if (eventList.length == 0) {
vm.$message({
type: 'error',
message: '请选择需要导出的事件'
});
} else {
await this.check(eventList);
vm.$message({
type: 'success',
message: '下载成功'
});
this.download()
}
}
,
check(eventList)
{
return new Promise((resolve, reject) => {
axios.post("${SITE_URL}event_out/", {eventList: eventList}).then(res => {
if (res.data == 1) {
resolve('ok')
}
},
check(eventList) {
return new Promise((resolve, reject) => {
axios.post("${SITE_URL}event_out/", {eventList: eventList}).then(res => {
if (res.data == 1) {
resolve('ok')
}
});
})
},
});
})
}
,
// 选择日期导出文件
async dateout()
{
if (this.dateoutinfo == null || this.dateoutinfo.length == 0) {
vm.$message({
type: 'error',
message: '请选择时间'
});
} else {
console.log('进入按时间导出1')
await
this.checkk();
console.log(this.dateoutflag)
if (this.dateoutflag == true) {
vm.$message({
type: 'success',
message: '下载成功'
});
this.download()
} else {
vm.$message({
type: 'error',
message: '该时间段内没有事件发生'
});
}
// 选择日期导出文件
async dateout() {
if (this.dateoutinfo == null || this.dateoutinfo.length == 0) {
vm.$message({
type: 'error',
message: '请选择时间'
});
}
}
,
checkk()
{
return new Promise((resolve, reject) => {
axios.post("${SITE_URL}event_out/", this.dateoutinfo).then(res => {
if (res.data == 1) {
resolve('ok')
console.log('时间段内有事件2');
this.dateoutflag = true
} else {
console.log('进入按时间导出1')
await this.checkk();
console.log(this.dateoutflag)
if (this.dateoutflag == true) {
vm.$message({
type: 'success',
message: '下载成功'
});
this.download()
} else {
vm.$message({
type: 'error',
message: '该时间段内没有事件发生'
});
}
}
},
checkk() {
return new Promise((resolve, reject) => {
axios.post("${SITE_URL}event_out/", this.dateoutinfo).then(res => {
if (res.data == 1) {
resolve('ok')
console.log('时间段内有事件2');
this.dateoutflag = true
} else {
resolve('ok')
console.log('时间段内无事件2');
this.dateoutflag = false
}
})
})
},
download() {
window.location.href = "${SITE_URL}download";
},
handleCurrentChange(val) {
console.log("当前页" + val);
if (this.currentPage != val) {
this.currentPage = val;
this.getTaskList(() => {
this.handleCurPageChange()
})
resolve('ok')
console.log('时间段内无事件2');
this.dateoutflag = false
}
},
})
})
}
,
download()
{
window.location.href = "${SITE_URL}download";
}
,
handleCurrentChange(val)
{
console.log("当前页" + val);
if (this.currentPage != val) {
this.currentPage = val;
this.getTaskList(() => {
this.handleCurPageChange()
})
}
}
,
},
},
})
......
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