monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit 1776381dafb4ec52aefa02ca08e85621bec2bf31 1 parent cb172c81

fix:工作日志查看新增下一条点击功能

Inline Side-by-side
Showing 6 changed files with 105 additions and 33 deletions
@@ -27,7 +27,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -27,7 +27,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
27 var where = {} 27 var where = {}
28 var url = '' 28 var url = ''
29 var historywarningTable = {} 29 var historywarningTable = {}
30 - 30 + var datas = data.datas;
  31 + var nextId = id;
31 var viewType = data && data.viewType ? data.viewType : ''; 32 var viewType = data && data.viewType ? data.viewType : '';
32 init() 33 init()
33 $('#workReport_type').val(data.repType) 34 $('#workReport_type').val(data.repType)
@@ -49,6 +50,81 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -49,6 +50,81 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
49 saveForm() 50 saveForm()
50 } 51 }
51 }) 52 })
  53 + $("#workReport-form-next-id").on('click', function () {
  54 + if (datas.length > 0) {
  55 + var datas1 = {};
  56 + for (let i = 0; i < datas.length; i++) {
  57 + if (datas[i].id == nextId) {
  58 + datas1 = datas[(datas[i].LAY_TABLE_INDEX + 1)];
  59 + if (datas1 != undefined) {
  60 + nextId = datas1.id;
  61 + var title = datas1.createUserNickName+'-'+datas1.repTitle
  62 + // window.parent.postMessage({'title':title},"*");
  63 + $(".layui-card-body.workReport").find(".layui-field-title").html("<legend>"+title+"</legend>");
  64 + form.render(null, 'add-workReport-form');
  65 + form.val('add-workReport-form', datas1);
  66 + var time = ''
  67 + time = datas1.createTime
  68 + var userArr = []
  69 + $.each(datas1.reportUserList, function (i, v) {
  70 + userArr.push(v.userName)
  71 + })
  72 + userSelect.setValue(userArr)
  73 + if (datas1.attachmentList.length != 0) {
  74 + $.each(datas1.attachmentList, function (i, v) {
  75 + writeTagsInfo(v.id, v.originalName)
  76 + })
  77 + }
  78 + cols.push({
  79 + field: 'alarmStatus', title: '告警状态', align: 'center', minWidth: 100,
  80 + templet: function (d) {
  81 + var str = ''
  82 + if (d.alarmStatus == '0') {
  83 + str = '告警'
  84 + } else if (d.alarmStatus == '1') {
  85 + str = '关闭'
  86 + }
  87 + return `<div><span>${str}</span></div>`
  88 + }
  89 + }
  90 + , {
  91 + field: 'clearType', title: '消除类型', align: 'center', minWidth: 100,
  92 + templet: function (d) {
  93 + var str = ''
  94 + if (d.clearType == '0') {
  95 + str = '自动消除'
  96 + } else if (d.clearType == '1') {
  97 + str = '手动消除'
  98 + }
  99 + return `<div><span>${str}</span></div>`
  100 + }
  101 + }
  102 + , {field: 'clearUserId', title: '消除人', align: 'center', minWidth: 100,}
  103 + , {field: 'clearTime', title: '消除时间', align: 'center', minWidth: 180,}
  104 + , {field: 'clearReason', title: '消除原因', align: 'center', minWidth: 250})
  105 + where = {access_token: accessToken, reportId: nextId, time: time}
  106 + url = domainName + '/api-web/workreport/getAlarmListByReportId'
  107 + getAlarmInfo(where, cols, url)
  108 + admin.req({
  109 + url: domainName + '/api-web/workreport/setRead',
  110 + data: {workReportIds: [nextId]}
  111 + }).done(function (response) {
  112 + if (response.success) {
  113 + }
  114 + });
  115 + return;
  116 + } else {
  117 + layer.msg('当前页已读完', {
  118 + offset: '15px',
  119 + icon: 7,
  120 + time: 1000,
  121 + })
  122 + }
  123 + }
  124 + }
  125 +
  126 + }
  127 + })
52 128
53 //表单验证 129 //表单验证
54 form.verify({ 130 form.verify({
@@ -225,7 +301,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -225,7 +301,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
225 async: false, 301 async: false,
226 done: function (res) { 302 done: function (res) {
227 form.val('add-workReport-form', res.object) 303 form.val('add-workReport-form', res.object)
228 - time = res.object.createTime 304 + time = res.object.createTime;
  305 + var title = res.object.createUserNickName+'-'+ res.object.repTitle
  306 + // window.parent.postMessage({'title':title},"*");
  307 + $(".layui-card-body.workReport").find(".layui-field-title").html(" <legend>"+title+"</legend>");
229 var userArr = [] 308 var userArr = []
230 $.each(res.object.reportUserList, function (i, v) { 309 $.each(res.object.reportUserList, function (i, v) {
231 userArr.push(v.userName) 310 userArr.push(v.userName)
@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
12 //对外暴露的接口 12 //对外暴露的接口
13 exports("workReportIndex", function () { 13 exports("workReportIndex", function () {
14 var accessToken = common.getMjToken(); 14 var accessToken = common.getMjToken();
15 - var createTime = 'today' 15 + var createTime = 'thisWeek'
16 var isRead = '' 16 var isRead = ''
17 var repType = '' 17 var repType = ''
18 18
@@ -15,7 +15,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -15,7 +15,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
15 var companyChart = echarts.init(document.getElementById('chart-company-report')); 15 var companyChart = echarts.init(document.getElementById('chart-company-report'));
16 var noReadChart = echarts.init(document.getElementById('chart-noRead-report')); 16 var noReadChart = echarts.init(document.getElementById('chart-noRead-report'));
17 var dateLimit = "" 17 var dateLimit = ""
18 - var createTime = "today" 18 + var createTime = "thisWeek"
19 var type = '' 19 var type = ''
20 var urlRepType = '' 20 var urlRepType = ''
21 var manufacturerId = '' 21 var manufacturerId = ''
@@ -55,7 +55,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -55,7 +55,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
55 done: function (value) { 55 done: function (value) {
56 dateLimit = value 56 dateLimit = value
57 if (dateLimit == '') { 57 if (dateLimit == '') {
58 - $('[data-period="today"]').click() 58 + $('[data-period="thisWeek"]').click()
59 } else { 59 } else {
60 $.each($("button.date"), function (i, e) { 60 $.each($("button.date"), function (i, e) {
61 var $dom = $(e); 61 var $dom = $(e);
@@ -166,13 +166,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -166,13 +166,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
166 // 加载工作汇报表格 166 // 加载工作汇报表格
167 function loadWorkReportTable() { 167 function loadWorkReportTable() {
168 var conditions = form.val('form-workreport-condition'); 168 var conditions = form.val('form-workreport-condition');
169 - $.each($("button.isRead"), function (i, e) { 169 + $.each($("button.isRead"),function (i,e) {
170 var $dom = $(e); 170 var $dom = $(e);
171 - if ($dom.hasClass("active")) { 171 + if($dom.hasClass("active")){
172 conditions["currIsRead"] = $dom.data("type") 172 conditions["currIsRead"] = $dom.data("type")
173 } 173 }
174 }) 174 })
175 - if (manufacturerId != '') { 175 + if(manufacturerId!=''){
176 conditions.manufacturerName = manufacturerId; 176 conditions.manufacturerName = manufacturerId;
177 } 177 }
178 Object.assign(conditions, { 178 Object.assign(conditions, {
@@ -265,17 +265,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -265,17 +265,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
265 }, { 265 }, {
266 field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) { 266 field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {
267 var manufacturerName = ''; 267 var manufacturerName = '';
268 - if(d.manufacturerName == '0'){  
269 - manufacturerName = d.manufacturerOther;  
270 - }else {  
271 if(manufactureArr && manufactureArr.length>0){ 268 if(manufactureArr && manufactureArr.length>0){
272 $.each(manufactureArr, function (i, v) { 269 $.each(manufactureArr, function (i, v) {
273 - if(d.manufacturerName==v.id) { 270 + if(d.manufacturerId==v.id) {
274 manufacturerName = v.name; 271 manufacturerName = v.name;
275 } 272 }
276 }) 273 })
277 }else{ 274 }else{
278 - var url = domainName + '/cmdb-CI/supplier/find/'+d.machineRoomId+'?accessToken='+accessToken 275 + var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
279 $.ajax({ 276 $.ajax({
280 url: url, 277 url: url,
281 success: function(res){ 278 success: function(res){
@@ -285,8 +282,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -285,8 +282,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
285 } 282 }
286 }); 283 });
287 } 284 }
288 - }  
289 - return manufacturerName; 285 +
  286 + return '<div><span>'+manufacturerName+'</span></div>';
290 } 287 }
291 }, { 288 }, {
292 field: 'createTime', title: '上报时间', align: 'center', 289 field: 'createTime', title: '上报时间', align: 'center',
@@ -307,8 +304,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -307,8 +304,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
307 table.on('tool(table-workreport-view)', function (obj) { 304 table.on('tool(table-workreport-view)', function (obj) {
308 var data = obj.data; 305 var data = obj.data;
309 if (obj.event === 'serRead') { 306 if (obj.event === 'serRead') {
310 -  
311 var id = data['id']; 307 var id = data['id'];
  308 + var datas = layui.table.cache["table-workreport-view"];
312 var repType = data['repType']; 309 var repType = data['repType'];
313 admin.req({ 310 admin.req({
314 url: domainName + '/api-web/workreport/setRead', 311 url: domainName + '/api-web/workreport/setRead',
@@ -318,20 +315,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -318,20 +315,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
318 obj.update({ 315 obj.update({
319 currIsRead: "1" 316 currIsRead: "1"
320 }); 317 });
321 - loadReadReport(); 318 + reloadAllChange();
322 } 319 }
323 }); 320 });
324 - common.openWin('workreport/add', '查看', {  
325 - id: id,  
326 - repType: repType,  
327 - viewType: 'view'  
328 - }, ['关闭'], function f() {  
329 - return true;  
330 - }, null, null, {  
331 - success: function () {  
332 - form.render();  
333 - }  
334 - }) 321 + common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view',datas:datas}, ['下一条','关闭'], function f() {
  322 + $("#workReport-form-next-id").trigger("click");
  323 + reloadAllChange();
  324 + });
335 } 325 }
336 }); 326 });
337 327
1 <!--工作汇报表单--> 1 <!--工作汇报表单-->
2 <article> 2 <article>
3 - <div class="layui-card-body"> 3 + <div class="layui-card-body workReport">
4 <fieldset class="layui-elem-field layui-field-title"> 4 <fieldset class="layui-elem-field layui-field-title">
5 <legend>日志信息</legend> 5 <legend>日志信息</legend>
6 </fieldset> 6 </fieldset>
@@ -103,6 +103,9 @@ @@ -103,6 +103,9 @@
103 <button class="layui-btn hide" id="workReport-form-save-id" lay-filter="workReport-form-save-id" lay-submit 103 <button class="layui-btn hide" id="workReport-form-save-id" lay-filter="workReport-form-save-id" lay-submit
104 type="submit">保存 104 type="submit">保存
105 </button> 105 </button>
  106 + <button type="button" lay-filter="workReport-form-next-id" class="layui-btn hide"
  107 + id="workReport-form-next-id">下一条
  108 + </button>
106 <table class="hide" id="table-report-add-attachment"></table> 109 <table class="hide" id="table-report-add-attachment"></table>
107 </form> 110 </form>
108 </div> 111 </div>
@@ -49,13 +49,13 @@ @@ -49,13 +49,13 @@
49 </div> 49 </div>
50 </div> 50 </div>
51 <div class="layui-inline layui-btn-group time-group" id="createTimeBtn"> 51 <div class="layui-inline layui-btn-group time-group" id="createTimeBtn">
52 - <button class="layui-btn layui-btn-primary layui-btn-sm active" data-period="today" 52 + <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="today"
53 type="button">今天 53 type="button">今天
54 </button> 54 </button>
55 <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastWeek" 55 <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastWeek"
56 type="button">上周 56 type="button">上周
57 </button> 57 </button>
58 - <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="thisWeek" 58 + <button class="layui-btn layui-btn-primary layui-btn-sm active" data-period="thisWeek"
59 type="button">本周 59 type="button">本周
60 </button> 60 </button>
61 <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth" 61 <button class="layui-btn layui-btn-primary layui-btn-sm" data-period="lastMonth"
@@ -59,13 +59,13 @@ @@ -59,13 +59,13 @@
59 </div> 59 </div>
60 </div> 60 </div>
61 <div class="layui-btn-group time-group" id="btns-workreport-time" style="padding: 0"> 61 <div class="layui-btn-group time-group" id="btns-workreport-time" style="padding: 0">
62 - <button class="layui-btn layui-btn-primary layui-btn-xs active date" data-period="today" 62 + <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="today"
63 type="button">今天 63 type="button">今天
64 </button> 64 </button>
65 <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="lastWeek" 65 <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="lastWeek"
66 type="button">上周 66 type="button">上周
67 </button> 67 </button>
68 - <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="thisWeek" 68 + <button class="layui-btn layui-btn-primary layui-btn-xs active date" data-period="thisWeek"
69 type="button">本周 69 type="button">本周
70 </button> 70 </button>
71 <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="lastMonth" 71 <button class="layui-btn layui-btn-primary layui-btn-xs date" data-period="lastMonth"