trap采集器绑定的资源增加告警过滤

@@ -136,7 +136,14 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
                     '</div>'
                     '</div>'
             }, {
             }, {
                 field: 'resCount', title: '绑定资源', align: 'right', sort: true, minWidth: 105,
                 field: 'resCount', title: '绑定资源', align: 'right', sort: true, minWidth: 105,
-                templet: '<div><span data-index="{{d.LAY_TABLE_INDEX}}" data-collectorid="{{d.collectorId}}" data-colltype="{{d.collType}}" class="layui-table-link link-collector-reslist">{{d.resCount}}</span></div>'
+                templet: '<div>' +
+                            '<span data-index="{{d.LAY_TABLE_INDEX}}" ' +
+                                'data-collectorid="{{d.collectorId}}" ' +
+                                'data-collectname="{{d.collectorName}}" ' +
+                                'data-colltype="{{d.collType}}" ' +
+                                'class="layui-table-link link-collector-reslist">{{d.resCount}}' +
+                            '</span>' +
+                        '</div>'
             }, {
             }, {
                 title: '采集类型', field: 'collType', align: 'center', sort: true, minWidth: 125,
                 title: '采集类型', field: 'collType', align: 'center', sort: true, minWidth: 125,
                 templet: function (d) {
                 templet: function (d) {
@@ -219,12 +226,14 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'upload',
                     if (!common.hasPermission('back:collector:addResources')){
                     if (!common.hasPermission('back:collector:addResources')){
                         return;
                         return;
                     }
                     }
-                    collectorId = $(this).data('collectorid');
+                    var collectorId = $(this).data('collectorid');
+                    var collectorName = $(this).data("collectname");
                     var collType = $(this).data('colltype');
                     var collType = $(this).data('colltype');
                     var params = {};
                     var params = {};
                     if (collType === 'collType_trap') {
                     if (collType === 'collType_trap') {
                         params = {
                         params = {
-                            trapCollectorId: collectorId
+                            trapCollectorId: collectorId,
+                            collectorName: collectorName
                         }
                         }
                     } else {
                     } else {
                         params = {
                         params = {

@@ -24,6 +24,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         // 采集器编号查询条件
         // 采集器编号查询条件
         var collectorId = (data && data.collectorId) ? data.collectorId : '';
         var collectorId = (data && data.collectorId) ? data.collectorId : '';
         var trapCollectorId = (data && data.trapCollectorId) ? data.trapCollectorId : '';  //trap采集器绑定资源查询  joke add 20210723
         var trapCollectorId = (data && data.trapCollectorId) ? data.trapCollectorId : '';  //trap采集器绑定资源查询  joke add 20210723
+        var collectorName = (data && data.collectorName) ? data.collectorName : "";
+        var isTrap = (data && data.trapCollectorId) ? true : false;
         var alarmTempId = (data && data.alarmTempId) ? data.alarmTempId : '';
         var alarmTempId = (data && data.alarmTempId) ? data.alarmTempId : '';
         var writeBackResList = (data && data.writeBackResList) ? data.writeBackResList : '';
         var writeBackResList = (data && data.writeBackResList) ? data.writeBackResList : '';
         var cutoverId = '', targetType = '',haveNum=0;
         var cutoverId = '', targetType = '',haveNum=0;
@@ -148,8 +150,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     templet: function (d){
                     templet: function (d){
                         let str = '<div>' +
                         let str = '<div>' +
                             '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-tips="资源解绑" collector-data-unbindRes="' + d.resId + '"><i class="layui-icon layui-icon-unlink"></i></button>'
                             '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-tips="资源解绑" collector-data-unbindRes="' + d.resId + '"><i class="layui-icon layui-icon-unlink"></i></button>'
-                            '</div>'
-                        return str
+                        if (isTrap) {
+                            str += '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-tips="告警过滤" ' +
+                                'collector-data-filteralarms-name = "'+d.resName+'" ' +
+                                'collector-data-filteralarms="' + d.resId + '"><i class="layui-icon layui-icon-fonts-clear"></i></button>';
+                        }
+                        return str + '</div>';
                     }
                     }
                 }
                 }
             ]],
             ]],
@@ -204,7 +210,68 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             layer.msg('解绑失败', {icon: 2});
                             layer.msg('解绑失败', {icon: 2});
                         }
                         }
                     })
                     })
-                })
+                });
+
+                // 告警清除
+                $('body').on('click','button[collector-data-filteralarms]',function (){
+
+                    // 点击该按钮，弹出对话框，上方显示采集器名称（不可编辑），
+                    // 资源名称（不可编辑），下方有个文本域，可以输入过滤内容，过滤内容不能为空。
+                    // 点击保存根据采集器id,资源id将过滤内容更新到b_trap_config表的filter字段中。
+
+                    let resId = $(this).attr('collector-data-filteralarms');
+                    let resName = $(this).attr('collector-data-filteralarms-name');
+                    let content = `
+                                <form class="layui-form" lay-filter="collectorFilterAlarmsForm">
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">采集器:</label>
+                                        <div class="layui-input-block" style="line-height: 36px;">${collectorName}</div>
+                                        <input type="hidden" id="trapCollectorId" name="trapCollectorId" value="${trapCollectorId}">
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label">资源名称:</label>
+                                        <div class="layui-input-block" style="line-height: 36px;">${resName}</div>
+                                        <input type="hidden" id="resourceId" name="resourceId" value="${resId}">
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label"><span style="color: red;">*</span>过滤内容:</label>
+                                        <div class="layui-input-inline">
+                                           <textarea class="layui-textarea" name="filterContent" placeholder="请输入描述"></textarea>
+                                        </div>
+                                    </div>
+                                </form>
+                            `
+                    layer.open({
+                        type: 1
+                        , title: '告警过滤' //不显示标题栏
+                        , closeBtn: false
+                        , area: ['500px', '500px']
+                        , shade: 0.8
+                        , resize: false
+                        , id: 'collector-filter-alarms-res-win' //设定一个id，防止重复弹出
+                        , btn: ['确定','返回']
+                        , content: content
+                        , yes: function (index, layero) {
+                            var formData = form.val('collectorFilterAlarmsForm');
+                            admin.req({
+                                url: domainName + '/api-web/trapoid/update/filter',
+                                type: 'POST',
+                                contentType: 'application/json',
+                                data: JSON.stringify(formData),
+                            }).done(function (response) {
+                                if (response.success) {
+                                    layer.msg('操作成功', {icon: 1, timeout: 3000});
+                                } else {
+                                    layer.msg('操作失败!', {icon: 2, timeout: 3000});
+                                }
+                            });
+
+                            layer.close(index);
+                        }
+                    });
+
+                });
+
             }
             }
         });
         });