monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit c4988cb7d5ae612efb1c14d9a7668c0ad5e0be14 2 parents 264f5912 a912a25e

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 7 changed files with 91 additions and 22 deletions
... ... @@ -98,6 +98,9 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
//两种虚拟机合并成一种
//var newResType = resType === 'VIRTUALIZATION_VHOST' ? 'VIRTUALIZATION_VHOST,VIRTUALIZATION_VMWARE_VHOST' : resType;
var newResType = resType;
if (newResType.indexOf("VHOST")!= -1){
newResType="VHOST"
}
$(".biz_reslist_search").show();
$(".biz_reslist_treetable_search").hide();
$("#bizResListTableContent").show();
... ...
... ... @@ -78,6 +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);
})
}
}
})
}
//左侧树
function loadResTree(data) {
tree.render({
... ... @@ -701,6 +716,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
form.on('select(resManageStateSelect)',function (data) {
reloadTable();
})
form.on('select(collProtocol)',function (data) {
reloadTable();
})
form.on('select(slt_res_manage_superior)',function (data) {
reloadTable();
})
... ... @@ -761,8 +779,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
}
}
, {field: 'shortName', title: '别名', align: 'center', sort: true, hide: 'true'}
, {field: 'ip', title: 'IP地址', align: 'center',width: 140, sort: true}]
, {field: 'ip', title: 'IP地址', align: 'center',width: 140, sort: true}
, {field: 'collProtocol', title: '采集协议', align: 'center', sort: true}]
if (resType === 'HOST_X86SERVER') {
cols[4].title = '业务IP';
cols.push({field: 'manageIp', title: '管理IP', align: 'center',width: 140, sort: true});
... ... @@ -826,7 +844,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
busId: $("#resManageIndexForm").find("input[name='busId']").val(),
state: $("#resManageIndexForm").find("select[name='state']").val(),
parentId: $("#resManageIndexForm").find("select[name='parentId']").val(),
collectionState: $("#resManageIndexForm").find("select[name='collectionState']").val(),
collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(),
pageName:'resmanage'
}
, height: 'full-200'
... ... @@ -1698,7 +1716,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
busId: bizId,
state: $("#resManageIndexForm").find("select[name='state']").val(),
parentId: $("#resManageIndexForm").find("select[name='parentId']").val(),
collectionState: $("#resManageIndexForm").find("select[name='collectionState']").val(),
collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(),
collProtocolList:$("#resManageIndexForm").find("select[name='collProtocol']").val(),
sortKey: sortKey,
pageName:'resmanage'
... ...
... ... @@ -94,6 +94,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
protocol:protocol,
editMode: 'true',
resCategory: 'resources',
state: $("#resManageIndexForm").find("select[name='state']").val(),
collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(),
pageName:'reslist'
}
, height: 'full-350'
... ... @@ -109,6 +111,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
{type: 'numbers', title: '序号', align: 'center'}
, {field: 'resName', title: '资源名称', minWidth: 300, align: 'center'}
, {field: 'ip', title: 'IP地址', align: 'center'}
, {field: 'os', title: 'os', align: 'center'}
, {field: 'collProtocol', title: '采集协议', align: 'center'}
, {field: 'adminName', title: '负责人', align: 'center'}
, {field: 'resTypeName', title: '资源类型', align: 'center'}
, {field: 'healthDesc', title: '资源状态', align: 'center'}
... ... @@ -142,17 +146,29 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
function bindSelectEvent() {
//选择业务搜索
form.on('select(reslist_resListBizTypes)', function(data){
busId = data.value;
reloadTable(resType);
});
// 资源状态
form.on('select(reslist_resStatus)', function(data){
reloadTable(resType);
});
// 监控状态
form.on('select(state)', function(data){
reloadTable(resType);
});
// 厂商
form.on('select(reslist_provider)', function(data){
reloadTable(resType);
});
// 绑定
// Start Wang 2022/3/25 14:04 当资源列表选择绑定类型后，下列表的数据导致不能修改，默认设置为空
$("#resManageIndexForm").find("select[name='collectionState']").val('');
form.on('select(resManageCollectionState)', function(data){
// 内容变更后设置对应的值
$("#resManageIndexForm").find("select[name='collectionState']").val(data.value);
reloadTable(resType);
});
}
//刷新表格
function reloadTable(resType) {
... ... @@ -171,6 +187,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
targetType: targetType,
protocolFlag:protocolFlag,
protocol:protocol,
state: $("#resManageIndexForm").find("select[name='state']").val(),
collectionstate: $("#resManageIndexForm").find("select[name='collectionState']").val(),
editMode: 'true'
},
done: function (res) {
... ...
... ... @@ -2640,6 +2640,7 @@ grayColor{
order: 1;
/*width: 250px;*/
min-width: 250px;
max-width: 300px;
overflow: hidden;
/*margin-left: 10px;*/
margin-left: 5px;
... ... @@ -7272,7 +7273,7 @@ form[lay-filter="tax-statistical-statement-condition"] {
}
/****** 动环配置 结束 ******/
/*资源视图、业务视图左侧树选中时添加背景颜色类似菜单树选择的样式*/
/*资源视图、左侧树选中时添加背景颜色类似菜单树选择的样式*/
.resIndexLeft .tree-node-select,.bizIndexLeft .tree-node-select {
font-size: 17px;
font-weight: bold;
... ...
... ... @@ -43,11 +43,11 @@
<div class="layui-inline">
<div class="layui-input-inline">
<select name="state" lay-filter="resManageStateSelect">
<option value="">=资源状态=</option>
<option value="">=资源监控状态=</option>
<option value="new">新增</option>
<option value="monitor">监控</option>
<option value="stop">暂停监控</option>
<!-- <option value="alarmIgnore">告警压制中</option>-->
<!-- <option value="alarmIgnore">告警压制中</option>-->
</select>
</div>
</div>
... ... @@ -62,8 +62,15 @@
<div class="layui-input-inline">
<select name="collectionState" lay-filter="resManageCollectionState">
<option value="">=任务绑定状态=</option>
<option value="1">已绑定</option>
<option value="0">未绑定</option>
<option value="yes">已绑定</option>
<option value="no">未绑定</option>
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="collProtocol" lay-filter="collProtocol">
<option value="">=采集协议=</option>
</select>
</div>
</div>
... ...
... ... @@ -5,7 +5,7 @@
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="res-list-query-form">
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="res-list-query-form" id="resManageIndexForm">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
... ... @@ -17,11 +17,10 @@
<div id="reslist_restype"></div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="reslist_resStatus" id="reslist_resStatus" lay-filter="reslist_resStatus" lay-verify="required">
<option value="">=资源状态=</option>
<option value="">=资源健康状态=</option>
<option value="1">中</option>
<option value="2">良</option>
<option value="3">优</option>
... ... @@ -37,11 +36,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="label" id="state" lay-filter="state">
<option value="">=监控状态=</option>
<option value="new">未监控</option>
<option value="monitor">监控中</option>
<option value="stop">暂停</option>
<select name="state" lay-filter="state">
<option value="">=资源监控状态=</option>
<option value="new">新增</option>
<option value="monitor">监控</option>
<option value="stop">暂停监控</option>
<!-- <option value="alarmIgnore">告警压制中</option>-->
</select>
</div>
</div>
... ... @@ -52,6 +52,15 @@
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="collectionState" lay-filter="resManageCollectionState">
<option value="">=任务绑定状态=</option>
<option value="yes">已绑定</option>
<option value="no">未绑定</option>
</select>
</div>
</div>
</div>
</form>
</div>
... ...
... ... @@ -15,7 +15,6 @@ const timeRange = () => {
proxy.$http.post(`/api-web/manage/ddic/findSucDdics/time_scope`, {}, function (res) {
if (res && res.data) {
timeRangeArr.value = res.data;
if (callback) {
callback(res.data[0].ddicCode);
}
... ... @@ -280,12 +279,20 @@ export default {
loadTimeRange,
} = timeRange();
let timeRangeChange = (item) => {
setTimeout(function(){
let code = item.ddicCode;
loadFrequency(code);
},300);
// 加载echar
setTimeout(function(){
getChartData();
},600);
}
//根菜单选择事件
... ... @@ -319,6 +326,7 @@ export default {
let getChartData = () => {
console.log("======form.value.scene===00000000--------",form.value.scene);
let timeScope = '';
try {
timeScope = form.value.scene.timeScope.replaceAll("time_scope_", "")
... ... @@ -572,15 +580,18 @@ export default {
});
//LH
setTimeout(function(){
let arrs= timeRangeArr.value
timeRangeChange(arrs[0]);
},300)
}
//查询对比分析基础数据
let getBContrastInfoById=(id)=>{
proxy.$http.get(`/api-web/ContrastAnalysis/getBContrastInfoById`,{id:id}, function (res) {
if (res.success) {
console.log("=============",res);
form.value.scene.name=res.object.configName;
form.value.scene.desc=res.object.configDepict;
// console.log("==================",res);
}
});
... ... @@ -589,7 +600,7 @@ export default {
// 挂载完
Vue.onMounted(() => {
init();
if(!id){
activeName.value = 'second';
... ... @@ -611,6 +622,7 @@ export default {
}
});
});
init();
console.log('onMounted');
})
... ...