monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 14a9ffd826e1d4131631a27f868a9cf0e506083a 2 parents 5aa59bde d339c86e

Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj

Inline Side-by-side
Showing 2 changed files with 12 additions and 14 deletions
... ... @@ -429,15 +429,15 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
resHealth: $("#fav_reslist_resStatus").val()
}
,
height: 'full-210'
height: 'full-120'
,
cellMinWidth: 80
,
page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
}
,
limit: 20
, limit: common.limit
, limits: common.limits
,
cols: [cols],
done: function (res) {
... ...
<title>我的收藏夹</title>
<article class="page-container">
<article class="page-container favorites-container">
<div class="page-panel">
<div class="main">
<div class="layui-card favorites-container">
<div class="layui-card">
<div class="breadcrumb">
<span class="layui-breadcrumb">
<a href="javascript:void(0)" id="tofavorite_home">我的收藏夹</a>
... ... @@ -14,40 +14,38 @@
lay-filter="favorites-form">
<div class="layui-form-item">
<div class="layui-inline favorite-cards">
<div class="layui-input-inline layui-input-inline--long">
<input autocomplete="off" class="layui-input" id="fav_keyword_id"
lay-tips="关键字检索包含： </br>收藏夹名称" name="fav_keyword_id"
placeholder="关键字，回车搜索" type="text">
</div>
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline layui-input-inline--long">
<div class="">
<input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id"
placeholder="请输入资源名称" type="text">
</div>
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline">
<div class="">
<select id="fav_reslist_restype" lay-filter="fav_reslist_restype"
name="fav_reslist_restype">
<option value="">=资源类型=</option>
<option value="">资源类型</option>
</select>
</div>
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline">
<div class="">
<select id="fav_reslist_resListBizTypes"
lay-filter="fav_reslist_resListBizTypes"
name="label">
<option value="">=选择业务=</option>
<option value="">选择业务</option>
</select>
</div>
</div>
<div class="layui-inline favorite-reslist">
<div class="layui-input-inline">
<div class="">
<select id="fav_reslist_resStatus" lay-filter="fav_reslist_resStatus"
name="fav_reslist_resStatus">
<option value="">=健康状态=</option>
<option value="">健康状态</option>
<option value="1">中</option>
<option value="2">良</option>
<option value="3">优</option>
... ...