monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit c81d29b6e58a56e4397f92f94f8b4219f37d2c34 2 parents 1d3a47a6 0ec9a749

Merge branch 'master-mj-yjpnew' into 'master-mj' 

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



See merge request !1196
Inline Side-by-side
Showing 14 changed files with 69 additions and 50 deletions
... ... @@ -8,7 +8,7 @@
<div class="page-panel">
<div class="main" style="background-color: #fff">
<div class="layui-card-header" style="padding-bottom: 5px;z-index:999">
<div class="layui-btn-group time-group" id="backupCount_time_button_id" style="float: right;">
<div class="layui-btn-group time-group right" id="backupCount_time_button_id">
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth">上月
</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm active"
... ...
... ... @@ -44,13 +44,14 @@
</select>
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn"
style="margin-right: 76px !important;">搜索
</button>
</div>
<div style="margin-bottom: 10px;">
<div style="margin-bottom: 10px;margin-top: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal"
id="btn-dingjia-export-excel">
<i class="layui-icon">&#xe60a;</i>导出
... ...
... ... @@ -47,14 +47,14 @@
class="layui-input" readonly placeholder="日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn"
style="margin-right: 76px !important;">搜索
</button>
</div>
<div style="margin-bottom: 10px;">
<div style="margin-bottom: 10px;margin-top: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal"
id="btn-inspStatistics-export-excel">
<i class="layui-icon">&#xe60a;</i>导出
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-emergency-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-emergency-time" >
<button type="button" class="layui-btn layui-btn-primary date"
data-period="all">全部
</button>
... ... @@ -73,9 +73,11 @@
class="layui-input" readonly placeholder="其他日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="emergency_create">
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-bizupgrade-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-bizupgrade-time" >
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
data-period="all">全部
</button>
... ... @@ -66,9 +66,11 @@
class="layui-input" readonly placeholder="其他日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="bizupgrade_create">
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-devicehitch-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-devicehitch-time">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
data-period="all">全部
</button>
... ... @@ -63,9 +63,11 @@
class="layui-input" readonly placeholder="日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="devicehitch_create" >
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-staff-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-staff-time" >
<button class="layui-btn layui-btn-primary date"
data-period="all">全部
</button>
... ... @@ -52,9 +52,11 @@
class="layui-input" readonly placeholder="其他日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" >
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-staff-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-staff-time" >
<button type="button" class="layui-btn layui-btn-primary date"
data-period="all">全部
</button>
... ... @@ -46,25 +46,30 @@
</select>
</div>
</div>
<div class="layui-inline" >
<div class="layui-inline">
<div class="layui-input-inline">
<input type="text" name="dateLimit" id="staffdateLimit" autocomplete="off"
class="layui-input" readonly placeholder="其他日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="staff_create" >
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="staff_create">
<i class="layui-icon">&#xe624;</i>新增
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal active"
id="staff-export-excel">
<i class="layui-icon">&#xe60a;</i>导出
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="report_download" >
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type=""
id="report_download">
<i class="layui-icon">&#xe601;</i>下载
</button>
</div>
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-extra-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-extra-time">
<button type="button" class="layui-btn layui-btn-primary span date"
data-period="all">全部
</button>
... ... @@ -59,9 +59,11 @@
class="layui-input" readonly placeholder="日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="extra_create" >
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-MeetingApply-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-MeetingApply-time">
<button type="button" class="layui-btn layui-btn-primary date"
data-period="all">全部
</button>
... ... @@ -54,9 +54,11 @@
class="layui-input" readonly placeholder="日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="meetingApply_create" >
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-meetingsummary-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-meetingsummary-time" >
<button type="button" class="layui-btn layui-btn-primary date"
data-period="all">全部
</button>
... ... @@ -45,9 +45,11 @@
class="layui-input" readonly placeholder="日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<table id="table-meetingsummary-view" lay-filter="table-meetingsummary-view"></table>
</div>
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-routeAdjust-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-routeAdjust-time">
<button type="button" class="layui-btn layui-btn-primary date"
data-period="all">全部
</button>
... ... @@ -65,9 +65,11 @@
class="layui-input" readonly placeholder="日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="routeAdjust_create" >
... ...
... ... @@ -3,18 +3,8 @@
<div class="page-panel ">
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-recoverycount-time" style="float: right;">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
data-period="lastYear">去年
</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date"
data-period="year">今年
</button>
</div>
</div>
<div class="layui-card-body" style="margin-top: 10px;">
<div style="display: flex;justify-content: space-between;align-items: center;margin-top: 40px">
<div style="display: flex;justify-content: space-between;align-items: center;">
<form class="layui-form layui-card-header" onsubmit="return false"
lay-filter="form-recoverycount-condition">
<div class="layui-form-item">
... ... @@ -25,16 +15,21 @@
<option value="">业务系统</option>
</select>
</div>
<!-- <button class="layui-btn layui-btn-sm layui-btn-normal active"
id="recoverycount-export-excel" style="float: right;">
<i class="layui-icon">&#xe60a;</i>导出到Excel
</button>-->
</div>
<div class="layui-inline layui-btn-group time-group" id="btns-recoverycount-time">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs date"
data-period="lastYear">去年
</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs active date"
data-period="year">今年
</button>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<table id="recoverycount-table" class="layui-table" lay-filter="recoverycount-table">
<thead>
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-btn-group time-group" id="btns-recoveryverify-time" style="float: right;">
<div class="layui-btn-group time-group right" id="btns-recoveryverify-time">
<button type="button" class="layui-btn layui-btn-primary date"
data-period="all">全部
</button>
... ... @@ -78,9 +78,11 @@
class="layui-input" readonly placeholder="其他日期范围">
</div>
</div>
<button class="layui-inline layui-btn layui-btn-sm layui-btn-normal active"
id="orgSearchBtn" >搜索
</button>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" id="orgSearchBtn" style="margin-right: 76px !important;">搜索</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create">
... ...