Commit 068990c3 authored by shiwr's avatar shiwr

事件分析前端问题修复

parent fb8cb1cd
......@@ -72,7 +72,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</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="">
</div>
<a class="navbar-brand" href="${SITE_URL}">
......@@ -137,8 +137,9 @@
   console.log(window.location.href) //待调用的函数
if(window.location.href.indexOf('error_alarm')>-1) {
document.getElementById('meu2').className = 'active'
}
if(window.location.href.indexOf('')>-1) {
}else if(window.location.href.indexOf('alarm_count')>-1) {
document.getElementById('meu3').className = 'active'
}else {
document.getElementById('meu1').className = 'active'
}
    });
......
......@@ -51,7 +51,7 @@
<el-table-column prop="normal_weekend" label="次要故障预警数(非交易日)" align="center"></el-table-column>
</el-table>
</div>
<div class="block" style="height: 50px; margin-top: 15px">
<div v-if="total" class="block" style="height: 50px; margin-top: 15px">
<el-pagination
@current-change="handleCurrentChange"
:current-page="currentPage"
......
<%inherit file="/base_index.html"/>
<%block name='content'>
<style>
.el-tooltip__popper {
max-width: 30%
}
</style>
<div class="tab-content mb20">
<div id="errorAlarm">
......@@ -106,13 +108,17 @@
:header-cell-style="{background:'#409EFF',color:'white'}">
<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"
show-overflow-tooltip></el-table-column>
<el-table-column width="130" prop="alarm_level" label="预警级别"
align="center"></el-table-column>
<el-table-column width="130" prop="alarm_system" label="预警系统"
align="center"></el-table-column>
<el-table-column width="130" label="预警系统"
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="处理人"
align="center"></el-table-column>
<el-table-column width="130" label="操作" align="center">
......@@ -130,7 +136,7 @@
</el-table-column>
</el-table>
</div>
<div class="block" style="height: 50px; margin-top: 15px">
<div v-if="total" class="block" style="height: 50px; margin-top: 15px">
<el-pagination
@current-change="handleCurrentChange"
:current-page="currentPage"
......@@ -330,7 +336,7 @@
data() {
return {
dateoutflag: false,
systemListCmdb:[],
systemListCmdb: [],
user: '',
gridData: [],
priorityOp: keyArray.priority,
......@@ -394,7 +400,7 @@
this.systemList = res
})
},
system_cmdb(){
system_cmdb() {
axios.get('${SITE_URL}system_cmdb/').then(res => {
res = res.data;
this.systemListCmdb = res
......@@ -402,10 +408,10 @@
},
handleSelectionChange(selection) {
this.selectData =selection
this.selectData = selection
},
createAlarmByIcube(){
createAlarmByIcube() {
let alarmList = [];
let vm = this;
//for (let i in this.selectData) {
......@@ -418,8 +424,11 @@
message: '请选择告警!'
});
} else {
axios.post('${SITE_URL}create_alarm_by_icube/', {'info':this.selectData,'system':this.formLine.failure_analysis.system_code}).then(res => {
if (res.code==0) {
axios.post('${SITE_URL}create_alarm_by_icube/', {
'info': this.selectData,
'system': this.formLine.failure_analysis.system_code
}).then(res => {
if (res.code == 0) {
this.$message({
type: "success",
message: '新建预警成功'
......@@ -444,7 +453,6 @@
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({
......@@ -474,6 +482,13 @@
createNewTask() {
// window.localStorage.removeItem("event_number")
// 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
},
delAlarm(row) {
......@@ -492,8 +507,7 @@
});
},
//查询
searchList()
{
searchList() {
this.currentPage = 1;
this.count = 0;
this.getAlarmList()
......@@ -501,8 +515,7 @@
,
//获取任务列表
getAlarmList()
{
getAlarmList() {
this.loading = true;
let vm = this;
let newdata = {
......@@ -609,8 +622,7 @@
},
handleCurrentChange(val)
{
handleCurrentChange(val) {
this.currentPage = val
this.getAlarmList()
},
......
This diff is collapsed.
......@@ -5,7 +5,9 @@
color: #44b549;
}
.el-tooltip__popper {
max-width:30%
}
.colorErrStyle {
color: orangered;
}
......@@ -76,11 +78,11 @@
<span style="font-weight:600;font-size:15.6px;">事件查询:</span>
</div>
<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-form-item>
<el-form-item label="优先级" style="display:inline-block; " label-width="130px">
<el-select style="width:100px;" clearable v-model="formLine.priority" >
<el-form-item label="优先级" style="display:inline-block; " label-width="160px">
<el-select style="width:140px;" clearable v-model="formLine.priority" >
<el-option v-for="item in priorityOp"
:key="item.value"
:label="item.label"
......@@ -89,7 +91,7 @@
</el-select>
</el-form-item>
<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"
:key="item.value"
:label="item.label"
......@@ -98,7 +100,7 @@
</el-form-item>
<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-popover placement="top-start"
title="支持全局搜索字段"
......@@ -110,7 +112,7 @@
</el-popover>
</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>
</el-form-item>
......@@ -123,14 +125,14 @@
<el-date-picker
v-model="formLine.event_hap_time"
type="daterange"
style="margin-right: 20px;padding: 0 15px;width: 300px"
style="padding: 0 15px;width: 300px"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</div>
<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-option v-for="item in eventStateOp"
:key="item.value"
......@@ -139,8 +141,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="事件标签" label-width="145px" style="display:inline-block; ">
<el-select style="width:145px;" clearable v-model="formLine.event_label"
<el-form-item label="事件标签" label-width="160px" style="display:inline-block; ">
<el-select style="width:140px;" clearable v-model="formLine.event_label"
multiple filterable>
<el-option v-for="item in labelList"
:key="item.value"
......@@ -198,7 +200,7 @@
</el-table>
</div>
<div class="block" style="height: 35px; padding-top: 15px">
<div v-if="total" class="block" style="height: 35px; padding-top: 15px">
<el-pagination
@current-change="handleCurrentChange"
: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