monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit c4f14127700773c5390b0e0f5b256b1377b65513 2 parents 769acbfb b80e918e

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

Inline Side-by-side
Showing 2 changed files with 6 additions and 0 deletions
@@ -472,6 +472,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -472,6 +472,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
472 templet: '#resindex_resName' 472 templet: '#resindex_resName'
473 }, 473 },
474 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true}, 474 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
  475 + {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
  476 + {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
475 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 477 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
476 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 478 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
477 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 479 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
@@ -1261,8 +1261,12 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -1261,8 +1261,12 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
1261 }) 1261 })
1262 } 1262 }
1263 if(subflag && !resTypeSelectExclude.includes(resType)){ 1263 if(subflag && !resTypeSelectExclude.includes(resType)){
  1264 + if(/ALI_CLOUD_/.test(resType) || /HUAWEI_CLOUD_/.test(resType)) {
  1265 + return
  1266 + }
1264 $("#res_sub_restype").parent().parent().removeClass("hide"); 1267 $("#res_sub_restype").parent().parent().removeClass("hide");
1265 $(".top-head-info").removeClass("hide"); 1268 $(".top-head-info").removeClass("hide");
  1269 +
1266 var url = `${common.domainName}/api-web/bResource/finsResTypeListByParentId?resType=${resType}` 1270 var url = `${common.domainName}/api-web/bResource/finsResTypeListByParentId?resType=${resType}`
1267 admin.req({ 1271 admin.req({
1268 url: url 1272 url: url