ops / monitor-ui · Commits

Go to a project

Authored by qinchao
Commit 44f7df5205b1f28cf59c1819fa197196dd069ab5 1 parent 78fee5a9

修改bug

Inline Side-by-side
Showing 2 changed files with 12 additions and 16 deletions
@@ -16,6 +16,7 @@ public class HostInfoReq extends PageRequest { @@ -16,6 +16,7 @@ public class HostInfoReq extends PageRequest {
16 16
17 private String hostIp; 17 private String hostIp;
18 18
  19 + // 1 只显示标签为空，0 只显示标签不为空 ，“” 全部显示
19 private String onlyShowTagsIsNull; 20 private String onlyShowTagsIsNull;
20 21
21 private int groupId; 22 private int groupId;
@@ -104,9 +104,15 @@ @@ -104,9 +104,15 @@
104 <option value="3">其他</option> 104 <option value="3">其他</option>
105 </select> 105 </select>
106 </div> 106 </div>
107 - <button id="addHostInfoBtn" class="btn btn-success" style="margin-left: 18px;">新增主机</button>  
108 - <button class="btn btn-danger" onclick="synHostInfo()" style="margin-left: 18px;">同步主机</button>  
109 - 107 + <div class="input-group" style="float: left;">
  108 + <span class="input-group-addon">过滤：</span>
  109 + <select id="tagsIsNull" class="form-control">
  110 + <option value="">全部主机</option>
  111 + <option value="1">标签为空</option>
  112 + <option value="0">标签不空</option>
  113 + </select>
  114 + </div>
  115 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button id="addHostInfoBtn" class="btn btn-success" style="margin-left: 18px;">新增主机</button>
110 </div> 116 </div>
111 </div> 117 </div>
112 <br/> 118 <br/>
@@ -128,20 +134,10 @@ @@ -128,20 +134,10 @@
128 134
129 <select id="tags" name="tags" class="form-control select2" style="width: 500px" multiple="multiple"></select> 135 <select id="tags" name="tags" class="form-control select2" style="width: 500px" multiple="multiple"></select>
130 </div> 136 </div>
131 - <div class="input-group" style="float: left;">  
132 - <%-- <span class="input-group-addon">标签为空：</span>--%>  
133 -<%--  
134 - <span class="input-group-addon" style="margin-left: 15px;">空标签</span>  
135 -  
136 - <input id="tagsIsNull" name="tags" style="margin-left:10px;" type="checkbox" />--%>  
137 - <span class="input-group-addon">过滤：</span>  
138 - <select id="tagsIsNull" class="form-control">  
139 - <option value="">全部主机</option>  
140 - <option value="1">标签为空</option>  
141 - </select>  
142 - </div> 137 +
143 <button id="searchHostInfoBtn" class="btn btn-primary" style="margin-left: 18px;">搜索</button> 138 <button id="searchHostInfoBtn" class="btn btn-primary" style="margin-left: 18px;">搜索</button>
144 <button class="btn btn-primary" onclick="setHostTags()" style="margin-left: 18px;">维护标签</button> 139 <button class="btn btn-primary" onclick="setHostTags()" style="margin-left: 18px;">维护标签</button>
  140 + <button class="btn btn-danger" onclick="synHostInfo()" style="margin-left: 18px;">同步主机</button>
145 </div> 141 </div>
146 </div> 142 </div>
147 143
@@ -455,7 +451,6 @@ @@ -455,7 +451,6 @@
455 success : function(data) { 451 success : function(data) {
456 if( data && data.code == 200){ 452 if( data && data.code == 200){
457 $(dialog).dialog("hide"); 453 $(dialog).dialog("hide");
458 - localAlert('修改标签成功!');  
459 $("#hostInfoTable").table("load"); 454 $("#hostInfoTable").table("load");
460 } else{ 455 } else{
461 $("#tagsInfoForm #messageAlert").alerts({ 456 $("#tagsInfoForm #messageAlert").alerts({