monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 714cfc7a5f57d3f662061d65d7dae6ed512fce3c 2 parents ebd1b60b a34e74eb

Merge branch 'master-mj-ztq' into 'master-mj' 

feat:样式统一



See merge request !1194
Inline Side-by-side
Showing 13 changed files with 29 additions and 23 deletions
... ... @@ -13,6 +13,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
//发送状态
// 下拉框改变搜索
form.on('select(slt-dingjia-biz)', renderBackupDingjiaListTable);
$('#dingjia_table_id thead tr th').css({'font-weight':'bold'})
// 加载查询条件下拉框
function loadConditionSelect() {
... ...
... ... @@ -37,6 +37,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
renderinspectioncountListTable();
});
}
$('#inspectioncount_table_id thead tr th').css({'font-weight':'bold'})
//日期范围选择
laydate.render({
... ...
... ... @@ -401,7 +401,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
url: url,
async: false,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
var options = "<option value=''>工作单位</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
... ... @@ -541,7 +541,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
text: '设备出入和配件更换图示',
textStyle: {
color: '#a3a3a4',
fontSize: 12
fontSize: 14
}
},
tooltip: {
... ...
... ... @@ -13,7 +13,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
loadConditionSelect();
$('button[data-period="year"]').click();
$('#recoverycount-table thead tr th').css({'font-weight':'bold'})
// 日期方式选择
$('#btns-recoverycount-time button').on("click",function () {
$.each($("button.date"), function (i, e) {
... ...
... ... @@ -224,7 +224,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
admin.req({
url: domainName + '/mj/sysOrg/page?orgType=1'
}).done(function (response) {
var options = "<option value=''>=所属处室=</option>";
var options = "<option value=''>所属处室</option>";
var data = response.data.rows;
$.each(data, function (i, v) {
... ... @@ -241,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
$.ajax({
url: url,
success: function (res) {
var options = "<option value=''>=工作单位=</option>";
var options = "<option value=''>工作单位</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
... ... @@ -317,8 +317,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
title: {
text: '数据库恢复验证统计图示',
textStyle: {
color: '#a3a3a4',
fontSize: 12
color: localStorage.getItem("theme") === 'diablo' ?'#fff':'#000',
fontSize: 14
}
},
tooltip: {
... ...
... ... @@ -311,7 +311,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
url: url,
async: false,
success: function (res) {
var options = "<option value=''>=选择厂商=</option>";
var options = "<option value=''>选择厂商</option>";
$.each(res.data, function (i, v) {
options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
var obj = {};
... ... @@ -329,7 +329,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
$.ajax({
url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + common.getMjToken(),
success: function (response) {
var options = "<option value=''>=选择汇报人=</option>";
var options = "<option value=''>选择汇报人</option>";
$.each(response.data.rows, function (i, v) {
options += "<option value='" + v.username + "'>" + v.nickname + "</option>"
});
... ...
... ... @@ -51,7 +51,7 @@
</div>
<div class="layui-card" style="height: 100%">
<div class="layui-card-body">
<div class="layui-tab layui-tab-card" lay-filter="insp-tab">
<div class="layui-tab" lay-filter="insp-tab">
<!-- <ul class="layui-tab-title">
</ul>-->
... ...
... ... @@ -33,7 +33,7 @@
<form class="layui-form layui-card-header" onsubmit="return false"
lay-filter="inspectioncount-index-form">
<div class="layui-form-item">
<div class="layui-btn-group time-group" id="btns-insp-time" style="padding: 0">
<div class="layui-btn-group time-group" id="btns-insp-time" style="padding: 0;margin-bottom: 5px;">
<button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" id="probutton"
data-period="today">今日
</button>
... ... @@ -56,7 +56,7 @@
</div>
<div class="layui-card" style="height: 100%">
<div class="layui-card-body">
<div class="layui-tab layui-tab-card" lay-filter="insp-tab">
<div class="layui-tab" lay-filter="insp-tab">
<!-- <ul class="layui-tab-title">
&lt;!&ndash;
<li class="layui-this">数据库备份</li>
... ...
... ... @@ -17,7 +17,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label">停机模式：</label>
<div class="layui-input-inline">
<div class="layui-input-inline layui-input-inline--long keyword-input">
<select class="layui-select" lay-filter="shutdownplanModeSearch"
name="cutoverMode">
<option value="1">暂停告警</option>
... ...
... ... @@ -28,7 +28,7 @@
</div>
</div>
<div class="layui-card-body" style="margin-top: 10px;">
<div style="display: flex">
<div style="display: flex;justify-content: space-between;align-items: center;">
<form class="layui-form layui-card-header" onsubmit="return false"
lay-filter="form-enterStaff-condition">
<div class="layui-form-item">
... ... @@ -42,7 +42,7 @@
<div class="layui-input-inline">
<select name="manufacturerId" id="slt-staff-group"
lay-filter="slt-staff-group" lay-search>
<option value="">=工作单位=</option>
<option value="">工作单位</option>
</select>
</div>
</div>
... ... @@ -54,9 +54,11 @@
</div>
</div>
</form>
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" >
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" style="margin-right: 76px !important;">
<i class="layui-icon">&#xe624;</i>新增
</button>
</div>
<div style="margin-bottom: 10px;">
<button class="layui-btn layui-btn-sm layui-btn-normal active"
id="device-export-excel">
<i class="layui-icon">&#xe60a;</i>导出到Excel
... ...
... ... @@ -42,7 +42,7 @@
<div class="layui-input-inline">
<select name="orgCode" id="slt-recoveryverify-org"
lay-filter="slt-recoveryverify-org" lay-search>
<option value="">=所属处室=</option>
<option value="">所属处室</option>
</select>
</div>
</div>
... ... @@ -50,7 +50,7 @@
<div class="layui-input-inline">
<select name="omanufacturerId" id="slt-recoveryverify-group"
lay-filter="slt-recoveryverify-group" lay-search>
<option value="">=运维单位=</option>
<option value="">运维单位</option>
</select>
</div>
</div>
... ... @@ -58,7 +58,7 @@
<div class="layui-input-inline">
<select name="bizId" id="slt-recoveryverify-biz"
lay-filter="slt-recoveryverify-biz" lay-search>
<option value="">=业务系统=</option>
<option value="">业务系统</option>
</select>
</div>
</div>
... ... @@ -80,6 +80,8 @@
</div>
</div>
</form>
</div>
<div style="display: flex;">
<button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create">
新增
</button>
... ...
... ... @@ -21,7 +21,7 @@
lay-filter="workReport-form" onsubmit="return false;">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline" style="width: 300px">
<div class="layui-input-inline" style="width: 260px">
<input autocomplete="off" class="layui-input" id="workReport_title"
name="repTitle" placeholder="标题搜索，支持内容模糊匹配" type="text">
</div>
... ... @@ -76,7 +76,7 @@
</div>
</div>
<div class="layui-card-body">
<div class="">
<div class="" style="margin-bottom: 10px">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="workReport_create_day">
新增日报
</button>
... ...
... ... @@ -30,7 +30,7 @@
<div class="layui-input-inline">
<select id="slt-workreport-group" lay-filter="slt-workreport-group"
lay-search name="manufacturerName">
<option value="">=选择厂商=</option>
<option value="">选择厂商</option>
</select>
</div>
</div>
... ... @@ -38,7 +38,7 @@
<div class="layui-input-inline">
<select id="slt-workreport-user" lay-filter="slt-workreport-user"
lay-search name="createBy">
<option value="">=选择汇报人=</option>
<option value="">选择汇报人</option>
</select>
</div>
</div>
... ...