monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 69b42a4b3571a0495ab251c9f6cd071330b37846 2 parents db245a0a 0dbe3f1b

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 10 changed files with 97 additions and 64 deletions
@@ -342,8 +342,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -342,8 +342,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
342 {field: 'adminPhone', title: '负责人电话', width: 118, 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'}, 343 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
344 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 344 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
345 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
346 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 345 +
  346 + {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},
  347 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
347 ], 348 ],
348 "HUAWEI_CLOUD_CLUSTER": [ 349 "HUAWEI_CLOUD_CLUSTER": [
349 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 350 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -358,8 +359,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -358,8 +359,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
358 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 359 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
359 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 360 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
360 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 361 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
  362 +
  363 + {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},
361 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}, 364 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
362 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}  
363 ], 365 ],
364 "HUAWEI_CLOUD_PHYSICSHOST": [ 366 "HUAWEI_CLOUD_PHYSICSHOST": [
365 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 367 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -375,9 +377,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -375,9 +377,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
375 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 377 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
376 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 378 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
377 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 379 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
378 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}, 380 +
379 // 2021-11-22 徐毫杰 连接状态无数据改成展示主机状态 381 // 2021-11-22 徐毫杰 连接状态无数据改成展示主机状态
380 - {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true} 382 + {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},
  383 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
381 ], 384 ],
382 "HUAWEI_CLOUD_VIRTUALHOST": [ 385 "HUAWEI_CLOUD_VIRTUALHOST": [
383 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 386 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -393,8 +396,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -393,8 +396,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
393 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 396 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
394 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 397 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
395 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 398 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
396 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
397 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 399 +
  400 + {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
  401 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
398 ], 402 ],
399 "HUAWEI_CLOUD_STORAGE": [ 403 "HUAWEI_CLOUD_STORAGE": [
400 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 404 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -410,8 +414,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -410,8 +414,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
410 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 414 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
411 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 415 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
412 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 416 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
413 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
414 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 417 + {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
  418 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
415 ], 419 ],
416 "HUAWEI_CLOUD_SWITCHBOARD": [ 420 "HUAWEI_CLOUD_SWITCHBOARD": [
417 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 421 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -423,12 +427,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -423,12 +427,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
423 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 427 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
424 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 428 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
425 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 429 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
426 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
427 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 430 +
428 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 431 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
429 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 432 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
430 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
431 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 433 + {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
  434 + {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
  435 + {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
  436 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
  437 +
432 ], 438 ],
433 "HUAWEI_CLOUD_FIREWALL": [ 439 "HUAWEI_CLOUD_FIREWALL": [
434 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 440 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -440,12 +446,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -440,12 +446,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
440 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 446 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
441 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 447 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
442 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 448 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
443 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
444 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 449 +
445 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 450 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
446 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 451 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
447 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
448 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 452 + {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
  453 + {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
  454 + {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
  455 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
  456 +
449 ], 457 ],
450 "ALI_CLOUD_ECS": [ 458 "ALI_CLOUD_ECS": [
451 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 459 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -459,12 +467,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -459,12 +467,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
459 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 467 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
460 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true}, 468 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
461 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 469 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
462 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
463 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 470 +
464 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 471 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
465 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 472 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
466 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
467 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 473 + {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true},
  474 + {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
  475 + {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
  476 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
  477 +
468 ], 478 ],
469 "ALI_CLOUD_RDS": [ 479 "ALI_CLOUD_RDS": [
470 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 480 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -476,12 +486,13 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -476,12 +486,13 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
476 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true}, 486 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
477 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true}, 487 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
478 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 488 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
479 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
480 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
481 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 489 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
482 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 490 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
483 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
484 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 491 + {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
  492 + {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
  493 + {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
  494 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
  495 +
485 ], 496 ],
486 "ALI_CLOUD_SLB": [ 497 "ALI_CLOUD_SLB": [
487 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 498 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -491,12 +502,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -491,12 +502,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
491 }, 502 },
492 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 503 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
493 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 504 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
494 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
495 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 505 +
496 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 506 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
497 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 507 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
  508 +
  509 + {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
  510 + {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
  511 + {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
498 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}, 512 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
499 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}  
500 ], 513 ],
501 "ALI_CLOUD_OSS": [ 514 "ALI_CLOUD_OSS": [
502 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 515 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -506,12 +519,13 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -506,12 +519,13 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
506 }, 519 },
507 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 520 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
508 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 521 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
509 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
510 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},  
511 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 522 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
512 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 523 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
513 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
514 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 524 + {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
  525 + {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
  526 + {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
  527 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
  528 +
515 ], 529 ],
516 "ALI_ARMS": [ 530 "ALI_ARMS": [
517 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 531 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -536,29 +550,34 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -536,29 +550,34 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
536 }, 550 },
537 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 551 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
538 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 552 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
539 - {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},  
540 - {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 553 +
541 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}, 554 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
542 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'}, 555 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
543 - {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},  
544 - {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true} 556 +
  557 + {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true},
  558 + {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
  559 + {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
  560 + {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
545 ], 561 ],
546 "A_CLOUD_PHYSICSHOST": [ 562 "A_CLOUD_PHYSICSHOST": [
547 // {type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 563 // {type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
548 - {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 564 +
549 { 565 {
550 field: 'resName', title: '资源名称', minWidth: 250, sort: true, 566 field: 'resName', title: '资源名称', minWidth: 250, sort: true,
551 templet: '#resindex_resName' 567 templet: '#resindex_resName'
552 }, 568 },
  569 + {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  570 + {field: 'resTypeName', title: '资源类型', width: 100, align: 'center'},
553 {field: 'health', title: '健康状态', width: 120, align: 'center', sort: true, templet: '#healthTpl'}, 571 {field: 'health', title: '健康状态', width: 120, align: 'center', sort: true, templet: '#healthTpl'},
554 {field: 'cpuRate', title: 'CPU使用率', align: 'center', width: 120, templet: '#cpuRateTpl', sort: true}, 572 {field: 'cpuRate', title: 'CPU使用率', align: 'center', width: 120, templet: '#cpuRateTpl', sort: true},
555 {field: 'memoryRate', title: '内存使用率', align: 'center', width: 120, templet: '#memoryRateTpl', sort: true}, 573 {field: 'memoryRate', title: '内存使用率', align: 'center', width: 120, templet: '#memoryRateTpl', sort: true},
556 - {field: 'lastColTime', title: '最近采集时间', width: 160, align: 'center', sort: true}, 574 +
557 {field: 'linkState', title: '连接状态', align: 'center', width: 110, templet: '#linkStateTpl', sort: true}, 575 {field: 'linkState', title: '连接状态', align: 'center', width: 110, templet: '#linkStateTpl', sort: true},
558 {field: 'adminName', title: '负责人', width: 125, align: 'center', sort: true}, 576 {field: 'adminName', title: '负责人', width: 125, align: 'center', sort: true},
559 {field: 'adminPhone', title: '负责人电话', width: 120, align: 'center', sort: true}, 577 {field: 'adminPhone', title: '负责人电话', width: 120, align: 'center', sort: true},
560 - {field: 'resTypeName', title: '资源类型', width: 100, align: 'center'},  
561 - {field: 'state', title: '资源状态', width: 120, align: 'center', sort: true, templet: '#resStateTpl'} 578 +
  579 + {field: 'state', title: '资源状态', width: 120, align: 'center', sort: true, templet: '#resStateTpl'},
  580 + {field: 'lastColTime', title: '最近采集时间', width: 160, align: 'center', sort: true}
562 ], 581 ],
563 "VIRTUALIZATION_COLONY": [ 582 "VIRTUALIZATION_COLONY": [
564 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 583 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -2556,19 +2575,21 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -2556,19 +2575,21 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
2556 {field: 'vmmemoryUseRate', title: '虚拟内存使用率', align: 'center', minWidth: x_165, templet: '#vmmemoryRateTpl', sort: true}, 2575 {field: 'vmmemoryUseRate', title: '虚拟内存使用率', align: 'center', minWidth: x_165, templet: '#vmmemoryRateTpl', sort: true},
2557 {field: 'maxNetCardUpRate', title: '上行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardUpRate}} kb/s</div>'}, 2576 {field: 'maxNetCardUpRate', title: '上行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardUpRate}} kb/s</div>'},
2558 {field: 'maxNetCardDownRate', title: '下行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardDownRate}} kb/s</div>'}, 2577 {field: 'maxNetCardDownRate', title: '下行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardDownRate}} kb/s</div>'},
2559 - {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},  
2560 {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true}, 2578 {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true},
  2579 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  2580 + {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'},
2561 {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true}, 2581 {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
2562 {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true}, 2582 {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
2563 - {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},  
2564 - {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'} 2583 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}
2565 ], 2584 ],
2566 "ALI_CLOUD_PLAT":[ 2585 "ALI_CLOUD_PLAT":[
2567 - {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true}, 2586 +
2568 { 2587 {
2569 field: 'resName', title: '资源名称', minWidth: x_300, sort: true, 2588 field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
2570 templet: '#resindex_resName' 2589 templet: '#resindex_resName'
2571 }, 2590 },
  2591 + {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
  2592 + {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
2572 {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'}, 2593 {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
2573 // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'}, 2594 // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'},
2574 {field: 'fileSysUseRate', title: '文件系统使用率(最大)', align: 'center', minWidth: x_185, templet: '#fileUseRateTpl', sort: true}, 2595 {field: 'fileSysUseRate', title: '文件系统使用率(最大)', align: 'center', minWidth: x_185, templet: '#fileUseRateTpl', sort: true},
@@ -2582,12 +2603,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -2582,12 +2603,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
2582 {field: 'vmmemoryUseRate', title: '虚拟内存使用率', align: 'center', minWidth: x_165, templet: '#vmmemoryRateTpl', sort: true}, 2603 {field: 'vmmemoryUseRate', title: '虚拟内存使用率', align: 'center', minWidth: x_165, templet: '#vmmemoryRateTpl', sort: true},
2583 {field: 'maxNetCardUpRate', title: '上行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardUpRate}} kb/s</div>'}, 2604 {field: 'maxNetCardUpRate', title: '上行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardUpRate}} kb/s</div>'},
2584 {field: 'maxNetCardDownRate', title: '下行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardDownRate}} kb/s</div>'}, 2605 {field: 'maxNetCardDownRate', title: '下行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardDownRate}} kb/s</div>'},
2585 - {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}, 2606 +
2586 {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true}, 2607 {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true},
  2608 +
  2609 +
  2610 + {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'},
2587 {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true}, 2611 {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
2588 {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true}, 2612 {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
2589 - {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},  
2590 - {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'} 2613 + {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}
2591 ], 2614 ],
2592 "ARMS":[ 2615 "ARMS":[
2593 { 2616 {
@@ -192,8 +192,17 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => { @@ -192,8 +192,17 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
192 } 192 }
193 193
194 global.openDetail = (resId, resType, title) => { 194 global.openDetail = (resId, resType, title) => {
195 - let url = window.top.location.href.split('/#')[0] + `/#/res/resDetail/resId=${resId}/resType=${resType}/title=${title}`;  
196 - global.openBlankWindow(url); 195 + // let url = `/#/res/resDetail/view/resId=${resId}`;
  196 + let url = window.top.location.href.split('/#')[0] + `/#/res/resDetail/view/resId=${resId}`;
  197 + if(resType){
  198 + url += '/resType=' + resType
  199 + }
  200 +
  201 + if(title){
  202 + url += '/title=' + title
  203 + }
  204 +
  205 + // global.openBlankWindow(url);
197 } 206 }
198 207
199 /** 208 /**
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </head> 10 </head>
11 <body> 11 <body>
12 <div class="outlinediv" style="height: 666px"> 12 <div class="outlinediv" style="height: 666px">
13 - <span>湖州灾备一机房平面图</span> 13 +<!-- <span>湖州灾备一机房平面图</span>-->
14 <div class="huzhouone-topcabinet"> 14 <div class="huzhouone-topcabinet">
15 <table> 15 <table>
16 <tr> 16 <tr>
@@ -239,4 +239,4 @@ @@ -239,4 +239,4 @@
239 </div> 239 </div>
240 </div> 240 </div>
241 </body> 241 </body>
242 -</html>  
  242 +</html>
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 </head> 15 </head>
16 <body> 16 <body>
17 <div class="outlinediv" > 17 <div class="outlinediv" >
18 - <span>湖州灾备三机房平面图</span> 18 +<!-- <span>湖州灾备三机房平面图</span>-->
19 <div class="huzhouone-topcabinet" style="margin-left: 25%;padding-top: 30px"> 19 <div class="huzhouone-topcabinet" style="margin-left: 25%;padding-top: 30px">
20 <table> 20 <table>
21 <tr> 21 <tr>
@@ -68,4 +68,4 @@ @@ -68,4 +68,4 @@
68 </div> 68 </div>
69 </div> 69 </div>
70 </body> 70 </body>
71 -</html>  
  71 +</html>
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 </head> 15 </head>
16 <body> 16 <body>
17 <div class="outlinediv" > 17 <div class="outlinediv" >
18 - <span>湖州灾备二机房平面图</span> 18 +<!-- <span>湖州灾备二机房平面图</span>-->
19 <div class="huzhouone-topcabinet" style="margin-left: 20%"> 19 <div class="huzhouone-topcabinet" style="margin-left: 20%">
20 <table> 20 <table>
21 <tr> 21 <tr>
@@ -78,4 +78,4 @@ @@ -78,4 +78,4 @@
78 </div> 78 </div>
79 </div> 79 </div>
80 </body> 80 </body>
81 -</html>  
  81 +</html>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </head> 10 </head>
11 <body> 11 <body>
12 <div class="outlinediv"> 12 <div class="outlinediv">
13 - <span>2号机房平面图</span> 13 +<!-- <span>2号机房平面图</span>-->
14 <div class="xiaoshansecond-topcabinet"> 14 <div class="xiaoshansecond-topcabinet">
15 <table> 15 <table>
16 <tr> 16 <tr>
@@ -90,4 +90,4 @@ @@ -90,4 +90,4 @@
90 </div> 90 </div>
91 </div> 91 </div>
92 </body> 92 </body>
93 -</html>  
  93 +</html>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </head> 8 </head>
9 <body> 9 <body>
10 <div class="outlinediv" style="width: 950px"> 10 <div class="outlinediv" style="width: 950px">
11 - <span>7号机房平面图</span> 11 +<!-- <span>7号机房平面图</span>-->
12 <div style="width: 100%;height: 100%;display: inline-flex"> 12 <div style="width: 100%;height: 100%;display: inline-flex">
13 <div class="xiaoshanseven-leftcabinet"> 13 <div class="xiaoshanseven-leftcabinet">
14 <table> 14 <table>
@@ -221,4 +221,4 @@ @@ -221,4 +221,4 @@
221 </div> 221 </div>
222 </div> 222 </div>
223 </body> 223 </body>
224 -</html>  
  224 +</html>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </head> 10 </head>
11 <body> 11 <body>
12 <div class="outlinediv"> 12 <div class="outlinediv">
13 - <span>3号机房平面图</span> 13 +<!-- <span>3号机房平面图</span>-->
14 <div class="xiaoshanthird-topcabinet"> 14 <div class="xiaoshanthird-topcabinet">
15 <table> 15 <table>
16 <tr> 16 <tr>
@@ -112,4 +112,4 @@ @@ -112,4 +112,4 @@
112 </div> 112 </div>
113 </div> 113 </div>
114 </body> 114 </body>
115 -</html>  
  115 +</html>
@@ -32,7 +32,8 @@ @@ -32,7 +32,8 @@
32 :showBorder="true" :currentPage="currentPage" :total="total" :loading="false" 32 :showBorder="true" :currentPage="currentPage" :total="total" :loading="false"
33 :showPage="true" :height="(height - 95)" :maxWidth="max"> 33 :showPage="true" :height="(height - 95)" :maxWidth="max">
34 <template #default="{row,prop,column}"> 34 <template #default="{row,prop,column}">
35 - <a href="javascript:void(0)" v-if="prop == 'resPositon' || prop == 'cabinetNo'" style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a> 35 +<!-- <a href="javascript:void(0)" v-if="prop == 'resPositon' || prop == 'cabinetNo'" style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a>-->
  36 + <a href="javascript:void(0)" v-if="prop == 'aaa' || prop == 'bbbbb'" style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a>
36 37
37 <component v-else-if="row[prop] && row[prop].props && row[prop].props.colComponents " v-bind:is="row[prop].props.colComponents" 38 <component v-else-if="row[prop] && row[prop].props && row[prop].props.colComponents " v-bind:is="row[prop].props.colComponents"
38 :resId="row.resId" 39 :resId="row.resId"
@@ -59,7 +60,7 @@ @@ -59,7 +60,7 @@
59 </div> 60 </div>
60 <div v-if="cellDetail.prop == 'resPositon'" @click="openCabinet(false)" style="background-image: url('/vue3/src/assets/images/res/img02.jpg');height: 600px;background-repeat: no-repeat;background-position: center;background-size: 80%;"> 61 <div v-if="cellDetail.prop == 'resPositon'" @click="openCabinet(false)" style="background-image: url('/vue3/src/assets/images/res/img02.jpg');height: 600px;background-repeat: no-repeat;background-position: center;background-size: 80%;">
61 <div style="font-weight: bold;font-size: 20px;"> 62 <div style="font-weight: bold;font-size: 20px;">
62 - {{cellDetail.row[cellDetail.prop]}}布局图 63 + <!--{{cellDetail.row[cellDetail.prop]}}布局图-->
63 </div> 64 </div>
64 </div> 65 </div>
65 </template> 66 </template>
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 </el-dialog> 35 </el-dialog>
36 36
37 <!--机房布局--> 37 <!--机房布局-->
38 - <el-dialog v-model="outerVisible" :title="dialogMachineName" width="70%" @close="closeDialog" top="4vh"> 38 + <el-dialog v-model="outerVisible" :title="dialogMachineName" width="70%" @close="closeDialog" top="7vh">
39 <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData"></GetMachineRoom> 39 <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData"></GetMachineRoom>
40 40
41 </el-dialog> 41 </el-dialog>