monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit ca41b10fe60b72f986eb459d70da2c63c1fba430 2 parents 56bc4ed3 08f6de4a

告警消除是否开启闭环功能状态判断

Inline Side-by-side
Showing 13 changed files with 193 additions and 28 deletions
... ... @@ -24,7 +24,8 @@ layui.define(['commonDetail','common'], function (exports) {
//文件系统信息
var filesystemkpi = "KPI7AC1664E,KPI449F5365,KPIA91F44E7,KPI98306224,KPIE25925F7";
//网络接口信息
var interfacekpi = "KPIFABFD741,KPI73C0F7E7,KPIFA92AF2D";
// Start Wang 2022/3/25 20:32 KPIFA92AF2D指标修改为KPI143DBD5B
var interfacekpi = "KPIFABFD741,KPI73C0F7E7,KPI143DBD5B";
//存储信息
var storagekpi = "KPIFB844B8B,KPI5E148DBE,KPIE55684DF,KPIDBFA1EE2";
... ... @@ -56,4 +57,4 @@ layui.define(['commonDetail','common'], function (exports) {
commonDetail.detailTimer.push(timer);
});
});
\ No newline at end of file
});
... ...
... ... @@ -400,6 +400,63 @@ layui.define(['xmSelect', 'md5'], function (exports) {
});
},
/**
* 字典公共方法
* @param targtetId 目标元素
* @param callback 回调
* @param ddocCode 字典code
* @param emptyText 空内容提示内容
*/
renderDdicSelect: function (targtetId, ddocCode,callback,emptyText) {
if(emptyText == undefined || emptyText == ''){
emptyText = "=请选择=";
}
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var options = `<option value=''>${emptyText}</option>`;
admin.req({
url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/${ddocCode}?access_token=` + accessToken,
type: 'POST',
async:false
}).done(function (res) {
var list = res.data;
$.each(list, function (i, v) {
options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';
});
$('#' + targtetId).html($(options));
if (callback) {
callback();
}
}).error(function (error) {
console.error(error);
});
},
/**
* 采集协议
*
* @param targtetId 目标id
* @param ddocCode
* @param callback
* @param emptyText
*/
renderCollProtocolSelect(targtetId){
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
$.ajax({
url:obj.domainName+'/api-web/manage/protocol/page?page=1&limit=10000&access_token=' + accessToken,
success:function (res) {
if(res && res.data){
res.data.forEach(function (v) {
var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`
$('[id="'+targtetId+'"]').append(options);
})
}
}
})
},
menuXmSelect: function (xmSelectParams, done, username_, roleId_) {
var username = username_ ? username_ : '';
var roleId = roleId_ ? roleId_ : '';
... ...
... ... @@ -78,20 +78,21 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
});
});
loadCollProtocolSelect();
function loadCollProtocolSelect(){
$.ajax({
url:common.domainName+'/api-web/manage/protocol/page?page=1&limit=10000&access_token=' + accessToken,
success:function (res) {
if(res && res.data){
res.data.forEach(function (v) {
var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`
$('[lay-filter="collProtocol"]').append(options);
})
}
}
})
}
// loadCollProtocolSelect();
// function loadCollProtocolSelect(){
// $.ajax({
// url:common.domainName+'/api-web/manage/protocol/page?page=1&limit=10000&access_token=' + accessToken,
// success:function (res) {
// if(res && res.data){
// res.data.forEach(function (v) {
// var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`
// $('[lay-filter="collProtocol"]').append(options);
// })
// }
// }
// })
// }
common.renderCollProtocolSelect('collProtocol');
//左侧树
function loadResTree(data) {
... ...
... ... @@ -64,6 +64,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
form.render("select");
});
common.renderDdicSelect('reslist_os','os',function () {
form.render("select");
},"=操作系统=")
common.renderCollProtocolSelect('collProtocol',function () {
form.render("select");
});
form.render();
//回车搜索
... ... @@ -72,6 +80,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
reloadTable(resType);
}
});
//选择框搜索事件
bindSelectEvent();
//渲染表格
... ... @@ -96,6 +106,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
resCategory: 'resources',
state: $("#resManageIndexForm").find("select[name='state']").val(),
collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(),
os:$("#resManageIndexForm").find("select[id='reslist_os']").val(),
collProtocolList:$("#resManageIndexForm").find("select[id='collProtocol']").val(),
pageName:'reslist'
}
, height: 'full-350'
... ... @@ -169,6 +181,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
$("#resManageIndexForm").find("select[name='collectionState']").val(data.value);
reloadTable(resType);
});
form.on('select(reslist_os)', function(data){
// 内容变更后设置对应的值
$("#resManageIndexForm").find("select[id='reslist_os']").val(data.value);
reloadTable(resType);
});
form.on('select(collProtocol)', function(data){
// 内容变更后设置对应的值
$("#resManageIndexForm").find("select[id='collProtocol']").val(data.value);
reloadTable(resType);
});
}
//刷新表格
function reloadTable(resType) {
... ... @@ -189,8 +213,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
protocol:protocol,
state: $("#resManageIndexForm").find("select[name='state']").val(),
collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(),
os:$("#resManageIndexForm").find("select[id='reslist_os']").val(),
collProtocolList:$("#resManageIndexForm").find("select[id='collProtocol']").val(),
editMode: 'true'
},
page: {
curr: 1 //重新从第 1 页开始
},
done: function (res) {
//更新table_data数据 joke add 20211206
table_data = res.data;
... ...
... ... @@ -69,7 +69,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="collProtocol" lay-filter="collProtocol">
<select id="collProtocol" name="collProtocol" lay-filter="collProtocol">
<option value="">=采集协议=</option>
</select>
</div>
... ...
... ... @@ -61,6 +61,20 @@
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select id="reslist_os" lay-filter="reslist_os" lay-search>
<option value="">=选择系统=</option>
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select id="collProtocol" name="collProtocol" lay-filter="collProtocol">
<option value="">=采集协议=</option>
</select>
</div>
</div>
</div>
</form>
</div>
... ...
... ... @@ -22,7 +22,7 @@ export default {
type:Boolean,
default:true
},
repositoryInfo:{//引用知识库的文本
repositoryInfo:{//内容回显，引用知识库的文本
type:String,
default:''
}
... ...
... ... @@ -46,7 +46,7 @@ export default {
width:'250',
},
{
prop: 'resType',
prop: 'resTypeName',
label: '资源类型',
sortable: true,
align: 'center',
... ...
... ... @@ -62,7 +62,7 @@
</div>
</div>
<!--通知统计信息组件-->
<cm-notice-statistics :alarmId="alarmInfo.id" :alarmInfo="alarmInfo" :isExamine="isExamine"></cm-notice-statistics>
<cm-notice-statistics :alarmId="alarmId" :alarmInfo="alarmInfo" :isExamine="isExamine"></cm-notice-statistics>
</div>
<div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active' || status==0 || status==3">
<div class="alarmNotice-title">消除原因</div>
... ...
... ... @@ -28,6 +28,8 @@ export default {
let isClear=Vue.ref(false);
let detail=Vue.ref('');
let detailText=Vue.ref('');
//统计信息及同类型告警的alarmId
let alarmId=props.amId?Vue.ref(props.amId):'';
//审批人
let approver=Vue.ref('');
let approverName=Vue.ref('admin');
... ... @@ -86,7 +88,7 @@ export default {
alarmType:alarmInfo.value.alarmTypeCustom,//告警类型，active活动告警，his历史告警
managetime:dateTime.value,
managename:loginName.value,
alarmHisId:alarmInfo.value.alarmTypeCustom=='active'?'':alarmInfo.value.primaryKey,
alarmHisId:alarmInfo.value.alarmTypeCustom=='active' || props.status==0?'':alarmInfo.value.primaryKey,
}
if(repositoryId.value){
params.repositoryId=repositoryId.value;//引用知识库id
... ... @@ -401,6 +403,9 @@ export default {
let data=res.object;
if(data){
alarmInfo.value=data;
if(alarmInfo.value.id){
alarmId.value=alarmInfo.value.id;
}
if( alarmInfo.value.approver){
approverName.value=alarmInfo.value.approver;
userList.value.map(item=>{
... ... @@ -445,7 +450,7 @@ export default {
title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend,
showUserDialog,showUserDialogVisible,userFileRight,userList,selectUser,getUserList,titles,
getAlarmInfo,alarmInfo,cascaderValue,propsTrigger,handleChange,cascaderOptions,noticeFlag,
getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion,getAlarmStatis,handleInfoObj
getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion,getAlarmStatis,handleInfoObj,alarmId
}
}
... ...
... ... @@ -257,11 +257,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
code: 'knFlag'
},
done: function (data) {
console.log("knFlag",data)
let knFlag=data.object.value;
console.log("knFlag",knFlag)
if(knFlag=='1'){
if(knFlag == '1'){
//开启闭环
/////////////////////////
// Start 将对象转成key=value&key1=value1 LSQ 2022/03/22
... ... @@ -1104,7 +1102,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
url: common.domainName + "/api-web/home/alarm/countByAlarmLevel"
, type: "get"
, done: function (data) {
let alarms = data.data;
var alarms = data.data;
if (data.code == 0) {
$.each(alarms, function (i, v) {
if (v.alarmLevel == 5) {//及时率
... ...
... ... @@ -400,6 +400,66 @@ layui.define(['xmSelect', 'md5'], function (exports) {
});
},
/**
* 字典公共方法
* @param targtetId 目标元素
* @param callback 回调
* @param ddocCode 字典code
* @param emptyText 空内容提示内容
*/
renderDdicSelect: function (targtetId, ddocCode,callback,emptyText) {
if(emptyText == undefined || emptyText == ''){
emptyText = "=请选择=";
}
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var options = `<option value=''>${emptyText}</option>`;
admin.req({
url: `${obj.domainName}/api-web/manage/ddic/findSucDdics/${ddocCode}?access_token=` + accessToken,
type: 'POST',
async:false
}).done(function (res) {
var list = res.data;
$.each(list, function (i, v) {
options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';
});
$('#' + targtetId).html($(options));
if (callback) {
callback();
}
}).error(function (error) {
console.error(error);
});
},
/**
* 采集协议
*
* @param targtetId 目标id
* @param ddocCode
* @param callback
* @param emptyText
*/
renderCollProtocolSelect(targtetId,callback){
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
$.ajax({
url:obj.domainName+'/api-web/manage/protocol/page?page=1&limit=10000&access_token=' + accessToken,
success:function (res) {
if(res && res.data){
res.data.forEach(function (v) {
var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`
$('[id="'+targtetId+'"]').append(options);
})
if (callback) {
callback();
}
}
}
})
},
menuXmSelect: function (xmSelectParams, done, username_, roleId_) {
var username = username_ ? username_ : '';
var roleId = roleId_ ? roleId_ : '';
... ...
... ... @@ -282,7 +282,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
, {field: 'durationStr', title: '持续时间', align: 'center', width: 190}
, {
title: '操作', align: 'center', minWidth: 100,
templet: '<div><span history-data-warn-clear="{{d.id}}" class="layui-table-link">消除</span> <span history-data-warn-view="{{d.id}}" class="layui-table-link">查看</span> <span history-data-warn-path="{{d.id}}" class="layui-table-link">轨迹</span></div>'
templet: '<div><!--<span history-data-warn-clear="{{d.id}}" class="layui-table-link">消除</span>--> <span history-data-warn-view="{{d.id}}" class="layui-table-link">查看</span> <span history-data-warn-path="{{d.id}}" class="layui-table-link">轨迹</span></div>'
}
];
}
... ...