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',
{field: 'resRemark', title: '备注', minWidth: 420, align: 'center'}
],
//虚拟化宿主机 joke add 20210804
"PHYSICSHOST": [
"VMWARE_PHYSICSHOST": [
//{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
{
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',
{field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}
],
//虚拟化资源池 joke add 20210804
"VCLUSTER": [
"VMWARE_CLUSTER": [
//{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
{
title: '#', width: 50, childTitle: false, children: [{
... ... @@ -2452,7 +2452,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
{field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'}
],
//虚拟化平台 joke add 20210804
"PLATFORM": [
"VMWARE_PLATFORM": [
//{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
{
title: '#', width: 50, childTitle: false, children: [{
... ...