Merge branch 'wangfeng-mj' into 'master-mj'

告警过滤回填



See merge request !1249

@@ -151,7 +151,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                         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>'
                         if (isTrap) {
                         if (isTrap) {
-                            str += '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-tips="告警过滤" ' +
+                            str += '<button class="layui-btn layui-btn-normal layui-btn-xs" style="margin-left: 10px !important;" lay-tips="告警过滤" ' +
                                 'collector-data-filteralarms-name = "'+d.resName+'" ' +
                                 'collector-data-filteralarms-name = "'+d.resName+'" ' +
                                 'collector-data-filteralarms="' + d.resId + '"><i class="layui-icon layui-icon-fonts-clear"></i></button>';
                                 'collector-data-filteralarms="' + d.resId + '"><i class="layui-icon layui-icon-fonts-clear"></i></button>';
                         }
                         }
@@ -218,56 +218,74 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     // 点击该按钮，弹出对话框，上方显示采集器名称（不可编辑），
                     // 点击该按钮，弹出对话框，上方显示采集器名称（不可编辑），
                     // 资源名称（不可编辑），下方有个文本域，可以输入过滤内容，过滤内容不能为空。
                     // 资源名称（不可编辑），下方有个文本域，可以输入过滤内容，过滤内容不能为空。
                     // 点击保存根据采集器id,资源id将过滤内容更新到b_trap_config表的filter字段中。
                     // 点击保存根据采集器id,资源id将过滤内容更新到b_trap_config表的filter字段中。
-
                     let resId = $(this).attr('collector-data-filteralarms');
                     let resId = $(this).attr('collector-data-filteralarms');
                     let resName = $(this).attr('collector-data-filteralarms-name');
                     let resName = $(this).attr('collector-data-filteralarms-name');
-                    let content = `
+
+                    let params = {
+                        resourceId:resId,
+                        trapCollectorId: trapCollectorId
+                    }
+                    admin.req({
+                        url: domainName + '/api-web/trapoid/get/filter',
+                        type: 'POST',
+                        contentType: 'application/json',
+                        data: JSON.stringify(params),
+                    }).done(function (response) {
+                        let filterContent = response.str;
+                        let content = `
                                 <form class="layui-form" lay-filter="collectorFilterAlarmsForm">
                                 <form class="layui-form" lay-filter="collectorFilterAlarmsForm">
                                     <div class="layui-form-item">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">采集器:</label>
                                         <label class="layui-form-label">采集器:</label>
-                                        <div class="layui-input-block" style="line-height: 36px;">${collectorName}</div>
+                                        <div class="layui-input-block" >${collectorName}</div>
                                         <input type="hidden" id="trapCollectorId" name="trapCollectorId" value="${trapCollectorId}">
                                         <input type="hidden" id="trapCollectorId" name="trapCollectorId" value="${trapCollectorId}">
                                     </div>
                                     </div>
                                     <div class="layui-form-item">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">资源名称:</label>
                                         <label class="layui-form-label">资源名称:</label>
-                                        <div class="layui-input-block" style="line-height: 36px;">${resName}</div>
+                                        <div class="layui-input-block">${resName}</div>
                                         <input type="hidden" id="resourceId" name="resourceId" value="${resId}">
                                         <input type="hidden" id="resourceId" name="resourceId" value="${resId}">
                                     </div>
                                     </div>
                                     <div class="layui-form-item">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label"><span style="color: red;">*</span>过滤内容:</label>
                                         <label class="layui-form-label"><span style="color: red;">*</span>过滤内容:</label>
                                         <div class="layui-input-inline">
                                         <div class="layui-input-inline">
-                                           <textarea class="layui-textarea" name="filterContent" placeholder="请输入描述"></textarea>
+                                           <textarea class="layui-textarea" name="filterContent" placeholder="请输入描述" value="${filterContent}"></textarea>
                                         </div>
                                         </div>
                                     </div>
                                     </div>
                                 </form>
                                 </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.open({
+                            type: 1
+                            , title: '告警过滤' //不显示标题栏
+                            , closeBtn: false
+                            , area: ['60%', '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');
+                                if(formData.filterContent){
+                                    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);
+                                }else{
+                                    layer.msg('请输入告警过滤信息', {icon: 7, timeout: 3000});
                                 }
                                 }
-                            });
 
 
-                            layer.close(index);
-                        }
+                            }
+                        });
+
                     });
                     });
 
 
                 });
                 });