monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhichao
Commit 4d0173b49d41ec23e64e59b2cc3eaf1fe6669a9c 1 parent a085f5e7

fix:巡检配置->巡检任务配置

Inline Side-by-side
Showing 4 changed files with 45 additions and 67 deletions
@@ -33,7 +33,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -33,7 +33,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
33 function initTable() { 33 function initTable() {
34 inspectionTaskHisTable = table.render({ 34 inspectionTaskHisTable = table.render({
35 elem: '#inspectionTaskHis_table' 35 elem: '#inspectionTaskHis_table'
36 - , url: domainName + '/api-web/inspectiontask/hisPage?access_token=' + accessToken 36 + , url: domainName + '/api-web/inspectiontask/hisPage'
37 , where: whereSearch() 37 , where: whereSearch()
38 , height: 'full-210' 38 , height: 'full-210'
39 , cellMinWidth: 80 39 , cellMinWidth: 80
@@ -250,7 +250,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -250,7 +250,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
250 //获取巡检结果PDF 250 //获取巡检结果PDF
251 function inspectionResultPDF(batchNo) { 251 function inspectionResultPDF(batchNo) {
252 admin.req({ 252 admin.req({
253 - url: domainName + '/api-web/inspectionTaskHis/getPdfPath?access_token=' + accessToken + '&batchNo=' + batchNo 253 + url: domainName + '/api-web/inspectionTaskHis/getPdfPath?batchNo=' + batchNo
254 }).done(function (response) { 254 }).done(function (response) {
255 if ("success" == response.msg) { 255 if ("success" == response.msg) {
256 window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath)); 256 window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
@@ -40,7 +40,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -40,7 +40,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
40 function initTable() { 40 function initTable() {
41 inspectionTaskTable = table.render({ 41 inspectionTaskTable = table.render({
42 elem: '#inspectionTask_table' 42 elem: '#inspectionTask_table'
43 - , url: domainName + '/api-web/inspectiontask/findPage?accessToken=' + accessToken 43 + , url: domainName + '/api-web/inspectiontask/findPage'
44 , where: whereSearch() 44 , where: whereSearch()
45 , height: 'full-210' 45 , height: 'full-210'
46 , cellMinWidth: 80 46 , cellMinWidth: 80
@@ -270,7 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -270,7 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
270 publishStatus = '0' 270 publishStatus = '0'
271 } 271 }
272 admin.req({ 272 admin.req({
273 - url: domainName + '/api-web/inspectiontask/publishTask?accessToken=' + accessToken, 273 + url: domainName + '/api-web/inspectiontask/publishTask',
274 type: 'get', 274 type: 'get',
275 data: {taskId: taskId, publishStatus: publishStatus}, 275 data: {taskId: taskId, publishStatus: publishStatus},
276 contentType: 'application/json', 276 contentType: 'application/json',
@@ -300,8 +300,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -300,8 +300,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
300 data: { 300 data: {
301 taskId: taskId, 301 taskId: taskId,
302 taskStatus: taskStatus 302 taskStatus: taskStatus
303 - },  
304 - success: function (response) { 303 + }
  304 + }).done(function (response) {
305 layer.closeAll('loading'); 305 layer.closeAll('loading');
306 if (response && response.success) { 306 if (response && response.success) {
307 layer.msg('操作成功!', {icon: 1}); 307 layer.msg('操作成功!', {icon: 1});
@@ -311,13 +311,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -311,13 +311,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
311 form.render(); 311 form.render();
312 layer.msg(response.msg, {icon: 2}); 312 layer.msg(response.msg, {icon: 2});
313 } 313 }
314 - },  
315 - error: function (error) { 314 + }).error(function (error) {
316 layer.closeAll('loading'); 315 layer.closeAll('loading');
317 obj.elem.checked = !obj.elem.checked; 316 obj.elem.checked = !obj.elem.checked;
318 form.render(); 317 form.render();
319 layer.msg('操作失败!', {icon: 2}); 318 layer.msg('操作失败!', {icon: 2});
320 - }  
321 }); 319 });
322 }); 320 });
323 // 查看巡检任务执行详情 321 // 查看巡检任务执行详情
@@ -465,13 +463,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -465,13 +463,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
465 // 上传模板事件 463 // 上传模板事件
466 upload.render({ 464 upload.render({
467 elem: '#upload_tasktemp' //绑定元素 465 elem: '#upload_tasktemp' //绑定元素
468 - , url: common.domainName + '/api-web/inspectiontask/upload?accessToken=' + accessToken //上传接口 466 + , url: common.domainName + '/api-web/inspectiontask/upload' //上传接口
469 , accept: 'file' //允许上传的文件类型 467 , accept: 'file' //允许上传的文件类型
470 , exts: 'docx|doc' 468 , exts: 'docx|doc'
471 , multiple: false 469 , multiple: false
472 , before: function () { 470 , before: function () {
473 layer.load(2); 471 layer.load(2);
474 - this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId + '&accessToken=' + accessToken; 472 + this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId;
475 } 473 }
476 , done: function (res) { 474 , done: function (res) {
477 layer.closeAll("loading"); 475 layer.closeAll("loading");
@@ -492,17 +490,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -492,17 +490,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
492 function sync(taskIds, elem) { 490 function sync(taskIds, elem) {
493 layer.load(2); 491 layer.load(2);
494 admin.req({ 492 admin.req({
495 - url: domainName + '/api-web/inspectiontask/sync?accessToken=' + accessToken, 493 + url: domainName + '/api-web/inspectiontask/sync',
496 type: 'get', 494 type: 'get',
497 data: {taskIds: taskIds}, 495 data: {taskIds: taskIds},
498 - contentType: 'application/json',  
499 - error: function (e) {  
500 - layer.closeAll('loading');  
501 - if (elem) {  
502 - elem.checked = !elem.checked;  
503 - form.render();  
504 - }  
505 - } 496 + contentType: 'application/json'
506 }).done(function (response) { 497 }).done(function (response) {
507 layer.closeAll('loading'); 498 layer.closeAll('loading');
508 if (response.success) { 499 if (response.success) {
@@ -515,13 +506,19 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -515,13 +506,19 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
515 form.render(); 506 form.render();
516 } 507 }
517 } 508 }
  509 + }).error(function (e) {
  510 + layer.closeAll('loading');
  511 + if (elem) {
  512 + elem.checked = !elem.checked;
  513 + form.render();
  514 + }
518 }); 515 });
519 } 516 }
520 517
521 //获取巡检结果PDF 518 //获取巡检结果PDF
522 function inspectionResultPDF(batchNo) { 519 function inspectionResultPDF(batchNo) {
523 admin.req({ 520 admin.req({
524 - url: domainName + '/api-web/inspectiontask/getPdfPath?accessToken=' + accessToken + '&batchNo=' + batchNo 521 + url: domainName + '/api-web/inspectiontask/getPdfPath?batchNo=' + batchNo
525 }).done(function (response) { 522 }).done(function (response) {
526 if ("success" == response.msg) { 523 if ("success" == response.msg) {
527 window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath)); 524 window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
@@ -532,13 +529,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -532,13 +529,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
532 function exec(taskId) { 529 function exec(taskId) {
533 layer.load(2); 530 layer.load(2);
534 admin.req({ 531 admin.req({
535 - url: domainName + '/api-web/inspectiontask/exec?accessToken=' + accessToken, 532 + url: domainName + '/api-web/inspectiontask/exec',
536 type: 'get', 533 type: 'get',
537 data: {taskId: taskId}, 534 data: {taskId: taskId},
538 - contentType: 'application/json',  
539 - error: function (error) {  
540 - layer.closeAll('loading');  
541 - } 535 + contentType: 'application/json'
542 }).done(function (response) { 536 }).done(function (response) {
543 layer.closeAll('loading'); 537 layer.closeAll('loading');
544 if (response && response.success) { 538 if (response && response.success) {
@@ -555,6 +549,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -555,6 +549,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
555 } else { 549 } else {
556 layer.msg(response.msg, {icon: 2}); 550 layer.msg(response.msg, {icon: 2});
557 } 551 }
  552 + }).error(function (error) {
  553 + layer.closeAll('loading');
558 }); 554 });
559 } 555 }
560 556
@@ -659,15 +655,12 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -659,15 +655,12 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
659 element: elementInfo 655 element: elementInfo
660 } 656 }
661 var url = `${common.domainName}/api-web/inspectiontask/saveOrUpdate` 657 var url = `${common.domainName}/api-web/inspectiontask/saveOrUpdate`
662 - $.ajax({ 658 + admin.req({
663 url: url, 659 url: url,
664 - headers: {  
665 - "Authorization": "Bearer " + accessToken + ""  
666 - },  
667 type: 'post', 660 type: 'post',
668 contentType: "application/json;charset=utf-8", 661 contentType: "application/json;charset=utf-8",
669 - data: JSON.stringify(param),  
670 - success: function (res) { 662 + data: JSON.stringify(param)
  663 + }).done(function (res) {
671 layer.close(load); 664 layer.close(load);
672 if (res && res.success) { 665 if (res && res.success) {
673 layer.msg('保存成功!', {offset: '15px', icon: 1}); 666 layer.msg('保存成功!', {offset: '15px', icon: 1});
@@ -676,10 +669,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -676,10 +669,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
676 } else { 669 } else {
677 layer.msg(res.msg, {offset: '15px', icon: 2}); 670 layer.msg(res.msg, {offset: '15px', icon: 2});
678 } 671 }
679 - },  
680 - error: function () { 672 + }).error(function () {
681 layer.close(load); 673 layer.close(load);
682 - }  
683 }) 674 })
684 675
685 676
@@ -757,10 +748,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -757,10 +748,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
757 layer.close(index); 748 layer.close(index);
758 layer.load(2); 749 layer.load(2);
759 admin.req({ 750 admin.req({
760 - url: common.domainName + '/api-web/inspectiontask/deleteByIds?taskIds=' + ids,  
761 - error: function (e) {  
762 - layer.closeAll('loading');  
763 - } 751 + url: common.domainName + '/api-web/inspectiontask/deleteByIds?taskIds=' + ids
764 }).done(function (response) { 752 }).done(function (response) {
765 layer.closeAll('loading'); 753 layer.closeAll('loading');
766 if (response && response.success) { 754 if (response && response.success) {
@@ -829,8 +817,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -829,8 +817,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
829 admin.req({ 817 admin.req({
830 url: domainName + '/api-web/inspectiontask/findPage', 818 url: domainName + '/api-web/inspectiontask/findPage',
831 data: lastSearchCondition, 819 data: lastSearchCondition,
832 - async: false,  
833 - success: function (response) { 820 + async: false
  821 + }).done(function (response) {
834 if (response && response.success) { 822 if (response && response.success) {
835 for (var i = 0; i < response.data.length; i++) { 823 for (var i = 0; i < response.data.length; i++) {
836 var taskId = response.data[i].taskId; 824 var taskId = response.data[i].taskId;
@@ -856,7 +844,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -856,7 +844,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
856 } 844 }
857 } 845 }
858 setTimeout(refreshTaskStatus, 7000); 846 setTimeout(refreshTaskStatus, 7000);
859 - }  
860 }); 847 });
861 } 848 }
862 } 849 }
@@ -124,13 +124,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -124,13 +124,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
124 params[$dom.attr("id")] = dirctiveIds.toString(); 124 params[$dom.attr("id")] = dirctiveIds.toString();
125 } 125 }
126 } 126 }
127 - $.ajax({ 127 + admin.req({
128 url: `${common.domainName}/api-web/manage/dirctive/findDistinctKpiInfo`, 128 url: `${common.domainName}/api-web/manage/dirctive/findDistinctKpiInfo`,
129 - headers: {  
130 - "Authorization": "Bearer " + accessToken + ""  
131 - },  
132 - data: params,  
133 - success: function (res) { 129 + data: params
  130 + }).done(function (res) {
134 if (!res || !res.object) { 131 if (!res || !res.object) {
135 return; 132 return;
136 } 133 }
@@ -193,7 +190,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -193,7 +190,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
193 baselineProtocolAddEvent(); 190 baselineProtocolAddEvent();
194 $("#taskEditFlag").val("0"); 191 $("#taskEditFlag").val("0");
195 //console.log(res.object); 192 //console.log(res.object);
196 - }  
197 }) 193 })
198 } else { 194 } else {
199 //未选择资源则跳转回任务项配置 195 //未选择资源则跳转回任务项配置
@@ -303,12 +299,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -303,12 +299,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
303 $.each(data, function (i, e) { 299 $.each(data, function (i, e) {
304 resIds.push(e.resId); 300 resIds.push(e.resId);
305 }) 301 })
306 - var url = common.domainName + '/api-web/bResource/groupByProtocolAndResType?access_token=' + accessToken  
307 - $.ajax({ 302 + var url = common.domainName + '/api-web/bResource/groupByProtocolAndResType'
  303 + admin.req({
308 url: url, 304 url: url,
309 type: 'get', 305 type: 'get',
310 - data: {resIds: resIds.toString()},  
311 - success: function (res) { 306 + data: {resIds: resIds.toString()}
  307 + }).done(function (res) {
312 if (!res || !res.object) { 308 if (!res || !res.object) {
313 return; 309 return;
314 } 310 }
@@ -333,7 +329,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -333,7 +329,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
333 protoTagsCloseEvent(); 329 protoTagsCloseEvent();
334 bottomProtocolAddEvent(); 330 bottomProtocolAddEvent();
335 resBoxEvent(); 331 resBoxEvent();
336 - }  
337 }) 332 })
338 return true; 333 return true;
339 } 334 }
@@ -360,13 +355,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -360,13 +355,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
360 taskId = hisTaskId; 355 taskId = hisTaskId;
361 url = `${common.domainName}/api-web/inspectiontask/findByHisId` 356 url = `${common.domainName}/api-web/inspectiontask/findByHisId`
362 } 357 }
363 - $.ajax({ 358 + admin.req({
364 url: url, 359 url: url,
365 - headers: {  
366 - "Authorization": "Bearer " + accessToken + ""  
367 - },  
368 - data: {taskId: taskId},  
369 - success: function (res) { 360 + data: {taskId: taskId}
  361 + }).done(function (res) {
370 var obj = res.object; 362 var obj = res.object;
371 var base = obj['base']; 363 var base = obj['base'];
372 var element = obj['element']; 364 var element = obj['element'];
@@ -401,7 +393,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -401,7 +393,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
401 baselineProtocolAddEvent(); 393 baselineProtocolAddEvent();
402 baselineCloseEvent(); 394 baselineCloseEvent();
403 form.render(); 395 form.render();
404 - }  
405 }) 396 })
406 } 397 }
407 398
@@ -84,12 +84,12 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi @@ -84,12 +84,12 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
84 var userListTable = table.render({ 84 var userListTable = table.render({
85 elem: '#userlist-table' 85 elem: '#userlist-table'
86 , height: '650' 86 , height: '650'
87 - , url: domainName + '/api-user/users' 87 + , url: domainName + '/mj/user/page'
88 , parseData: function (res) { 88 , parseData: function (res) {
89 return { 89 return {
90 "code": 0, 90 "code": 0,
91 - "count": res.count,  
92 - "data": res.data 91 + "count": res.data.count,
  92 + "data": res.data.rows
93 }; 93 };
94 } 94 }
95 , where: { 95 , where: {
@@ -106,13 +106,13 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi @@ -106,13 +106,13 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
106 done: function (res, curr, count) { 106 done: function (res, curr, count) {
107 //判断的条件是否选中 107 //判断的条件是否选中
108 if (oldUsers) { 108 if (oldUsers) {
109 - $.each(res.data, function (i, e) { 109 + $.each(res.rows, function (i, e) {
110 $.each(oldUsers, function (j, k) { 110 $.each(oldUsers, function (j, k) {
111 if (e.username === k) { 111 if (e.username === k) {
112 //选中 112 //选中
113 - res.data[i]["LAY_CHECKED"] = 'true'; 113 + res.rows[i]["LAY_CHECKED"] = 'true';
114 //下面三句是通过更改css来实现选中的效果 114 //下面三句是通过更改css来实现选中的效果
115 - var index = res.data[i]['LAY_TABLE_INDEX']; 115 + var index = res.rows[i]['LAY_TABLE_INDEX'];
116 $('div[lay-id="userlist-table"] tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true); 116 $('div[lay-id="userlist-table"] tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true);
117 $('div[lay-id="userlist-table"] tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked'); 117 $('div[lay-id="userlist-table"] tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
118 } 118 }