cq_anquan
/
safety-eval-service-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1

dev-tmp1
luotaiqian 2026-08-28 14:08:06 +08:00
parent 6e434f6d03 b5f0174483
commit d336c013f5
6 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jjb.config.js
View File

@ -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
},

4
src/pages/Container/EduAgentTraining/ClassManage/Add/CourseTab.js
View File

@ -89,7 +89,7 @@ function ClassCourseTab(props) {
>
查看
</Button>
<Button
{classDetailData?.status !== 2&&<Button
danger
type="link"
size="small"
@ -112,7 +112,7 @@ function ClassCourseTab(props) {
}
>
删除
</Button>
</Button>}
</TableAction>
),
},

4
src/pages/Container/EduAgentTraining/ClassManage/Add/StudentTab.js
View File

@ -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,

7
src/pages/Container/EduAgentTraining/ClassManage/Add/index.js
View File

@ -89,6 +89,11 @@ function ClassAddPage(props) {
props.history.goBack();
}
})();
return () => {
props.resetModelState(NS_COURSEWARE, {
classDetailData: {}
});
}
}, []);
const handleSubmit = async () => {
@ -98,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"),

10
src/pages/Container/EduAgentTraining/ClassManage/List/index.js
View File

@ -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,
};

6
src/pages/Container/SafetyEvalBusiness/ProjectFlow/InternalReviewContent.js
View File

@ -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 }) => {
/>
<div style={{ marginTop: 12 }}>
<Typography.Text strong>总体审核意见</Typography.Text>
<Typography.Text strong>内部审核意见</Typography.Text>
<TextArea
rows={2}
value={overallOpinion}
allowClear
disabled={readOnly}
placeholder="请输入总体审核意见"
placeholder="请输入内部审核意见"
maxLength={120}
onChange={(e) => setOverallOpinion(e.target.value)}
style={{ marginTop: 4 }}