diff --git a/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf b/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf index 263bb640..7fc035b7 100644 Binary files a/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf and b/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf differ diff --git a/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf b/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf index 1056de52..0d50c705 100644 Binary files a/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf and b/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf differ diff --git a/WebRoot/view/tb/dis/job_view.html b/WebRoot/view/tb/dis/job_view.html index 2289db49..5746551c 100644 --- a/WebRoot/view/tb/dis/job_view.html +++ b/WebRoot/view/tb/dis/job_view.html @@ -62,9 +62,10 @@ var jobId = GetQueryString("job_id"); var targetId = GetQueryString("target_id"); + var statusCode = GetQueryString("status_code"); $.ajax({ - url: "/QingLong/collect/getJob?job_id=" + jobId + "&target_id=" + targetId, + url: "/QingLong/collect/getJob?job_id=" + jobId + "&target_id=" + targetId + "&status_code=" + statusCode, async: false, type: 'GET', success: function (res) { diff --git a/WebRoot/view/tb/dis/task_list_w.html b/WebRoot/view/tb/dis/task_list_w.html index 8170c1af..22e38d2e 100644 --- a/WebRoot/view/tb/dis/task_list_w.html +++ b/WebRoot/view/tb/dis/task_list_w.html @@ -192,7 +192,7 @@ title: '查看', shade: 0.1, area: ['800px', '400px'], - content: './job_view.html?job_id=' + obj.data.job_id + content: './job_view.html?job_id=' + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id }); } diff --git a/WebRoot/view/tb/dis/task_list_y.html b/WebRoot/view/tb/dis/task_list_y.html index 8c54902b..ca87ff4f 100644 --- a/WebRoot/view/tb/dis/task_list_y.html +++ b/WebRoot/view/tb/dis/task_list_y.html @@ -175,7 +175,7 @@ icon: 3, title: '提示' }, function (index) { - layer.close(index); + layer.close(index); $.ajax({ url: '/QingLong/collect/setForwardFinish', type: 'post', @@ -199,13 +199,13 @@ }); } - window.view = function (obj) { + window.view = function (obj) { layer.open({ type: 2, title: '查看', shade: 0.1, area: ['800px', '400px'], - content: './job_view.html?job_id=' + obj.data.job_id + '&target_id=' + obj.data.target_id + content: './job_view.html?job_id=' + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id }); } diff --git a/WebRoot/view/tb/school/task_list.html b/WebRoot/view/tb/school/task_list.html index 85f463ff..92c430e5 100644 --- a/WebRoot/view/tb/school/task_list.html +++ b/WebRoot/view/tb/school/task_list.html @@ -177,13 +177,14 @@ } window.view = function (obj) { - if (obj.data.is_finish === 0) { + var lastDigit = String(obj.data.status_code).slice(-1); + if (lastDigit == "0") { layer.open({ type: 2, title: '查看', shade: 0.1, area: ['800px', '400px'], - content: '../dis/job_view.html?job_id=' + obj.data.job_id + content: '../dis/job_view.html?job_id=' + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id }); } else { if (obj.data.job_type === 1) {