From d20279ef437c5be24e649d6f044c86504b7ffd3c Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Thu, 1 Feb 2024 08:42:23 +0800
Subject: [PATCH] 'commit'

---
 .../0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf  | Bin 6926 -> 6926 bytes
 .../881514a4-d21a-462a-9bce-2232b0bc7f86.pdf  | Bin 6841 -> 6841 bytes
 WebRoot/view/tb/dis/job_view.html             |   3 ++-
 WebRoot/view/tb/dis/task_list_w.html          |   2 +-
 WebRoot/view/tb/dis/task_list_y.html          |   6 +++---
 WebRoot/view/tb/school/task_list.html         |   5 +++--
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf b/WebRoot/Excel/0fe49efe-6f28-4187-922f-fb59a08a13a7.pdf
index 263bb6401d47da69602f7a0cbfc8ebdb64cf28ec..7fc035b72bfe54f124fb1c18dc87e20bb3f0debb 100644
GIT binary patch
delta 122
zcmeA(>oePs&#Y!-U}#`qWMW_*rKzCro1fy6Sdyxs;bLV35`;@`p2{pK?&NG_V(4gM
zW?^aJ=xAnaW@_ea=4@{4Vr*{c<mBe;=wxSO>g;4<>1N{MYHDt1=4N7PVd-RGX5?mS
QXz1+XYUX4%`Gb@k07{@95&!@I

delta 122
zcmeA(>oePs&#Y!>WNBbvWN2a<rKzCro1fy6Sdyxs;bLWEU}Rzdm)ty+SyJ4|$imsw
z$-vRk!r0l&%-GD-%-PJ@+}Oy(&BD>h(89pk&c@8t$kEZ%$iTqK$lT4;#MRN<)Xl)u
S%+1`*(A3b?z<KfqDLDW{X&u7=

diff --git a/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf b/WebRoot/Excel/881514a4-d21a-462a-9bce-2232b0bc7f86.pdf
index 1056de52b30b0fa53c7077f3d7fef2a3805152ea..0d50c7054bc1ffa9284d1a4308893bb241af9c6d 100644
GIT binary patch
delta 122
zcmdmKy3=$+KC_yUfuR8qnHWWBD(L&>r?@1Rq$+5*SQ!}@nHaz&H&10gBIe{|;O1&z
zW@2VwW?^P#Y-VcaZ02lk?C9iVY;0m-X=!9<V{GnhZscU-VrXLNY-nL(VF4sv%$zNZ
Q-JH!_U5t$<&z6z{0FMYBSO5S3

delta 122
zcmdmKy3=$+KC_ykk)?rwk(r4}l%|5dZ+?nPVo9okhKrSvfsu&;TypbN<|ATG<`#x#
zMyBS*hUR9LX2xcwX3l2L=EhELmab;buEypDb~fft&K3qnKxr3qV`pO%Cnr}UV`E24
RXJ<=ib8}-C!^yLy<N%uO9)$n^

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) {