monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit a42e038194834e2198cdce8980d8649e966b27cb 1 parent 6f0d1571

杭州-资源视图-阿里云、华为云及子资源类型列表连接状态改变及列宽调整

Inline Side-by-side
Showing 2 changed files with 101 additions and 78 deletions
@@ -337,30 +337,31 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -337,30 +337,31 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
337 {field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'}, 337 {field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'},
338 {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'}, 338 {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'},
339 {field: 'storageSetRate', title: '存储分配率', align: 'center', minWidth: 120, templet: '#storageSetRateTpl'}, 339 {field: 'storageSetRate', title: '存储分配率', align: 'center', minWidth: 120, templet: '#storageSetRateTpl'},
340 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
341 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
342 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
343 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
344 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 340 + {field: 'resTypeName', title: '资源类型', minWidth: 101, align: 'center'},
  341 + {field: 'adminName', title: '负责人', minWidth: 120, align: 'center', sort: true},
  342 + {field: 'adminPhone', title: '负责人电话', minWidth: 120, align: 'center', sort: true},
  343 + {field: 'state', title: '资源状态', minWidth: 120, align: 'center', sort: true, templet: '#resStateTpl'},
  344 + {field: 'health', title: '健康状态', minWidth: 120, align: 'center', sort: true, templet: '#healthTpl'},
345 345
346 - {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},  
347 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true} 346 + {field: 'clusterState', title: '资源池状态', align: 'center', minWidth: x_120,templet:'#clusterStateTpl'},
  347 + //{field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},
  348 + {field: 'lastColTime', title: '最近采集时间', minWidth: 160, align: 'center', sort: true}
348 ], 349 ],
349 "HUAWEI_CLOUD_CLUSTER": [ 350 "HUAWEI_CLOUD_CLUSTER": [
350 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 351 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
351 { 352 {
352 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 353 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
353 templet: '#resindex_resName' 354 templet: '#resindex_resName'
354 }, 355 },
355 - {field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'},  
356 - {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'},  
357 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
358 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
359 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
360 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
361 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
362 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
363 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 356 + {field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: x_120, templet: '#cpuSetRateTpl'},
  357 + {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: x_120, templet: '#memorySetRateTpl'},
  358 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  359 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  360 + {field: 'adminPhone', title: '负责人电话', minWidth: x_120, align: 'center', sort: true},
  361 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  362 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  363 + {field: 'lastColTime', title: '最近采集时间', minWidth: 160, align: 'center', sort: true}
  364 + // {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_120, templet: '#linkStateTpl', sort: true}
364 ], 365 ],
365 "HUAWEI_CLOUD_PHYSICSHOST": [ 366 "HUAWEI_CLOUD_PHYSICSHOST": [
366 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 367 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -400,58 +401,58 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -400,58 +401,58 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
400 "HUAWEI_CLOUD_STORAGE": [ 401 "HUAWEI_CLOUD_STORAGE": [
401 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 402 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
402 { 403 {
403 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 404 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
404 templet: '#resindex_resName' 405 templet: '#resindex_resName'
405 }, 406 },
406 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 407 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
407 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 408 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
408 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 409 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
409 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
410 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
411 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
412 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
413 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
414 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
415 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 410 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  411 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  412 + {field: 'adminPhone', title: '负责人电话', minWidth: x_120, align: 'center', sort: true},
  413 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  414 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  415 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
  416 + {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true,templet: '#runStateTpl'}
416 ], 417 ],
417 "HUAWEI_CLOUD_SWITCHBOARD": [ 418 "HUAWEI_CLOUD_SWITCHBOARD": [
418 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 419 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
419 { 420 {
420 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 421 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
421 templet: '#resindex_resName' 422 templet: '#resindex_resName'
422 }, 423 },
423 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 424 + {field: 'ip', title: 'IP地址', minWidth: x_110, align: 'center', sort: true},
424 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 425 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
425 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 426 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
426 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
427 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
428 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
429 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
430 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
431 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
432 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 427 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  428 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  429 + {field: 'adminPhone', title: '负责人电话', minWidth: x_120, align: 'center', sort: true},
  430 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  431 + {field: 'health', title: '健康状态', minWdth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  432 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
  433 + // {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
433 ], 434 ],
434 "HUAWEI_CLOUD_FIREWALL": [ 435 "HUAWEI_CLOUD_FIREWALL": [
435 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 436 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
436 { 437 {
437 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 438 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
438 templet: '#resindex_resName' 439 templet: '#resindex_resName'
439 }, 440 },
440 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 441 + {field: 'ip', title: 'IP地址', minWidth: x_120, align: 'center', sort: true},
441 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 442 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
442 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 443 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
443 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
444 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
445 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
446 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
447 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
448 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
449 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 444 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  445 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  446 + {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
  447 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  448 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  449 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}
  450 + //{field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
450 ], 451 ],
451 "ALI_CLOUD_ECS": [ 452 "ALI_CLOUD_ECS": [
452 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 453 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
453 { 454 {
454 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 455 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
455 templet: '#resindex_resName' 456 templet: '#resindex_resName'
456 }, 457 },
457 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 458 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
@@ -459,60 +460,61 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -459,60 +460,61 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
459 {field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_120, sort: true, templet: '<div>{{d.memorySize}} GB</div>'}, 460 {field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_120, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
460 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 461 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
461 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true}, 462 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
462 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
463 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
464 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
465 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
466 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
467 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
468 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 463 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  464 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  465 + {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
  466 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  467 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  468 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
  469 + {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_120, templet: '#linkStateTpl', sort: true}
469 ], 470 ],
470 "ALI_CLOUD_RDS": [ 471 "ALI_CLOUD_RDS": [
471 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 472 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
472 { 473 {
473 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 474 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
474 templet: '#resindex_resName' 475 templet: '#resindex_resName'
475 }, 476 },
476 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 477 + {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
477 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 478 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
478 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 479 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
479 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
480 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
481 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
482 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
483 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
484 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
485 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 480 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  481 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  482 + {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
  483 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  484 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  485 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
  486 + // {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
486 ], 487 ],
487 "ALI_CLOUD_SLB": [ 488 "ALI_CLOUD_SLB": [
488 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 489 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
489 { 490 {
490 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 491 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
491 templet: '#resindex_resName' 492 templet: '#resindex_resName'
492 }, 493 },
493 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},  
494 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
495 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
496 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
497 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
498 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
499 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
500 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 494 + {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
  495 + {field: 'resTypeName', title: '资源类型', minWidth: x_120, align: 'center'},
  496 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  497 + {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
  498 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  499 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  500 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
  501 + {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true,templet: '#runStateTpl'}
  502 + //{field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
501 ], 503 ],
502 "ALI_CLOUD_OSS": [ 504 "ALI_CLOUD_OSS": [
503 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 505 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
504 { 506 {
505 - field: 'resName', title: '资源名称', minWidth: 250, sort: true, 507 + field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
506 templet: '#resindex_resName' 508 templet: '#resindex_resName'
507 }, 509 },
508 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},  
509 - {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},  
510 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
511 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
512 - {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},  
513 - {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},  
514 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
515 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 510 + // {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
  511 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  512 + {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
  513 + {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
  514 + {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
  515 + {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
  516 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_120, align: 'center', sort: true},
  517 + // {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
516 ], 518 ],
517 "ALI_ARMS": [ 519 "ALI_ARMS": [
518 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 520 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -941,6 +941,27 @@ @@ -941,6 +941,27 @@
941 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a> 941 <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>
942 </div> 942 </div>
943 </script> 943 </script>
  944 +<!--资源池状态-->
  945 +<script type="text/html" id="clusterStateTpl">
  946 + {{# if(d.clusterState === '正常'){ }}
  947 + <button type="button" class="layui-btn layui-btn-danger layui-bg-green layui-btn-radius layui-btn-xs p-0-15">正常
  948 + </button>
  949 + {{# }else{ }}
  950 + <button type="button" class="layui-btn layui-btn-radius layui-bg-red layui-btn-xs p-0-15">异常</button>
  951 + {{# } }}
  952 +</script>
  953 +<!--运行状态-->
  954 +<script type="text/html" id="runStateTpl">
  955 + {{# if(d.runState === '正常'){ }}
  956 + <button type="button" class="layui-btn layui-btn-danger layui-bg-green layui-btn-radius layui-btn-xs p-0-15">正常
  957 + </button>
  958 + {{# }else{ if(d.runState === '运行中'){ }}
  959 + <button type="button" class="layui-btn layui-btn-danger layui-bg-green layui-btn-radius layui-btn-xs p-0-15">运行中</button>
  960 + {{# }else{ }}
  961 + <button type="button" class="layui-btn layui-btn-radius layui-bg-red layui-btn-xs p-0-15">异常</button>
  962 + {{# } }}
  963 + {{# } }}
  964 +</script>
944 <script type="text/html" id="weblogicIpTpl"> 965 <script type="text/html" id="weblogicIpTpl">
945 <div>{{d.ip?d.ip:""}}</div> 966 <div>{{d.ip?d.ip:""}}</div>
946 </script> 967 </script>