monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit f6139f7dcc568609a129af4d7c1617acad5b4c3a 2 parents db89e2cb b6621275

Merge branch 'master-joke' into 'master' 

chore:腾讯云资源列表调整

chore:腾讯云资源列表调整

See merge request !1146
Inline Side-by-side
Showing 1 changed file with 0 additions and 19 deletions
... ... @@ -2651,11 +2651,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
templet: '#resindex_resName'
},
// {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
{field: 'health', title: '健康状态', width: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
{field: 'lastColTime', title: '最近采集时间', width: x_160, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
{field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
... ... @@ -2667,11 +2664,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
templet: '#resindex_resName'
},
// {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
{field: 'health', title: '健康状态', width: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
{field: 'lastColTime', title: '最近采集时间', width: x_160, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
{field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
... ... @@ -2683,11 +2677,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
templet: '#resindex_resName'
},
// {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
{field: 'health', title: '健康状态', width: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
{field: 'lastColTime', title: '最近采集时间', width: x_160, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
{field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
... ... @@ -2699,11 +2690,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
templet: '#resindex_resName'
},
// {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
{field: 'health', title: '健康状态', width: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
{field: 'lastColTime', title: '最近采集时间', width: x_160, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
{field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
... ... @@ -2715,10 +2703,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
templet: '#resindex_resName'
},
// {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
{field: 'health', title: '健康状态', width: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', width: x_160, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
{field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
... ... @@ -2730,25 +2716,20 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
templet: '#resindex_resName'
},
// {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
{field: 'health', title: '健康状态', width: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', width: x_160, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
{field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
{field: 'state', title: '资源状态', width: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
],
"TENCENT_CLOUD_PLAT_RES_DISK": [
{field: 'ip', title: 'IP地址', width: x_130, align: 'center', sort: true},
{
field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
templet: '#resindex_resName'
},
// {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
{field: 'health', title: '健康状态', width: x_120, align: 'center', sort: true, templet: '#healthTpl'},
{field: 'lastColTime', title: '最近采集时间', width: x_160, align: 'center', sort: true},
{field: 'linkState', title: '连接状态', align: 'center', width: x_120, templet: '#linkStateTpl', sort: true},
{field: 'adminName', title: '负责人', width: x_130, align: 'center', sort: true},
{field: 'adminPhone', title: '负责人电话', width: x_130, align: 'center', sort: true},
{field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
... ...