Authored by 高磊

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

Wangfeng mj



See merge request !1250
... ... @@ -231,22 +231,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
contentType: 'application/json',
data: JSON.stringify(params),
}).done(function (response) {
console.log(response,"----------------------->response")
let filterContent = response.str;
console.log(filterContent,"----------------------->filterContent")
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" >${collectorName}</div>
<input type="hidden" id="trapCollectorId" name="trapCollectorId" value="${trapCollectorId}">
<div class="layui-input-block">
<input type="text" value="${collectorName}" readonly>
<input type="hidden" id="trapCollectorId" name="trapCollectorId" value="${trapCollectorId}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">资源名称:</label>
<div class="layui-input-block">${resName}</div>
<input type="hidden" id="resourceId" name="resourceId" value="${resId}">
<div class="layui-input-block">
<input type="text" value="${resName}" readonly>
<input type="hidden" id="resourceId" name="resourceId" value="${resId}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red;">*</span>过滤内容:</label>
<div class="layui-input-inline">
<div class="layui-input-block">
<textarea class="layui-textarea" name="filterContent" placeholder="请输入描述" value="${filterContent}"></textarea>
</div>
</div>
... ...