Authored by 王涛

Merge branch 'master-mj-yjp' into 'master-mj'

fix:巡检任务报错的解决



See merge request !1092
... ... @@ -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()['access_token'];
var accessToken = sessions.getToken().accessToken;
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?access_token=' + accessToken
, url: domainName + '/api-web/inspectiontask/inspectionTaskLog?accessToken=' + accessToken
, where: whereSearch()
, height: 'full-210'
, cellMinWidth: 80
... ... @@ -210,7 +210,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
layer.confirm('点击确认会导出巡检结果报表,请确认', {
btn: ['确定', '取消'] //按钮
}, function () {
var url = common.domainName + '/api-web/inspectiontask/download?access_token=' + accessToken + '&batchNo='
var url = common.domainName + '/api-web/inspectiontask/download?accessToken=' + accessToken + '&batchNo='
+ task.batchNo + '&name=' + task.taskName + task.startTime;
window.open(url);
layer.closeAll();
... ... @@ -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?access_token=' + accessToken + '&taskId=' + task.taskId
url: domainName + '/api-web/inspectiontask/exec?accessToken=' + accessToken + '&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?access_token=' + accessToken + '&batchNo=' + batchNo
url: domainName + '/api-web/inspectiontask/getPdfPath?accessToken=' + accessToken + '&batchNo=' + batchNo
}).done(function (response) {
if ("success" == response.msg) {
window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
... ... @@ -305,7 +305,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
, content: $("#inspection-result-notice-table").html()
, success: function () {
var elem = "#inspectionResultNotice_table"
var url = domainName + '/api-web/inspectiontask/inspectionNoticeUser?access_token=' + accessToken + '&batchNo=' + batchNo
var url = domainName + '/api-web/inspectiontask/inspectionNoticeUser?accessToken=' + accessToken + '&batchNo=' + batchNo
var cols = [
{field: 'alarmNoticeUserName', title: '通知人', align: 'center', width: "20%"}
, {field: 'alarmNoticeTime', title: '通知时间', align: 'center', width: "20%"}
... ...