From e4a858d6f354552556462b81ddba1280857650c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 26 Aug 2022 13:37:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?glcc=E5=AF=BC=E5=B8=88=E4=B8=AD=E6=9C=9F?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E7=BB=93=E6=9E=9C=E4=B8=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx index d4277253d..b38d22f43 100644 --- a/src/glcc/index.jsx +++ b/src/glcc/index.jsx @@ -87,8 +87,8 @@ const Glcc = (propsF) => { const secondStudentApplyDate = new Date().getTime() > new Date('2022-06-29 1:0').getTime() && new Date().getTime() < new Date('2022-06-30 0:0').getTime(); // 学生中期考核入口可见时间 const checkTime1 = new Date().getTime() > new Date('2022-08-12 8:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime(); - // 导师中期考核时间 - const checkTime2 = new Date().getTime() > new Date('2022-08-12 10:0').getTime() && new Date().getTime() < new Date('2022-08-25 24:0').getTime(); + // 导师中期考核时间 && new Date().getTime() < new Date('2022-08-25 24:0').getTime() + const checkTime2 = new Date().getTime() > new Date('2022-08-12 10:0').getTime(); // 中期考核结果公示8月26日0点 const checkTime3 = new Date().getTime() > new Date('2022-08-26 0:0').getTime(); From e6e7f83f25ee1b89142c8b8a34d4f86855b71d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 26 Aug 2022 14:59:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?glcc=E7=BB=93=E6=9E=9C=E5=85=AC=E7=A4=BA?= =?UTF-8?q?=E7=AD=94=E8=BE=A9=E8=A7=86=E9=A2=91url=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/interimReview/result.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glcc/interimReview/result.jsx b/src/glcc/interimReview/result.jsx index 56efa7664..822ca8f9d 100644 --- a/src/glcc/interimReview/result.jsx +++ b/src/glcc/interimReview/result.jsx @@ -56,7 +56,7 @@ function CheckResult({current_user, history, checkTime3}) { { title: '课题名称', dataIndex: 'taskName', className:"columnsResult", width: '20%', ellipsis: true, render: (text, item) => {window.open(`/glcc/subjects/detail/${item.taskId}`)}}>{text} }, { title: '项目名称', dataIndex: 'projectName', className:"columnsResult", ellipsis: true, width: '14%', render: (text) => {text} }, { title: '项目简介', dataIndex: 'introduce', className:"columnsResult", width: '13%', ellipsis: true}, - { title: '答辩视频', dataIndex: 'defenceVideoUrl', className:"columnsResult", width: '15%', ellipsis: true, render: (text, item) => {window.open(`/glcc/subjects/detail/${item.taskId}`)}}>{text}}, + { title: '答辩视频', dataIndex: 'defenceVideoUrl', className:"columnsResult", width: '15%', ellipsis: true, render: (text, item) => {window.open(text)}}>{text}}, { title: '考核结果', dataIndex: 'totalityEvaluation', align: 'center', className:"columnsResult actionBox", render: (text, item, index) => {text === 'D' || !text ? '未通过' : '通过'}}, ] From 84c4ec3c3d7784bc5f7f2ba48fbf2d6ba257b616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 26 Aug 2022 16:09:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?glcc=E4=B8=AD=E6=9C=9F=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=85=A5=E5=8F=A3=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/home/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx index 093891d3b..b549b9023 100644 --- a/src/glcc/home/index.jsx +++ b/src/glcc/home/index.jsx @@ -105,7 +105,7 @@ export default (props) => {
导师拟定中期考核结果
} {/* 中期考核结果公示页 */} - {checkTime3 && + {checkTime3 && false &&
考核结果 From e4fc7db8434a6eaf8cf2fefba49d0e4479eab2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 26 Aug 2022 16:17:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?glcc=E7=BB=93=E6=9E=9C=E5=85=AC=E7=A4=BA?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/home/index.jsx | 2 +- src/glcc/index.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx index b549b9023..94617f22d 100644 --- a/src/glcc/home/index.jsx +++ b/src/glcc/home/index.jsx @@ -105,7 +105,7 @@ export default (props) => {
导师拟定中期考核结果
} {/* 中期考核结果公示页 */} - {checkTime3 && false && + {checkTime3 && false &&
考核结果 diff --git a/src/glcc/index.jsx b/src/glcc/index.jsx index b38d22f43..954535a53 100644 --- a/src/glcc/index.jsx +++ b/src/glcc/index.jsx @@ -211,7 +211,7 @@ const Glcc = (propsF) => { {/* 中期审核-结果公示 */} ( )}