monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 329e36a30e1a3d670faf2d1f9989a6c83407893d 2 parents b7e2f6b2 17bc8c3c

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

Inline Side-by-side
Showing 10 changed files with 32 additions and 18 deletions
... ... @@ -136,7 +136,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'sessions',
field: 'flag', title: '指标标识', align: 'center', sort: true, width: 150
}, {
field: 'kpiValue', title: '指标值', align: 'center', sort: true, width: 150,
templet: '<div><span class="layui-table-link ca-unit-chart" data-resid="{{d.resId}}" data-flag="{{d.flag}}" data-kpiid="{{d.kpiId}}">{{d.kpiValue}}</span></div>'
templet: '<div><span class="layui-table-link ca-unit-chart" data-resid="{{d.resId}}" data-name="{{d.resName}}-{{d.kpiName}}" data-flag="{{d.flag}}" data-kpiid="{{d.kpiId}}">{{d.kpiValue}}</span></div>'
}, {
field: 'createUser', title: '创建人', align: 'center', sort: true, width: 150, templet: function (d) {
return d.createUserName ? d.createUserName : ''
... ... @@ -149,7 +149,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'sessions',
var params = {
kpiId: $(this).data('kpiid'),
resId: $(this).data('resid'),
flag: $(this).data('flag')
flag: $(this).data('flag'),
name: $(this).data('name')
}
let url = '/et2';
view('commonViewModel').render(url).then(function (res) {
... ...
... ... @@ -58,7 +58,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'admin',
color: '#333',
show: true,
interval: 0,
rotate: 15
formatter(value, index) {
return new Date(value).format('yyyy-MM-dd')
}
},
axisLine: {
lineStyle: {
... ... @@ -123,6 +125,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'admin',
trigger: 'axis',
axisPointer: {
type: 'shadow'
},
formatter: function (param) {
var tips = new Date(param[0].axisValue).format('yyyy-MM-dd HH:mm:ss') + "<br/>";
$.each(param, function (i, v) {
tips += v.marker + " " + v.seriesName + ":" + v.value[1] + "</br>"
});
return tips;
}
},
toolbox: {
... ...
... ... @@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
, {title: '表空间使用率', align: 'center', width:250, templet: '#predictionTpsRateTpl'}
, {title: '操作', align: 'center',width:200, fixed: 'right',
templet: '<div>' +
'<span data-id="{{d.resId}}" class="layui-table-link prediction_database_info" lay-tips="明细">明细</span>'+
'<span data-id="{{d.resId}}" data-resname="{{d.resName}}" class="layui-table-link prediction_database_info" lay-tips="明细">明细</span>'+
'</div>'
}
]
... ... @@ -71,6 +71,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
//打开明细列表
$('.prediction_database_info').unbind('click').on('click',function () {
var resId = $(this).data("id");
var resName = $(this).data("resname");
admin.req({
url:domainName + '/api-web/prediction/database/detail'
,data:{resId:resId}
... ... @@ -79,7 +80,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
var trs = '';
$.each(res.data,function (i,v){
trs += `<tr><td>${i+1}</td><td>${v.tpsName}</td><td>${v.tpsSize}</td><td>${v.tpsUsed}</td><td>${v.tpsFree}</td>
<td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI64B1610A" data-flag=${v.flag} data-name="使用率">${v.tpsUsedRate}</span></tr>`;
<td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI64B1610A" data-flag=${v.flag} data-name="${resName}-表空间使用率">${v.tpsUsedRate}</span></tr>`;
});
var tb = `<div class="layui-form" style="padding: 0 10px;">
<table class="layui-table" id="info_table">
... ...
... ... @@ -63,7 +63,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
, {title: '当前 / 推荐配置', align: 'center', width:450, colspan: 3,}
, {title: '操作', align: 'center',width:160, fixed: 'right', rowspan: 2,
templet: '<div>' +
'<span data-id="{{d.resId}}" class="layui-table-link prediction_server_info" lay-tips="明细">明细</span>'+
'<span data-id="{{d.resId}}" data-resname="{{d.resName}}" class="layui-table-link prediction_server_info" lay-tips="明细">明细</span>'+
'</div>'
}
], [
... ... @@ -137,6 +137,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
//打开明细列表
$('.prediction_server_info').unbind('click').on('click',function () {
var resId = $(this).data("id");
var resName = $(this).data("resname");
admin.req({
url:domainName + '/api-web/prediction/server/detail'
,data:{resId:resId}
... ... @@ -145,7 +146,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
var trs = '';
$.each(res.data,function (i,v){
trs += `<tr><td>${i+1}</td><td>${v.fsName}</td><td>${v.fsSize}</td><td>${v.fsUsed}</td>
<td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI449F5365" data-flag=${v.flag} data-name="使用率">${v.fsUsedRate}</span></td><td>${v.dailyGrowthRate == 0 ? '-' : v.dailyGrowthRate}</td><td>${v.availableDays == 0 ? '-' : v.availableDays}</td></tr>`;
<td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI449F5365" data-flag=${v.flag} data-name="${resName}-文件系统使用率">${v.fsUsedRate}</span></td><td>${v.dailyGrowthRate == 0 ? '-' : v.dailyGrowthRate}</td><td>${v.availableDays == 0 ? '-' : v.availableDays}</td></tr>`;
});
var tb = `<div class="layui-form" style="padding: 0 10px;">
<table class="layui-table" id="info_table">
... ...
... ... @@ -64,7 +64,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
, {title: '容量使用率', align: 'center', width:280, templet: '#predictionStorageRateTpl'}
, {title: '操作', align: 'center',width:220, fixed: 'right',
templet: '<div>' +
'<span data-id="{{d.resId}}" class="layui-table-link prediction_storage_info" lay-tips="明细">明细</span>'+
'<span data-id="{{d.resId}}" data-resname="{{d.resName}}" class="layui-table-link prediction_storage_info" lay-tips="明细">明细</span>'+
'</div>'
}
]
... ... @@ -73,6 +73,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
//打开明细列表
$('.prediction_storage_info').unbind('click').on('click',function () {
var resId = $(this).data("id");
var resName = $(this).data("resname");
admin.req({
url:domainName + '/api-web/prediction/storage/detail'
,data:{resId:resId}
... ... @@ -81,7 +82,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
var trs = '';
$.each(res.data,function (i,v){
trs += `<tr><td>${i+1}</td><td>${v.storageName}</td><td>${v.storageSize}</td><td>${v.storageUsed}</td><td>${v.storageFree}</td>
<td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI5E148DBE" data-flag=${v.flag} data-name="使用率">${v.storageUsedRate}</span></td></tr>`;
<td><span class="kpiSubDiv" style="cursor: pointer;text-decoration: underline;color: #1E9FFF;" data-resid=${resId} data-kpiid="KPI5E148DBE" data-flag=${v.flag} data-name="${resName}-容量使用率">${v.storageUsedRate}</span></td></tr>`;
});
var tb = `<div class="layui-form" style="padding: 0 10px;">
<table class="layui-table" id="info_table">
... ...
... ... @@ -58,9 +58,10 @@
<li class="layui-nav-item layui-hide-xs" lay-tips="全局搜索">
<a href="javascript:;" layadmin-event="globalSearch"><i class="layui-icon layui-icon-search"></i></a>
</li>
<li class="layui-nav-item" lay-tips="一体化视图">
<a href="javascript:;" layadmin-event="toSxView"><i class="layui-icon layui-icon-chart-screen"></i></a>
</li>
<!-- // Start xwx 2021/10/28 删除天津首页一体化视图 -->
<!-- <li class="layui-nav-item" lay-tips="一体化视图">-->
<!-- <a href="javascript:;" layadmin-event="toSxView"><i class="layui-icon layui-icon-chart-screen"></i></a>-->
<!-- </li>-->
<li class="layui-nav-item" lay-tips="大屏">
<a href="javascript:;" layadmin-event="toBigScreen"><i class="layui-icon layui-icon-chart-screen"></i></a>
</li>
... ...
... ... @@ -36,7 +36,7 @@
<!--表空间使用率-->
<script type="text/html" id="predictionTpsRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI64B1610A" data-flag="tps" data-name="表空间使用率">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI64B1610A" data-flag="tps" data-name="{{d.resName}}-表空间使用率">
<div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
<div class="layui-progress-bar layui-bg-green"
lay-percent="{{ d.tsUsedRate }}%"
... ...
... ... @@ -47,7 +47,7 @@
<!--CPU使用率-->
<script type="text/html" id="predictionCpuRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI7054BC34" data-flag="cpu" data-name="CPU使用率">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI7054BC34" data-flag="cpu" data-name="{{d.resName}}-CPU使用率">
<div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
<div class="layui-progress-bar layui-bg-green"
lay-percent="{{ d.cpuRate }}%"
... ... @@ -59,7 +59,7 @@
</script>
<!--内存使用率-->
<script type="text/html" id="predictionMemoryRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI31CB8D97" data-flag="mem" data-name="内存使用率">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI31CB8D97" data-flag="mem" data-name="{{d.resName}}-内存使用率">
<div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
<div class="layui-progress-bar layui-bg-green"
lay-percent="{{ d.memRate }}%"
... ... @@ -71,7 +71,7 @@
</script>
<!--文件系统使用率-->
<script type="text/html" id="predictionFileSysStemRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI449F5365" data-flag="fs" data-name="文件系统使用率">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI449F5365" data-flag="fs" data-name="{{d.resName}}-文件系统使用率">
<div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
<div class="layui-progress-bar layui-bg-green"
lay-percent="{{ d.fsRate }}%"
... ...
... ... @@ -36,7 +36,7 @@
<!--容量使用率-->
<script type="text/html" id="predictionStorageRateTpl">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI5E148DBE" data-flag="storage" data-name="容量使用率">
<div class="layui-progress-wrap kpiSubDiv" data-resid={{d.resId}} data-kpiid="KPI5E148DBE" data-flag="storage" data-name="{{d.resName}}-容量使用率">
<div class="layui-progress layui-progress-big" lay-showpercent="true" style="margin-right: 10px;">
<div class="layui-progress-bar layui-bg-green"
lay-percent="{{ d.storageUsedRate }}%"
... ...
... ... @@ -29,7 +29,7 @@ url:
config:
layer:
load:
icon: hg
icon: mj
audio:
mp3: 14039
tingyun:
... ...