Authored by 王涛

Merge branch 'master-500-dev-xwx' into 'master-500-dev'

【643】域视图用户选取某个资源,按照连接状态搜索,在查看其他资源信息,搜索条件没有清空导致带到下一个资源里面,数据展示错误



See merge request !601
... ... @@ -177,6 +177,13 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
showLine: false,
data: data,
click: function (node) {
$("#domainindex_keyword").val("");
$("#domain_resStatus").val("");
$("#domain_res_colony").val("");
$("#domain_res_cluster").val("");
$("#domainlink_state").val("");
$("#domain_state").val("");
curTreeNode = node;
curDomainResType = node.data.id;
if (node.data.alias == 'domain') {
... ... @@ -1759,4 +1766,4 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
}
}
});
});
\ No newline at end of file
});
... ...
... ... @@ -96,13 +96,13 @@
</select>
</div>
</div>
<div class="layui-inline hide" >
<div class="layui-input-inline">
<select name="label" id="domain_sub_restype" lay-filter="domain_sub_restype">
<option value="">=选择资源类型=</option>
</select>
</div>
</div>
<!-- <div class="layui-inline hide" >-->
<!-- <div class="layui-input-inline">-->
<!-- <select name="label" id="domain_sub_restype" lay-filter="domain_sub_restype">-->
<!-- <option value="">=选择资源类型=</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
</div>
</form>
</div>
... ... @@ -474,4 +474,4 @@
layui.use('domainindex', function (fn) {
fn();
});
</script>
\ No newline at end of file
</script>
... ...