monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ac504d9a8c5feb1dc27f2abf10a6017cf4c72ceb 2 parents 164db9c5 154fe0d4

Merge branch 'master-V32-XuHaoJie' into 'master' 

杭州-首页-虚拟机数量对不上



See merge request !210
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
@@ -2333,7 +2333,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -2333,7 +2333,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
2333 {field: 'resRemark', title: '备注', minWidth: 420, align: 'center'} 2333 {field: 'resRemark', title: '备注', minWidth: 420, align: 'center'}
2334 ], 2334 ],
2335 //虚拟化宿主机 joke add 20210804 2335 //虚拟化宿主机 joke add 20210804
2336 - "PHYSICSHOST": [ 2336 + "VMWARE_PHYSICSHOST": [
2337 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 2337 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
2338 { 2338 {
2339 title: '#', width: 50, childTitle: false,isChild: function(row){return row.childrenNum != 0}, children: [{ 2339 title: '#', width: 50, childTitle: false,isChild: function(row){return row.childrenNum != 0}, children: [{
@@ -2396,7 +2396,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -2396,7 +2396,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
2396 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'} 2396 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}
2397 ], 2397 ],
2398 //虚拟化资源池 joke add 20210804 2398 //虚拟化资源池 joke add 20210804
2399 - "VCLUSTER": [ 2399 + "VMWARE_CLUSTER": [
2400 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 2400 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
2401 { 2401 {
2402 title: '#', width: 50, childTitle: false, children: [{ 2402 title: '#', width: 50, childTitle: false, children: [{
@@ -2452,7 +2452,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -2452,7 +2452,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
2452 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'} 2452 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}
2453 ], 2453 ],
2454 //虚拟化平台 joke add 20210804 2454 //虚拟化平台 joke add 20210804
2455 - "PLATFORM": [ 2455 + "VMWARE_PLATFORM": [
2456 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'}, 2456 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
2457 { 2457 {
2458 title: '#', width: 50, childTitle: false, children: [{ 2458 title: '#', width: 50, childTitle: false, children: [{