monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 911b14837ff40292d077c9c5749ecea873ae15f7 1 parent efc0b9fe

【无】详情页标题存在undefined ，提示信息出现滚动条-增加判断

Inline Side-by-side
Showing 2 changed files with 19 additions and 19 deletions
... ... @@ -4869,22 +4869,22 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
*/
getTitle: function (name, resType, resTypeName, ip, manageIp, collProtocol, adminName) {
var title = name;
if (name && name !== '') {
if (name && name!=undefined && name!='undefined' && name !== '') {
title += '|';
}
if (resTypeName && resType !== 'HOST_X86SERVER') {
if (resTypeName && resTypeName!=undefined && resTypeName!='undefined' && resType !== 'HOST_X86SERVER') {
title += resTypeName + '|';
}
if (ip) {
if (ip && ip!=undefined && ip!='undefined') {
if (resType === 'HOST_X86SERVER') {
if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {
if (collProtocol && collProtocol!=undefined && collProtocol!='undefined' && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) {
title += '应用IP-' + ip + '|';
}
} else {
title += ip + '|';
}
}
if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {
if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol!=undefined && collProtocol!='undefined' && collProtocol.indexOf('SNMP') !== -1) {
if (manageIp) {
title += '管理IP-' + manageIp + '|';
}
... ...
... ... @@ -3381,72 +3381,72 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
if (res.map) {
if (res.map.ip) {
li += ' <li><span style="text-align:left;width:40%">IP地址</span>' +
'<span title="' + res.map.ip + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.ip + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.ip + '</span></li>'
}
if (res.map.resTypeName) {
li += ' <li><span style="text-align:left;width:40%">资源类型</span>' +
'<span title="' + res.map.resTypeName + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.resTypeName + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.resTypeName + '</span></li>'
}
if (res.map.businessName) {
li += ' <li><span style="text-align:left;width:30%">所属业务</span>' +
'<span title="' + res.map.businessName + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.businessName + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.businessName + '</span></li>'
}
if (res.map.taskName) {
li += ' <li><span style="text-align:left;width:40%">所属任务</span>' +
'<span title="' + res.map.taskName + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.taskName + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.taskName + '</span></li>'
}
if (res.map.collectorName) {
li += ' <li><span style="text-align:left;width:40%">所属采集器</span>' +
'<span title="' + res.map.collectorName + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.collectorName + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.collectorName + '</span></li>'
}
if (res.map.domainName) {
li += ' <li><span style="text-align:left;width:40%">所属域</span>' +
'<span title="' + res.map.domainName + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.domainName + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.domainName + '</span></li>'
}
if (res.map.extendCol3) {
li += ' <li><span style="text-align:left;width:40%">所属平台</span>' +
'<span title="' + res.map.extendCol3 + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.extendCol3 + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.extendCol3 + '</span></li>'
}
if (res.map.colonyName) {
li += ' <li><span style="text-align:left;width:40%">所属资源池</span>' +
'<span title="' + res.map.colonyName + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.colonyName + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.colonyName + '</span></li>'
}
if (res.map.resNameHost) {
li += ' <li><span style="text-align:left;width:40%">所属宿主机</span>' +
'<span title="' + res.map.resNameHost + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.resNameHost + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.resNameHost + '</span></li>'
}
if (res.map.os) {
li += ' <li><span style="text-align:left;width:40%">操作系统</span>' +
'<span title="' + res.map.os + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.os + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.os + '</span></li>'
}
if (res.map.provider) {
li += ' <li><span style="text-align:left;width:40%">厂商</span>' +
'<span title="' + res.map.provider + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.provider + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.provider + '</span></li>'
}
if (res.map.model) {
li += ' <li><span style="text-align:left;width:40%">型号</span>' +
'<span title="' + res.map.extendCol3 + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.extendCol3 + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.model + '</span></li>'
}
if (res.map.resPositon) {
li += ' <li><span style="text-align:left;width:40%">所属机房</span>' +
'<span title="' + res.map.resPositon + '" style="width:60%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">'
'<span title="' + res.map.resPositon + '" style="width:60%;overflow: hidden !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
+ res.map.resPositon + '</span></li>'
}
if (resId) {
li += ' <li><span style="text-align:left;width:40%">资源ID</span>' +
'<span title="' + resId + '" style="width:60%;text-overflow: inherit;white-space: normal;word-break: break-all;">'
'<span title="' + resId + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ resId + '</span></li>'
}
}
... ...