From 170d3af347a48af0e5e2b9b5957b9a5c01f230ad Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Fri, 28 Aug 2026 09:54:58 +0800 Subject: [PATCH 1/4] fix --- .../Container/EduAgentTraining/ClassManage/Add/CourseTab.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Container/EduAgentTraining/ClassManage/Add/CourseTab.js b/src/pages/Container/EduAgentTraining/ClassManage/Add/CourseTab.js index b72a6f5..db9db99 100644 --- a/src/pages/Container/EduAgentTraining/ClassManage/Add/CourseTab.js +++ b/src/pages/Container/EduAgentTraining/ClassManage/Add/CourseTab.js @@ -89,7 +89,7 @@ function ClassCourseTab(props) { > 查看 - + } ), }, From b00ea8f0c7ae8e7308aff59577eadd8eab91f816 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Fri, 28 Aug 2026 10:26:38 +0800 Subject: [PATCH 2/4] fix --- .../EduAgentTraining/ClassManage/Add/index.js | 5 +++++ .../EduAgentTraining/ClassManage/List/index.js | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/pages/Container/EduAgentTraining/ClassManage/Add/index.js b/src/pages/Container/EduAgentTraining/ClassManage/Add/index.js index 17a9813..ffa38b5 100644 --- a/src/pages/Container/EduAgentTraining/ClassManage/Add/index.js +++ b/src/pages/Container/EduAgentTraining/ClassManage/Add/index.js @@ -89,6 +89,11 @@ function ClassAddPage(props) { props.history.goBack(); } })(); + return () => { + props.resetModelState(NS_COURSEWARE, { + classDetailData: {} + }); + } }, []); const handleSubmit = async () => { diff --git a/src/pages/Container/EduAgentTraining/ClassManage/List/index.js b/src/pages/Container/EduAgentTraining/ClassManage/List/index.js index dace1eb..2493449 100644 --- a/src/pages/Container/EduAgentTraining/ClassManage/List/index.js +++ b/src/pages/Container/EduAgentTraining/ClassManage/List/index.js @@ -27,11 +27,13 @@ const buildQuery = (value) => { return { ...rest, ...(trainingDateRange?.[0] - ? { startDateBegin: trainingDateRange[0].format("YYYY-MM-DD") } - : {}), + ? { startDateBegin: trainingDateRange[0]?.startOf("day") + .format("YYYY-MM-DD HH:mm:ss") } + : {startDateBegin: undefined}), ...(trainingDateRange?.[1] - ? { endDateEnd: trainingDateRange[1].format("YYYY-MM-DD") } - : {}), + ? { endDateEnd: trainingDateRange[1]?.endOf("day") + .format("YYYY-MM-DD HH:mm:ss") } + : {endDateEnd: undefined}), current: 1, size: 10, }; From de95e1620e29baf687ea722bc1d4287d24b5ce02 Mon Sep 17 00:00:00 2001 From: tangjie <122778500@qq.com> Date: Fri, 28 Aug 2026 10:58:57 +0800 Subject: [PATCH 3/4] fix --- jjb.config.js | 4 ++-- .../Container/EduAgentTraining/ClassManage/Add/StudentTab.js | 4 ++-- src/pages/Container/EduAgentTraining/ClassManage/Add/index.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jjb.config.js b/jjb.config.js index 77f6dcd..d3739cf 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -12,8 +12,8 @@ module.exports = { // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095 //API_HOST: "http://localhost:80", - // API_HOST: "http://192.168.0.134", - API_HOST: "http://192.168.0.150", //太浅 + API_HOST: "http://192.168.0.134", + // API_HOST: "http://192.168.0.150", //太浅 // API_HOST: "https://gbs-gateway.qhdsafety.com", // API_HOST: "http://192.168.0.103", //huwei }, diff --git a/src/pages/Container/EduAgentTraining/ClassManage/Add/StudentTab.js b/src/pages/Container/EduAgentTraining/ClassManage/Add/StudentTab.js index 79806d8..4df249a 100644 --- a/src/pages/Container/EduAgentTraining/ClassManage/Add/StudentTab.js +++ b/src/pages/Container/EduAgentTraining/ClassManage/Add/StudentTab.js @@ -21,10 +21,10 @@ const buildQuery = (value) => { return { ...rest, ...(entryTimeRange?.[0] - ? { entryTimeStart: entryTimeRange[0].format("YYYY-MM-DD") } + ? { entryTimeStart: entryTimeRange[0].startOf("day").format("YYYY-MM-DD HH:mm:ss") } : {}), ...(entryTimeRange?.[1] - ? { entryTimeEnd: entryTimeRange[1].format("YYYY-MM-DD") } + ? { entryTimeEnd: entryTimeRange[1]?.endOf("day").format("YYYY-MM-DD HH:mm:ss") } : {}), current: 1, size: 10, diff --git a/src/pages/Container/EduAgentTraining/ClassManage/Add/index.js b/src/pages/Container/EduAgentTraining/ClassManage/Add/index.js index ffa38b5..c22523a 100644 --- a/src/pages/Container/EduAgentTraining/ClassManage/Add/index.js +++ b/src/pages/Container/EduAgentTraining/ClassManage/Add/index.js @@ -103,7 +103,7 @@ function ClassAddPage(props) { const { trainingDateRange, ...rest } = values; const payload = { ...rest, - startDate: trainingDateRange?.[0]?.format("YYYY-MM-DD"), + startDate: trainingDateRange?.[0]?.startOf("day").format("YYYY-MM-DD HH:mm:ss"), endDate: trainingDateRange?.[1] ?.endOf("day") .format("YYYY-MM-DD HH:mm:ss"), From b5f01744833668d7496d45ff301f5d655f1e55bc Mon Sep 17 00:00:00 2001 From: zhanglei Date: Fri, 28 Aug 2026 14:07:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20bug:=E7=BA=BF=E4=B8=8A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=8A=82=E7=82=B9=E6=8F=8F=E8=BF=B0=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js index b451d92..866b94c 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js @@ -81,7 +81,7 @@ const InternalReviewContent = ({ readOnly, ...props }) => { "dispatched": "待APP签字", "completed": "已手写签字", }; - + const problemCount = rows.filter( (r) => r.reviewConclusion === "not_conform_to", ).length; @@ -247,13 +247,13 @@ const InternalReviewContent = ({ readOnly, ...props }) => { />
- 总体审核意见 + 内部审核意见