diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/ali_cloud_ecs.js b/hg-monitor-web-base/src/main/resources/static/src/controller/ali_cloud_ecs.js index 13b21b2..764e941 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/ali_cloud_ecs.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/ali_cloud_ecs.js @@ -28,7 +28,7 @@ layui.define(['commonDetail','common'], function (exports) { function reload() { //基本信息 // 根据高磊最新调整,屏蔽 KPI1D79730C(是否IO优化)/KPI93CB4C19(专有网络名称) - commonDetail.renderTextCols("ali_cloud_ecs_baseinfo",resId,jbxxKpi,3); + commonDetail.renderTextCols("ali_cloud_ecs_baseinfo",resId,jbxxKpi,2); //维保信息 joke add 20200611 commonDetail.renderMaintenanceInfo('ali_cloud_ecs_wbinfo',resId,resType); // CPU使用率 @@ -63,4 +63,4 @@ layui.define(['commonDetail','common'], function (exports) { },commonDetail.timerTime); commonDetail.detailTimer.push(timer); }); -}); \ No newline at end of file +}); diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/ali_cloud_ecs.html b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/ali_cloud_ecs.html index df76b1d..3323e7e 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/ali_cloud_ecs.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/template/detail/ali_cloud_ecs.html @@ -7,14 +7,14 @@ <div class="lay-row"> <div class="lay-row-item lay-row-item--auto-width"> <h5 class="lay-row-title">基本信息<i data-id="ali_cloud_ecs_baseinfo" class="iconfont detail_base_info"></i></h5> - <ul class="info-table info-ali-cloud-ecs" id="ali_cloud_ecs_baseinfo"></ul> + <ul class="info-table" id="ali_cloud_ecs_baseinfo"></ul> </div> - </div> - <div class="lay-row"> - <div class="lay-row-item lay-row-item--auto-width"> + <div class="lay-row-item lay-row-item--small"> <h5 class="lay-row-title">维保信息</h5> <ul class="info-table" id="ali_cloud_ecs_wbinfo"></ul> </div> + </div> + <div class="lay-row"> <div class="lay-row-item"> <h5 class="lay-row-title">CPU使用率 <a class="detail_row_menu hide"> @@ -30,8 +30,6 @@ </li> </ul> </div> - </div> - <div class="lay-row"> <div class="lay-row-item"> <h5 class="lay-row-title">内存使用率 <a class="detail_row_menu hide"> @@ -118,4 +116,4 @@ fn(JSON.parse(parm)); } }); -</script> \ No newline at end of file +</script>