monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit b9238b6fcdcaf0c0eda999994ec18bc306208481 1 parent 9869a5a2

【无】有的资源列表有两个别名字段

Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
@@ -4783,7 +4783,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -4783,7 +4783,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
4783 field: 'resName', title: '资源名称', minWidth: 250, sort: true, 4783 field: 'resName', title: '资源名称', minWidth: 250, sort: true,
4784 templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>' 4784 templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'
4785 }, 4785 },
4786 - {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'}, 4786 + // {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
4787 {field: 'health', title: '健康状态', width: 86, align: 'center', sort: true, templet: '#healthTpl'}, 4787 {field: 'health', title: '健康状态', width: 86, align: 'center', sort: true, templet: '#healthTpl'},
4788 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}, 4788 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
4789 {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}, 4789 {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true},
@@ -4798,7 +4798,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -4798,7 +4798,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
4798 field: 'resName', title: '资源名称', minWidth: 220, sort: true, 4798 field: 'resName', title: '资源名称', minWidth: 220, sort: true,
4799 templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>' 4799 templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'
4800 }, 4800 },
4801 - {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'}, 4801 + // {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
4802 {field: 'health', title: '健康状态', width: 105, align: 'center', sort: true, templet: '#healthTpl'}, 4802 {field: 'health', title: '健康状态', width: 105, align: 'center', sort: true, templet: '#healthTpl'},
4803 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}, 4803 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
4804 {field: 'linkState', title: '连接状态', align: 'center', width: 110, templet: '#linkStateTpl', sort: true}, 4804 {field: 'linkState', title: '连接状态', align: 'center', width: 110, templet: '#linkStateTpl', sort: true},
@@ -4814,7 +4814,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -4814,7 +4814,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
4814 field: 'resName', title: '资源名称', minWidth: 220, sort: true, 4814 field: 'resName', title: '资源名称', minWidth: 220, sort: true,
4815 templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>' 4815 templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'
4816 }, 4816 },
4817 - {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'}, 4817 + // {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
4818 {field: 'health', title: '健康状态', width: 105, align: 'center', sort: true, templet: '#healthTpl'}, 4818 {field: 'health', title: '健康状态', width: 105, align: 'center', sort: true, templet: '#healthTpl'},
4819 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}, 4819 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
4820 {field: 'linkState', title: '连接状态', align: 'center', width: 110, templet: '#linkStateTpl', sort: true}, 4820 {field: 'linkState', title: '连接状态', align: 'center', width: 110, templet: '#linkStateTpl', sort: true},
@@ -4829,7 +4829,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', @@ -4829,7 +4829,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
4829 field: 'resName', title: '资源名称', minWidth: 215, sort: true, 4829 field: 'resName', title: '资源名称', minWidth: 215, sort: true,
4830 templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>' 4830 templet: '<div><span data-zymc="{{ d.resId }}" data-restype="{{d.resType}}" data-name="{{d.resName}}" data-childrennum="{{d.childrenNum}}" data-ip="{{ d.ip }}" data-resTypeName="{{ d.resTypeName }}" data-admin="{{ d.admin }}" data-adminName="{{ d.adminName }}" data-pingenable="{{d.pingEnable}}" class="layui-table-link">{{ d.resName }}</span></div>'
4831 }, 4831 },
4832 - {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'}, 4832 + // {field: 'shortName', title: '别名', width: 100, align: 'center', sort: true, templet:'#shortNameTpl'},
4833 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'}, 4833 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
4834 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true}, 4834 {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
4835 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true}, 4835 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},