Authored by 鲁尚清

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

…master-v32-lushangqing
@@ -222,7 +222,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -222,7 +222,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
222 // {field: 'provider', title: '厂商', minWidth: x_130, align: 'center', sort: true}, 222 // {field: 'provider', title: '厂商', minWidth: x_130, align: 'center', sort: true},
223 // {field: 'model', title: '型号', minWidth: x_130, align: 'center', sort: true}, 223 // {field: 'model', title: '型号', minWidth: x_130, align: 'center', sort: true},
224 { 224 {
225 - field: 'resName', title: '资源名称', minWidth: x_300, sort: true, 225 + field: 'resName', title: '资源名称', minWidth: x_330, sort: true,
226 templet: '#resindex_resName' }, 226 templet: '#resindex_resName' },
227 {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'}, 227 {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
228 // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'}, 228 // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'},