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 42 additions and 44 deletions
... ... @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//对外暴露的接口
exports('inspectionResultElement', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
var batchNo = data.batchNo;
execute(batchNo);
... ... @@ -52,7 +52,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
var height = false
layer.load(2);
admin.req({
url: domainName + '/api-web/inspectiontask/indpectionElement?access_token=' + accessToken,
url: domainName + '/api-web/inspectiontask/indpectionElement',
type: 'get',
data: {batchNo: batchNo},
contentType: 'application/json',
... ... @@ -61,7 +61,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
if (res.data) {
$.each(res.data, function (v, e) {
$("#inspectionResultExecute").append(laytpl(tableHtml).render(e));
var reqUrl = domainName + '/api-web/inspectiontask/indpectionResult?access_token=' + accessToken + '&batchNo=' + batchNo + '&elementId=' + e.elementId
var reqUrl = domainName + '/api-web/inspectiontask/indpectionResult?accessToken=' + accessToken + '&batchNo=' + batchNo + '&elementId=' + e.elementId
table.render({
elem: "#" + e.elementId
, url: reqUrl
... ... @@ -144,30 +144,29 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
var $table = $('#inspectionResultExecute div[lay-id="' + elementId + '"');
if ($table.length) {
admin.req({
url: url,
success: function (response) {
if (response && response.data) {
for (let i = 0; i < response.data.length; i++) {
var $tr = $table.find('tr[data-index="' + i + '"]');
var colList = ['status', 'duration', 'funResultFlag', 'funResult'];
for (let j = 0; j < colList.length; j++) {
var $td = $tr.find('td[data-field="' + colList[j] + '"]');
// 当且仅当原值与现值不同，并且至少有一方有值时。
if (((response.data[i][colList[j]] + '') != $td.attr('data-content')) && (($td.attr('data-content') || $td.attr('data-content') === 0) || (response.data[i][colList[j]] || response.data[i][colList[j]] === 0))) {
if (response.data[i][colList[j]] || response.data[i][colList[j]] === 0) {
$td.attr('data-content', response.data[i][colList[j]]);
} else {
$td.attr('data-content', '');
}
changeTextSoftly($td.find('div'), eval(colList[j] + 'Format(' + JSON.stringify(response.data[i]) + ')'));
url: url
}).done(function (response) {
if (response && response.data) {
for (let i = 0; i < response.data.length; i++) {
var $tr = $table.find('tr[data-index="' + i + '"]');
var colList = ['status', 'duration', 'funResultFlag', 'funResult'];
for (let j = 0; j < colList.length; j++) {
var $td = $tr.find('td[data-field="' + colList[j] + '"]');
// 当且仅当原值与现值不同，并且至少有一方有值时。
if (((response.data[i][colList[j]] + '') != $td.attr('data-content')) && (($td.attr('data-content') || $td.attr('data-content') === 0) || (response.data[i][colList[j]] || response.data[i][colList[j]] === 0))) {
if (response.data[i][colList[j]] || response.data[i][colList[j]] === 0) {
$td.attr('data-content', response.data[i][colList[j]]);
} else {
$td.attr('data-content', '');
}
changeTextSoftly($td.find('div'), eval(colList[j] + 'Format(' + JSON.stringify(response.data[i]) + ')'));
}
}
}
setTimeout(() => {
refreshElementTable(elementId, url)
}, 3000);
}
setTimeout(() => {
refreshElementTable(elementId, url)
}, 3000);
});
}
... ...
... ... @@ -14,7 +14,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//对外暴露的接口
exports('inspectionResultIndex', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken().accessToken;
var accessToken = common.getMjToken();
var inspectionResultTable;
var lastSearchCondition;
//页面关闭状态
... ... @@ -71,7 +71,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
function initTable() {
inspectionResultTable = table.render({
elem: '#inspectionResultTable'
, url: domainName + '/api-web/inspectiontask/inspectionTaskLog?accessToken=' + accessToken
, url: domainName + '/api-web/inspectiontask/inspectionTaskLog'
, where: whereSearch()
, height: 'full-210'
, cellMinWidth: 80
... ... @@ -231,7 +231,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
var loding = layer.load(2);
// openExelogWindow();
admin.req({
url: domainName + '/api-web/inspectiontask/exec?accessToken=' + accessToken + '&taskId=' + task.taskId
url: domainName + '/api-web/inspectiontask/exec?taskId=' + task.taskId
}).done(function (response) {
if (response.success) {
layer.close(loding);
... ... @@ -255,7 +255,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//获取巡检结果PDF
function inspectionResultPDF(batchNo) {
admin.req({
url: domainName + '/api-web/inspectiontask/getPdfPath?accessToken=' + accessToken + '&batchNo=' + batchNo
url: domainName + '/api-web/inspectiontask/getPdfPath?batchNo=' + batchNo
}).done(function (response) {
if ("success" == response.msg) {
window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
... ... @@ -342,28 +342,27 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
if ($('li[lay-id="/inspectionresult/index"]').length) {
admin.req({
url: domainName + '/api-web/inspectiontask/inspectionTaskLog',
data: lastSearchCondition,
success: function (response) {
if (response && response.data) {
for (var i = 0; i < response.data.length; i++) {
var batchNo = response.data[i].batchNo;
var status = response.data[i].status;
var $statusDom = $('div[inspectiontask-status-taskid="' + batchNo + '"]');
if ($statusDom.length) {
var statusStr = '未执行';
if (statusEnum[status]) {
statusStr = statusEnum[status];
}
if (statusStr != $statusDom.text()) {
changeTextSoftly($statusDom, statusStr);
var index = $statusDom.parents('tr[data-index]').data('index');
tableData[index].status = status;
}
data: lastSearchCondition
}).done(function (response) {
if (response && response.data) {
for (var i = 0; i < response.data.length; i++) {
var batchNo = response.data[i].batchNo;
var status = response.data[i].status;
var $statusDom = $('div[inspectiontask-status-taskid="' + batchNo + '"]');
if ($statusDom.length) {
var statusStr = '未执行';
if (statusEnum[status]) {
statusStr = statusEnum[status];
}
if (statusStr != $statusDom.text()) {
changeTextSoftly($statusDom, statusStr);
var index = $statusDom.parents('tr[data-index]').data('index');
tableData[index].status = status;
}
}
}
setTimeout(refreshTaskStatus, 7000);
}
setTimeout(refreshTaskStatus, 7000);
});
}
}
... ...