mirror of
https://github.com/PlayEdu/backend
synced 2025-07-29 10:01:03 +08:00
Compare commits
No commits in common. "895385c4d7911368c349168cb0c266dcaec78041" and "5b124ca8210e3443c2b0bf0c339f5af6787a7c8a" have entirely different histories.
895385c4d7
...
5b124ca821
@ -60,22 +60,6 @@ type HourCountModel = {
|
|||||||
[key: number]: string;
|
[key: number]: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type PerCourseRecordsModel = {
|
|
||||||
[key: number]: {
|
|
||||||
course_id: number;
|
|
||||||
created_at: string;
|
|
||||||
finished_at: string;
|
|
||||||
finished_duration: number;
|
|
||||||
hour_id: number;
|
|
||||||
id: number;
|
|
||||||
is_finished: number;
|
|
||||||
real_duration: number;
|
|
||||||
total_duration: number;
|
|
||||||
updated_at: string;
|
|
||||||
user_id: number;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const CourseUserPage = () => {
|
const CourseUserPage = () => {
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
const result = new URLSearchParams(useLocation().search);
|
const result = new URLSearchParams(useLocation().search);
|
||||||
@ -85,7 +69,6 @@ const CourseUserPage = () => {
|
|||||||
const [hourCount, setHourCount] = useState<HourCountModel>({});
|
const [hourCount, setHourCount] = useState<HourCountModel>({});
|
||||||
const [userDepIds, setUserDepIds] = useState<DepIdsModel>({});
|
const [userDepIds, setUserDepIds] = useState<DepIdsModel>({});
|
||||||
const [departments, setDepartments] = useState<DepartmentsModel>({});
|
const [departments, setDepartments] = useState<DepartmentsModel>({});
|
||||||
const [perRecords, setPerRecords] = useState<PerCourseRecordsModel>({});
|
|
||||||
const [refresh, setRefresh] = useState(false);
|
const [refresh, setRefresh] = useState(false);
|
||||||
const [page, setPage] = useState(1);
|
const [page, setPage] = useState(1);
|
||||||
const [size, setSize] = useState(10);
|
const [size, setSize] = useState(10);
|
||||||
@ -152,8 +135,8 @@ const CourseUserPage = () => {
|
|||||||
dataIndex: "created_at",
|
dataIndex: "created_at",
|
||||||
render: (_, record: any) => (
|
render: (_, record: any) => (
|
||||||
<>
|
<>
|
||||||
{perRecords[record.id] ? (
|
{records[record.id] ? (
|
||||||
<span>{dateFormat(perRecords[record.id].created_at)}</span>
|
<span>{dateFormat(records[record.id].created_at)}</span>
|
||||||
) : hourCount[record.id] ? (
|
) : hourCount[record.id] ? (
|
||||||
<span>{dateFormat(hourCount[record.id])}</span>
|
<span>{dateFormat(hourCount[record.id])}</span>
|
||||||
) : (
|
) : (
|
||||||
@ -230,7 +213,6 @@ const CourseUserPage = () => {
|
|||||||
setList(res.data.data);
|
setList(res.data.data);
|
||||||
setHourCount(res.data.user_course_hour_user_first_at);
|
setHourCount(res.data.user_course_hour_user_first_at);
|
||||||
setRecords(res.data.user_course_records);
|
setRecords(res.data.user_course_records);
|
||||||
setPerRecords(res.data.per_user_earliest_records);
|
|
||||||
setCourse(res.data.course);
|
setCourse(res.data.course);
|
||||||
setDepartments(res.data.departments);
|
setDepartments(res.data.departments);
|
||||||
setUserDepIds(res.data.user_dep_ids);
|
setUserDepIds(res.data.user_dep_ids);
|
||||||
|
@ -558,7 +558,7 @@ const DashboardPage = () => {
|
|||||||
<div className={styles["usage-guide"]}>
|
<div className={styles["usage-guide"]}>
|
||||||
<img className={styles["banner"]} src={banner} alt="" />
|
<img className={styles["banner"]} src={banner} alt="" />
|
||||||
<Link
|
<Link
|
||||||
to="https://www.playedu.xyz/book/opensource-handbook/article/wFymJ4SXcX"
|
to="https://www.playedu.xyz/docs/docs/guide/"
|
||||||
target="blank"
|
target="blank"
|
||||||
className={styles["link"]}
|
className={styles["link"]}
|
||||||
>
|
>
|
||||||
|
@ -14,14 +14,13 @@ import {
|
|||||||
} from "antd";
|
} from "antd";
|
||||||
import { appConfig, system } from "../../../api/index";
|
import { appConfig, system } from "../../../api/index";
|
||||||
import { UploadImageButton } from "../../../compenents";
|
import { UploadImageButton } from "../../../compenents";
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import type { TabsProps } from "antd";
|
import type { TabsProps } from "antd";
|
||||||
import type { CheckboxChangeEvent } from "antd/es/checkbox";
|
import type { CheckboxChangeEvent } from "antd/es/checkbox";
|
||||||
import {
|
import {
|
||||||
SystemConfigStoreInterface,
|
SystemConfigStoreInterface,
|
||||||
saveConfigAction,
|
saveConfigAction,
|
||||||
} from "../../../store/system/systemConfigSlice";
|
} from "../../../store/system/systemConfigSlice";
|
||||||
import logoIcon from "../../../assets/logo.png";
|
|
||||||
|
|
||||||
const SystemConfigPage = () => {
|
const SystemConfigPage = () => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
@ -34,9 +33,6 @@ const SystemConfigPage = () => {
|
|||||||
const [nameChecked, setNameChecked] = useState(false);
|
const [nameChecked, setNameChecked] = useState(false);
|
||||||
const [emailChecked, setEmailChecked] = useState(false);
|
const [emailChecked, setEmailChecked] = useState(false);
|
||||||
const [idCardchecked, setIdCardChecked] = useState(false);
|
const [idCardchecked, setIdCardChecked] = useState(false);
|
||||||
const memberDefaultAvatar = useSelector(
|
|
||||||
(state: any) => state.systemConfig.value.memberDefaultAvatar
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
getDetail();
|
getDetail();
|
||||||
@ -56,8 +52,6 @@ const SystemConfigPage = () => {
|
|||||||
});
|
});
|
||||||
if (configData[i].key_value !== "") {
|
if (configData[i].key_value !== "") {
|
||||||
setLogo(configData[i].key_value);
|
setLogo(configData[i].key_value);
|
||||||
} else {
|
|
||||||
setLogo(logoIcon);
|
|
||||||
}
|
}
|
||||||
} else if (configData[i].key_name === "system.api_url") {
|
} else if (configData[i].key_name === "system.api_url") {
|
||||||
form.setFieldsValue({
|
form.setFieldsValue({
|
||||||
@ -128,11 +122,7 @@ const SystemConfigPage = () => {
|
|||||||
"system.pc_index_footer_msg": configData[i].key_value,
|
"system.pc_index_footer_msg": configData[i].key_value,
|
||||||
});
|
});
|
||||||
} else if (configData[i].key_name === "member.default_avatar") {
|
} else if (configData[i].key_name === "member.default_avatar") {
|
||||||
if (configData[i].key_value !== "") {
|
setAvatar(configData[i].key_value);
|
||||||
setAvatar(configData[i].key_value);
|
|
||||||
} else {
|
|
||||||
setAvatar(memberDefaultAvatar);
|
|
||||||
}
|
|
||||||
form.setFieldsValue({
|
form.setFieldsValue({
|
||||||
"member.default_avatar": configData[i].key_value,
|
"member.default_avatar": configData[i].key_value,
|
||||||
});
|
});
|
||||||
|
@ -24,12 +24,22 @@ export function timeFormat(dateStr: number) {
|
|||||||
return "-";
|
return "-";
|
||||||
}
|
}
|
||||||
var d = moment.duration(dateStr, "seconds");
|
var d = moment.duration(dateStr, "seconds");
|
||||||
let value = d.hours() + "时" + d.minutes() + "分" + d.seconds() + "秒";
|
let value =
|
||||||
|
Math.floor(d.asDays()) +
|
||||||
|
"天" +
|
||||||
|
d.hours() +
|
||||||
|
"时" +
|
||||||
|
d.minutes() +
|
||||||
|
"分" +
|
||||||
|
d.seconds() +
|
||||||
|
"秒";
|
||||||
|
|
||||||
if (d.hours() === 0) {
|
if (Math.floor(d.asDays()) === 0) {
|
||||||
value = d.minutes() + "分" + d.seconds() + "秒";
|
if (d.hours() === 0) {
|
||||||
} else {
|
value = d.minutes() + "分" + d.seconds() + "秒";
|
||||||
value = d.hours() + "时" + d.minutes() + "分" + d.seconds() + "秒";
|
} else {
|
||||||
|
value = d.hours() + "时" + d.minutes() + "分" + d.seconds() + "秒";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return value;
|
return value;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user