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 174 additions and 196 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,24 +300,22 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -300,24 +300,22 @@ 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) {  
305 - layer.closeAll('loading');  
306 - if (response && response.success) {  
307 - layer.msg('操作成功!', {icon: 1});  
308 - reloadTable();  
309 - } else {  
310 - obj.elem.checked = !obj.elem.checked;  
311 - form.render();  
312 - layer.msg(response.msg, {icon: 2});  
313 - }  
314 - },  
315 - error: function (error) {  
316 - layer.closeAll('loading'); 303 + }
  304 + }).done(function (response) {
  305 + layer.closeAll('loading');
  306 + if (response && response.success) {
  307 + layer.msg('操作成功!', {icon: 1});
  308 + reloadTable();
  309 + } else {
317 obj.elem.checked = !obj.elem.checked; 310 obj.elem.checked = !obj.elem.checked;
318 form.render(); 311 form.render();
319 - layer.msg('操作失败!', {icon: 2}); 312 + layer.msg(response.msg, {icon: 2});
320 } 313 }
  314 + }).error(function (error) {
  315 + layer.closeAll('loading');
  316 + obj.elem.checked = !obj.elem.checked;
  317 + form.render();
  318 + layer.msg('操作失败!', {icon: 2});
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,27 +655,22 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -659,27 +655,22 @@ 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) {  
671 - layer.close(load);  
672 - if (res && res.success) {  
673 - layer.msg('保存成功!', {offset: '15px', icon: 1});  
674 - layer.close(index);  
675 - reloadTable();  
676 - } else {  
677 - layer.msg(res.msg, {offset: '15px', icon: 2});  
678 - }  
679 - },  
680 - error: function () {  
681 - layer.close(load); 662 + data: JSON.stringify(param)
  663 + }).done(function (res) {
  664 + layer.close(load);
  665 + if (res && res.success) {
  666 + layer.msg('保存成功!', {offset: '15px', icon: 1});
  667 + layer.close(index);
  668 + reloadTable();
  669 + } else {
  670 + layer.msg(res.msg, {offset: '15px', icon: 2});
682 } 671 }
  672 + }).error(function () {
  673 + layer.close(load);
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,34 +817,33 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -829,34 +817,33 @@ 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) {  
834 - if (response && response.success) {  
835 - for (var i = 0; i < response.data.length; i++) {  
836 - var taskId = response.data[i].taskId;  
837 - var status = response.data[i].status;  
838 - var $statusDom = $('div[inspectiontask-status-taskid="' + taskId + '"]');  
839 - if ($statusDom.length) {  
840 - var statusStr = '未执行';  
841 - if (statusEnum[status]) {  
842 - statusStr = statusEnum[status];  
843 - }  
844 - if (statusStr != $statusDom.text()) {  
845 - changeTextSoftly($statusDom, statusStr);  
846 - if (statusStr == '未执行') {  
847 - $statusDom.removeClass('link');  
848 - } else {  
849 - $statusDom.addClass('link');  
850 - $statusDom.attr('batchno', response.data[i].batchNo);  
851 - }  
852 - var index = $statusDom.parents('tr[data-index]').data('index');  
853 - tableData[index].status = status; 820 + async: false
  821 + }).done(function (response) {
  822 + if (response && response.success) {
  823 + for (var i = 0; i < response.data.length; i++) {
  824 + var taskId = response.data[i].taskId;
  825 + var status = response.data[i].status;
  826 + var $statusDom = $('div[inspectiontask-status-taskid="' + taskId + '"]');
  827 + if ($statusDom.length) {
  828 + var statusStr = '未执行';
  829 + if (statusEnum[status]) {
  830 + statusStr = statusEnum[status];
  831 + }
  832 + if (statusStr != $statusDom.text()) {
  833 + changeTextSoftly($statusDom, statusStr);
  834 + if (statusStr == '未执行') {
  835 + $statusDom.removeClass('link');
  836 + } else {
  837 + $statusDom.addClass('link');
  838 + $statusDom.attr('batchno', response.data[i].batchNo);
854 } 839 }
  840 + var index = $statusDom.parents('tr[data-index]').data('index');
  841 + tableData[index].status = status;
855 } 842 }
856 } 843 }
857 } 844 }
858 - setTimeout(refreshTaskStatus, 7000);  
859 } 845 }
  846 + setTimeout(refreshTaskStatus, 7000);
860 }); 847 });
861 } 848 }
862 } 849 }
@@ -124,41 +124,38 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -124,41 +124,38 @@ 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) {  
134 - if (!res || !res.object) {  
135 - return;  
136 - }  
137 - var obj = res.object;  
138 - $.each($('#page3 .baseline-element-box'), (index, element) => {  
139 - var baselineList = obj[$(element).data('id')];  
140 - if (baselineList) {  
141 - var selectedResList = $.map($(element).find('.baseline-kpi-box[data-kpiid]'), baselineDom => $(baselineDom).data('kpiid'));  
142 - var baselineKpiIdList = $.map(baselineList, item => item.kpiId);  
143 - for (var j = 0; j < selectedResList.length; j++) {  
144 - if (baselineKpiIdList.indexOf(selectedResList[j]) === -1) {  
145 - $(element).find('.baseline-kpi-box[data-kpiid="' + selectedResList[j] + '"]').remove();  
146 - } 129 + data: params
  130 + }).done(function (res) {
  131 + if (!res || !res.object) {
  132 + return;
  133 + }
  134 + var obj = res.object;
  135 + $.each($('#page3 .baseline-element-box'), (index, element) => {
  136 + var baselineList = obj[$(element).data('id')];
  137 + if (baselineList) {
  138 + var selectedResList = $.map($(element).find('.baseline-kpi-box[data-kpiid]'), baselineDom => $(baselineDom).data('kpiid'));
  139 + var baselineKpiIdList = $.map(baselineList, item => item.kpiId);
  140 + for (var j = 0; j < selectedResList.length; j++) {
  141 + if (baselineKpiIdList.indexOf(selectedResList[j]) === -1) {
  142 + $(element).find('.baseline-kpi-box[data-kpiid="' + selectedResList[j] + '"]').remove();
147 } 143 }
148 - for (var i = 0; i < baselineList.length; i++) {  
149 - var kpiId = baselineList[i].kpiId;  
150 - if (selectedResList.indexOf(kpiId) !== -1) {  
151 - continue;  
152 - } else {  
153 - var protocol = $(element).data('id').split("#")[2];  
154 - var funType = '', funVal = '';  
155 - var reg = /\[默认基线:.+\((.+)\)(.*)]/;  
156 - if (reg.test(baselineList[i].remark)) {  
157 - var strList = reg.exec(baselineList[i].remark);  
158 - funType = strList[1];  
159 - funVal = strList[2];  
160 - }  
161 - $(element).append(` 144 + }
  145 + for (var i = 0; i < baselineList.length; i++) {
  146 + var kpiId = baselineList[i].kpiId;
  147 + if (selectedResList.indexOf(kpiId) !== -1) {
  148 + continue;
  149 + } else {
  150 + var protocol = $(element).data('id').split("#")[2];
  151 + var funType = '', funVal = '';
  152 + var reg = /\[默认基线:.+\((.+)\)(.*)]/;
  153 + if (reg.test(baselineList[i].remark)) {
  154 + var strList = reg.exec(baselineList[i].remark);
  155 + funType = strList[1];
  156 + funVal = strList[2];
  157 + }
  158 + $(element).append(`
162 <div class="layui-row baseline-kpi-box" data-kpiid="${baselineList[i].kpiId}"> 159 <div class="layui-row baseline-kpi-box" data-kpiid="${baselineList[i].kpiId}">
163 <label class="baseline-kpi-title">${baselineList[i].kpiName}</label> 160 <label class="baseline-kpi-title">${baselineList[i].kpiName}</label>
164 <div class="layui-input-inline"> 161 <div class="layui-input-inline">
@@ -181,19 +178,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -181,19 +178,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep'
181 </div> 178 </div>
182 </div> 179 </div>
183 `); 180 `);
184 - }  
185 } 181 }
186 - delete obj[$(element).data('id')];  
187 - } else {  
188 - $(element).remove();  
189 } 182 }
190 - }); 183 + delete obj[$(element).data('id')];
  184 + } else {
  185 + $(element).remove();
  186 + }
  187 + });
191 188
192 - $(".baseline-element-content").append(laytpl($("#baselineCofigTpl").html()).render(res['object']))  
193 - baselineProtocolAddEvent();  
194 - $("#taskEditFlag").val("0");  
195 - //console.log(res.object);  
196 - } 189 + $(".baseline-element-content").append(laytpl($("#baselineCofigTpl").html()).render(res['object']))
  190 + baselineProtocolAddEvent();
  191 + $("#taskEditFlag").val("0");
  192 + //console.log(res.object);
197 }) 193 })
198 } else { 194 } else {
199 //未选择资源则跳转回任务项配置 195 //未选择资源则跳转回任务项配置
@@ -303,37 +299,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -303,37 +299,36 @@ 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) {  
312 - if (!res || !res.object) {  
313 - return;  
314 - }  
315 - var obj = res.object;  
316 - $.each($('#page2 .inspection-task-box'), (index, element) => {  
317 - var resList = obj[$(element).attr('id')];  
318 - if (resList) {  
319 - var selectedResList = $.map($(element).find('.res-tags[data-resid]'), resDom => $(resDom).data('resid'));  
320 - for (var i = 0; i < resList.length; i++) {  
321 - if (selectedResList.indexOf(resList[i].resId) !== -1) {  
322 - continue;  
323 - } else {  
324 - $(element).find('.res-tags[data-resid]:last-child').after(`<label class="res-tags" data-resid="${resList[i].resId}">${resList[i].resName} <a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>`);  
325 - } 306 + data: {resIds: resIds.toString()}
  307 + }).done(function (res) {
  308 + if (!res || !res.object) {
  309 + return;
  310 + }
  311 + var obj = res.object;
  312 + $.each($('#page2 .inspection-task-box'), (index, element) => {
  313 + var resList = obj[$(element).attr('id')];
  314 + if (resList) {
  315 + var selectedResList = $.map($(element).find('.res-tags[data-resid]'), resDom => $(resDom).data('resid'));
  316 + for (var i = 0; i < resList.length; i++) {
  317 + if (selectedResList.indexOf(resList[i].resId) !== -1) {
  318 + continue;
  319 + } else {
  320 + $(element).find('.res-tags[data-resid]:last-child').after(`<label class="res-tags" data-resid="${resList[i].resId}">${resList[i].resName} <a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>`);
326 } 321 }
327 - delete obj[$(element).attr('id')];  
328 } 322 }
329 - });  
330 - $(".choose-res-content").append(laytpl($("#inspectionTaskBoxHtml").html()).render(res['object']))  
331 - resTagsCloseEvent();  
332 - bottomResAddEvent();  
333 - protoTagsCloseEvent();  
334 - bottomProtocolAddEvent();  
335 - resBoxEvent();  
336 - } 323 + delete obj[$(element).attr('id')];
  324 + }
  325 + });
  326 + $(".choose-res-content").append(laytpl($("#inspectionTaskBoxHtml").html()).render(res['object']))
  327 + resTagsCloseEvent();
  328 + bottomResAddEvent();
  329 + protoTagsCloseEvent();
  330 + bottomProtocolAddEvent();
  331 + resBoxEvent();
337 }) 332 })
338 return true; 333 return true;
339 } 334 }
@@ -360,48 +355,44 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'setStep' @@ -360,48 +355,44 @@ 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) {  
370 - var obj = res.object;  
371 - var base = obj['base'];  
372 - var element = obj['element'];  
373 - var tplData = {}, tplDirctive = {}, tplInputName = {}, baselinetpl = {};  
374 - form.val('form-inspectiontask-edit', obj['base']);  
375 - $('#task-title-version').text(obj['base'].version);  
376 - $("#form-inspectiontask-edit").find("[data-name='executionWay'] [data-value='" + base['executionWay'] + "']").trigger("click");  
377 - $("#form-inspectiontask-edit").find("[data-name='frequencyType'] [data-value='" + base['frequencyType'] + "']").trigger("click");  
378 - $.each(element, function (i, e) {  
379 - var tplId = e.resType + "#" + e.resTypeName + "#" + e.protocol;  
380 - tplData[tplId] = e.resourceList;  
381 - tplDirctive[tplId] = e.dirctiveList;  
382 - baselinetpl[tplId] = e.baselineList;  
383 - tplInputName[tplId] = e.elementName;  
384 - })  
385 - $(".choose-res-content").html(laytpl($("#inspectionTaskBoxHtml").html()).render(tplData))  
386 - $.each(tplDirctive, function (j, k) {  
387 - var html = '';  
388 - $.each(k, function (l, m) {  
389 - html += `<label class="res-tags" data-dirctiveid="${m.dirctiveId}">${m.dirctiveName}<a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>`  
390 - })  
391 - $(document.getElementById(j)).find(".proto-tags-box div.div-proto-tags").append(html)  
392 - $(document.getElementById(j)).find("input[name='taskResName']").val(tplInputName[j]) 360 + data: {taskId: taskId}
  361 + }).done(function (res) {
  362 + var obj = res.object;
  363 + var base = obj['base'];
  364 + var element = obj['element'];
  365 + var tplData = {}, tplDirctive = {}, tplInputName = {}, baselinetpl = {};
  366 + form.val('form-inspectiontask-edit', obj['base']);
  367 + $('#task-title-version').text(obj['base'].version);
  368 + $("#form-inspectiontask-edit").find("[data-name='executionWay'] [data-value='" + base['executionWay'] + "']").trigger("click");
  369 + $("#form-inspectiontask-edit").find("[data-name='frequencyType'] [data-value='" + base['frequencyType'] + "']").trigger("click");
  370 + $.each(element, function (i, e) {
  371 + var tplId = e.resType + "#" + e.resTypeName + "#" + e.protocol;
  372 + tplData[tplId] = e.resourceList;
  373 + tplDirctive[tplId] = e.dirctiveList;
  374 + baselinetpl[tplId] = e.baselineList;
  375 + tplInputName[tplId] = e.elementName;
  376 + })
  377 + $(".choose-res-content").html(laytpl($("#inspectionTaskBoxHtml").html()).render(tplData))
  378 + $.each(tplDirctive, function (j, k) {
  379 + var html = '';
  380 + $.each(k, function (l, m) {
  381 + html += `<label class="res-tags" data-dirctiveid="${m.dirctiveId}">${m.dirctiveName}<a class="close-icon"><i class="layui-icon layui-icon-close"></i></a></label>`
393 }) 382 })
394 - $(".baseline-element-content").html(laytpl($("#baselineCofigTpl").html()).render(baselinetpl))  
395 - resTagsCloseEvent();  
396 - bottomResAddEvent();  
397 - protoTagsCloseEvent();  
398 - bottomProtocolAddEvent();  
399 - resBoxEvent();  
400 - protoTagsCloseEvent();  
401 - baselineProtocolAddEvent();  
402 - baselineCloseEvent();  
403 - form.render();  
404 - } 383 + $(document.getElementById(j)).find(".proto-tags-box div.div-proto-tags").append(html)
  384 + $(document.getElementById(j)).find("input[name='taskResName']").val(tplInputName[j])
  385 + })
  386 + $(".baseline-element-content").html(laytpl($("#baselineCofigTpl").html()).render(baselinetpl))
  387 + resTagsCloseEvent();
  388 + bottomResAddEvent();
  389 + protoTagsCloseEvent();
  390 + bottomProtocolAddEvent();
  391 + resBoxEvent();
  392 + protoTagsCloseEvent();
  393 + baselineProtocolAddEvent();
  394 + baselineCloseEvent();
  395 + form.render();
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 }