From a4555070a2f33ac853baa783d9668e0d5efa713a Mon Sep 17 00:00:00 2001
From: wangxi <123456>
Date: Wed, 9 Mar 2022 08:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/pages/course/list/index.tsx           | 19 ++++++++++++++-----
 web/src/pages/course/subject/index.tsx        |  9 +++++++--
 .../mockExamination/chapterExamination.tsx    |  2 +-
 web/src/pages/mockExamination/chapterList.tsx | 12 +++++++++---
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/web/src/pages/course/list/index.tsx b/web/src/pages/course/list/index.tsx
index e6cf72c..341190d 100644
--- a/web/src/pages/course/list/index.tsx
+++ b/web/src/pages/course/list/index.tsx
@@ -17,6 +17,7 @@ const CardList = () => {
   const ids = params.msg.split(',');
 
   const [currentCourse, SetCurrentCourse] = useState()
+  const [selectedMenu, setSelectedMenu] = useState('')
 
   /** 获取主题下课程 */
   const { data } = useRequest(() => {
@@ -33,6 +34,7 @@ const CardList = () => {
       result.subject.startTime= result.subject.learning_start_time.split(' ')[0];
       result.subject.endTime= result.subject.learning_end_time.split(' ')[0];
       console.log('result9999',result);
+      setSelectedMenu(result.chapter_list[0].chapter_id.toString())
     }
   });
 
@@ -81,7 +83,12 @@ const CardList = () => {
             hoverable={false}
             className={styles.card}
             actions={[]}
-            extra={<><span style={{ padding: 10 }}>开始学习时间: {subject_data ? subject_data.startTime : '--'}</span><span style={{ padding: 10 }}>距离结束时间：{subject_data ? subject_data.distance_end_time : '--'}</span><span style={{padding:10}}>学习结束时间:{subject_data?subject_data.endTime:'--'}</span><span style={{ padding: 10 }}>考核学时：{subject_data ? subject_data.total_course_hours : '--'}小时</span></>}
+            extra={<>
+            <span style={{ padding: 10 }}>学习开始时间： {subject_data ? subject_data.startTime : '--'}</span>
+            <span style={{ padding: 10 }}>距离结束时间：{subject_data ? subject_data.distance_end_time : '--'}</span>
+            <span style={{padding:10}}>学习结束时间：{subject_data?subject_data.endTime:'--'}</span>
+            <span style={{ padding: 10 }}>考核学时：{subject_data ? subject_data.total_course_hours : '--'}学时</span>
+            </>}
           >
             <Card.Meta
               avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${subject_data.attachment_json.url}`} fallback="../fallback.svg" />}
@@ -100,7 +107,7 @@ const CardList = () => {
                       <>
                       <Row>
                         <Col span={16} style={{ display: 'inline-block', padding: 10 }}><span>学习进度：</span><span style={{ display: 'inline-block', width: '80%' }}>
-                          <Progress percent={subject_data ? subject_data.subject_learning_progress * 100 : 0}
+                          <Progress percent={subject_data ? parseInt(subject_data.subject_learning_progress * 100) : 0}
                                     format={(percent) => percent === 100 ? '100%' : `${percent}%`}
                           />
                         </span></Col>
@@ -139,7 +146,7 @@ const CardList = () => {
         <Col span={6} style={{ paddingRight: 24 }}>
           <Menu
             mode="inline"
-            selectedKeys={[chapter_list.length !== 0 ? chapter_list[0].chapter_id.toString() : '']}
+            selectedKeys={[selectedMenu]}
             defaultOpenKeys={['sub1']}
             style={{ height: '100%', width: '100%' }}
           >
@@ -151,6 +158,7 @@ const CardList = () => {
                       <Menu.Item
                         key={item.chapter_id}
                         onClick={() => {
+                          setSelectedMenu(item.chapter_id.toString())
                           run({ subject_id: item.subject_id, chapter_id: item.chapter_id })
                         }}
                       >{item.chapter_name}</Menu.Item>
@@ -161,6 +169,7 @@ const CardList = () => {
 
             </SubMenu>
           </Menu>
+
         </Col>
         <Col span={18} style={{ background: '#ffffff', padding: 24, minHeight: '20rem' }}>
           {
@@ -171,9 +180,9 @@ const CardList = () => {
                     <div style={{ marginBottom: '2rem', }}>
                       <div style={{ paddingRight: '1rem', width: '10%', display: 'inline-block' }}>第{item?.sort_no}讲</div>
                       <div title={item?.course_name} style={{ paddingRight: '1rem', width: '30%', display: 'inline-block', verticalAlign: 'middle', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{item?.course_name}</div>
-                      <div style={{ paddingRight: '1rem', width: '10%', display: 'inline-block' }}>{item?.course_hours}小时</div>
+                      <div style={{ paddingRight: '1rem', width: '10%', display: 'inline-block' }}>{item?.course_hours*60}分钟</div>
                       <div style={{ paddingRight: '1rem', width: '30%', display: 'inline-block' }}>
-                        <Progress percent={item?.learning_progress * 100}
+                        <Progress percent={item?parseInt(item.learning_progress * 100):0}
                                   format={(percent) => percent === 100 ? '100%' : `${percent}%`}
                         />
                       </div>
diff --git a/web/src/pages/course/subject/index.tsx b/web/src/pages/course/subject/index.tsx
index 51f3ed7..83dfab6 100644
--- a/web/src/pages/course/subject/index.tsx
+++ b/web/src/pages/course/subject/index.tsx
@@ -57,7 +57,12 @@ const SubjectList = () => {
                     hoverable
                     className={styles.card}
                     actions={[]}
-                    extra={<><span style={{padding:10}}>学开始习时间:{item?.startTime}</span><span style={{padding:10}}>距离结束时间：{item?.distance_end_time}</span><span style={{padding:10}}>学习结束时间:{item?.endTime}</span><span style={{padding:10}}>考核学时：{item?.total_course_hours}小时</span></>}
+                    extra={<>
+                    <span style={{padding:10}}>学习开始时间：{item?.startTime}</span>
+                    <span style={{padding:10}}>距离结束时间：{item?.distance_end_time}</span>
+                    <span style={{padding:10}}>学习结束时间：{item?.endTime}</span>
+                    <span style={{padding:10}}>考核学时：{item?.total_course_hours}学时</span>
+                    </>}
                   >
                     <Card.Meta
                       avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${item.attachment_json.url}`} fallback="../fallback.svg" />}
@@ -72,7 +77,7 @@ const SubjectList = () => {
                           </Card.Grid>
                           <Card.Grid hoverable={false} style={{width:'30%',textAlign:'center'}}>
                             <Progress type="circle"
-                                      percent={item?.subject_learning_progress*100}
+                                      percent={item?parseInt(item.subject_learning_progress*100):0}
                                       format={(percent) => percent === 100 ? '100%' : `${percent}%`}
                             />
                           </Card.Grid>
diff --git a/web/src/pages/mockExamination/chapterExamination.tsx b/web/src/pages/mockExamination/chapterExamination.tsx
index 78d78fd..d7754a0 100644
--- a/web/src/pages/mockExamination/chapterExamination.tsx
+++ b/web/src/pages/mockExamination/chapterExamination.tsx
@@ -47,7 +47,7 @@ const SubjectList = () => {
                     // extra={<><span style={{ padding: 10 }}>开始学习时间:{item?.learning_start_time}</span><span style={{ padding: 10 }}>距离结束时间：{item?.distance_end_time}</span><span style={{ padding: 10 }}>考核学时：{item?.total_course_hours}小时</span></>}
                   >
                     <Card.Meta
-                      avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${item.attachment_json.url}`} fallback="../fallback.svg" />}sss
+                      avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${item.attachment_json.url}`} fallback="../fallback.svg" />}
                       title={false}
                       description={
                         <>
diff --git a/web/src/pages/mockExamination/chapterList.tsx b/web/src/pages/mockExamination/chapterList.tsx
index 157bda9..fbd0df4 100644
--- a/web/src/pages/mockExamination/chapterList.tsx
+++ b/web/src/pages/mockExamination/chapterList.tsx
@@ -15,9 +15,10 @@ let chapterCourse = [];
 let total_process = 0;
 const CardList = () => {
   const params = useParams();
-
+  const [selectedMenu, setSelectedMenu] = useState('')
   const [currentCourse, SetCurrentCourse] = useState()
 
+
   /** 获取主题下课程 */
   const { data } = useRequest(() => {
     return viewMyLearningSubject({
@@ -28,6 +29,10 @@ const CardList = () => {
       subject_id: params?.subject_id
 
     });
+  },{
+    onSuccess:(result)=>{
+      setSelectedMenu(result.chapter_list[0].chapter_id.toString())
+    }
   });
 
   // const list = data?.list||[];
@@ -122,7 +127,7 @@ const CardList = () => {
                 </Card.Grid>
                 <Card.Grid hoverable={false} style={{width:'25%',textAlign:'center',boxShadow: 'none'}}>
                   <Button type="primary"
-                          style={{width:'10rem',height:'6rem'}}
+                          style={{width:'10rem',height:'5'}}
                           onClick={() => {
                             console.log('last_data', last_data)
                             const info = subject_data.subject_id + "," + cookie.load('person_id')
@@ -162,7 +167,7 @@ const CardList = () => {
         <Col span={6} style={{ paddingRight: 24 }}>
           <Menu
             mode="inline"
-            selectedKeys={[chapter_list.length !== 0 ? chapter_list[0].chapter_id.toString() : '']}
+            selectedKeys={[selectedMenu]}
             defaultOpenKeys={['sub1']}
             style={{ height: '100%', width: '100%' }}
           >
@@ -174,6 +179,7 @@ const CardList = () => {
                       <Menu.Item
                         key={item.chapter_id}
                         onClick={() => {
+                          setSelectedMenu(item.chapter_id.toString())
                           run({ subject_id: item.subject_id, chapter_id: item.chapter_id })
                         }}
                       >{item.chapter_name}</Menu.Item>