From 5b99de72011c177da1f111c5daf2240e632175ca Mon Sep 17 00:00:00 2001 From: wangxi <123456> Date: Tue, 8 Mar 2022 08:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=88=E8=AF=BE=E7=A8=8B=E5=AD=A6=E4=B9=A0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/pages/course/list/index.tsx | 102 +++++++++++++++---------- web/src/pages/course/subject/index.tsx | 25 ++++-- 2 files changed, 79 insertions(+), 48 deletions(-) diff --git a/web/src/pages/course/list/index.tsx b/web/src/pages/course/list/index.tsx index 58b2f6d..01a507f 100644 --- a/web/src/pages/course/list/index.tsx +++ b/web/src/pages/course/list/index.tsx @@ -1,6 +1,6 @@ import { AlignLeftOutlined, LaptopOutlined, NotificationOutlined, PlusOutlined, UserOutlined } from '@ant-design/icons'; import { useEffect, useState } from 'react'; -import { Button, Card, Col, Layout, List, Menu, Progress, Row, Typography } from 'antd'; +import { Button, Card, Col, Layout, List, Menu, Progress, Row, Typography,Image } from 'antd'; import { PageContainer } from '@ant-design/pro-layout'; import { useParams, useRequest } from 'umi'; import { viewMyLearningSubject, listMyLearningChapterCourse } from './service'; @@ -28,14 +28,20 @@ const CardList = () => { subject_id: ids[2] }); + },{ + onSuccess:(result)=>{ + result.subject.startTime= result.subject.learning_start_time.split(' ')[0]; + result.subject.endTime= result.subject.learning_end_time.split(' ')[0]; + console.log('result9999',result); + } }); // const list = data?.list||[]; const subject_data = data ? data.subject : []; - const last_data = data ? data.last_learning_course : []; + const last_data = data ? data.last_learning_course : {}; const chapter_list = data ? data.chapter_list : []; - // console.log('list', list) + // console.log('last_data', last_data) /** 获取课程详情 */ const { data: chapterCourse, run, loading } = useRequest((params: { subject_id: number, chapter_id: number }) => { @@ -68,45 +74,57 @@ const CardList = () => { const content = (
- {subject_data ? subject_data.subject_name : '--'}} - hoverable={false} - className={styles.card} - actions={[]} - extra={<>开始学习时间: {subject_data ? subject_data.learning_start_time : '--'}距离结束时间:{subject_data ? subject_data.distance_end_time : '--'}考核学时:{subject_data ? subject_data.total_course_hours : '--'}小时} - > - } - title={false} - description={ - <> - - - {subject_data ? subject_data.subject_describe : '--'} - - - 学习进度: - - - 上次学习:{last_data ? last_data.course_name : '--'} - 主讲人:{last_data ? last_data.lecture_teacher : '--'} - - - - - - - } - /> - + { + subject_data.length!==0? + {subject_data ? subject_data.subject_name : '--'}} + hoverable={false} + className={styles.card} + actions={[]} + extra={<>开始学习时间: {subject_data ? subject_data.startTime : '--'}距离结束时间:{subject_data ? subject_data.distance_end_time : '--'}学习结束时间:{subject_data?subject_data.endTime:'--'}考核学时:{subject_data ? subject_data.total_course_hours : '--'}小时} + > + } + title={false} + description={ + <> + + + {subject_data ? +
+ : '--'} + + + { + JSON.stringify(last_data)!=='{}'? + <> + + 学习进度: + + + 上次学习:{last_data ? last_data.course_name : '--'} + 主讲人:{last_data ? last_data.lecture_teacher : '--'} + + + + + :
+ } + + + } + /> + :
+ } +
); diff --git a/web/src/pages/course/subject/index.tsx b/web/src/pages/course/subject/index.tsx index 32f6d2a..9ee1301 100644 --- a/web/src/pages/course/subject/index.tsx +++ b/web/src/pages/course/subject/index.tsx @@ -8,17 +8,29 @@ import styles from './style.less'; import NumberInfo from './components/NumberInfo'; import cookie from 'react-cookies'; const { Paragraph } = Typography; - +import { useEffect, useRef, useState } from 'react'; const SubjectList = () => { + const [list,setList]=useState([]); /** 获取主题列表数据 */ const { data, loading } = useRequest(() => { - return listMyLearningSubject({ identity_id: cookie.load('identity_id'), person_id:cookie.load('person_id') }); + },{ + onSuccess:(result)=>{ + + if(result.length){ + result.forEach((item)=>{ + item.startTime=item.learning_start_time.split(' ')[0] + item.endTime=item.learning_end_time.split(' ')[0] + }) + } + setList(result) + console.log('result9999',result) + } }); - const list = data?data : []; + return ( @@ -45,16 +57,17 @@ const SubjectList = () => { hoverable className={styles.card} actions={[]} - extra={<>开始学习时间:{item?.learning_start_time}距离结束时间:{item?.distance_end_time}考核学时:{item?.total_course_hours}小时} + extra={<>学开始习时间:{item?.startTime}距离结束时间:{item?.distance_end_time}学习结束时间:{item?.endTime}考核学时:{item?.total_course_hours}小时} > } + avatar={} title={false} description={ <> - {item.subject_describe} + {/*{item.subject_describe}*/} +