monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit 0ec9a749554b6c5414e3378640595437cad6f491 1 parent 66153423

fix:基础功能样式优化调整2

Inline Side-by-side
Showing 14 changed files with 69 additions and 50 deletions
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <div class="page-panel"> 8 <div class="page-panel">
9 <div class="main" style="background-color: #fff"> 9 <div class="main" style="background-color: #fff">
10 <div class="layui-card-header" style="padding-bottom: 5px;z-index:999"> 10 <div class="layui-card-header" style="padding-bottom: 5px;z-index:999">
11 - <div class="layui-btn-group time-group" id="backupCount_time_button_id" style="float: right;"> 11 + <div class="layui-btn-group time-group right" id="backupCount_time_button_id">
12 <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth">上月 12 <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth">上月
13 </button> 13 </button>
14 <button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" 14 <button type="button" class="layui-btn layui-btn-primary layui-btn-sm active"
@@ -44,13 +44,14 @@ @@ -44,13 +44,14 @@
44 </select> 44 </select>
45 </div> 45 </div>
46 </div> 46 </div>
  47 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  48 + id="orgSearchBtn" >搜索
  49 + </button>
47 </div> 50 </div>
48 </form> 51 </form>
49 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn"  
50 - style="margin-right: 76px !important;">搜索  
51 - </button> 52 +
52 </div> 53 </div>
53 - <div style="margin-bottom: 10px;"> 54 + <div style="margin-bottom: 10px;margin-top: 10px;">
54 <button class="layui-btn layui-btn-sm layui-btn-normal" 55 <button class="layui-btn layui-btn-sm layui-btn-normal"
55 id="btn-dingjia-export-excel"> 56 id="btn-dingjia-export-excel">
56 <i class="layui-icon">&#xe60a;</i>导出 57 <i class="layui-icon">&#xe60a;</i>导出
@@ -47,14 +47,14 @@ @@ -47,14 +47,14 @@
47 class="layui-input" readonly placeholder="日期范围"> 47 class="layui-input" readonly placeholder="日期范围">
48 </div> 48 </div>
49 </div> 49 </div>
50 - 50 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  51 + id="orgSearchBtn" >搜索
  52 + </button>
51 </div> 53 </div>
52 </form> 54 </form>
53 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn"  
54 - style="margin-right: 76px !important;">搜索  
55 - </button> 55 +
56 </div> 56 </div>
57 - <div style="margin-bottom: 10px;"> 57 + <div style="margin-bottom: 10px;margin-top: 10px;">
58 <button class="layui-btn layui-btn-sm layui-btn-normal" 58 <button class="layui-btn layui-btn-sm layui-btn-normal"
59 id="btn-inspStatistics-export-excel"> 59 id="btn-inspStatistics-export-excel">
60 <i class="layui-icon">&#xe60a;</i>导出 60 <i class="layui-icon">&#xe60a;</i>导出
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-emergency-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-emergency-time" >
8 <button type="button" class="layui-btn layui-btn-primary date" 8 <button type="button" class="layui-btn layui-btn-primary date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -73,9 +73,11 @@ @@ -73,9 +73,11 @@
73 class="layui-input" readonly placeholder="其他日期范围"> 73 class="layui-input" readonly placeholder="其他日期范围">
74 </div> 74 </div>
75 </div> 75 </div>
  76 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  77 + id="orgSearchBtn" >搜索
  78 + </button>
76 </div> 79 </div>
77 </form> 80 </form>
78 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
79 </div> 81 </div>
80 <div style="margin-bottom: 10px;"> 82 <div style="margin-bottom: 10px;">
81 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="emergency_create"> 83 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="emergency_create">
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-bizupgrade-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-bizupgrade-time" >
8 <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" 8 <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -66,9 +66,11 @@ @@ -66,9 +66,11 @@
66 class="layui-input" readonly placeholder="其他日期范围"> 66 class="layui-input" readonly placeholder="其他日期范围">
67 </div> 67 </div>
68 </div> 68 </div>
  69 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  70 + id="orgSearchBtn" >搜索
  71 + </button>
69 </div> 72 </div>
70 </form> 73 </form>
71 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
72 </div> 74 </div>
73 <div style="margin-bottom: 10px;"> 75 <div style="margin-bottom: 10px;">
74 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="bizupgrade_create"> 76 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="bizupgrade_create">
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-devicehitch-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-devicehitch-time">
8 <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" 8 <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -63,9 +63,11 @@ @@ -63,9 +63,11 @@
63 class="layui-input" readonly placeholder="日期范围"> 63 class="layui-input" readonly placeholder="日期范围">
64 </div> 64 </div>
65 </div> 65 </div>
  66 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  67 + id="orgSearchBtn" >搜索
  68 + </button>
66 </div> 69 </div>
67 </form> 70 </form>
68 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
69 </div> 71 </div>
70 <div style="margin-bottom: 10px;"> 72 <div style="margin-bottom: 10px;">
71 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="devicehitch_create" > 73 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="devicehitch_create" >
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-staff-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-staff-time" >
8 <button class="layui-btn layui-btn-primary date" 8 <button class="layui-btn layui-btn-primary date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -52,9 +52,11 @@ @@ -52,9 +52,11 @@
52 class="layui-input" readonly placeholder="其他日期范围"> 52 class="layui-input" readonly placeholder="其他日期范围">
53 </div> 53 </div>
54 </div> 54 </div>
  55 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  56 + id="orgSearchBtn" >搜索
  57 + </button>
55 </div> 58 </div>
56 </form> 59 </form>
57 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
58 </div> 60 </div>
59 <div style="margin-bottom: 10px;"> 61 <div style="margin-bottom: 10px;">
60 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" > 62 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" >
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-staff-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-staff-time" >
8 <button type="button" class="layui-btn layui-btn-primary date" 8 <button type="button" class="layui-btn layui-btn-primary date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -46,25 +46,30 @@ @@ -46,25 +46,30 @@
46 </select> 46 </select>
47 </div> 47 </div>
48 </div> 48 </div>
49 - <div class="layui-inline" > 49 + <div class="layui-inline">
50 <div class="layui-input-inline"> 50 <div class="layui-input-inline">
51 <input type="text" name="dateLimit" id="staffdateLimit" autocomplete="off" 51 <input type="text" name="dateLimit" id="staffdateLimit" autocomplete="off"
52 class="layui-input" readonly placeholder="其他日期范围"> 52 class="layui-input" readonly placeholder="其他日期范围">
53 </div> 53 </div>
54 </div> 54 </div>
  55 +
  56 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  57 + id="orgSearchBtn" >搜索
  58 + </button>
  59 +
55 </div> 60 </div>
56 </form> 61 </form>
57 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
58 </div> 62 </div>
59 <div style="margin-bottom: 10px;"> 63 <div style="margin-bottom: 10px;">
60 - <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="staff_create" > 64 + <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="staff_create">
61 <i class="layui-icon">&#xe624;</i>新增 65 <i class="layui-icon">&#xe624;</i>新增
62 </button> 66 </button>
63 <button class="layui-btn layui-btn-sm layui-btn-normal active" 67 <button class="layui-btn layui-btn-sm layui-btn-normal active"
64 id="staff-export-excel"> 68 id="staff-export-excel">
65 <i class="layui-icon">&#xe60a;</i>导出 69 <i class="layui-icon">&#xe60a;</i>导出
66 </button> 70 </button>
67 - <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="report_download" > 71 + <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type=""
  72 + id="report_download">
68 <i class="layui-icon">&#xe601;</i>下载 73 <i class="layui-icon">&#xe601;</i>下载
69 </button> 74 </button>
70 </div> 75 </div>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-extra-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-extra-time">
8 <button type="button" class="layui-btn layui-btn-primary span date" 8 <button type="button" class="layui-btn layui-btn-primary span date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -59,9 +59,11 @@ @@ -59,9 +59,11 @@
59 class="layui-input" readonly placeholder="日期范围"> 59 class="layui-input" readonly placeholder="日期范围">
60 </div> 60 </div>
61 </div> 61 </div>
  62 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  63 + id="orgSearchBtn" >搜索
  64 + </button>
62 </div> 65 </div>
63 </form> 66 </form>
64 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
65 </div> 67 </div>
66 <div style="margin-bottom: 10px;"> 68 <div style="margin-bottom: 10px;">
67 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="extra_create" > 69 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="extra_create" >
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-MeetingApply-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-MeetingApply-time">
8 <button type="button" class="layui-btn layui-btn-primary date" 8 <button type="button" class="layui-btn layui-btn-primary date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -54,9 +54,11 @@ @@ -54,9 +54,11 @@
54 class="layui-input" readonly placeholder="日期范围"> 54 class="layui-input" readonly placeholder="日期范围">
55 </div> 55 </div>
56 </div> 56 </div>
  57 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  58 + id="orgSearchBtn" >搜索
  59 + </button>
57 </div> 60 </div>
58 </form> 61 </form>
59 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
60 </div> 62 </div>
61 <div style="margin-bottom: 10px;"> 63 <div style="margin-bottom: 10px;">
62 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="meetingApply_create" > 64 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="meetingApply_create" >
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-meetingsummary-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-meetingsummary-time" >
8 <button type="button" class="layui-btn layui-btn-primary date" 8 <button type="button" class="layui-btn layui-btn-primary date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -45,9 +45,11 @@ @@ -45,9 +45,11 @@
45 class="layui-input" readonly placeholder="日期范围"> 45 class="layui-input" readonly placeholder="日期范围">
46 </div> 46 </div>
47 </div> 47 </div>
  48 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  49 + id="orgSearchBtn" >搜索
  50 + </button>
48 </div> 51 </div>
49 </form> 52 </form>
50 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
51 </div> 53 </div>
52 <table id="table-meetingsummary-view" lay-filter="table-meetingsummary-view"></table> 54 <table id="table-meetingsummary-view" lay-filter="table-meetingsummary-view"></table>
53 </div> 55 </div>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-routeAdjust-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-routeAdjust-time">
8 <button type="button" class="layui-btn layui-btn-primary date" 8 <button type="button" class="layui-btn layui-btn-primary date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -65,9 +65,11 @@ @@ -65,9 +65,11 @@
65 class="layui-input" readonly placeholder="日期范围"> 65 class="layui-input" readonly placeholder="日期范围">
66 </div> 66 </div>
67 </div> 67 </div>
  68 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  69 + id="orgSearchBtn" >搜索
  70 + </button>
68 </div> 71 </div>
69 </form> 72 </form>
70 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
71 </div> 73 </div>
72 <div style="margin-bottom: 10px;"> 74 <div style="margin-bottom: 10px;">
73 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="routeAdjust_create" > 75 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="routeAdjust_create" >
@@ -3,18 +3,8 @@ @@ -3,18 +3,8 @@
3 <div class="page-panel "> 3 <div class="page-panel ">
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 - <div class="layui-card-header">  
7 - <div class="layui-btn-group time-group" id="btns-recoverycount-time" style="float: right;">  
8 - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"  
9 - data-period="lastYear">去年  
10 - </button>  
11 - <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date"  
12 - data-period="year">今年  
13 - </button>  
14 - </div>  
15 - </div>  
16 <div class="layui-card-body" style="margin-top: 10px;"> 6 <div class="layui-card-body" style="margin-top: 10px;">
17 - <div style="display: flex;justify-content: space-between;align-items: center;margin-top: 40px"> 7 + <div style="display: flex;justify-content: space-between;align-items: center;">
18 <form class="layui-form layui-card-header" onsubmit="return false" 8 <form class="layui-form layui-card-header" onsubmit="return false"
19 lay-filter="form-recoverycount-condition"> 9 lay-filter="form-recoverycount-condition">
20 <div class="layui-form-item"> 10 <div class="layui-form-item">
@@ -25,16 +15,21 @@ @@ -25,16 +15,21 @@
25 <option value="">业务系统</option> 15 <option value="">业务系统</option>
26 </select> 16 </select>
27 </div> 17 </div>
28 - <!-- <button class="layui-btn layui-btn-sm layui-btn-normal active"  
29 - id="recoverycount-export-excel" style="float: right;">  
30 - <i class="layui-icon">&#xe60a;</i>导出到Excel  
31 - </button>-->  
32 </div> 18 </div>
33 - 19 + <div class="layui-inline layui-btn-group time-group" id="btns-recoverycount-time">
  20 + <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
  21 + data-period="lastYear">去年
  22 + </button>
  23 + <button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date"
  24 + data-period="year">今年
  25 + </button>
  26 + </div>
  27 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  28 + id="orgSearchBtn" >搜索
  29 + </button>
34 </div> 30 </div>
35 31
36 </form> 32 </form>
37 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
38 </div> 33 </div>
39 <table id="recoverycount-table" class="layui-table" lay-filter="recoverycount-table"> 34 <table id="recoverycount-table" class="layui-table" lay-filter="recoverycount-table">
40 <thead> 35 <thead>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 - <div class="layui-btn-group time-group" id="btns-recoveryverify-time" style="float: right;"> 7 + <div class="layui-btn-group time-group right" id="btns-recoveryverify-time">
8 <button type="button" class="layui-btn layui-btn-primary date" 8 <button type="button" class="layui-btn layui-btn-primary date"
9 data-period="all">全部 9 data-period="all">全部
10 </button> 10 </button>
@@ -78,9 +78,11 @@ @@ -78,9 +78,11 @@
78 class="layui-input" readonly placeholder="其他日期范围"> 78 class="layui-input" readonly placeholder="其他日期范围">
79 </div> 79 </div>
80 </div> 80 </div>
  81 + <button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
  82 + id="orgSearchBtn" >搜索
  83 + </button>
81 </div> 84 </div>
82 </form> 85 </form>
83 - <button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>  
84 </div> 86 </div>
85 <div style="margin-bottom: 10px;"> 87 <div style="margin-bottom: 10px;">
86 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create"> 88 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create">