Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-lushangqing
Showing
1 changed file
with
13 additions
and
13 deletions
| @@ -3384,67 +3384,67 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele | @@ -3384,67 +3384,67 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele | ||
| 3384 | if (res.map) { | 3384 | if (res.map) { |
| 3385 | if (res.map.ip) { | 3385 | if (res.map.ip) { |
| 3386 | li += ' <li><span style="text-align:left;width:40%">IP地址</span>' + | 3386 | li += ' <li><span style="text-align:left;width:40%">IP地址</span>' + |
| 3387 | - '<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;">' | 3387 | + '<span title="' + res.map.ip + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3388 | + res.map.ip + '</span></li>' | 3388 | + res.map.ip + '</span></li>' |
| 3389 | } | 3389 | } |
| 3390 | if (res.map.resTypeName) { | 3390 | if (res.map.resTypeName) { |
| 3391 | li += ' <li><span style="text-align:left;width:40%">资源类型</span>' + | 3391 | li += ' <li><span style="text-align:left;width:40%">资源类型</span>' + |
| 3392 | - '<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;">' | 3392 | + '<span title="' + res.map.resTypeName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3393 | + res.map.resTypeName + '</span></li>' | 3393 | + res.map.resTypeName + '</span></li>' |
| 3394 | } | 3394 | } |
| 3395 | if (res.map.businessName) { | 3395 | if (res.map.businessName) { |
| 3396 | li += ' <li><span style="text-align:left;width:30%">所属业务</span>' + | 3396 | li += ' <li><span style="text-align:left;width:30%">所属业务</span>' + |
| 3397 | - '<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;">' | 3397 | + '<span title="' + res.map.businessName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3398 | + res.map.businessName + '</span></li>' | 3398 | + res.map.businessName + '</span></li>' |
| 3399 | } | 3399 | } |
| 3400 | if (res.map.taskName) { | 3400 | if (res.map.taskName) { |
| 3401 | li += ' <li><span style="text-align:left;width:40%">所属任务</span>' + | 3401 | li += ' <li><span style="text-align:left;width:40%">所属任务</span>' + |
| 3402 | - '<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;">' | 3402 | + '<span title="' + res.map.taskName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3403 | + res.map.taskName + '</span></li>' | 3403 | + res.map.taskName + '</span></li>' |
| 3404 | } | 3404 | } |
| 3405 | if (res.map.collectorName) { | 3405 | if (res.map.collectorName) { |
| 3406 | li += ' <li><span style="text-align:left;width:40%">所属采集器</span>' + | 3406 | li += ' <li><span style="text-align:left;width:40%">所属采集器</span>' + |
| 3407 | - '<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;">' | 3407 | + '<span title="' + res.map.collectorName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3408 | + res.map.collectorName + '</span></li>' | 3408 | + res.map.collectorName + '</span></li>' |
| 3409 | } | 3409 | } |
| 3410 | if (res.map.domainName) { | 3410 | if (res.map.domainName) { |
| 3411 | li += ' <li><span style="text-align:left;width:40%">所属域</span>' + | 3411 | li += ' <li><span style="text-align:left;width:40%">所属域</span>' + |
| 3412 | - '<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;">' | 3412 | + '<span title="' + res.map.domainName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3413 | + res.map.domainName + '</span></li>' | 3413 | + res.map.domainName + '</span></li>' |
| 3414 | } | 3414 | } |
| 3415 | if (res.map.extendCol3) { | 3415 | if (res.map.extendCol3) { |
| 3416 | li += ' <li><span style="text-align:left;width:40%">所属平台</span>' + | 3416 | li += ' <li><span style="text-align:left;width:40%">所属平台</span>' + |
| 3417 | - '<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;">' | 3417 | + '<span title="' + res.map.extendCol3 + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3418 | + res.map.extendCol3 + '</span></li>' | 3418 | + res.map.extendCol3 + '</span></li>' |
| 3419 | } | 3419 | } |
| 3420 | if (res.map.colonyName) { | 3420 | if (res.map.colonyName) { |
| 3421 | li += ' <li><span style="text-align:left;width:40%">所属资源池</span>' + | 3421 | li += ' <li><span style="text-align:left;width:40%">所属资源池</span>' + |
| 3422 | - '<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;">' | 3422 | + '<span title="' + res.map.colonyName + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3423 | + res.map.colonyName + '</span></li>' | 3423 | + res.map.colonyName + '</span></li>' |
| 3424 | } | 3424 | } |
| 3425 | if (res.map.resNameHost) { | 3425 | if (res.map.resNameHost) { |
| 3426 | li += ' <li><span style="text-align:left;width:40%">所属宿主机</span>' + | 3426 | li += ' <li><span style="text-align:left;width:40%">所属宿主机</span>' + |
| 3427 | - '<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;">' | 3427 | + '<span title="' + res.map.resNameHost + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3428 | + res.map.resNameHost + '</span></li>' | 3428 | + res.map.resNameHost + '</span></li>' |
| 3429 | } | 3429 | } |
| 3430 | if (res.map.os) { | 3430 | if (res.map.os) { |
| 3431 | li += ' <li><span style="text-align:left;width:40%">操作系统</span>' + | 3431 | li += ' <li><span style="text-align:left;width:40%">操作系统</span>' + |
| 3432 | - '<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;">' | 3432 | + '<span title="' + res.map.os + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3433 | + res.map.os + '</span></li>' | 3433 | + res.map.os + '</span></li>' |
| 3434 | } | 3434 | } |
| 3435 | if (res.map.provider) { | 3435 | if (res.map.provider) { |
| 3436 | li += ' <li><span style="text-align:left;width:40%">厂商</span>' + | 3436 | li += ' <li><span style="text-align:left;width:40%">厂商</span>' + |
| 3437 | - '<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;">' | 3437 | + '<span title="' + res.map.provider + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3438 | + res.map.provider + '</span></li>' | 3438 | + res.map.provider + '</span></li>' |
| 3439 | } | 3439 | } |
| 3440 | if (res.map.model) { | 3440 | if (res.map.model) { |
| 3441 | li += ' <li><span style="text-align:left;width:40%">型号</span>' + | 3441 | li += ' <li><span style="text-align:left;width:40%">型号</span>' + |
| 3442 | - '<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;">' | 3442 | + '<span title="' + res.map.extendCol3 + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3443 | + res.map.model + '</span></li>' | 3443 | + res.map.model + '</span></li>' |
| 3444 | } | 3444 | } |
| 3445 | if (res.map.resPositon) { | 3445 | if (res.map.resPositon) { |
| 3446 | li += ' <li><span style="text-align:left;width:40%">所属机房</span>' + | 3446 | li += ' <li><span style="text-align:left;width:40%">所属机房</span>' + |
| 3447 | - '<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;">' | 3447 | + '<span title="' + res.map.resPositon + '" style="width:60%;text-overflow: ellipsis;white-space: nowrap !important; word-break: break-word;overflow: hidden !important;">' |
| 3448 | + res.map.resPositon + '</span></li>' | 3448 | + res.map.resPositon + '</span></li>' |
| 3449 | } | 3449 | } |
| 3450 | if (resId) { | 3450 | if (resId) { |
-
Please register or login to post a comment