monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit d339c86e73bc77f2fab289e3e84ce1d857e5ec62 2 parents 706643b6 a8257b2f

Merge branch 'master-mj-joke' into 'master-mj' 

chore:我的收藏夹样式优化

chore:我的收藏夹样式优化

See merge request !1192
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 @@ -429,15 +429,15 @@ layui.define(['table', 'admin', 'form', 'common', 'sessions', 'reslist', 'common
429 resHealth: $("#fav_reslist_resStatus").val() 429 resHealth: $("#fav_reslist_resStatus").val()
430 } 430 }
431 , 431 ,
432 - height: 'full-210' 432 + height: 'full-120'
433 , 433 ,
434 cellMinWidth: 80 434 cellMinWidth: 80
435 , 435 ,
436 page: { 436 page: {
437 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] 437 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
438 } 438 }
439 - ,  
440 - limit: 20 439 + , limit: common.limit
  440 + , limits: common.limits
441 , 441 ,
442 cols: [cols], 442 cols: [cols],
443 done: function (res) { 443 done: function (res) {
1 <title>我的收藏夹</title> 1 <title>我的收藏夹</title>
2 -<article class="page-container"> 2 +<article class="page-container favorites-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 <div class="main"> 4 <div class="main">
5 - <div class="layui-card favorites-container"> 5 + <div class="layui-card">
6 <div class="breadcrumb"> 6 <div class="breadcrumb">
7 <span class="layui-breadcrumb"> 7 <span class="layui-breadcrumb">
8 <a href="javascript:void(0)" id="tofavorite_home">我的收藏夹</a> 8 <a href="javascript:void(0)" id="tofavorite_home">我的收藏夹</a>
@@ -14,40 +14,38 @@ @@ -14,40 +14,38 @@
14 lay-filter="favorites-form"> 14 lay-filter="favorites-form">
15 <div class="layui-form-item"> 15 <div class="layui-form-item">
16 <div class="layui-inline favorite-cards"> 16 <div class="layui-inline favorite-cards">
17 - <div class="layui-input-inline layui-input-inline--long">  
18 <input autocomplete="off" class="layui-input" id="fav_keyword_id" 17 <input autocomplete="off" class="layui-input" id="fav_keyword_id"
19 lay-tips="关键字检索包含： </br>收藏夹名称" name="fav_keyword_id" 18 lay-tips="关键字检索包含： </br>收藏夹名称" name="fav_keyword_id"
20 placeholder="关键字，回车搜索" type="text"> 19 placeholder="关键字，回车搜索" type="text">
21 </div> 20 </div>
22 - </div>  
23 <div class="layui-inline favorite-reslist"> 21 <div class="layui-inline favorite-reslist">
24 - <div class="layui-input-inline layui-input-inline--long"> 22 + <div class="">
25 <input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id" 23 <input autocomplete="off" class="layui-input" id="keyword_id" name="keyword_id"
26 placeholder="请输入资源名称" type="text"> 24 placeholder="请输入资源名称" type="text">
27 </div> 25 </div>
28 </div> 26 </div>
29 <div class="layui-inline favorite-reslist"> 27 <div class="layui-inline favorite-reslist">
30 - <div class="layui-input-inline"> 28 + <div class="">
31 <select id="fav_reslist_restype" lay-filter="fav_reslist_restype" 29 <select id="fav_reslist_restype" lay-filter="fav_reslist_restype"
32 name="fav_reslist_restype"> 30 name="fav_reslist_restype">
33 - <option value="">=资源类型=</option> 31 + <option value="">资源类型</option>
34 </select> 32 </select>
35 </div> 33 </div>
36 </div> 34 </div>
37 <div class="layui-inline favorite-reslist"> 35 <div class="layui-inline favorite-reslist">
38 - <div class="layui-input-inline"> 36 + <div class="">
39 <select id="fav_reslist_resListBizTypes" 37 <select id="fav_reslist_resListBizTypes"
40 lay-filter="fav_reslist_resListBizTypes" 38 lay-filter="fav_reslist_resListBizTypes"
41 name="label"> 39 name="label">
42 - <option value="">=选择业务=</option> 40 + <option value="">选择业务</option>
43 </select> 41 </select>
44 </div> 42 </div>
45 </div> 43 </div>
46 <div class="layui-inline favorite-reslist"> 44 <div class="layui-inline favorite-reslist">
47 - <div class="layui-input-inline"> 45 + <div class="">
48 <select id="fav_reslist_resStatus" lay-filter="fav_reslist_resStatus" 46 <select id="fav_reslist_resStatus" lay-filter="fav_reslist_resStatus"
49 name="fav_reslist_resStatus"> 47 name="fav_reslist_resStatus">
50 - <option value="">=健康状态=</option> 48 + <option value="">健康状态</option>
51 <option value="1">中</option> 49 <option value="1">中</option>
52 <option value="2">良</option> 50 <option value="2">良</option>
53 <option value="3">优</option> 51 <option value="3">优</option>