monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 3c93cb03d1d45237b1ff30f5c8aac32aafa3ff07 2 parents 466b09bd 6dc07c42

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

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 2 changed files with 13 additions and 11 deletions
... ... @@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
, {field: 'resTypeName', title: '资源类型', align: 'center', width: '15%'}
, {
field: 'resName', title: '资源名称', minWidth: 200, align: 'center', width: '25%',
templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restypename="{{d.resTypeName}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
}
// , {field: 'kpiName', title: '指标', align: 'left'}
, {field: 'flag', title: '标识', align: 'center', width: '15%'}
... ... @@ -82,7 +82,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
, {field: 'resTypeName', title: '资源类型', align: 'center'}
, {
field: 'resName', title: '资源名称', minWidth: 200, align: 'center',
templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restypename="{{d.resTypeName}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
}
, {field: 'kpiName', title: '指标', align: 'left'}
, {field: 'flag', title: '标识', align: 'center'}
... ... @@ -116,10 +116,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
$('[data-zymc]').unbind().bind('click', function () {
var resId = $(this).data("resid");
var resType = $(this).data("restype");
var ip = $(this).data("ip");
var resName = $(this).data("resname");
var resTypeName = $(this).data("");
var title = resName + '|' + resTypeName + '|' + ip;//名称，类型，及ip
//lsq 优化详情页的title出现undefined 2022-08-31
var ip = $(this).data("ip") && $(this).data("ip")!=undefined && $(this).data("ip")!='undefined'?$(this).data("ip"):'';
var resName = $(this).data("resname") && $(this).data("resname")!=undefined && $(this).data("resname")!='undefined'?$(this).data("resname"):'';
var resTypeName = $(this).data("resTypeName") && $(this).data("resTypeName")!=undefined && $(this).data("resTypeName")!='undefined'?$(this).data("resTypeName"):'';
var title = resName + (resTypeName?'|' + resTypeName:'') + (ip?'|' + ip:'');//名称，类型，及ip
commonDetail.openDetail(resId, resType, title);
});
... ...
... ... @@ -121,11 +121,12 @@ layui.define(['laytpl', 'layer'], function (exports) {
}
//其它异常
else {
var error = [
'<cite>Error：</cite> ' + (res[response.msgName] || '返回状态码异常')
, debug()
].join('');
view.error(error);
// var error = [
// '<cite>Error：</cite> ' + (res[response.msgName] || '返回状态码异常')
// , debug()
// ].join('');
// view.error(error);
console.log(error)
}
//只要 http 状态码正常，无论 response 的 code 是否正常都执行 success
... ...