monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 881dd7fee6736c45439ac2f882a2388cf85578ca 2 parents 3676cd00 af6a3719

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

过滤和压制-【无】-说明列表出现null值



See merge request !916
Inline Side-by-side
Showing 1 changed file with 3 additions and 14 deletions
@@ -61,24 +61,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe @@ -61,24 +61,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
61 {type: 'numbers', title: '序号', align: 'center'} 61 {type: 'numbers', title: '序号', align: 'center'}
62 , {field: 'resTypeName', title: '资源类型', align: 'center', width: '15%'} 62 , {field: 'resTypeName', title: '资源类型', align: 'center', width: '15%'}
63 , { 63 , {
64 - field: 'resName', title: '资源名称', minWidth: 200, align: 'center', width: '20%', 64 + field: 'resName', title: '资源名称', minWidth: 200, align: 'center', width: '25%',
65 templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>' 65 templet: '<div><span data-ip="{{d.ip}}" data-resname="{{d.resName}}" data-resid="{{d.resId}}" data-restype="{{d.resType}}" data-zymc="{{d.id}}" class="layui-table-link">{{d.resName}}</span></div>'
66 } 66 }
67 // , {field: 'kpiName', title: '指标', align: 'left'} 67 // , {field: 'kpiName', title: '指标', align: 'left'}
68 - , {field: 'flag', title: '标识', align: 'center', width: '10%'} 68 + , {field: 'flag', title: '标识', align: 'center', width: '15%'}
69 , { 69 , {
70 - field: 'typeName', title: '说明', align: 'left',  
71 - templet: function (d) {  
72 - var str = '单指标过滤：';  
73 - if (d.kpiId == '') {  
74 - str = '多指标过滤：';  
75 - }  
76 - if (d.subFlag.indexOf('--') != -1) {  
77 - return '<div><span style="color: grey;">' + str + '</span><span>' + d.kpiName + '</span></div>'  
78 - } else {  
79 - return '<div><span style="color: grey;">' + str + '</span><span>' + d.kpiName + '：' + d.subFlag + '</span></div>'  
80 - }  
81 - } 70 + field: 'typeName', title: '说明', align: 'left'
82 } 71 }
83 , { 72 , {
84 title: '操作', align: 'center', width: '5%', 73 title: '操作', align: 'center', width: '5%',