monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by zhichao
Commit fa34fe4eadfc9734e2f06165da5f69e3ed5bf4b0 1 parent 4d0173b4

fix:巡检配置->巡检归档管理

Inline Side-by-side
Showing 2 changed files with 11 additions and 13 deletions
@@ -14,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
14 //对外暴露的接口 14 //对外暴露的接口
15 exports('inspectionResultElement', function (data) { 15 exports('inspectionResultElement', function (data) {
16 var sessions = layui.sessions; 16 var sessions = layui.sessions;
17 - var accessToken = sessions.getToken()['access_token']; 17 + var accessToken = common.getMjToken();
18 18
19 var batchNo = data.batchNo; 19 var batchNo = data.batchNo;
20 execute(batchNo); 20 execute(batchNo);
@@ -52,7 +52,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -52,7 +52,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
52 var height = false 52 var height = false
53 layer.load(2); 53 layer.load(2);
54 admin.req({ 54 admin.req({
55 - url: domainName + '/api-web/inspectiontask/indpectionElement?access_token=' + accessToken, 55 + url: domainName + '/api-web/inspectiontask/indpectionElement',
56 type: 'get', 56 type: 'get',
57 data: {batchNo: batchNo}, 57 data: {batchNo: batchNo},
58 contentType: 'application/json', 58 contentType: 'application/json',
@@ -61,7 +61,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -61,7 +61,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
61 if (res.data) { 61 if (res.data) {
62 $.each(res.data, function (v, e) { 62 $.each(res.data, function (v, e) {
63 $("#inspectionResultExecute").append(laytpl(tableHtml).render(e)); 63 $("#inspectionResultExecute").append(laytpl(tableHtml).render(e));
64 - var reqUrl = domainName + '/api-web/inspectiontask/indpectionResult?access_token=' + accessToken + '&batchNo=' + batchNo + '&elementId=' + e.elementId 64 + var reqUrl = domainName + '/api-web/inspectiontask/indpectionResult?accessToken=' + accessToken + '&batchNo=' + batchNo + '&elementId=' + e.elementId
65 table.render({ 65 table.render({
66 elem: "#" + e.elementId 66 elem: "#" + e.elementId
67 , url: reqUrl 67 , url: reqUrl
@@ -144,8 +144,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -144,8 +144,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
144 var $table = $('#inspectionResultExecute div[lay-id="' + elementId + '"'); 144 var $table = $('#inspectionResultExecute div[lay-id="' + elementId + '"');
145 if ($table.length) { 145 if ($table.length) {
146 admin.req({ 146 admin.req({
147 - url: url,  
148 - success: function (response) { 147 + url: url
  148 + }).done(function (response) {
149 if (response && response.data) { 149 if (response && response.data) {
150 for (let i = 0; i < response.data.length; i++) { 150 for (let i = 0; i < response.data.length; i++) {
151 var $tr = $table.find('tr[data-index="' + i + '"]'); 151 var $tr = $table.find('tr[data-index="' + i + '"]');
@@ -167,7 +167,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -167,7 +167,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
167 setTimeout(() => { 167 setTimeout(() => {
168 refreshElementTable(elementId, url) 168 refreshElementTable(elementId, url)
169 }, 3000); 169 }, 3000);
170 - }  
171 }); 170 });
172 171
173 } 172 }
@@ -14,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
14 //对外暴露的接口 14 //对外暴露的接口
15 exports('inspectionResultIndex', function (data) { 15 exports('inspectionResultIndex', function (data) {
16 var sessions = layui.sessions; 16 var sessions = layui.sessions;
17 - var accessToken = sessions.getToken().accessToken; 17 + var accessToken = common.getMjToken();
18 var inspectionResultTable; 18 var inspectionResultTable;
19 var lastSearchCondition; 19 var lastSearchCondition;
20 //页面关闭状态 20 //页面关闭状态
@@ -71,7 +71,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -71,7 +71,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
71 function initTable() { 71 function initTable() {
72 inspectionResultTable = table.render({ 72 inspectionResultTable = table.render({
73 elem: '#inspectionResultTable' 73 elem: '#inspectionResultTable'
74 - , url: domainName + '/api-web/inspectiontask/inspectionTaskLog?accessToken=' + accessToken 74 + , url: domainName + '/api-web/inspectiontask/inspectionTaskLog'
75 , where: whereSearch() 75 , where: whereSearch()
76 , height: 'full-210' 76 , height: 'full-210'
77 , cellMinWidth: 80 77 , cellMinWidth: 80
@@ -231,7 +231,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -231,7 +231,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
231 var loding = layer.load(2); 231 var loding = layer.load(2);
232 // openExelogWindow(); 232 // openExelogWindow();
233 admin.req({ 233 admin.req({
234 - url: domainName + '/api-web/inspectiontask/exec?accessToken=' + accessToken + '&taskId=' + task.taskId 234 + url: domainName + '/api-web/inspectiontask/exec?taskId=' + task.taskId
235 }).done(function (response) { 235 }).done(function (response) {
236 if (response.success) { 236 if (response.success) {
237 layer.close(loding); 237 layer.close(loding);
@@ -255,7 +255,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -255,7 +255,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
255 //获取巡检结果PDF 255 //获取巡检结果PDF
256 function inspectionResultPDF(batchNo) { 256 function inspectionResultPDF(batchNo) {
257 admin.req({ 257 admin.req({
258 - url: domainName + '/api-web/inspectiontask/getPdfPath?accessToken=' + accessToken + '&batchNo=' + batchNo 258 + url: domainName + '/api-web/inspectiontask/getPdfPath?batchNo=' + batchNo
259 }).done(function (response) { 259 }).done(function (response) {
260 if ("success" == response.msg) { 260 if ("success" == response.msg) {
261 window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath)); 261 window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
@@ -342,8 +342,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -342,8 +342,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
342 if ($('li[lay-id="/inspectionresult/index"]').length) { 342 if ($('li[lay-id="/inspectionresult/index"]').length) {
343 admin.req({ 343 admin.req({
344 url: domainName + '/api-web/inspectiontask/inspectionTaskLog', 344 url: domainName + '/api-web/inspectiontask/inspectionTaskLog',
345 - data: lastSearchCondition,  
346 - success: function (response) { 345 + data: lastSearchCondition
  346 + }).done(function (response) {
347 if (response && response.data) { 347 if (response && response.data) {
348 for (var i = 0; i < response.data.length; i++) { 348 for (var i = 0; i < response.data.length; i++) {
349 var batchNo = response.data[i].batchNo; 349 var batchNo = response.data[i].batchNo;
@@ -363,7 +363,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -363,7 +363,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
363 } 363 }
364 } 364 }
365 setTimeout(refreshTaskStatus, 7000); 365 setTimeout(refreshTaskStatus, 7000);
366 - }  
367 }); 366 });
368 } 367 }
369 } 368 }