monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit aa207722b01f53a2694ab5f3d7401b44d230ea59 2 parents cc0ebb23 54058ab3

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

Inline Side-by-side
Showing 13 changed files with 57 additions and 31 deletions
... ... @@ -24,6 +24,8 @@ layui.define(['commonDetail','common'], function (exports) {
var xnxxKpi = "KPIE2174352,KPIC0A94965";
//运行状态信息
var yxztxx = "KPIE4B51D5C,KPI7F91F142";
//配置信息
var pzxx = "";
reload()
... ... @@ -36,7 +38,9 @@ layui.define(['commonDetail','common'], function (exports) {
// 屏蔽KPI3B6A0393（连接数使用率），增加KPIC0A94965（已打开会话数）
commonDetail.renderText("ali_cloud_rds_xnxxinfo",resId,xnxxKpi);
//运行状态信息
commonDetail.renderText("ali_cloud_rds_yxztinfo",resId,yxztxx);
commonDetail.renderText("ali_cloud_rds_linkinfo",resId,yxztxx);
//配置信息
commonDetail.renderText("ali_cloud_rds_setinfo",resId,pzxx);
// CPU使用率
commonDetail.renderGauge("ali_cloud_rds_cpu_rate",resId,"KPI7054BC34");
// 内存使用率
... ...
... ... @@ -758,7 +758,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
showFolderIcon: true,
showLine: true,
indent: 20,
expandedKeys: [-3],
expandedKeys: true,
strict: false
},
data: data
... ...
... ... @@ -914,8 +914,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
var sessions = layui.sessions;
accessToken = sessions.getToken()['access_token'];
});
var parseData=JSON.parse(data['cols']);
var cols = parseData[0];
var cols = data['cols'][0];
$.each(cols, function (i, e) {
if (e['isChild']) {
if (e['isChild'] && typeof e['isChild'] === 'function') {
... ...
... ... @@ -366,37 +366,37 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
"HUAWEI_CLOUD_PHYSICSHOST": [
//{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
{
field: 'resName', title: '资源名称', minWidth: 250, sort: true,
field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
{field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
{field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
{field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
{field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
{field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', minWidth: x_120, align: 'center', sort: true},
{field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
{field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
// 2021-11-22 徐毫杰 连接状态无数据改成展示主机状态
{field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true}
],
"HUAWEI_CLOUD_VIRTUALHOST": [
//{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
{
field: 'resName', title: '资源名称', minWidth: 250, sort: true,
field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
templet: '#resindex_resName'
},
{field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
{field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
{field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
{field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
{field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
{field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
{field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
{field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
{field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
{field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
{field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', minWidth: x_120, templet: '#linkStateTpl', sort: true}
],
"HUAWEI_CLOUD_STORAGE": [
//{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
... ...
... ... @@ -3159,7 +3159,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
showFolderIcon: true,
showLine: true,
indent: 20,
expandedKeys: [-3],
expandedKeys: true,
strict: false
},
data: response.data,
... ...
... ... @@ -1618,7 +1618,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
showFolderIcon: true,
showLine: true,
indent: 20,
expandedKeys: [-3],
expandedKeys: true,
strict: false
},
data: data
... ...
... ... @@ -210,7 +210,7 @@ layui.define(['admin', 'table', 'common', 'sessions', 'form'], function (exports
showFolderIcon: true,
showLine: true,
indent: 20,
expandedKeys: [-3],
expandedKeys: true,
strict: false
},
data: data
... ...
... ... @@ -950,7 +950,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
showFolderIcon: true,
showLine: true,
indent: 20,
expandedKeys: [-3],
expandedKeys: true,
strict: false
},
data: data
... ...
... ... @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
type: 'text'
}
},
height: 'auto',
height: '200px',
data: resTypeTree,
on: function (data) {
if(data.isAdd){
... ...
... ... @@ -58,7 +58,7 @@
<li class="layui-nav-item" >
<div id="toYTHView_div" >
<dd layadmin-event="toYTHViewScreen" title="一体化控制台"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px"></a></dd>
<dd layadmin-event="toYTHViewScreen" title="一体化监控台"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px"></a></dd>
</div>
</li>
... ... @@ -724,7 +724,7 @@
{{#
var linkStateHtml = '';
var linkStateTips = '无连接信息';
if(d.linkStateList && d.linkStateList.length) {
if(d.linkStateList && d.linkStateList.length >=0 ) {
linkStateTips = '';
if(d.linkStateList.length == 1) {
var linkState = d.linkStateList[0];
... ... @@ -737,11 +737,31 @@
data-message="${d.message}"
data-state="${d.state}"
data-id="${d.resId}_bizdanger"
class="layui-btn showTip layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
class="layui-btn layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
失败
</button>`;
}
} else {
if(d.linkStateList.length == 0){
if(d.hostState == 'active' || d.hostState == 'connected' || d.hostState == '正常' ){
linkStateHtml = '<button type="button" class="layui-btn layui-btn-radius layui-bg-green layui-btn-xs p-0-15 cant-click">成功</button>';
linkStateTips += `<li class='li-link-state-tips-red'>自动发现: 连接成功</li>`;
}else{
linkStateHtml = `<button type="button"
id="${d.resId}_bizdanger"
data-message="${d.message}"
data-state="${d.state}"
data-id="${d.resId}_bizdanger"
class="layui-btn layui-btn-danger layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
失败
</button>`;
if(d.hostState!=''){
linkStateTips += `<li class='li-link-state-tips-red'>自动发现: 连接失败</li>`;
}else{
linkStateTips += `<li class='li-link-state-tips-red'>ssh: 连接失败</li>`;
}
}
}else{
linkStateTips += `<ul class='ul-link-state-tips'>`;
layui.each(d.linkStateList, function(index, value) {
if(value.state.indexOf('成功') !== -1) {
... ... @@ -755,6 +775,7 @@
linkStateTips += '</ul>';
}
}
}
}}
<div class="div-link-state-list" lay-tips="{{linkStateTips}}">
{{linkStateHtml}}
... ...
<div class="analysis-add-container">
<div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;color:#337ab7">
<div class="add-top-title" style=" padding: 20px 20px 0px 20px;font-weight: bold">
比对分析场景
</div>
<div class="analysis-drop" v-if="!isShowLIst">
... ...
... ... @@ -132,7 +132,8 @@ export default {
if (this.$route.query.msgKey){
document.getElementById("goDP").style.display="block"
}
};
document.title = '电子税务局大屏';
},
unmounted () {
window.removeEventListener('resize', this.screenAdapter)
... ...
... ... @@ -59,6 +59,7 @@ export default {
setInterval(function(){
getDateTime();
},1000);
document.title = '监控一体化视图'
})
let getDateTime=()=>{
... ...