Compare commits

..

No commits in common. "main" and "v1.2.1" have entirely different histories.
main ... v1.2.1

28 changed files with 207 additions and 399 deletions

View File

@ -1 +1,2 @@
VITE_APP_URL= VITE_APP_URL=
VITE_G_ID=

4
.gitignore vendored
View File

@ -32,6 +32,4 @@ yarn.lock
deploy-test.sh deploy-test.sh
deploy-prod.sh deploy-prod.sh
deploy-demo.sh deploy-demo.sh
pnpm-lock.yaml

View File

@ -13,5 +13,10 @@
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="module" src="/src/main.tsx"></script> <script type="module" src="/src/main.tsx"></script>
<script
crossorigin="anonymous"
integrity="sha512-oHrfR/z2wkuRuaHrdZ9NhoT/o/1kteub+QvmQgVzOKK7NTvIKQMvnY9+/RR0+eW311o4lAE/YzzLXXmP2XUvig=="
src="https://lib.baomitu.com/hls.js/1.1.4/hls.min.js"
></script>
</body> </body>
</html> </html>

View File

@ -1,6 +1,6 @@
{ {
"name": "playedu-pc-interface", "name": "frontend",
"private": false, "private": true,
"version": "0.0.0", "version": "0.0.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
@ -9,31 +9,28 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@ant-design/icons": "^5.3.0",
"@reduxjs/toolkit": "^1.9.3", "@reduxjs/toolkit": "^1.9.3",
"add": "^2.0.6", "add": "^2.0.6",
"antd": "^5.3.2", "antd": "^5.3.2",
"axios": "^1.3.4", "axios": "^1.3.4",
"dayjs": "^1.11.10",
"localforage": "^1.10.0", "localforage": "^1.10.0",
"match-sorter": "^6.3.1", "match-sorter": "^6.3.1",
"moment": "^2.29.4", "moment": "^2.29.4",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-ga": "^3.3.1",
"react-redux": "^8.0.5", "react-redux": "^8.0.5",
"react-router-dom": "^6.9.0", "react-router-dom": "^6.9.0",
"redux": "^4.2.1", "redux": "^4.2.1",
"sort-by": "^1.2.0" "sort-by": "^1.2.0"
}, },
"devDependencies": { "devDependencies": {
"@types/react": "^18.2.0", "@types/react": "^18.0.28",
"@types/react-dom": "^18.2.0", "@types/react-dom": "^18.0.11",
"@vitejs/plugin-legacy": "^4.1.1",
"@vitejs/plugin-react-swc": "^3.0.0", "@vitejs/plugin-react-swc": "^3.0.0",
"rollup-plugin-gzip": "^3.1.0", "rollup-plugin-gzip": "^3.1.0",
"sass": "^1.59.3", "sass": "^1.59.3",
"terser": "^5.20.0",
"typescript": "^4.9.3", "typescript": "^4.9.3",
"vite": "^4.2.0" "vite": "^4.2.0"
} }

1
public/js/xg/hls.min.js vendored Normal file

File diff suppressed because one or more lines are too long

21
public/js/xg/index.js Normal file

File diff suppressed because one or more lines are too long

View File

@ -1,13 +1,31 @@
import { Suspense } from "react"; import { Suspense, useEffect } from "react";
import { useRoutes } from "react-router-dom"; import ReactGA from "react-ga";
import { useLocation, useRoutes } from "react-router-dom";
import routes from "./routes"; import routes from "./routes";
import "./App.scss"; import "./App.scss";
import LoadingPage from "./pages/loading"; import LoadingPage from "./pages/loading";
const G_ID = import.meta.env.VITE_G_ID || "";
if (G_ID) {
ReactGA.initialize(G_ID);
}
const App = () => { const App = () => {
const views = useRoutes(routes); const views = useRoutes(routes);
return <Suspense fallback={<LoadingPage />}>{views}</Suspense>; const location = useLocation();
useEffect(() => {
if (!G_ID) {
return;
}
ReactGA.pageview(location.pathname + location.search);
}, [location]);
return (
<Suspense fallback={<LoadingPage />}>
{views}
</Suspense>
);
}; };
export default App; export default App;

View File

@ -1,21 +1,14 @@
import axios, { Axios, AxiosResponse } from "axios"; import axios, { Axios, AxiosResponse } from "axios";
import { message } from "antd"; import { message } from "antd";
import { import { getToken, clearToken } from "../../utils/index";
getToken,
clearToken,
clearDepKey,
clearDepName,
} from "../../utils/index";
const GoLogin = () => { const GoLogin = () => {
clearToken(); clearToken();
clearDepName();
clearDepKey();
window.location.href = "/login"; window.location.href = "/login";
}; };
const GoError = (status: number) => { const GoError = () => {
window.location.href = "/error?status=" + status; window.location.href = "/error";
}; };
export class HttpClient { export class HttpClient {
@ -63,13 +56,13 @@ export class HttpClient {
GoLogin(); GoLogin();
} else if (status === 404) { } else if (status === 404) {
// 跳转到404页面 // 跳转到404页面
GoError(404); GoError();
} else if (status === 403) { } else if (status === 403) {
// 跳转到无权限页面 // 跳转到无权限页面
GoError(403); GoError();
} else if (status === 500) { } else if (status === 500) {
// 跳转到500异常页面 // 跳转到500异常页面
GoError(500); GoError();
} }
return Promise.reject(error.response); return Promise.reject(error.response);
} }

View File

@ -10,11 +10,3 @@ export function login(email: string, password: string) {
export function logout() { export function logout() {
return client.post("/api/v1/auth/logout", {}); return client.post("/api/v1/auth/logout", {});
} }
export function loginLdap(email: string, password: string) {
return client.post("/api/v1/auth/login/ldap", {
username: email,
password: password,
});
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -1,3 +1,5 @@
@import "./assets/iconfont/iconfont.css";
$primaryColor: #ff4d4f; $primaryColor: #ff4d4f;
:root { :root {
@ -33,18 +35,6 @@ body {
min-height: 100vh; min-height: 100vh;
} }
.layout-box {
display: flex;
flex-direction: column;
min-height: 100vh;
}
.footer-box {
flex: 1;
display: flex;
flex-direction: column-reverse;
}
.main-body { .main-body {
width: 100%; width: 100%;
height: auto; height: auto;

View File

@ -4,7 +4,6 @@ import store from "./store";
import { BrowserRouter } from "react-router-dom"; import { BrowserRouter } from "react-router-dom";
import { ConfigProvider } from "antd"; import { ConfigProvider } from "antd";
import zhCN from "antd/locale/zh_CN"; import zhCN from "antd/locale/zh_CN";
import "./assets/iconfont/iconfont.css";
import App from "./App"; import App from "./App";
import "./index.scss"; //全局样式 import "./index.scss"; //全局样式
import AutoScorllTop from "./AutoTop"; import AutoScorllTop from "./AutoTop";
@ -22,4 +21,4 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
</BrowserRouter> </BrowserRouter>
</ConfigProvider> </ConfigProvider>
</Provider> </Provider>
); );

View File

@ -101,7 +101,7 @@
align-items: center; align-items: center;
position: relative; position: relative;
.tab-item { .tab-item {
min-width: 64px; width: 64px;
height: 48px; height: 48px;
margin-right: 50px; margin-right: 50px;
transition: all 0.2s; transition: all 0.2s;
@ -114,7 +114,7 @@
} }
} }
.tit { .tit {
width: 100%; width: 64px;
height: 40px; height: 40px;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
@ -123,7 +123,7 @@
} }
} }
.tab-active-item { .tab-active-item {
min-width: 64px; width: 64px;
height: 48px; height: 48px;
cursor: pointer; cursor: pointer;
margin-right: 50px; margin-right: 50px;
@ -133,7 +133,7 @@
opacity: 0.8; opacity: 0.8;
} }
.tit { .tit {
width: 100%; width: 64px;
height: 40px; height: 40px;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;

View File

@ -8,12 +8,12 @@ import { HourCompenent } from "./compenents/hour";
import { Empty } from "../../compenents"; import { Empty } from "../../compenents";
import iconRoute from "../../assets/images/commen/icon-route.png"; import iconRoute from "../../assets/images/commen/icon-route.png";
type TabModel = { type tabModal = {
key: number; key: number;
label: string; label: string;
}; };
type AttachModel = { type attachModal = {
id: number; id: number;
course_id: number; course_id: number;
rid: number; rid: number;
@ -23,40 +23,19 @@ type AttachModel = {
url?: string; url?: string;
}; };
type HoursModel = {
[key: number]: HourModel[];
};
type ChapterModel = {
course_id: number;
created_at: string;
id: number;
name: string;
sort: number;
updated_at: string;
};
type LearnHourRecordsModel = {
[key: number]: HourRecordModel;
};
const CoursePage = () => { const CoursePage = () => {
const params = useParams(); const params = useParams();
const navigate = useNavigate(); const navigate = useNavigate();
const result = new URLSearchParams(useLocation().search); const result = new URLSearchParams(useLocation().search);
const [loading, setLoading] = useState<boolean>(true); const [loading, setLoading] = useState<boolean>(true);
const [course, setCourse] = useState<CourseModel | null>(null); const [course, setCourse] = useState<any>({});
const [chapters, setChapters] = useState<ChapterModel[]>([]); const [chapters, setChapters] = useState<any>([]);
const [hours, setHours] = useState<HoursModel>({}); const [hours, setHours] = useState<any>({});
const [learnRecord, setLearnRecord] = useState<CourseRecordModel | null>( const [learnRecord, setLearnRecord] = useState<any>({});
null const [learnHourRecord, setLearnHourRecord] = useState<any>({});
);
const [learnHourRecord, setLearnHourRecord] = useState<LearnHourRecordsModel>(
{}
);
const [tabKey, setTabKey] = useState(Number(result.get("tab") || 1)); const [tabKey, setTabKey] = useState(Number(result.get("tab") || 1));
const [attachments, setAttachments] = useState<AttachModel[]>([]); const [attachments, setAttachments] = useState<attachModal[]>([]);
const [items, setItems] = useState<TabModel[]>([]); const [items, setItems] = useState<tabModal[]>([]);
useEffect(() => { useEffect(() => {
getDetail(); getDetail();
@ -76,8 +55,8 @@ const CoursePage = () => {
if (res.data.learn_hour_records) { if (res.data.learn_hour_records) {
setLearnHourRecord(res.data.learn_hour_records); setLearnHourRecord(res.data.learn_hour_records);
} }
let arr: AttachModel[] = res.data.attachments; let arr = res.data.attachments;
let tabs: TabModel[] = [ let tabs = [
{ {
key: 1, key: 1,
label: `课程目录`, label: `课程目录`,
@ -136,18 +115,18 @@ const CoursePage = () => {
height={90} height={90}
style={{ borderRadius: 10 }} style={{ borderRadius: 10 }}
preview={false} preview={false}
src={course?.thumb} src={course.thumb}
/> />
<div className={styles["info"]}> <div className={styles["info"]}>
<div className={styles["title"]}>{course?.title}</div> <div className={styles["title"]}>{course.title}</div>
<div className={styles["status"]}> <div className={styles["status"]}>
{course?.is_required === 1 && ( {course.is_required === 1 && (
<div className={styles["type"]}></div> <div className={styles["type"]}></div>
)} )}
{course?.is_required === 0 && ( {course.is_required === 0 && (
<div className={styles["active-type"]}></div> <div className={styles["active-type"]}></div>
)} )}
{learnRecord && learnRecord.progress / 100 >= 100 && ( {learnRecord.progress / 100 >= 100 && (
<div className={styles["success"]}> <div className={styles["success"]}>
<Image <Image
width={24} width={24}
@ -161,8 +140,7 @@ const CoursePage = () => {
</div> </div>
</div> </div>
</div> </div>
{(!learnRecord || {JSON.stringify(learnRecord) === "{}" &&
(learnRecord && JSON.stringify(learnRecord) === "{}")) &&
JSON.stringify(learnHourRecord) === "{}" && ( JSON.stringify(learnHourRecord) === "{}" && (
<Progress <Progress
type="circle" type="circle"
@ -174,8 +152,7 @@ const CoursePage = () => {
format={(percent) => `${percent}%`} format={(percent) => `${percent}%`}
/> />
)} )}
{(!learnRecord || {JSON.stringify(learnRecord) === "{}" &&
(learnRecord && JSON.stringify(learnRecord) === "{}")) &&
JSON.stringify(learnHourRecord) !== "{}" && ( JSON.stringify(learnHourRecord) !== "{}" && (
<Progress <Progress
type="circle" type="circle"
@ -187,8 +164,7 @@ const CoursePage = () => {
format={(percent) => `${percent}%`} format={(percent) => `${percent}%`}
/> />
)} )}
{learnRecord && {JSON.stringify(learnRecord) !== "{}" &&
JSON.stringify(learnRecord) !== "{}" &&
JSON.stringify(learnHourRecord) !== "{}" && ( JSON.stringify(learnHourRecord) !== "{}" && (
<Progress <Progress
type="circle" type="circle"
@ -201,7 +177,7 @@ const CoursePage = () => {
/> />
)} )}
</div> </div>
{course?.short_desc && ( {course.short_desc && (
<div className={styles["desc"]}>{course.short_desc}</div> <div className={styles["desc"]}>{course.short_desc}</div>
)} )}
</div> </div>

View File

@ -64,7 +64,6 @@
margin: 0 auto; margin: 0 auto;
border-radius: 8px; border-radius: 8px;
position: relative; position: relative;
.alert-message { .alert-message {
position: absolute; position: absolute;
top: 0; top: 0;
@ -81,12 +80,6 @@
font-size: 18px; font-size: 18px;
color: white; color: white;
z-index: 100; z-index: 100;
.des-video {
font-size: 15px;
font-weight: 400;
color: #ffffff;
line-height: 15px;
}
.alert-button { .alert-button {
width: 200px; width: 200px;
height: 54px; height: 54px;

View File

@ -5,35 +5,31 @@ import { useSelector } from "react-redux";
import { course as Course } from "../../api/index"; import { course as Course } from "../../api/index";
import { ArrowLeftOutlined } from "@ant-design/icons"; import { ArrowLeftOutlined } from "@ant-design/icons";
import { message } from "antd"; import { message } from "antd";
import { getPlayId, savePlayId } from "../../utils";
declare const window: any; declare const window: any;
var timer: any = null;
const CoursePalyPage = () => { const CoursePalyPage = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const params = useParams(); const params = useParams();
const systemConfig = useSelector((state: any) => state.systemConfig.value); const systemConfig = useSelector((state: any) => state.systemConfig.value);
const user = useSelector((state: any) => state.loginUser.value.user); const user = useSelector((state: any) => state.loginUser.value.user);
const [playUrl, setPlayUrl] = useState(""); const [playUrl, setPlayUrl] = useState<string>("");
const [playDuration, setPlayDuration] = useState(0); const [playDuration, setPlayDuration] = useState(0);
const [playendedStatus, setPlayendedStatus] = useState(false); const [playendedStatus, setPlayendedStatus] = useState<Boolean>(false);
const [lastSeeValue, setLastSeeValue] = useState({}); const [lastSeeValue, setLastSeeValue] = useState({});
const [course, setCourse] = useState<CourseModel | null>(null); const [course, setCourse] = useState<any>({});
const [hour, setHour] = useState<HourModel | null>(null); const [hour, setHour] = useState<any>({});
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState<Boolean>(false);
const [isLastpage, setIsLastpage] = useState(false); const [isLastpage, setIsLastpage] = useState<Boolean>(false);
const [totalHours, setTotalHours] = useState<HourModel[]>([]); const [totalHours, setTotalHours] = useState<any>([]);
const [playingTime, setPlayingTime] = useState(0); const [playingTime, setPlayingTime] = useState(0);
const [watchedSeconds, setWatchedSeconds] = useState(0); const [watchedSeconds, setWatchedSeconds] = useState(0);
const myRef = useRef(0); const myRef = useRef(0);
const playRef = useRef(0); const playRef = useRef(0);
const watchRef = useRef(0); const watchRef = useRef(0);
const totalRef = useRef(0); const totalRef = useRef(0);
const [checkPlayerStatus, setCheckPlayerStatus] = useState(false);
useEffect(() => { useEffect(() => {
timer && clearInterval(timer);
getCourse(); getCourse();
getDetail(); getDetail();
document.oncontextmenu = function (e) { document.oncontextmenu = function (e) {
@ -41,9 +37,7 @@ const CoursePalyPage = () => {
e = e || window.event; e = e || window.event;
return false; return false;
}; };
return () => { return () => {
timer && clearInterval(timer);
document.oncontextmenu = function (e) { document.oncontextmenu = function (e) {
/*恢复浏览器默认右键事件*/ /*恢复浏览器默认右键事件*/
e = e || window.event; e = e || window.event;
@ -65,17 +59,17 @@ const CoursePalyPage = () => {
}, [watchedSeconds]); }, [watchedSeconds]);
useEffect(() => { useEffect(() => {
totalRef.current = hour?.duration || 0; totalRef.current = hour.duration;
}, [hour]); }, [hour]);
const getCourse = () => { const getCourse = () => {
Course.detail(Number(params.courseId)).then((res: any) => { Course.detail(Number(params.courseId)).then((res: any) => {
let totalHours: HourModel[] = []; let totalHours: any = [];
if (res.data.chapters.length === 0) { if (res.data.chapters.length === 0) {
setTotalHours(res.data.hours[0]); setTotalHours(res.data.hours[0]);
totalHours = res.data.hours[0]; totalHours = res.data.hours[0];
} else if (res.data.chapters.length > 0) { } else if (res.data.chapters.length > 0) {
const arr: HourModel[] = []; const arr: any = [];
for (let key in res.data.hours) { for (let key in res.data.hours) {
res.data.hours[key].map((item: any) => { res.data.hours[key].map((item: any) => {
arr.push(item); arr.push(item);
@ -103,7 +97,7 @@ const CoursePalyPage = () => {
setCourse(res.data.course); setCourse(res.data.course);
setHour(res.data.hour); setHour(res.data.hour);
document.title = res.data.hour.title; document.title = res.data.hour.title;
let record: HourRecordModel = res.data.user_hour_record; let record = res.data.user_hour_record;
let params = null; let params = null;
if (record && record.finished_duration && record.is_finished === 0) { if (record && record.finished_duration && record.is_finished === 0) {
params = { params = {
@ -129,7 +123,6 @@ const CoursePalyPage = () => {
(res: any) => { (res: any) => {
setPlayUrl(res.data.url); setPlayUrl(res.data.url);
initDPlayer(res.data.url, 0, data); initDPlayer(res.data.url, 0, data);
savePlayId(String(params.courseId) + "-" + String(params.hourId));
} }
); );
}; };
@ -192,7 +185,6 @@ const CoursePalyPage = () => {
window.player && window.player.destroy(); window.player && window.player.destroy();
}); });
setLoading(false); setLoading(false);
checkPlayer();
}; };
const playTimeUpdate = (duration: number, isEnd: boolean) => { const playTimeUpdate = (duration: number, isEnd: boolean) => {
@ -209,22 +201,6 @@ const CoursePalyPage = () => {
} }
}; };
const checkPlayer = () => {
timer = setInterval(() => {
let playId = getPlayId();
if (
playId &&
playId !== String(params.courseId) + "-" + String(params.hourId)
) {
timer && clearInterval(timer);
window.player && window.player.destroy();
setCheckPlayerStatus(true);
} else {
setCheckPlayerStatus(false);
}
}, 5000);
};
const goNextVideo = () => { const goNextVideo = () => {
const index = totalHours.findIndex( const index = totalHours.findIndex(
(i: any) => i.id === Number(params.hourId) (i: any) => i.id === Number(params.hourId)
@ -258,7 +234,6 @@ const CoursePalyPage = () => {
<div <div
className={styles["close-btn"]} className={styles["close-btn"]}
onClick={() => { onClick={() => {
timer && clearInterval(timer);
window.player && window.player.destroy(); window.player && window.player.destroy();
document.oncontextmenu = function (e) { document.oncontextmenu = function (e) {
/*恢复浏览器默认右键事件*/ /*恢复浏览器默认右键事件*/
@ -274,20 +249,13 @@ const CoursePalyPage = () => {
</div> </div>
</div> </div>
<div className={styles["video-body"]}> <div className={styles["video-body"]}>
<div className={styles["video-title"]}>{hour?.title}</div> <div className={styles["video-title"]}>{hour.title}</div>
<div className={styles["video-box"]}> <div className={styles["video-box"]}>
<div <div
className="play-box" className="play-box"
id="meedu-player-container" id="meedu-player-container"
style={{ borderRadius: 8 }} style={{ borderRadius: 8 }}
></div> ></div>
{checkPlayerStatus && (
<div className={styles["alert-message"]}>
<div className={styles["des-video"]}>
</div>
</div>
)}
{playendedStatus && ( {playendedStatus && (
<div className={styles["alert-message"]}> <div className={styles["alert-message"]}>
{isLastpage && ( {isLastpage && (

View File

@ -1,17 +1,14 @@
import { useState } from "react";
import { Button, Result } from "antd"; import { Button, Result } from "antd";
import { useNavigate, useLocation } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import styles from "./index.module.scss"; import styles from "./index.module.scss";
const ErrorPage = () => { const ErrorPage = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const result = new URLSearchParams(useLocation().search);
const [status, setStatus] = useState(String(result.get("status") || "404"));
return ( return (
<Result <Result
status="404" status="404"
title={status} title="404"
subTitle="您访问的页面不存在" subTitle="您访问的页面不存在"
className={styles["main"]} className={styles["main"]}
extra={ extra={

View File

@ -11,29 +11,6 @@ import studyTime from "../../assets/images/commen/icon-studytime.png";
import iconRoute from "../../assets/images/commen/icon-route.png"; import iconRoute from "../../assets/images/commen/icon-route.png";
import { studyTimeFormat } from "../../utils/index"; import { studyTimeFormat } from "../../utils/index";
type StatsModel = {
learn_duration: number;
nun_required_course_count: number;
nun_required_finished_course_count: number;
nun_required_finished_hour_count: number;
nun_required_hour_count: number;
required_course_count: number;
required_finished_course_count: number;
required_finished_hour_count: number;
required_hour_count: number;
today_learn_duration: number;
};
type LearnCourseRecordsModel = {
[key: number]: CourseRecordModel;
};
type CategoryModel = {
key: number;
title: any;
children?: CategoryModel[];
};
const IndexPage = () => { const IndexPage = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const result = new URLSearchParams(useLocation().search); const result = new URLSearchParams(useLocation().search);
@ -41,8 +18,8 @@ const IndexPage = () => {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [loading, setLoading] = useState<boolean>(false); const [loading, setLoading] = useState<boolean>(false);
const [tabKey, setTabKey] = useState(Number(result.get("tab") || 0)); const [tabKey, setTabKey] = useState(Number(result.get("tab") || 0));
const [coursesList, setCoursesList] = useState<CourseModel[]>([]); const [coursesList, setCoursesList] = useState<any>([]);
const [categories, setCategories] = useState<CategoryModel[]>([]); const [categories, setCategories] = useState<any>([]);
const [categoryId, setCategoryId] = useState<number>( const [categoryId, setCategoryId] = useState<number>(
Number(result.get("cid") || 0) Number(result.get("cid") || 0)
); );
@ -50,10 +27,9 @@ const IndexPage = () => {
String(result.get("catName") || "所有分类") String(result.get("catName") || "所有分类")
); );
const [selectKey, setSelectKey] = useState<any>([0]); const [selectKey, setSelectKey] = useState<any>([0]);
const [learnCourseRecords, setLearnCourseRecords] = const [learnCourseRecords, setLearnCourseRecords] = useState<any>({});
useState<LearnCourseRecordsModel>({});
const [learnCourseHourCount, setLearnCourseHourCount] = useState<any>({}); const [learnCourseHourCount, setLearnCourseHourCount] = useState<any>({});
const [stats, setStats] = useState<StatsModel | null>(null); const [stats, setStats] = useState<any>({});
const currentDepId = useSelector( const currentDepId = useSelector(
(state: any) => state.loginUser.value.currentDepId (state: any) => state.loginUser.value.currentDepId
); );
@ -86,14 +62,14 @@ const IndexPage = () => {
const getData = () => { const getData = () => {
setLoading(true); setLoading(true);
user.courses(currentDepId, categoryId).then((res: any) => { user.courses(currentDepId, categoryId).then((res: any) => {
const records: LearnCourseRecordsModel = res.data.learn_course_records; const records = res.data.learn_course_records;
setStats(res.data.stats); setStats(res.data.stats);
setLearnCourseRecords(records); setLearnCourseRecords(records);
setLearnCourseHourCount(res.data.user_course_hour_count); setLearnCourseHourCount(res.data.user_course_hour_count);
if (tabKey === 0) { if (tabKey === 0) {
setCoursesList(res.data.courses); setCoursesList(res.data.courses);
} else if (tabKey === 1) { } else if (tabKey === 1) {
const arr: CourseModel[] = []; const arr: any = [];
res.data.courses.map((item: any) => { res.data.courses.map((item: any) => {
if (item.is_required === 1) { if (item.is_required === 1) {
arr.push(item); arr.push(item);
@ -101,7 +77,7 @@ const IndexPage = () => {
}); });
setCoursesList(arr); setCoursesList(arr);
} else if (tabKey === 2) { } else if (tabKey === 2) {
const arr: CourseModel[] = []; const arr: any = [];
res.data.courses.map((item: any) => { res.data.courses.map((item: any) => {
if (item.is_required === 0) { if (item.is_required === 0) {
arr.push(item); arr.push(item);
@ -109,7 +85,7 @@ const IndexPage = () => {
}); });
setCoursesList(arr); setCoursesList(arr);
} else if (tabKey === 3) { } else if (tabKey === 3) {
const arr: CourseModel[] = []; const arr: any = [];
res.data.courses.map((item: any) => { res.data.courses.map((item: any) => {
if (records[item.id] && records[item.id].progress >= 10000) { if (records[item.id] && records[item.id].progress >= 10000) {
arr.push(item); arr.push(item);
@ -117,7 +93,7 @@ const IndexPage = () => {
}); });
setCoursesList(arr); setCoursesList(arr);
} else if (tabKey === 4) { } else if (tabKey === 4) {
const arr: CourseModel[] = []; const arr: any = [];
res.data.courses.map((item: any) => { res.data.courses.map((item: any) => {
if ( if (
!records[item.id] || !records[item.id] ||
@ -136,7 +112,7 @@ const IndexPage = () => {
user.coursesCategories().then((res: any) => { user.coursesCategories().then((res: any) => {
const categories = res.data.categories; const categories = res.data.categories;
if (JSON.stringify(categories) !== "{}") { if (JSON.stringify(categories) !== "{}") {
const new_arr: CategoryModel[] = checkArr(categories, 0); const new_arr: any[] = checkArr(categories, 0);
new_arr.unshift({ new_arr.unshift({
key: 0, key: 0,
title: "所有分类", title: "所有分类",
@ -147,7 +123,7 @@ const IndexPage = () => {
}; };
const checkArr = (categories: any[], id: number) => { const checkArr = (categories: any[], id: number) => {
const arr: CategoryModel[] = []; const arr = [];
for (let i = 0; i < categories[id].length; i++) { for (let i = 0; i < categories[id].length; i++) {
if (!categories[categories[id][i].id]) { if (!categories[categories[id][i].id]) {
arr.push({ arr.push({
@ -157,10 +133,7 @@ const IndexPage = () => {
key: categories[id][i].id, key: categories[id][i].id,
}); });
} else { } else {
const new_arr: CategoryModel[] = checkArr( const new_arr: any[] = checkArr(categories, categories[id][i].id);
categories,
categories[id][i].id
);
arr.push({ arr.push({
title: ( title: (
<span style={{ marginRight: 20 }}>{categories[id][i].name}</span> <span style={{ marginRight: 20 }}>{categories[id][i].name}</span>
@ -267,17 +240,17 @@ const IndexPage = () => {
<div className={styles["info"]}> <div className={styles["info"]}>
<div className={styles["info-item"]}> <div className={styles["info-item"]}>
<span></span> <span></span>
<strong> {stats?.required_finished_course_count || 0} </strong> <strong> {stats.required_finished_course_count || 0} </strong>
<span>/ {stats?.required_course_count || 0}</span> <span>/ {stats.required_course_count || 0}</span>
</div> </div>
{stats && stats.nun_required_course_count > 0 && ( {stats.nun_required_course_count > 0 && (
<div className={styles["info-item"]}> <div className={styles["info-item"]}>
<span></span> <span></span>
<strong> <strong>
{" "} {" "}
{stats?.nun_required_finished_course_count || 0}{" "} {stats.nun_required_finished_course_count || 0}{" "}
</strong> </strong>
<span>/ {stats?.nun_required_course_count || 0}</span> <span>/ {stats.nun_required_course_count || 0}</span>
</div> </div>
)} )}
</div> </div>
@ -287,56 +260,70 @@ const IndexPage = () => {
<img className={styles["icon"]} src={studyTime} /> <img className={styles["icon"]} src={studyTime} />
<span></span> <span></span>
</div> </div>
{stats ? ( <div className={styles["info"]}>
<div className={styles["info"]}> <div className={styles["info-item"]}>
<div className={styles["info-item"]}>
{studyTimeFormat(stats.today_learn_duration)[0] !== 0 && (
{studyTimeFormat(stats.today_learn_duration)[0] !== 0 && ( <>
<> <strong>
<strong> {" "}
{" "} {studyTimeFormat(stats.today_learn_duration)[0] || 0}{" "}
{studyTimeFormat(stats.today_learn_duration)[0] || </strong>
0}{" "}
</strong> </>
)}
</> {studyTimeFormat(stats.today_learn_duration)[1] !== 0 && (
)} <>
<strong> <strong>
{" "} {" "}
{studyTimeFormat(stats.today_learn_duration)[1] || 0}{" "} {studyTimeFormat(stats.today_learn_duration)[1] || 0}{" "}
</strong> </strong>
<strong> </>
{" "} )}
{studyTimeFormat(stats.today_learn_duration)[2] || 0}{" "} <strong>
</strong> {" "}
{studyTimeFormat(stats.today_learn_duration)[2] || 0}{" "}
</div> </strong>
<div className={styles["info-item"]}>
<strong>
{studyTimeFormat(stats.learn_duration || 0)[0] !== 0 && ( {" "}
<> {studyTimeFormat(stats.today_learn_duration)[3] || 0}{" "}
<strong> </strong>
{" "}
{studyTimeFormat(stats.learn_duration || 0)[0] ||
0}{" "}
</strong>
</>
)}
<strong>
{" "}
{studyTimeFormat(stats.learn_duration || 0)[1] || 0}{" "}
</strong>
<strong>
{" "}
{studyTimeFormat(stats.learn_duration || 0)[2] || 0}{" "}
</strong>
</div>
</div> </div>
) : null} <div className={styles["info-item"]}>
{studyTimeFormat(stats.learn_duration || 0)[0] !== 0 && (
<>
<strong>
{" "}
{studyTimeFormat(stats.learn_duration || 0)[0] || 0}{" "}
</strong>
</>
)}
{studyTimeFormat(stats.learn_duration || 0)[1] !== 0 && (
<>
<strong>
{" "}
{studyTimeFormat(stats.learn_duration || 0)[1] || 0}{" "}
</strong>
</>
)}
<strong>
{" "}
{studyTimeFormat(stats.learn_duration || 0)[2] || 0}{" "}
</strong>
<strong>
{" "}
{studyTimeFormat(stats.learn_duration || 0)[3] || 0}{" "}
</strong>
</div>
</div>
</div> </div>
</div> </div>
<div className={styles["tabs"]}> <div className={styles["tabs"]}>

View File

@ -24,7 +24,6 @@ export const InitPage = (props: Props) => {
if (props.configData) { if (props.configData) {
let config: SystemConfigStoreInterface = { let config: SystemConfigStoreInterface = {
//系统配置 //系统配置
"ldap-enabled": props.configData["ldap-enabled"],
systemApiUrl: props.configData["system-api-url"], systemApiUrl: props.configData["system-api-url"],
systemH5Url: props.configData["system-h5-url"], systemH5Url: props.configData["system-h5-url"],
systemLogo: props.configData["system-logo"], systemLogo: props.configData["system-logo"],

View File

@ -7,46 +7,12 @@ import mediaIcon from "../../assets/images/commen/icon-medal.png";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type LastLearnModel = {
[key: number]: LearnModel;
};
type LearnModel = {
course: LastCourseModel;
hour_record: HourRecordModel;
last_learn_hour: LastHourModel;
record: CourseRecordModel;
};
type LastCourseModel = {
charge?: number;
class_hour: number;
created_at?: string;
id: number;
is_required: number;
is_show?: number;
short_desc: string;
thumb: string;
title: string;
};
type LastHourModel = {
chapter_id: number;
course_id: number;
duration: number;
id: number;
rid: number;
sort: number;
title: string;
type: string;
};
const LatestLearnPage = () => { const LatestLearnPage = () => {
document.title = "最近学习"; document.title = "最近学习";
const navigate = useNavigate(); const navigate = useNavigate();
const systemConfig = useSelector((state: any) => state.systemConfig.value); const systemConfig = useSelector((state: any) => state.systemConfig.value);
const [loading, setLoading] = useState<boolean>(false); const [loading, setLoading] = useState<boolean>(false);
const [courses, setCourses] = useState<LastLearnModel[]>([]); const [courses, setCourses] = useState<any>([]);
useEffect(() => { useEffect(() => {
getCourses(); getCourses();

View File

@ -5,15 +5,13 @@ import LoadingPage from "../../loading";
const WithHeaderWithFooter = () => { const WithHeaderWithFooter = () => {
return ( return (
<div className="layout-box"> <>
<Header></Header> <Header></Header>
<Suspense fallback={<LoadingPage height="100vh" />}> <Suspense fallback={<LoadingPage height="100vh" />}>
<Outlet /> <Outlet />
</Suspense> </Suspense>
<div className="footer-box"> <Footer></Footer>
<Footer></Footer> </>
</div>
</div>
); );
}; };

View File

@ -5,14 +5,12 @@ import LoadingPage from "../../loading";
const WithoutHeaderWithFooter = () => { const WithoutHeaderWithFooter = () => {
return ( return (
<div className="layout-box"> <>
<Suspense fallback={<LoadingPage height="100vh" />}> <Suspense fallback={<LoadingPage height="100vh" />}>
<Outlet /> <Outlet />
</Suspense> </Suspense>
<div className="footer-box"> <Footer></Footer>
<Footer></Footer> </>
</div>
</div>
); );
}; };

View File

@ -1,8 +1,8 @@
import { Input, Button, message } from "antd"; import { Input, Button, message } from "antd";
import React, { useState } from "react"; import React, { useState, useEffect } from "react";
import styles from "./index.module.scss"; import styles from "./index.module.scss";
import banner from "../../assets/images/login/banner.png"; import banner from "../../assets/images/login/banner.png";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch } from "react-redux";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { loginAction } from "../../store/user/loginUserSlice"; import { loginAction } from "../../store/user/loginUserSlice";
import { login, user } from "../../api/index"; import { login, user } from "../../api/index";
@ -15,11 +15,10 @@ const LoginPage: React.FC = () => {
const [loading, setLoading] = useState<boolean>(false); const [loading, setLoading] = useState<boolean>(false);
const [email, setEmail] = useState<string>(""); const [email, setEmail] = useState<string>("");
const [password, setPassword] = useState<string>(""); const [password, setPassword] = useState<string>("");
const systemConfig = useSelector((state: any) => state.systemConfig.value);
const loginSubmit = (e: any) => { const loginSubmit = (e: any) => {
if (!email) { if (!email) {
message.error("请输入邮箱或UID"); message.error("请输入学员邮箱账号");
return; return;
} }
if (!password) { if (!password) {
@ -43,29 +42,16 @@ const LoginPage: React.FC = () => {
return; return;
} }
setLoading(true); setLoading(true);
if (systemConfig["ldap-enabled"] === "1") { login
login .login(email, password)
.loginLdap(email, password) .then((res: any) => {
.then((res: any) => { const token = res.data.token;
const token = res.data.token; setToken(token);
setToken(token); getUser();
getUser(); })
}) .catch((e) => {
.catch((e) => { setLoading(false);
setLoading(false); });
});
} else {
login
.login(email, password)
.then((res: any) => {
const token = res.data.token;
setToken(token);
getUser();
})
.catch((e) => {
setLoading(false);
});
}
}; };
const getUser = () => { const getUser = () => {
@ -93,7 +79,7 @@ const LoginPage: React.FC = () => {
setEmail(e.target.value); setEmail(e.target.value);
}} }}
style={{ width: 400, height: 54 }} style={{ width: 400, height: 54 }}
placeholder={"请输入邮箱或UID"} placeholder="请输入学员邮箱账号"
onKeyUp={(e) => keyUp(e)} onKeyUp={(e) => keyUp(e)}
/> />
</div> </div>

53
src/playedu.d.ts vendored
View File

@ -1,53 +0,0 @@
declare global {
interface CourseModel {
charge: number;
class_hour: number;
created_at: string;
id: number;
is_required: number;
is_show: number;
short_desc: string;
thumb: string;
title: string;
}
interface HourModel {
chapter_id: number;
course_id: number;
duration: number;
id: number;
rid: number;
sort: number;
title: string;
type: string;
}
interface HourRecordModel {
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;
}
interface CourseRecordModel {
course_id: number;
created_at: string;
finished_at?: string;
finished_count: number;
hour_count: number;
id: number;
is_finished: number;
progress: number;
updated_at: string;
user_id: number;
}
}
export {};

View File

@ -1,7 +1,6 @@
import { createSlice } from "@reduxjs/toolkit"; import { createSlice } from "@reduxjs/toolkit";
type SystemConfigStoreInterface = { type SystemConfigStoreInterface = {
"ldap-enabled": string;
systemApiUrl: string; systemApiUrl: string;
systemPcUrl: string; systemPcUrl: string;
systemH5Url: string; systemH5Url: string;
@ -17,7 +16,6 @@ type SystemConfigStoreInterface = {
}; };
let defaultValue: SystemConfigStoreInterface = { let defaultValue: SystemConfigStoreInterface = {
"ldap-enabled": "",
systemApiUrl: "", systemApiUrl: "",
systemPcUrl: "", systemPcUrl: "",
systemH5Url: "", systemH5Url: "",

View File

@ -31,7 +31,7 @@ const loginUserSlice = createSlice({
stage.value.user = e.payload.user; stage.value.user = e.payload.user;
stage.value.departments = e.payload.departments; stage.value.departments = e.payload.departments;
stage.value.isLogin = true; stage.value.isLogin = true;
if (e.payload.departments.length > 0 && !getDepKey()) { if (e.payload.departments.length > 0 && stage.value.currentDepId === 0) {
stage.value.currentDepId = e.payload.departments[0].id; stage.value.currentDepId = e.payload.departments[0].id;
setDepName(e.payload.departments[0].name); setDepName(e.payload.departments[0].name);
} }

View File

@ -28,6 +28,7 @@ export function durationFormat(dateStr: number) {
export function studyTimeFormat(dateStr: number) { export function studyTimeFormat(dateStr: number) {
var d = moment.duration(dateStr / 1000, "seconds"); var d = moment.duration(dateStr / 1000, "seconds");
let value = []; let value = [];
value.push(Math.floor(d.asDays()));
value.push(d.hours()); value.push(d.hours());
value.push(d.minutes()); value.push(d.minutes());
value.push(d.seconds()); value.push(d.seconds());
@ -110,15 +111,3 @@ export function isMobile() {
); );
return flag; return flag;
} }
export function getPlayId(): string {
return window.localStorage.getItem("playedu-play-id") || "";
}
export function savePlayId(id: string) {
window.localStorage.setItem("playedu-play-id", id);
}
export function clearPlayId() {
window.localStorage.removeItem("playedu-play-id");
}

View File

@ -1,7 +1,6 @@
import { defineConfig } from "vite"; import { defineConfig } from "vite";
import react from "@vitejs/plugin-react-swc"; import react from "@vitejs/plugin-react-swc";
import gzipPlugin from "rollup-plugin-gzip"; import gzipPlugin from "rollup-plugin-gzip";
import legacy from "@vitejs/plugin-legacy";
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default defineConfig({
@ -9,15 +8,7 @@ export default defineConfig({
host: "0.0.0.0", host: "0.0.0.0",
port: 9797, port: 9797,
}, },
plugins: [ plugins: [react()],
react(),
legacy({
targets: ["chrome 52"],
additionalLegacyPolyfills: ["regenerator-runtime/runtime"],
renderLegacyChunks: true,
modernPolyfills: true,
}),
],
build: { build: {
rollupOptions: { rollupOptions: {
plugins: [gzipPlugin()], plugins: [gzipPlugin()],