Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-joke
Showing
31 changed files
with
202 additions
and
144 deletions
@@ -42,23 +42,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -42,23 +42,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
42 | cols: [[ | 42 | cols: [[ |
43 | {type: 'numbers', title: '序号'}, | 43 | {type: 'numbers', title: '序号'}, |
44 | { | 44 | { |
45 | - field: 'busName', title: '系统名称', align: 'center', minWith: 240, | 45 | + field: 'busName', title: '系统名称', align: 'center' |
46 | }, { | 46 | }, { |
47 | - field: 'evaluationLevel', title: '等保等级', align: 'center', minWith: 130, | 47 | + field: 'evaluationLevel', title: '等保等级', align: 'center', |
48 | + templet:function (d) { | ||
49 | + var evaluationLevel = ''; | ||
50 | + if(d.evaluationLevel == 'one-level'){ | ||
51 | + evaluationLevel = '一级'; | ||
52 | + }else if(d.evaluationLevel == 'two-level'){ | ||
53 | + evaluationLevel = '二级'; | ||
54 | + }else if(d.evaluationLevel == 'three-level'){ | ||
55 | + evaluationLevel = '三级'; | ||
56 | + } | ||
57 | + return evaluationLevel; | ||
58 | + } | ||
48 | }, { | 59 | }, { |
49 | - field: 'resName', title: '数据库名称', align: 'center', minWith: 240, | 60 | + field: 'resName', title: '数据库名称', align: 'center' |
50 | }, | 61 | }, |
51 | { | 62 | { |
52 | - field: 'ip', title: 'IP地址', align: 'center', minWith: 150, | 63 | + field: 'ip', title: 'IP地址', align: 'center' |
53 | }, | 64 | }, |
54 | { | 65 | { |
55 | - field: 'platform', title: '备份平台', align: 'center', minWith: 130, | 66 | + field: 'platform', title: '备份平台', align: 'center' |
56 | }, | 67 | }, |
57 | { | 68 | { |
58 | - field: 'backLevel', title: '备份级别', align: 'center', minWith: 180, | 69 | + field: 'backLevel', title: '备份级别', align: 'center' |
59 | }, | 70 | }, |
60 | { | 71 | { |
61 | - field: 'backStatus', title: '备份状态', align: 'center', minWith: 120, | 72 | + field: 'backStatus', title: '备份状态', align: 'center', |
62 | templet:function (d) { | 73 | templet:function (d) { |
63 | var backStatus = d.backStatus | 74 | var backStatus = d.backStatus |
64 | var backStatushtml = '成功'; | 75 | var backStatushtml = '成功'; |
@@ -45,11 +45,11 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -45,11 +45,11 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
45 | field: 'shouldBack', title: '应备份数量', align: 'center', drag: false, | 45 | field: 'shouldBack', title: '应备份数量', align: 'center', drag: false, |
46 | }, { | 46 | }, { |
47 | field: 'success', title: '备份成功数量', align: 'center', drag: false, | 47 | field: 'success', title: '备份成功数量', align: 'center', drag: false, |
48 | - templet: '<div><span data-date="{{d.createDate}}" data-status="成功" class="layui-table-link view-failCount-collectValue" style="color: green;font-size: 14px">{{d.success}}</span></div>' | 48 | + templet: '<div><span data-date="{{d.createDate}}" data-status="成功" class="layui-table-link view-failCount-collectValue" style="color: green!important;">{{d.success}}</span></div>' |
49 | 49 | ||
50 | }, { | 50 | }, { |
51 | field: 'fail', title: '备份失败数量', align: 'center', drag: false, | 51 | field: 'fail', title: '备份失败数量', align: 'center', drag: false, |
52 | - templet: '<div><span data-date="{{d.createDate}}" data-status="失败" class="layui-table-link view-failCount-collectValue" style="color: red;font-size: 14px">{{d.fail}}</span></div>' | 52 | + templet: '<div><span data-date="{{d.createDate}}" data-status="失败" class="layui-table-link view-failCount-collectValue" style="color: red!important;">{{d.fail}}</span></div>' |
53 | 53 | ||
54 | }, { | 54 | }, { |
55 | field: 'inback', title: '备份中数量', align: 'center', drag: false, | 55 | field: 'inback', title: '备份中数量', align: 'center', drag: false, |
@@ -63,8 +63,8 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -63,8 +63,8 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
63 | $('.view-failCount-collectValue').on('click', function () { | 63 | $('.view-failCount-collectValue').on('click', function () { |
64 | var createDate = $(this).data("date"); | 64 | var createDate = $(this).data("date"); |
65 | var status = $(this).data("status"); | 65 | var status = $(this).data("status"); |
66 | - var title = '备份失败列表' | ||
67 | - common.openWin('backup/failList', title, {createDate: createDate, status: status}, ['确定', '取消']) | 66 | + var title = status=="失败"?'备份失败列表':'备份成功列表'; |
67 | + common.openWin('backup/failList', title, {createDate: createDate, status: status}, ['确定', '取消'],null,null,['95%', '90%']) | ||
68 | }); | 68 | }); |
69 | } | 69 | } |
70 | }); | 70 | }); |
@@ -72,7 +72,6 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -72,7 +72,6 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
72 | 72 | ||
73 | function initStatusTable() { | 73 | function initStatusTable() { |
74 | var loading = layer.load(2) | 74 | var loading = layer.load(2) |
75 | - var mycars = new Array(); | ||
76 | var url = common.domainName + '/api-web/backupview/countLastHalfMonthBackStatus' | 75 | var url = common.domainName + '/api-web/backupview/countLastHalfMonthBackStatus' |
77 | $.ajax({ | 76 | $.ajax({ |
78 | url: url, | 77 | url: url, |
@@ -81,23 +80,16 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -81,23 +80,16 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
81 | success: function (res) { | 80 | success: function (res) { |
82 | layer.close(loading); | 81 | layer.close(loading); |
83 | var data = res.data; | 82 | var data = res.data; |
84 | - var tr = '<div style="line-height: 26px;padding: 15px;text-align:center;color: #999;">暂无数据</div>'; | ||
85 | - if(data.length==0){ | ||
86 | -/* | ||
87 | - $(".backupCountStatus-table").append(tr); | ||
88 | -*/ | ||
89 | - }else { | ||
90 | - $("#status_table").find("thead").empty(); | ||
91 | - $("#status_table").find("tbody").empty(); | ||
92 | - | ||
93 | - var htr = "<tr><th>序号</th><th width='200'>系统名称</th><th>等保等级</th><th width='200'>数据库名称</th><th>IP地址</th>" | ||
94 | - $.each(data[0].backlist[0], function (j, f) { | ||
95 | - if (j != "resId" && j != "resName" && j != "ip") { | ||
96 | - htr += "<th>" + j + "</th>" | ||
97 | - } | 83 | + var htr = "<tr><th style='color: #151b26;font-weight: bold!important;'>序号</th><th style='color: #151b26;font-weight: bold!important;'>系统名称</th><th style='color: #151b26;font-weight: bold!important;'>等保等级</th><th style='color: #151b26;font-weight: bold!important;'>数据库名称</th><th style='color: #151b26;font-weight: bold!important;'>IP地址</th>" |
84 | + $.each(res.object, function (j, f) { | ||
85 | + htr += "<th style='color: #151b26;font-weight: bold!important;'>" + f + "</th>" | ||
98 | }); | 86 | }); |
99 | - htr += "</tr>" | 87 | + htr += "</tr>"; |
100 | $("#status_table").find("thead").append(htr); | 88 | $("#status_table").find("thead").append(htr); |
89 | + $("#status_table").find("tbody").empty(); | ||
90 | + if(data.length==0){ | ||
91 | + | ||
92 | + }else { | ||
101 | $.each(data, function (i, e) { | 93 | $.each(data, function (i, e) { |
102 | var evaluationLevel = ''; | 94 | var evaluationLevel = ''; |
103 | var tr = ''; | 95 | var tr = ''; |
@@ -140,19 +132,19 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -140,19 +132,19 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
140 | $.each(e.backlist[j], function (h, n) { | 132 | $.each(e.backlist[j], function (h, n) { |
141 | if (h != "resId") { | 133 | if (h != "resId") { |
142 | if (/失败/.test(n)) { | 134 | if (/失败/.test(n)) { |
143 | - tr += '<td style="text-align: center"><i class="layui-icon layui-icon-close" style="font-size: 20px; color: #ff252c;"></i></td>' | 135 | + tr += '<td style="text-align: center"><i class="layui-icon layui-icon-close" style="font-size: 20px!important; color: #ff252c!important;"></i></td>' |
144 | } else if (/成功/.test(n)) { | 136 | } else if (/成功/.test(n)) { |
145 | - tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-ok" style="font-size: 20px; color: #1dff1c;"></i></p><p style="margin-top: 8px;text-align: center">主楼+综改</p></td>' | 137 | + tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-ok" style="font-size: 20px!important; color: #1dff1c!important;"></i></p><p style="margin-top: 8px;text-align: center">主楼+综改</p></td>' |
146 | } else if (/备份中/.test(n)) { | 138 | } else if (/备份中/.test(n)) { |
147 | - tr += '<td style="text-align: center"><span style="color:#ffe40e">' + n + '</span></td>' | 139 | + tr += '<td style="text-align: center"><span style="color:#ffe40e!important;">' + n + '</span></td>' |
148 | } else if (/未备份/.test(n)) { | 140 | } else if (/未备份/.test(n)) { |
149 | - tr += '<td style="text-align: center"><span style="color:magenta">' + n + '</span></td>' | 141 | + tr += '<td style="text-align: center"><span style="color:magenta!important;">' + n + '</span></td>' |
150 | } else if (/历史存放/.test(n)) { | 142 | } else if (/历史存放/.test(n)) { |
151 | - tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-log" style="font-size: 20px; color: #1e9fff;"></i></p><p style="margin-top: 8px;text-align: center">综改</p></td>' | 143 | + tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-log" style="font-size: 20px!important; color: #1e9fff!important;"></i></p><p style="margin-top: 8px;text-align: center">综改</p></td>' |
152 | } else if (/全备/.test(n)) { | 144 | } else if (/全备/.test(n)) { |
153 | - tr += '<td style="text-align: center"><span style="color:#1DFF1C">' + n + '</span></td>' | 145 | + tr += '<td style="text-align: center"><span style="color:#1DFF1C!important;">' + n + '</span></td>' |
154 | } else if (/已失效/.test(n)){ | 146 | } else if (/已失效/.test(n)){ |
155 | - tr += '<td style="text-align: center"><span style="color:#FF252C">' + n + '</span></td>' | 147 | + tr += '<td style="text-align: center"><span style="color:#FF252C!important;">' + n + '</span></td>' |
156 | }else { | 148 | }else { |
157 | tr += '<td style="text-align: center">' + n + '</td>' | 149 | tr += '<td style="text-align: center">' + n + '</td>' |
158 | 150 |
@@ -115,7 +115,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -115,7 +115,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
115 | common.openWin('backup/backDingjiaList', title, { | 115 | common.openWin('backup/backDingjiaList', title, { |
116 | busId: busId, | 116 | busId: busId, |
117 | flag: flag | 117 | flag: flag |
118 | - }, ['确定', '取消'],null,null,['1512px', '90%']) | 118 | + }, ['确定', '取消'],null,null,['95%', '90%']) |
119 | }); | 119 | }); |
120 | 120 | ||
121 | } | 121 | } |
@@ -181,11 +181,11 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -181,11 +181,11 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
181 | var backStatushtml = ''; | 181 | var backStatushtml = ''; |
182 | if (f.backStatus != null) { | 182 | if (f.backStatus != null) { |
183 | backStatus = f.backStatus | 183 | backStatus = f.backStatus |
184 | - backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" class="layui-table-link view-backstatus-collectValue" style="color: green;font-size: 14px">成功</span></div>'; | 184 | + backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" class="layui-table-link view-backstatus-collectValue" style="color: green!important;">成功</span></div>'; |
185 | if (/失败/.test(backStatus)) { | 185 | if (/失败/.test(backStatus)) { |
186 | - backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" class="layui-table-link view-backstatus-collectValue" style="color: red;font-size: 14px">失败</span></div>'; | 186 | + backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" class="layui-table-link view-backstatus-collectValue" style="color: red!important;">失败</span></div>'; |
187 | } else if (/备份中/.test(backStatus)) { | 187 | } else if (/备份中/.test(backStatus)) { |
188 | - backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" style="color: #ffe40e;font-size: 14px">备份中</span></div>'; | 188 | + backStatushtml = '<div><span data-date="' + f.startTime + '" data-resid="' + f.resId + '" data-ip= "' + f.ip + '" style="color: #ffe40e!important;">备份中</span></div>'; |
189 | } | 189 | } |
190 | } | 190 | } |
191 | var backBytes = ''; | 191 | var backBytes = ''; |
@@ -216,7 +216,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -216,7 +216,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
216 | 216 | ||
217 | if (f.lastTime != null) { | 217 | if (f.lastTime != null) { |
218 | if (f.startTime == null || f.lastTime != f.startTime) { | 218 | if (f.startTime == null || f.lastTime != f.startTime) { |
219 | - lastTime = '<span style="font-size: 14px;color: red">' + dateForm(f.lastTime) + '</span>' | 219 | + lastTime = '<span style="color: red!important;">' + dateForm(f.lastTime) + '</span>' |
220 | } else { | 220 | } else { |
221 | lastTime = dateForm(f.lastTime) | 221 | lastTime = dateForm(f.lastTime) |
222 | } | 222 | } |
@@ -274,7 +274,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -274,7 +274,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
274 | startTime: startTime, | 274 | startTime: startTime, |
275 | resId: resId, | 275 | resId: resId, |
276 | resIp: ip | 276 | resIp: ip |
277 | - }, ['确定', '取消'],null,null,['1512px', '90%']) | 277 | + }, ['确定', '取消'],null,null,['95%', '90%']) |
278 | }); | 278 | }); |
279 | $('#inspectioncount_table_id :button.edit').click(function () { | 279 | $('#inspectioncount_table_id :button.edit').click(function () { |
280 | var toEdit = this.value == '编辑'; | 280 | var toEdit = this.value == '编辑'; |
@@ -298,7 +298,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -298,7 +298,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
298 | common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() { | 298 | common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() { |
299 | $("#bizupgrade-form-save-id").trigger("click"); | 299 | $("#bizupgrade-form-save-id").trigger("click"); |
300 | reloadAllChange(); | 300 | reloadAllChange(); |
301 | - },null,['1512px', '90%'],null,{end: function () { | 301 | + },null,['90%', '90%'],null,{end: function () { |
302 | reloadAllChange(); | 302 | reloadAllChange(); |
303 | }}) | 303 | }}) |
304 | } | 304 | } |
@@ -207,7 +207,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -207,7 +207,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
207 | common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){ | 207 | common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){ |
208 | $("#devicehitch-form-save-id").trigger("click"); | 208 | $("#devicehitch-form-save-id").trigger("click"); |
209 | reloadAllChange(); | 209 | reloadAllChange(); |
210 | - },null,['1512px', '90%'],null,{end: function () { | 210 | + },null,['90%', '90%'],null,{end: function () { |
211 | reloadAllChange(); | 211 | reloadAllChange(); |
212 | }}) | 212 | }}) |
213 | } | 213 | } |
@@ -290,7 +290,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' | @@ -290,7 +290,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' | ||
290 | } | 290 | } |
291 | if (winWidth>0 && formWidth + 130 > winWidth) { | 291 | if (winWidth>0 && formWidth + 130 > winWidth) { |
292 | $('.openStow').css('display', 'inline-block') | 292 | $('.openStow').css('display', 'inline-block') |
293 | - $('.form-item-open-stow').css('height', '50px'); | 293 | + $('.form-item-open-stow').css('height', '40px'); |
294 | } else { | 294 | } else { |
295 | $('.openStow').css('display', 'none') | 295 | $('.openStow').css('display', 'none') |
296 | } | 296 | } |
@@ -300,7 +300,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' | @@ -300,7 +300,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' | ||
300 | $('.form-item-open-stow').css('height', 'auto'); | 300 | $('.form-item-open-stow').css('height', 'auto'); |
301 | } else { | 301 | } else { |
302 | $(this).text('展开') | 302 | $(this).text('展开') |
303 | - $('.form-item-open-stow').css('height', '50px'); | 303 | + $('.form-item-open-stow').css('height', '40px'); |
304 | } | 304 | } |
305 | }) | 305 | }) |
306 | //end lsq 2022-06-27 | 306 | //end lsq 2022-06-27 |
@@ -334,7 +334,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -334,7 +334,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
334 | common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() { | 334 | common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() { |
335 | $("#emergency-form-save-id").trigger("click"); | 335 | $("#emergency-form-save-id").trigger("click"); |
336 | reloadAllChange(); | 336 | reloadAllChange(); |
337 | - },null,['1512px', '90%'],null,{end: function () { | 337 | + },null,['90%', '90%'],null,{end: function () { |
338 | reloadAllChange(); | 338 | reloadAllChange(); |
339 | }}) | 339 | }}) |
340 | } | 340 | } |
@@ -375,7 +375,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -375,7 +375,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
375 | common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() { | 375 | common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() { |
376 | $("#device-form-save-id").trigger("click"); | 376 | $("#device-form-save-id").trigger("click"); |
377 | reloadAllChange(); | 377 | reloadAllChange(); |
378 | - }, null, ['1512px', '90%'], null, {end: function () { | 378 | + }, null, ['90%', '90%'], null, {end: function () { |
379 | reloadAllChange(); | 379 | reloadAllChange(); |
380 | }}) | 380 | }}) |
381 | } | 381 | } |
@@ -227,7 +227,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -227,7 +227,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
227 | var title = id ? '编辑' : '新增' | 227 | var title = id ? '编辑' : '新增' |
228 | common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() { | 228 | common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() { |
229 | $("#staff-form-save-id").trigger("click"); | 229 | $("#staff-form-save-id").trigger("click"); |
230 | - },null,['1512px', '90%'],null,{end: function () { | 230 | + },null,['90%', '90%'],null,{end: function () { |
231 | reloadAllChange(); | 231 | reloadAllChange(); |
232 | }}) | 232 | }}) |
233 | } | 233 | } |
@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
195 | common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){ | 195 | common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){ |
196 | $("#extra-form-save-id").trigger("click"); | 196 | $("#extra-form-save-id").trigger("click"); |
197 | reloadAllChange(); | 197 | reloadAllChange(); |
198 | - },null,['1512px', '90%'],null,{end: function () { | 198 | + },null,['90%', '90%'],null,{end: function () { |
199 | reloadAllChange(); | 199 | reloadAllChange(); |
200 | }}) | 200 | }}) |
201 | } | 201 | } |
@@ -161,7 +161,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -161,7 +161,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
161 | common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){ | 161 | common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){ |
162 | $("#meetingApply-form-save-id").trigger("click"); | 162 | $("#meetingApply-form-save-id").trigger("click"); |
163 | form.render(); | 163 | form.render(); |
164 | - },null,['1512px', '90%'],null,{end: function () { | 164 | + },null,['90%', '90%'],null,{end: function () { |
165 | reloadAllChange(); | 165 | reloadAllChange(); |
166 | }}) | 166 | }}) |
167 | } | 167 | } |
@@ -139,7 +139,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -139,7 +139,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
139 | function openmeetingsummaryForm(id) { | 139 | function openmeetingsummaryForm(id) { |
140 | var title = id ? '编辑' : '新增' | 140 | var title = id ? '编辑' : '新增' |
141 | common.openWin('machineroom/meetingsummaryAdd', title, {id: id}, ['确定', '取消'], function f(index,layero){ | 141 | common.openWin('machineroom/meetingsummaryAdd', title, {id: id}, ['确定', '取消'], function f(index,layero){ |
142 | - },null,['1512px', '90%'],null,{end: function () { | 142 | + },null,['90%', '90%'],null,{end: function () { |
143 | reloadAllChange(); | 143 | reloadAllChange(); |
144 | }}) | 144 | }}) |
145 | } | 145 | } |
1 | /** 应急演练 */ | 1 | /** 应急演练 */ |
2 | -layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydate', 'element'], function (exports) { | 2 | +layui.define(['table', 'form','laytpl', 'sessions', 'admin', 'common', 'echarts', 'laydate', 'element'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var common = layui.common; | 5 | var common = layui.common; |
6 | + var laytpl = layui.laytpl; | ||
6 | exports('recoverycount', function () { | 7 | exports('recoverycount', function () { |
7 | var sessions = layui.sessions; | 8 | var sessions = layui.sessions; |
8 | var accessToken = localStorage.getItem("accessToken"); | 9 | var accessToken = localStorage.getItem("accessToken"); |
@@ -42,20 +43,38 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -42,20 +43,38 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
42 | 43 | ||
43 | // 下拉框改变搜索 | 44 | // 下拉框改变搜索 |
44 | //form.on('select(slt-recoverycount-biz)', reloadAllChange); | 45 | //form.on('select(slt-recoverycount-biz)', reloadAllChange); |
45 | - | ||
46 | - function renderStyle(number){ | 46 | + function renderStyle(number,resId){ |
47 | if(number>0){ | 47 | if(number>0){ |
48 | - return '<div><span style="color: #0BAC33" >'+number+'</span></div>'; | 48 | + return '<a class="view-recoveryverify-record" style="color: #1dff1c;cursor: pointer;text-decoration:underline;" data-resid="'+resId+'"><span >'+number+'</span></a>'; |
49 | }else { | 49 | }else { |
50 | - return '<div><span style="color: #aa2222">'+number+'</span></div>'; | 50 | + return '<div><span style="color: #aa2222">'+'-'+'</span></div>'; |
51 | + } | ||
52 | + } | ||
53 | + | ||
54 | + function openrecoveryverifyForm(id) { | ||
55 | + var title = '数据库恢复验证记录'; | ||
56 | + layer.open({ | ||
57 | + title:title, | ||
58 | + id:'recoveryverifyDetail', | ||
59 | + type:1, | ||
60 | + area: ['95%', '90%'], | ||
61 | + btn:['确定','取消'], | ||
62 | + scrollbar:true, | ||
63 | + success: function(){ | ||
64 | + view(this.id).render('recoveryverify/index',{resId: id,period:createTime}); | ||
65 | + }, | ||
66 | + yes:function (index,layero) { | ||
67 | + return true | ||
51 | } | 68 | } |
69 | + }) | ||
70 | + | ||
52 | } | 71 | } |
53 | 72 | ||
54 | function renderIsDiscovery(isRecovery) { | 73 | function renderIsDiscovery(isRecovery) { |
55 | if(isRecovery=="1"){ | 74 | if(isRecovery=="1"){ |
56 | - return '<i class="layui-icon layui-icon-ok" style="font-size: 30px; color: #1dff1c;"></i>'; | 75 | + return '<i class="layui-icon layui-icon-ok" style="font-size: 20px!important; color: #1dff1c!important;"></i>'; |
57 | }else { | 76 | }else { |
58 | - return '<i class="layui-icon layui-icon-close" style="font-size: 30px; color: #ff252c;"></i>'; | 77 | + return '<i class="layui-icon layui-icon-close" style="font-size: 20px!important; color: #ff252c!important;"></i>'; |
59 | } | 78 | } |
60 | } | 79 | } |
61 | $("#orgSearchBtn").on("click",function () { | 80 | $("#orgSearchBtn").on("click",function () { |
@@ -77,7 +96,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -77,7 +96,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
77 | data: conditions, | 96 | data: conditions, |
78 | success: function (res) { | 97 | success: function (res) { |
79 | layer.close(loading); | 98 | layer.close(loading); |
80 | - var data = res.data; | 99 | + var data = res.object.recoveryCountViews; |
81 | $("#recoverycount-table").find("tbody").empty(); | 100 | $("#recoverycount-table").find("tbody").empty(); |
82 | $.each(data, function (i, e) { | 101 | $.each(data, function (i, e) { |
83 | var evaluationLevel = ''; | 102 | var evaluationLevel = ''; |
@@ -96,19 +115,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -96,19 +115,19 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
96 | $.each(e.children, function (j, f) { | 115 | $.each(e.children, function (j, f) { |
97 | tr += '<td >' + f.resName + '</td>' + | 116 | tr += '<td >' + f.resName + '</td>' + |
98 | '<td>' + f.ip + '</td>' + | 117 | '<td>' + f.ip + '</td>' + |
99 | - '<td>' + renderIsDiscovery(f.isRecovery)+ '</td>' + | ||
100 | - '<td>' + renderStyle(f.dece)+ '</td>' + | ||
101 | - '<td>' + renderStyle(f.nov) + '</td>' + | ||
102 | - '<td>' + renderStyle(f.oct) + '</td>' + | ||
103 | - '<td>' + renderStyle(f.sep) + '</td>' + | ||
104 | - '<td>' + renderStyle(f.aug) + '</td>' + | ||
105 | - '<td>' + renderStyle(f.jul) + '</td>' + | ||
106 | - '<td>' + renderStyle(f.jun) + '</td>' + | ||
107 | - '<td>' + renderStyle(f.may) + '</td>' + | ||
108 | - '<td>' + renderStyle(f.apr) + '</td>' + | ||
109 | - '<td>' + renderStyle(f.mar) + '</td>' + | ||
110 | - '<td>' + renderStyle(f.feb) + '</td>' + | ||
111 | - '<td>' + renderStyle(f.jan) + '</td>' + | 118 | + '<td data-resid="'+f.resId+'" >' + renderIsDiscovery(f.isRecovery,f.resId)+ '</td>' + |
119 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.dece,f.resId)+ '</td>' + | ||
120 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.nov,f.resId) + '</td>' + | ||
121 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.oct,f.resId) + '</td>' + | ||
122 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.sep,f.resId) + '</td>' + | ||
123 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.aug,f.resId) + '</td>' + | ||
124 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.jul,f.resId) + '</td>' + | ||
125 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.jun,f.resId) + '</td>' + | ||
126 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.may,f.resId) + '</td>' + | ||
127 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.apr,f.resId) + '</td>' + | ||
128 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.mar,f.resId) + '</td>' + | ||
129 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.feb,f.resId) + '</td>' + | ||
130 | + '<td data-resid="'+f.resId+'" >' + renderStyle(f.jan,f.resId) + '</td>' + | ||
112 | '</tr>' | 131 | '</tr>' |
113 | }); | 132 | }); |
114 | }else{ | 133 | }else{ |
@@ -129,9 +148,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -129,9 +148,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
129 | '</tr>' | 148 | '</tr>' |
130 | } | 149 | } |
131 | $("#recoverycount-table").find("tbody").append(tr); | 150 | $("#recoverycount-table").find("tbody").append(tr); |
132 | - }) | ||
133 | - | ||
134 | - | 151 | + }); |
152 | + $('.view-recoveryverify-record').on('click', function () { | ||
153 | + openrecoveryverifyForm($(this).data('resid')); | ||
154 | + }); | ||
155 | + $('#recoverycount-top-head-info').html(laytpl($('#tpl-recoverycount-top-head-info').html()).render(res.object)); | ||
135 | } | 156 | } |
136 | }) | 157 | }) |
137 | } | 158 | } |
@@ -211,7 +211,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -211,7 +211,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
211 | common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() { | 211 | common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() { |
212 | $("#recoveryverify-form-save-id").trigger("click"); | 212 | $("#recoveryverify-form-save-id").trigger("click"); |
213 | reloadAllChange(); | 213 | reloadAllChange(); |
214 | - },null,['1512px', '90%'],null,{end: function () { | 214 | + },null,['90%', '90%'],null,{end: function () { |
215 | reloadAllChange(); | 215 | reloadAllChange(); |
216 | }}) | 216 | }}) |
217 | } | 217 | } |
@@ -271,7 +271,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -271,7 +271,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
271 | } | 271 | } |
272 | if (formWidth + 130 > winWidth) { | 272 | if (formWidth + 130 > winWidth) { |
273 | $('.openStow').css('display', 'inline-block') | 273 | $('.openStow').css('display', 'inline-block') |
274 | - $('.form-item-open-stow').css('height', '50px'); | 274 | + $('.form-item-open-stow').css('height', '40px'); |
275 | } else { | 275 | } else { |
276 | $('.openStow').css('display', 'none') | 276 | $('.openStow').css('display', 'none') |
277 | } | 277 | } |
@@ -281,7 +281,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -281,7 +281,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
281 | $('.form-item-open-stow').css('height', 'auto'); | 281 | $('.form-item-open-stow').css('height', 'auto'); |
282 | } else { | 282 | } else { |
283 | $(this).text('展开') | 283 | $(this).text('展开') |
284 | - $('.form-item-open-stow').css('height', '50px'); | 284 | + $('.form-item-open-stow').css('height', '40px'); |
285 | } | 285 | } |
286 | }) | 286 | }) |
287 | //end lsq 2022-06-27 | 287 | //end lsq 2022-06-27 |
@@ -889,9 +889,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -889,9 +889,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
889 | if ((d.resType !== 'MIDDLEWARE_WEBLOGIC') || (d.resType === 'MIDDLEWARE_WEBLOGIC' && d.parentId && d.parentId !== '')) { | 889 | if ((d.resType !== 'MIDDLEWARE_WEBLOGIC') || (d.resType === 'MIDDLEWARE_WEBLOGIC' && d.parentId && d.parentId !== '')) { |
890 | htm += '<a resmanage-data-opendetail="' + d.resId + '" data-ip="' + d.ip + '" data-restype="' + d.resType + '" data-restypename="' + d.resTypeName + '" data-admin="' + d.admin + '" data-name="' + d.resName + '" data-adminname="' + d.adminName + '" data-manageip="' + d.manageIp + '" data-collprotocol="' + d.collProtocol + '" data-provider="' + d.provider + '" class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="查看详情">查看详情</a>'; | 890 | htm += '<a resmanage-data-opendetail="' + d.resId + '" data-ip="' + d.ip + '" data-restype="' + d.resType + '" data-restypename="' + d.resTypeName + '" data-admin="' + d.admin + '" data-name="' + d.resName + '" data-adminname="' + d.adminName + '" data-manageip="' + d.manageIp + '" data-collprotocol="' + d.collProtocol + '" data-provider="' + d.provider + '" class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="查看详情">查看详情</a>'; |
891 | } | 891 | } |
892 | - if (d.resType && d.resType.indexOf("HOST") > -1) { | ||
893 | - htm += '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="CONSOLE" resmanage-data-console="' + d.resId + '">控制台</a>' | ||
894 | - } | 892 | + // if (d.resType && d.resType.indexOf("HOST") > -1) { |
893 | + // htm += '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="CONSOLE" resmanage-data-console="' + d.resId + '">控制台</a>' | ||
894 | + // } | ||
895 | if (loginName === 'admin') { | 895 | if (loginName === 'admin') { |
896 | htm += '<a resmanage-data-delete-plus="' + d.resId + '" class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="强制删除">强制删除</a>' | 896 | htm += '<a resmanage-data-delete-plus="' + d.resId + '" class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="强制删除">强制删除</a>' |
897 | } | 897 | } |
@@ -1186,44 +1186,49 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -1186,44 +1186,49 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
1186 | // $(this).parents('tr').eq(0).addClass("tbody-tr-background-color"); | 1186 | // $(this).parents('tr').eq(0).addClass("tbody-tr-background-color"); |
1187 | var resId = $(this).attr("resmanage-data-openDetail"); | 1187 | var resId = $(this).attr("resmanage-data-openDetail"); |
1188 | var resType = $(this).data("restype"); | 1188 | var resType = $(this).data("restype"); |
1189 | - var name = $(this).data("name"); | ||
1190 | - var ip = $(this).data("ip"); | ||
1191 | - var resTypeName = $(this).data("restypename"); | ||
1192 | - var admin = $(this).data("admin"); | ||
1193 | - var adminName = $(this).data("adminname"); | ||
1194 | - var manageIp = $(this).data("manageip"); | ||
1195 | - var collProtocol = $(this).data("collprotocol"); | ||
1196 | - var provider = $(this).data("provider"); | ||
1197 | - if (name && name != '') { | ||
1198 | - name += ' | '; | ||
1199 | - } | ||
1200 | - if (resTypeName && resType !== 'HOST_X86SERVER') { | ||
1201 | - name += resTypeName + '|'; | ||
1202 | - } | ||
1203 | - if (ip) { | ||
1204 | - if (resType === 'HOST_X86SERVER') { | ||
1205 | - if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) { | ||
1206 | - name += '应用IP-' + ip + '|'; | ||
1207 | - } | ||
1208 | - } else { | ||
1209 | - name += ip + '|'; | ||
1210 | - } | ||
1211 | - } | ||
1212 | - if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) { | ||
1213 | - if (manageIp) { | ||
1214 | - name += '管理IP-' + manageIp + '|'; | ||
1215 | - } | ||
1216 | - } | ||
1217 | - if (adminName) { | ||
1218 | - name += adminName + ' | '; | ||
1219 | - } | ||
1220 | - if (name.length > 0) { | ||
1221 | - name = name.substr(0, name.length - 1); | ||
1222 | - } | ||
1223 | - if (resType == 'STORAGE_SHARE' && provider != 'HUAWEI' && provider != 'Inspur' && provider != 'macrosan') { | ||
1224 | - return false; | ||
1225 | - } | ||
1226 | - commonDetail.openDetail(resId, resType, name) | 1189 | + // var name = $(this).data("name"); |
1190 | + // var ip = $(this).data("ip"); | ||
1191 | + // var resTypeName = $(this).data("restypename"); | ||
1192 | + // var admin = $(this).data("admin"); | ||
1193 | + // var adminName = $(this).data("adminname"); | ||
1194 | + // var manageIp = $(this).data("manageip"); | ||
1195 | + // var collProtocol = $(this).data("collprotocol"); | ||
1196 | + // var provider = $(this).data("provider"); | ||
1197 | + // if (name && name != '') { | ||
1198 | + // name += ' | '; | ||
1199 | + // } | ||
1200 | + // if (resTypeName && resType !== 'HOST_X86SERVER') { | ||
1201 | + // name += resTypeName + '|'; | ||
1202 | + // } | ||
1203 | + // if (ip) { | ||
1204 | + // if (resType === 'HOST_X86SERVER') { | ||
1205 | + // if (collProtocol && (collProtocol.split(",").length > 1 || collProtocol === 'SSH')) { | ||
1206 | + // name += '应用IP-' + ip + '|'; | ||
1207 | + // } | ||
1208 | + // } else { | ||
1209 | + // name += ip + '|'; | ||
1210 | + // } | ||
1211 | + // } | ||
1212 | + // if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) { | ||
1213 | + // if (manageIp) { | ||
1214 | + // name += '管理IP-' + manageIp + '|'; | ||
1215 | + // } | ||
1216 | + // } | ||
1217 | + // if (adminName) { | ||
1218 | + // name += adminName + ' | '; | ||
1219 | + // } | ||
1220 | + // if (name.length > 0) { | ||
1221 | + // name = name.substr(0, name.length - 1); | ||
1222 | + // } | ||
1223 | + // if (resType == 'STORAGE_SHARE' && provider != 'HUAWEI' && provider != 'Inspur' && provider != 'macrosan') { | ||
1224 | + // return false; | ||
1225 | + // } | ||
1226 | + // commonDetail.openDetail(resId, resType, name) | ||
1227 | + | ||
1228 | + window.top.postMessage({ | ||
1229 | + type: 'resDetail', | ||
1230 | + message: {'params':{'resId':resId,'resType':resType}} | ||
1231 | + }, '*') | ||
1227 | }); | 1232 | }); |
1228 | resTopo(); | 1233 | resTopo(); |
1229 | //lsq T3和IOP点击修改删除 2022-08-04 | 1234 | //lsq T3和IOP点击修改删除 2022-08-04 |
@@ -2351,7 +2356,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -2351,7 +2356,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
2351 | } | 2356 | } |
2352 | if (formWidth + 130 > winWidth) { | 2357 | if (formWidth + 130 > winWidth) { |
2353 | $('.openStow').css('display', 'inline-block') | 2358 | $('.openStow').css('display', 'inline-block') |
2354 | - $('.form-item-open-stow').css('height', '50px'); | 2359 | + $('.form-item-open-stow').css('height', '40px'); |
2355 | } else { | 2360 | } else { |
2356 | $('.openStow').css('display', 'none') | 2361 | $('.openStow').css('display', 'none') |
2357 | } | 2362 | } |
@@ -2361,7 +2366,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -2361,7 +2366,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
2361 | $('.form-item-open-stow').css('height', 'auto'); | 2366 | $('.form-item-open-stow').css('height', 'auto'); |
2362 | } else { | 2367 | } else { |
2363 | $(this).text('展开') | 2368 | $(this).text('展开') |
2364 | - $('.form-item-open-stow').css('height', '50px'); | 2369 | + $('.form-item-open-stow').css('height', '40px'); |
2365 | } | 2370 | } |
2366 | }) | 2371 | }) |
2367 | //end lsq 2022-06-27 | 2372 | //end lsq 2022-06-27 |
@@ -405,7 +405,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -405,7 +405,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
405 | } | 405 | } |
406 | if (formWidth + 130 > winWidth) { | 406 | if (formWidth + 130 > winWidth) { |
407 | $('.openStow').css('display', 'inline-block') | 407 | $('.openStow').css('display', 'inline-block') |
408 | - $('.form-item-open-stow').css('height', '50px'); | 408 | + $('.form-item-open-stow').css('height', '40px'); |
409 | } else { | 409 | } else { |
410 | $('.openStow').css('display', 'none') | 410 | $('.openStow').css('display', 'none') |
411 | } | 411 | } |
@@ -415,7 +415,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -415,7 +415,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
415 | $('.form-item-open-stow').css('height', 'auto'); | 415 | $('.form-item-open-stow').css('height', 'auto'); |
416 | } else { | 416 | } else { |
417 | $(this).text('展开') | 417 | $(this).text('展开') |
418 | - $('.form-item-open-stow').css('height', '50px'); | 418 | + $('.form-item-open-stow').css('height', '40px'); |
419 | } | 419 | } |
420 | }) | 420 | }) |
421 | //end lsq 2022-06-21 | 421 | //end lsq 2022-06-21 |
@@ -166,7 +166,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -166,7 +166,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
166 | common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() { | 166 | common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() { |
167 | $("#routeAdjust-form-save-id").trigger("click"); | 167 | $("#routeAdjust-form-save-id").trigger("click"); |
168 | reloadAllChange(); | 168 | reloadAllChange(); |
169 | - },null,['1512px', '90%'],null,{end: function () { | 169 | + },null,['90%', '90%'],null,{end: function () { |
170 | reloadAllChange(); | 170 | reloadAllChange(); |
171 | }}) | 171 | }}) |
172 | } | 172 | } |
@@ -521,7 +521,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -521,7 +521,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
521 | title: `<a class="layui-icon layui-icon-edit win_title_icon"></a>停机计划`+titleName, | 521 | title: `<a class="layui-icon layui-icon-edit win_title_icon"></a>停机计划`+titleName, |
522 | type: '1', | 522 | type: '1', |
523 | resize: false, | 523 | resize: false, |
524 | - area: ['1000px', '500px'], | 524 | + area: ['1000px', '600px'], |
525 | success: function (indexm, layero) { | 525 | success: function (indexm, layero) { |
526 | //start 停机模式从数据字典中获取 2022-05-24 | 526 | //start 停机模式从数据字典中获取 2022-05-24 |
527 | admin.req({ | 527 | admin.req({ |
@@ -239,7 +239,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -239,7 +239,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
239 | var title = id ? '编辑' : '新增' | 239 | var title = id ? '编辑' : '新增' |
240 | common.openWin('workreport/add', title, {id: id, repType: repType}, ['保存', '取消'], function f() { | 240 | common.openWin('workreport/add', title, {id: id, repType: repType}, ['保存', '取消'], function f() { |
241 | $("#workReport-form-save-id").trigger("click"); | 241 | $("#workReport-form-save-id").trigger("click"); |
242 | - },null,['1100px', '90%'],null,{end: function () { | 242 | + },null,['80%', '90%'],null,{end: function () { |
243 | reloadWorkReportTable(); | 243 | reloadWorkReportTable(); |
244 | }}) | 244 | }}) |
245 | } | 245 | } |
@@ -300,7 +300,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -300,7 +300,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
300 | common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view',datas:datas}, ['下一条','关闭'], function f() { | 300 | common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view',datas:datas}, ['下一条','关闭'], function f() { |
301 | $("#workReport-form-next-id").trigger("click"); | 301 | $("#workReport-form-next-id").trigger("click"); |
302 | reloadAllChange(); | 302 | reloadAllChange(); |
303 | - },null,['1100px', '90%'],null,{end: function () { | 303 | + },null,['80%', '90%'],null,{end: function () { |
304 | reloadAllChange(); | 304 | reloadAllChange(); |
305 | }}); | 305 | }}); |
306 | } | 306 | } |
@@ -5426,11 +5426,8 @@ grayColor { | @@ -5426,11 +5426,8 @@ grayColor { | ||
5426 | .favorites-container .layui-cols-items .card-main .favorites-btngroup { | 5426 | .favorites-container .layui-cols-items .card-main .favorites-btngroup { |
5427 | width: 100%; | 5427 | width: 100%; |
5428 | text-align: right; | 5428 | text-align: right; |
5429 | - display: none; | ||
5430 | height: 30px; | 5429 | height: 30px; |
5431 | - position: absolute; | ||
5432 | - top: 26px; | ||
5433 | - right: 30px; | 5430 | + justify-content: flex-end; |
5434 | } | 5431 | } |
5435 | 5432 | ||
5436 | .favorites-container .card-list .layui-cols-items:hover .favorites-btngroup { | 5433 | .favorites-container .card-list .layui-cols-items:hover .favorites-btngroup { |
@@ -109,9 +109,11 @@ | @@ -109,9 +109,11 @@ | ||
109 | </select> | 109 | </select> |
110 | </td> | 110 | </td> |
111 | <td><input type="text" class="layui-input" name="paramDesc"></td> | 111 | <td><input type="text" class="layui-input" name="paramDesc"></td> |
112 | - <td align="center" style="min-width: 80px"><a class="layui-table-link layui-btn layui-btn-xs layui-btn-normal" | ||
113 | - title="删除"><i style="font-size: 18px" | ||
114 | - class="layui-icon"></i></a></td> | 112 | + <td align="center" style="min-width: 80px"> |
113 | + <a class="layui-table-link layui-btn layui-btn-xs layui-btn-normal" title="删除"> | ||
114 | + 删除 | ||
115 | + </a> | ||
116 | + </td> | ||
115 | </tr> | 117 | </tr> |
116 | </script> | 118 | </script> |
117 | <script> | 119 | <script> |
@@ -87,9 +87,9 @@ | @@ -87,9 +87,9 @@ | ||
87 | </div> | 87 | </div> |
88 | </div> | 88 | </div> |
89 | <div class="layui-form-item" style="display: flex;"> | 89 | <div class="layui-form-item" style="display: flex;"> |
90 | - <label class="layui-form-label textarea-label" | 90 | + <label class="layui-form-label" |
91 | style="min-width: 120px!important;max-width: 120px!important;">描述:</label> | 91 | style="min-width: 120px!important;max-width: 120px!important;">描述:</label> |
92 | - <div class="layui-input-block" style="width: calc(100% - 120px)!important;margin-left: 0px!important;"> | 92 | + <div class="layui-input-block" style="width: calc(100% - 200px)!important;margin-left: 0px!important;"> |
93 | <textarea class="layui-textarea" name="cutoverDesc"></textarea> | 93 | <textarea class="layui-textarea" name="cutoverDesc"></textarea> |
94 | </div> | 94 | </div> |
95 | </div> | 95 | </div> |
@@ -31,6 +31,8 @@ | @@ -31,6 +31,8 @@ | ||
31 | 31 | ||
32 | </form> | 32 | </form> |
33 | </div> | 33 | </div> |
34 | + <div class="layui-tab-item" style="display: block"> | ||
35 | + <div id="recoverycount-top-head-info" class="statistics-top-head"></div> | ||
34 | <table id="recoverycount-table" class="layui-table" lay-filter="recoverycount-table"> | 36 | <table id="recoverycount-table" class="layui-table" lay-filter="recoverycount-table"> |
35 | <thead> | 37 | <thead> |
36 | <tr> | 38 | <tr> |
@@ -57,11 +59,34 @@ | @@ -57,11 +59,34 @@ | ||
57 | <tbody> | 59 | <tbody> |
58 | </tbody> | 60 | </tbody> |
59 | </table> | 61 | </table> |
60 | - </div> | 62 | + </div></div> |
61 | </div> | 63 | </div> |
62 | </div> | 64 | </div> |
63 | </div> | 65 | </div> |
64 | </article> | 66 | </article> |
67 | +<script type="text/html" id="tpl-recoverycount-top-head-info"> | ||
68 | + <div class="info-box-count"> | ||
69 | + <i></i> | ||
70 | + <label>应恢复数</label> | ||
71 | + <div class="num"> | ||
72 | + <span lay-tips="数据库恢复总数">{{d.totalSum}}</span> | ||
73 | + </div> | ||
74 | + </div> | ||
75 | + <div class="info-box-count"> | ||
76 | + <i></i> | ||
77 | + <label>已恢复数量</label> | ||
78 | + <div class="num"> | ||
79 | + <span style="color: #1dff1c;" lay-tips="已恢复数量">{{d.recoveriedSum}}</span> | ||
80 | + </div> | ||
81 | + </div> | ||
82 | + <div class="info-box-count"> | ||
83 | + <i></i> | ||
84 | + <label>未恢复数量</label> | ||
85 | + <div class="num"> | ||
86 | + <span style="color: #aa2222" lay-tips="未恢复数量">{{d.noRecoverySum}}</span> | ||
87 | + </div> | ||
88 | + </div> | ||
89 | +</script> | ||
65 | <script> | 90 | <script> |
66 | layui.use('recoverycount', function (fn) { | 91 | layui.use('recoverycount', function (fn) { |
67 | fn(); | 92 | fn(); |
@@ -1359,7 +1359,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -1359,7 +1359,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
1359 | } | 1359 | } |
1360 | if (formWidth + 130 > winWidth) { | 1360 | if (formWidth + 130 > winWidth) { |
1361 | $('.openStow').css('display', 'inline-block') | 1361 | $('.openStow').css('display', 'inline-block') |
1362 | - $('.form-item-open-stow').css('height', '50px'); | 1362 | + $('.form-item-open-stow').css('height', '40px'); |
1363 | } else { | 1363 | } else { |
1364 | $('.openStow').css('display', 'none') | 1364 | $('.openStow').css('display', 'none') |
1365 | } | 1365 | } |
@@ -1369,7 +1369,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -1369,7 +1369,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
1369 | $('.form-item-open-stow').css('height', 'auto'); | 1369 | $('.form-item-open-stow').css('height', 'auto'); |
1370 | } else { | 1370 | } else { |
1371 | $(this).text('展开') | 1371 | $(this).text('展开') |
1372 | - $('.form-item-open-stow').css('height', '50px'); | 1372 | + $('.form-item-open-stow').css('height', '40px'); |
1373 | } | 1373 | } |
1374 | }) | 1374 | }) |
1375 | //end lsq 2022-06-21 | 1375 | //end lsq 2022-06-21 |
@@ -268,7 +268,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -268,7 +268,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
268 | } | 268 | } |
269 | if (formWidth + 130 > winWidth) { | 269 | if (formWidth + 130 > winWidth) { |
270 | $('.openStow').css('display', 'inline-block') | 270 | $('.openStow').css('display', 'inline-block') |
271 | - $('.form-item-open-stow').css('height', '50px'); | 271 | + $('.form-item-open-stow').css('height', '40px'); |
272 | } else { | 272 | } else { |
273 | $('.openStow').css('display', 'none') | 273 | $('.openStow').css('display', 'none') |
274 | } | 274 | } |
@@ -278,7 +278,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -278,7 +278,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
278 | $('.form-item-open-stow').css('height', 'auto'); | 278 | $('.form-item-open-stow').css('height', 'auto'); |
279 | } else { | 279 | } else { |
280 | $(this).text('展开') | 280 | $(this).text('展开') |
281 | - $('.form-item-open-stow').css('height', '50px'); | 281 | + $('.form-item-open-stow').css('height', '40px'); |
282 | } | 282 | } |
283 | }) | 283 | }) |
284 | //end lsq 2022-06-27 | 284 | //end lsq 2022-06-27 |
@@ -838,7 +838,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -838,7 +838,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
838 | } | 838 | } |
839 | if (formWidth + 130 > winWidth) { | 839 | if (formWidth + 130 > winWidth) { |
840 | $('.openStow').css('display', 'inline-block') | 840 | $('.openStow').css('display', 'inline-block') |
841 | - $('.form-item-open-stow').css('height', '50px'); | 841 | + $('.form-item-open-stow').css('height', '40px'); |
842 | } else { | 842 | } else { |
843 | $('.openStow').css('display', 'none') | 843 | $('.openStow').css('display', 'none') |
844 | } | 844 | } |
@@ -848,7 +848,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -848,7 +848,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
848 | $('.form-item-open-stow').css('height', 'auto'); | 848 | $('.form-item-open-stow').css('height', 'auto'); |
849 | } else { | 849 | } else { |
850 | $(this).text('展开') | 850 | $(this).text('展开') |
851 | - $('.form-item-open-stow').css('height', '50px'); | 851 | + $('.form-item-open-stow').css('height', '40px'); |
852 | } | 852 | } |
853 | }) | 853 | }) |
854 | //end lsq 2022-06-21 | 854 | //end lsq 2022-06-21 |
@@ -378,7 +378,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -378,7 +378,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
378 | } | 378 | } |
379 | if (formWidth + 260 > winWidth) { | 379 | if (formWidth + 260 > winWidth) { |
380 | $('.openStow').css('display', 'inline-block') | 380 | $('.openStow').css('display', 'inline-block') |
381 | - $('.form-item-open-stow').css('height', '50px'); | 381 | + $('.form-item-open-stow').css('height', '40px'); |
382 | } else { | 382 | } else { |
383 | $('.openStow').css('display', 'none') | 383 | $('.openStow').css('display', 'none') |
384 | } | 384 | } |
@@ -388,7 +388,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -388,7 +388,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
388 | $('.form-item-open-stow').css('height', 'auto'); | 388 | $('.form-item-open-stow').css('height', 'auto'); |
389 | } else { | 389 | } else { |
390 | $(this).text('展开') | 390 | $(this).text('展开') |
391 | - $('.form-item-open-stow').css('height', '50px'); | 391 | + $('.form-item-open-stow').css('height', '40px'); |
392 | } | 392 | } |
393 | }) | 393 | }) |
394 | //end lsq 2022-06-27 | 394 | //end lsq 2022-06-27 |
-
Please register or login to post a comment