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 = (
     <div className={styles.pageHeaderContent}>
-      <Card
-        title={<a>{subject_data ? subject_data.subject_name : '--'}</a>}
-        hoverable={false}
-        className={styles.card}
-        actions={[]}
-        extra={<><span style={{ padding: 10 }}>开始学习时间: {subject_data ? subject_data.learning_start_time : '--'}</span><span style={{ padding: 10 }}>距离结束时间：{subject_data ? subject_data.distance_end_time : '--'}</span><span style={{ padding: 10 }}>考核学时：{subject_data ? subject_data.total_course_hours : '--'}小时</span></>}
-      >
-        <Card.Meta
-          avatar={<img alt="" className={styles.cardAvatar} src={'https://gw.alipayobjects.com/zos/rmsportal/uMfMFlvUuceEyPpotzlq.png'} style={{ width: '270px', height: '150px', borderRadius: '10px' }} />}
-          title={false}
-          description={
-            <>
-              <Card.Grid hoverable={false} style={{ width: '100%', padding: 0, boxShadow: 'none' }}>
-                <Paragraph className={styles.item} ellipsis={{ rows: 4 }} style={{ paddingLeft: 10 }}>
-                  {subject_data ? subject_data.subject_describe : '--'}
-                </Paragraph>
-                <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} /></span></Col>
-                </Row>
-                <Row>
-                  <Col span={10} style={{ padding: 10 }}><span>上次学习：</span><span>{last_data ? last_data.course_name : '--'}</span></Col>
-                  <Col span={10} style={{ padding: 10 }}>主讲人：<span>{last_data ? last_data.lecture_teacher : '--'}</span></Col>
-                  <Col span={4} style={{ padding: 10 }}>
-                    <Button type="primary"
-                      onClick={() => {
-                        if (last_data) {
-                          const info = last_data.chapter_id + ',' + last_data.course_id + ',' + subject_data.subject_id;
-                          window.open(location.pathname+'#/course/detail/' + info)
-                        }
-
-                      }}
-                    >去学习</Button>
-                  </Col>
-                </Row>
-              </Card.Grid>
-            </>
-          }
-        />
-      </Card>
+      {
+        subject_data.length!==0?
+          <Card
+            title={<a>{subject_data ? subject_data.subject_name : '--'}</a>}
+            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></>}
+          >
+            <Card.Meta
+              avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${subject_data.attachment_json.url}`} fallback="../fallback.svg" />}
+              title={false}
+              description={
+                <>
+                <Card.Grid hoverable={false} style={{ width: '100%', padding: 0, boxShadow: 'none' }}>
+                  <Paragraph className={styles.item} ellipsis={{ rows: 4 }} style={{ paddingLeft: 10 }}>
+                    {subject_data ?
+                      <div dangerouslySetInnerHTML={{__html:subject_data.subject_describe}}/>
+                      : '--'}
+
+                  </Paragraph>
+                  {
+                    JSON.stringify(last_data)!=='{}'?
+                      <>
+                      <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} /></span></Col>
+                      </Row>
+                      <Row>
+                        <Col span={10} style={{ padding: 10 }}><span>上次学习：</span><span>{last_data ? last_data.course_name : '--'}</span></Col>
+                        <Col span={10} style={{ padding: 10 }}>主讲人：<span>{last_data ? last_data.lecture_teacher : '--'}</span></Col>
+                        <Col span={4} style={{ padding: 10 }}>
+                          <Button type="primary"
+                                  onClick={() => {
+                                    if (last_data) {
+                                      const info = last_data.chapter_id + ',' + last_data.course_id + ',' + subject_data.subject_id;
+                                      window.open(location.pathname+'#/course/detail/' + info)
+                                    }
+
+                                  }}
+                          >去学习</Button>
+                        </Col>
+                      </Row>
+                      </>:<div/>
+                  }
+                </Card.Grid>
+                </>
+              }
+            />
+          </Card>:<div/>
+      }
+
     </div>
   );
 
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 (
     <PageContainer content={false} extraContent={false}>
@@ -45,16 +57,17 @@ const SubjectList = () => {
                     hoverable
                     className={styles.card}
                     actions={[]}
-                    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></>}
+                    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={`${item.attachment_json.url}`} fallback="../fallback.svg" />}
+                      avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${item.attachment_json.url}`} fallback="../fallback.svg" />}
                       title={false}
                       description={
                         <>
                           <Card.Grid hoverable={false} style={{width:'50%',padding:0}}>
                             <Paragraph className={styles.item} ellipsis={{ rows: 4 }}>
-                              {item.subject_describe}
+                              {/*{item.subject_describe}*/}
+                              <div dangerouslySetInnerHTML={{__html:item.subject_describe}}/>
                             </Paragraph>
                           </Card.Grid>
                           <Card.Grid hoverable={false} style={{width:'30%',textAlign:'center'}}><Progress type="circle" percent={item?.subject_learning_progress*100} /></Card.Grid>