Merge branch 'master-yjp' into 'master'

问题 18、19 、16，资源类型加载为空 See merge request !101

Merge branch 'master-yjp' into 'master'
问题 18、19 、16，资源类型加载为空 See merge request !101
王涛
Commit b80e918e628154699b4b8a3b94ecf4c9223cd744 2 parents ea1ca028 75a414ea
Showing 2 changed files with 6 additions and 0 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
hg-monitor-web-base/src/main/resources/static/src/controller/resindex.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @b80e918
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @b80e918
@@ -472,6 +472,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                     templet: '#resindex_resName'
                 },
                 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
+                {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
+                {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
                 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
                 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/resindex.js
View file @b80e918
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/resindex.js
View file @b80e918
@@ -1261,8 +1261,12 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                 })
             }
             if(subflag && !resTypeSelectExclude.includes(resType)){
+                if(/ALI_CLOUD_/.test(resType) || /HUAWEI_CLOUD_/.test(resType)) {
+                    return
+                }
                 $("#res_sub_restype").parent().parent().removeClass("hide");
                 $(".top-head-info").removeClass("hide");
+
                 var url = `${common.domainName}/api-web/bResource/finsResTypeListByParentId?resType=${resType}`
                 admin.req({
                     url: url