monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit d19cdf474a11a9cf9f117a92086cb429785ac9ea 2 parents deccb700 3c50bf39

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

资源详情页-【1062】-悬浮提示文字溢出



See merge request !975
Inline Side-by-side
Showing 1 changed file with 13 additions and 13 deletions
... ... @@ -3384,67 +3384,67 @@ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.ip + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.resTypeName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.businessName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.taskName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.collectorName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.domainName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.extendCol3 + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.colonyName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.resNameHost + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.os + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.provider + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.extendCol3 + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ 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 !important;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;white-space: nowrap;">'
'<span title="' + res.map.resPositon + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">'
+ res.map.resPositon + '</span></li>'
}
if (resId) {
... ...