Merge branch 'master-v32-xwx' into 'master'

资源视图小型机分区添加主机cpu总核数列 See merge request !479

Merge branch 'master-v32-xwx' into 'master'
资源视图小型机分区添加主机cpu总核数列 See merge request !479
王涛
Commit c923e201f38f385829d28d443ac1508d372c2de8 2 parents 08ea3362 a5b8961d
Showing 1 changed file with 1 additions and 0 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @c923e20
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @c923e20
@@ -175,6 +175,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'fileSysUseRate', title: '文件系统使用率(最大)', align: 'center', minWidth: x_185, templet: '#fileUseRateTpl', sort: true},
                 // {field: 'diskBusyRate', title: '磁盘繁忙率(最大)', minWidth: x_160, align: 'center', sort: true, templet: '<div>{{d.diskBusyRate}}%</div>'},
                 {field: 'cpuCores', title: '单个CPU核数', align: 'center', minWidth: x_150, sort: true, templet: '#cpuCoresTpl'},
+                {field: 'cpuNum', title: '主机CPU总核数', align: 'center', minWidth: x_150, sort: true, templet: '#cpuNumTpl'},
                 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_120, templet: '#cpuRateTpl', sort: true},
                 {field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
                 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_120, templet: '#memoryRateTpl', sort: true},