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', @@ -13,6 +13,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
13 //发送状态 13 //发送状态
14 // 下拉框改变搜索 14 // 下拉框改变搜索
15 form.on('select(slt-dingjia-biz)', renderBackupDingjiaListTable); 15 form.on('select(slt-dingjia-biz)', renderBackupDingjiaListTable);
  16 + $('#dingjia_table_id thead tr th').css({'font-weight':'bold'})
16 17
17 // 加载查询条件下拉框 18 // 加载查询条件下拉框
18 function loadConditionSelect() { 19 function loadConditionSelect() {
@@ -37,6 +37,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', @@ -37,6 +37,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view',
37 renderinspectioncountListTable(); 37 renderinspectioncountListTable();
38 }); 38 });
39 } 39 }
  40 + $('#inspectioncount_table_id thead tr th').css({'font-weight':'bold'})
40 41
41 //日期范围选择 42 //日期范围选择
42 laydate.render({ 43 laydate.render({
@@ -401,7 +401,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -401,7 +401,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
401 url: url, 401 url: url,
402 async: false, 402 async: false,
403 success: function (res) { 403 success: function (res) {
404 - var options = "<option value=''>=工作单位=</option>"; 404 + var options = "<option value=''>工作单位</option>";
405 $.each(res.data, function (i, v) { 405 $.each(res.data, function (i, v) {
406 options += "<option value='" + v.id + "'>" + v.shortName + "</option>" 406 options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
407 var obj = {}; 407 var obj = {};
@@ -541,7 +541,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -541,7 +541,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
541 text: '设备出入和配件更换图示', 541 text: '设备出入和配件更换图示',
542 textStyle: { 542 textStyle: {
543 color: '#a3a3a4', 543 color: '#a3a3a4',
544 - fontSize: 12 544 + fontSize: 14
545 } 545 }
546 }, 546 },
547 tooltip: { 547 tooltip: {
@@ -13,7 +13,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -13,7 +13,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
13 loadConditionSelect(); 13 loadConditionSelect();
14 14
15 $('button[data-period="year"]').click(); 15 $('button[data-period="year"]').click();
16 - 16 + $('#recoverycount-table thead tr th').css({'font-weight':'bold'})
17 // 日期方式选择 17 // 日期方式选择
18 $('#btns-recoverycount-time button').on("click",function () { 18 $('#btns-recoverycount-time button').on("click",function () {
19 $.each($("button.date"), function (i, e) { 19 $.each($("button.date"), function (i, e) {
@@ -224,7 +224,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -224,7 +224,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
224 admin.req({ 224 admin.req({
225 url: domainName + '/mj/sysOrg/page?orgType=1' 225 url: domainName + '/mj/sysOrg/page?orgType=1'
226 }).done(function (response) { 226 }).done(function (response) {
227 - var options = "<option value=''>=所属处室=</option>"; 227 + var options = "<option value=''>所属处室</option>";
228 228
229 var data = response.data.rows; 229 var data = response.data.rows;
230 $.each(data, function (i, v) { 230 $.each(data, function (i, v) {
@@ -241,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -241,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
241 $.ajax({ 241 $.ajax({
242 url: url, 242 url: url,
243 success: function (res) { 243 success: function (res) {
244 - var options = "<option value=''>=工作单位=</option>"; 244 + var options = "<option value=''>工作单位</option>";
245 $.each(res.data, function (i, v) { 245 $.each(res.data, function (i, v) {
246 options += "<option value='" + v.id + "'>" + v.shortName + "</option>" 246 options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
247 var obj = {}; 247 var obj = {};
@@ -317,8 +317,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -317,8 +317,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
317 title: { 317 title: {
318 text: '数据库恢复验证统计图示', 318 text: '数据库恢复验证统计图示',
319 textStyle: { 319 textStyle: {
320 - color: '#a3a3a4',  
321 - fontSize: 12 320 + color: localStorage.getItem("theme") === 'diablo' ?'#fff':'#000',
  321 + fontSize: 14
322 } 322 }
323 }, 323 },
324 tooltip: { 324 tooltip: {
@@ -311,7 +311,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -311,7 +311,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
311 url: url, 311 url: url,
312 async: false, 312 async: false,
313 success: function (res) { 313 success: function (res) {
314 - var options = "<option value=''>=选择厂商=</option>"; 314 + var options = "<option value=''>选择厂商</option>";
315 $.each(res.data, function (i, v) { 315 $.each(res.data, function (i, v) {
316 options += "<option value='" + v.id + "'>" + v.shortName + "</option>" 316 options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
317 var obj = {}; 317 var obj = {};
@@ -329,7 +329,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -329,7 +329,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
329 $.ajax({ 329 $.ajax({
330 url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + common.getMjToken(), 330 url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + common.getMjToken(),
331 success: function (response) { 331 success: function (response) {
332 - var options = "<option value=''>=选择汇报人=</option>"; 332 + var options = "<option value=''>选择汇报人</option>";
333 $.each(response.data.rows, function (i, v) { 333 $.each(response.data.rows, function (i, v) {
334 options += "<option value='" + v.username + "'>" + v.nickname + "</option>" 334 options += "<option value='" + v.username + "'>" + v.nickname + "</option>"
335 }); 335 });
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 </div> 51 </div>
52 <div class="layui-card" style="height: 100%"> 52 <div class="layui-card" style="height: 100%">
53 <div class="layui-card-body"> 53 <div class="layui-card-body">
54 - <div class="layui-tab layui-tab-card" lay-filter="insp-tab"> 54 + <div class="layui-tab" lay-filter="insp-tab">
55 <!-- <ul class="layui-tab-title"> 55 <!-- <ul class="layui-tab-title">
56 56
57 </ul>--> 57 </ul>-->
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <form class="layui-form layui-card-header" onsubmit="return false" 33 <form class="layui-form layui-card-header" onsubmit="return false"
34 lay-filter="inspectioncount-index-form"> 34 lay-filter="inspectioncount-index-form">
35 <div class="layui-form-item"> 35 <div class="layui-form-item">
36 - <div class="layui-btn-group time-group" id="btns-insp-time" style="padding: 0"> 36 + <div class="layui-btn-group time-group" id="btns-insp-time" style="padding: 0;margin-bottom: 5px;">
37 <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" id="probutton" 37 <button type="button" class="layui-btn layui-btn-primary layui-btn-xs date" id="probutton"
38 data-period="today">今日 38 data-period="today">今日
39 </button> 39 </button>
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 </div> 56 </div>
57 <div class="layui-card" style="height: 100%"> 57 <div class="layui-card" style="height: 100%">
58 <div class="layui-card-body"> 58 <div class="layui-card-body">
59 - <div class="layui-tab layui-tab-card" lay-filter="insp-tab"> 59 + <div class="layui-tab" lay-filter="insp-tab">
60 <!-- <ul class="layui-tab-title"> 60 <!-- <ul class="layui-tab-title">
61 &lt;!&ndash; 61 &lt;!&ndash;
62 <li class="layui-this">数据库备份</li> 62 <li class="layui-this">数据库备份</li>
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 </div> 17 </div>
18 <div class="layui-inline"> 18 <div class="layui-inline">
19 <label class="layui-form-label">停机模式：</label> 19 <label class="layui-form-label">停机模式：</label>
20 - <div class="layui-input-inline"> 20 + <div class="layui-input-inline layui-input-inline--long keyword-input">
21 <select class="layui-select" lay-filter="shutdownplanModeSearch" 21 <select class="layui-select" lay-filter="shutdownplanModeSearch"
22 name="cutoverMode"> 22 name="cutoverMode">
23 <option value="1">暂停告警</option> 23 <option value="1">暂停告警</option>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 </div> 28 </div>
29 </div> 29 </div>
30 <div class="layui-card-body" style="margin-top: 10px;"> 30 <div class="layui-card-body" style="margin-top: 10px;">
31 - <div style="display: flex"> 31 + <div style="display: flex;justify-content: space-between;align-items: center;">
32 <form class="layui-form layui-card-header" onsubmit="return false" 32 <form class="layui-form layui-card-header" onsubmit="return false"
33 lay-filter="form-enterStaff-condition"> 33 lay-filter="form-enterStaff-condition">
34 <div class="layui-form-item"> 34 <div class="layui-form-item">
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <div class="layui-input-inline"> 42 <div class="layui-input-inline">
43 <select name="manufacturerId" id="slt-staff-group" 43 <select name="manufacturerId" id="slt-staff-group"
44 lay-filter="slt-staff-group" lay-search> 44 lay-filter="slt-staff-group" lay-search>
45 - <option value="">=工作单位=</option> 45 + <option value="">工作单位</option>
46 </select> 46 </select>
47 </div> 47 </div>
48 </div> 48 </div>
@@ -54,9 +54,11 @@ @@ -54,9 +54,11 @@
54 </div> 54 </div>
55 </div> 55 </div>
56 </form> 56 </form>
57 - <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" > 57 + <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="device_create" style="margin-right: 76px !important;">
58 <i class="layui-icon">&#xe624;</i>新增 58 <i class="layui-icon">&#xe624;</i>新增
59 </button> 59 </button>
  60 + </div>
  61 + <div style="margin-bottom: 10px;">
60 <button class="layui-btn layui-btn-sm layui-btn-normal active" 62 <button class="layui-btn layui-btn-sm layui-btn-normal active"
61 id="device-export-excel"> 63 id="device-export-excel">
62 <i class="layui-icon">&#xe60a;</i>导出到Excel 64 <i class="layui-icon">&#xe60a;</i>导出到Excel
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <div class="layui-input-inline"> 42 <div class="layui-input-inline">
43 <select name="orgCode" id="slt-recoveryverify-org" 43 <select name="orgCode" id="slt-recoveryverify-org"
44 lay-filter="slt-recoveryverify-org" lay-search> 44 lay-filter="slt-recoveryverify-org" lay-search>
45 - <option value="">=所属处室=</option> 45 + <option value="">所属处室</option>
46 </select> 46 </select>
47 </div> 47 </div>
48 </div> 48 </div>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 <div class="layui-input-inline"> 50 <div class="layui-input-inline">
51 <select name="omanufacturerId" id="slt-recoveryverify-group" 51 <select name="omanufacturerId" id="slt-recoveryverify-group"
52 lay-filter="slt-recoveryverify-group" lay-search> 52 lay-filter="slt-recoveryverify-group" lay-search>
53 - <option value="">=运维单位=</option> 53 + <option value="">运维单位</option>
54 </select> 54 </select>
55 </div> 55 </div>
56 </div> 56 </div>
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 <div class="layui-input-inline"> 58 <div class="layui-input-inline">
59 <select name="bizId" id="slt-recoveryverify-biz" 59 <select name="bizId" id="slt-recoveryverify-biz"
60 lay-filter="slt-recoveryverify-biz" lay-search> 60 lay-filter="slt-recoveryverify-biz" lay-search>
61 - <option value="">=业务系统=</option> 61 + <option value="">业务系统</option>
62 </select> 62 </select>
63 </div> 63 </div>
64 </div> 64 </div>
@@ -80,6 +80,8 @@ @@ -80,6 +80,8 @@
80 </div> 80 </div>
81 </div> 81 </div>
82 </form> 82 </form>
  83 + </div>
  84 + <div style="display: flex;">
83 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create"> 85 <button class="layui-btn layui-btn-sm layui-btn-normal active" data-type="" id="recoveryverify_create">
84 新增 86 新增
85 </button> 87 </button>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 lay-filter="workReport-form" onsubmit="return false;"> 21 lay-filter="workReport-form" onsubmit="return false;">
22 <div class="layui-form-item"> 22 <div class="layui-form-item">
23 <div class="layui-inline"> 23 <div class="layui-inline">
24 - <div class="layui-input-inline" style="width: 300px"> 24 + <div class="layui-input-inline" style="width: 260px">
25 <input autocomplete="off" class="layui-input" id="workReport_title" 25 <input autocomplete="off" class="layui-input" id="workReport_title"
26 name="repTitle" placeholder="标题搜索，支持内容模糊匹配" type="text"> 26 name="repTitle" placeholder="标题搜索，支持内容模糊匹配" type="text">
27 </div> 27 </div>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 </div> 76 </div>
77 </div> 77 </div>
78 <div class="layui-card-body"> 78 <div class="layui-card-body">
79 - <div class=""> 79 + <div class="" style="margin-bottom: 10px">
80 <button class="layui-btn layui-btn-sm layui-btn-normal" id="workReport_create_day"> 80 <button class="layui-btn layui-btn-sm layui-btn-normal" id="workReport_create_day">
81 新增日报 81 新增日报
82 </button> 82 </button>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <div class="layui-input-inline"> 30 <div class="layui-input-inline">
31 <select id="slt-workreport-group" lay-filter="slt-workreport-group" 31 <select id="slt-workreport-group" lay-filter="slt-workreport-group"
32 lay-search name="manufacturerName"> 32 lay-search name="manufacturerName">
33 - <option value="">=选择厂商=</option> 33 + <option value="">选择厂商</option>
34 </select> 34 </select>
35 </div> 35 </div>
36 </div> 36 </div>
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <div class="layui-input-inline"> 38 <div class="layui-input-inline">
39 <select id="slt-workreport-user" lay-filter="slt-workreport-user" 39 <select id="slt-workreport-user" lay-filter="slt-workreport-user"
40 lay-search name="createBy"> 40 lay-search name="createBy">
41 - <option value="">=选择汇报人=</option> 41 + <option value="">选择汇报人</option>
42 </select> 42 </select>
43 </div> 43 </div>
44 </div> 44 </div>