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

告警过滤表单优化 See merge request !1251

Merge branch 'wangfeng-mj' into 'master-mj'
告警过滤表单优化 See merge request !1251
高磊
Commit 94155929cbcacc595d96661c90fedf672cc985ce 2 parents 258a42a4 9b7149c9
Showing 1 changed file with 3 additions and 3 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/reslist.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/reslist.js
View file @9415592
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/reslist.js
View file @9415592
@@ -239,21 +239,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                                     <div class="layui-form-item">
                                         <label class="layui-form-label">采集器:</label>
                                         <div class="layui-input-block">
-                                            <input type="text" value="${collectorName}" readonly>
+                                            <div style="line-height: 36px;">${collectorName}</div>
                                             <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">
-                                            <input type="text" value="${resName}" readonly>
+                                            <div style="line-height: 36px;">${resName}</div>
                                             <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-block">
-                                           <textarea class="layui-textarea" name="filterContent" placeholder="请输入描述" value="${filterContent}"></textarea>
+                                           <textarea class="layui-textarea" name="filterContent" placeholder="请输入过滤内容" value="${filterContent}">${filterContent}</textarea>
                                         </div>
                                     </div>
                                 </form>