|
|
|
@ -1,6 +1,6 @@
|
|
|
|
import { AlignLeftOutlined, LaptopOutlined, NotificationOutlined, PlusOutlined, UserOutlined } from '@ant-design/icons';
|
|
|
|
import { AlignLeftOutlined, LaptopOutlined, NotificationOutlined, PlusOutlined, UserOutlined } from '@ant-design/icons';
|
|
|
|
import { useEffect, useState } from 'react';
|
|
|
|
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 { PageContainer } from '@ant-design/pro-layout';
|
|
|
|
import { useParams, useRequest, history } from 'umi';
|
|
|
|
import { useParams, useRequest, history } from 'umi';
|
|
|
|
import { viewMyLearningSubject, getCourseExaminationProgressList } from './service';
|
|
|
|
import { viewMyLearningSubject, getCourseExaminationProgressList } from './service';
|
|
|
|
@ -57,15 +57,16 @@ const CardList = () => {
|
|
|
|
total_question_count += item.question_count;
|
|
|
|
total_question_count += item.question_count;
|
|
|
|
if (item.finish_count !== 0) {
|
|
|
|
if (item.finish_count !== 0) {
|
|
|
|
let num = 0;
|
|
|
|
let num = 0;
|
|
|
|
num = result.finish_count / result.question_count;
|
|
|
|
num = item.finish_count/item.question_count;
|
|
|
|
item.process = num.toFixed(4)
|
|
|
|
item.process = parseFloat(num).toFixed(2)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
item.process = 0;
|
|
|
|
item.process = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
console.log('result.list',result.list)
|
|
|
|
if (total_finish_count !== 0) {
|
|
|
|
if (total_finish_count !== 0) {
|
|
|
|
const total_num = total_finish_count / total_question_count;
|
|
|
|
const total_num = total_finish_count / total_question_count;
|
|
|
|
total_process = total_num.toFixed(4)
|
|
|
|
total_process = parseFloat(total_num).toFixed(2)
|
|
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
total_process = 0;
|
|
|
|
total_process = 0;
|
|
|
|
@ -98,6 +99,8 @@ const CardList = () => {
|
|
|
|
|
|
|
|
|
|
|
|
const content = (
|
|
|
|
const content = (
|
|
|
|
<div className={styles.pageHeaderContent}>
|
|
|
|
<div className={styles.pageHeaderContent}>
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
subject_data.length!==0?
|
|
|
|
<Card
|
|
|
|
<Card
|
|
|
|
title={<a>{subject_data ? subject_data.subject_name : '--'}</a>}
|
|
|
|
title={<a>{subject_data ? subject_data.subject_name : '--'}</a>}
|
|
|
|
hoverable={false}
|
|
|
|
hoverable={false}
|
|
|
|
@ -105,20 +108,21 @@ const CardList = () => {
|
|
|
|
actions={[]}
|
|
|
|
actions={[]}
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<Card.Meta
|
|
|
|
<Card.Meta
|
|
|
|
avatar={<img alt="" className={styles.cardAvatar} src={'https://gw.alipayobjects.com/zos/rmsportal/uMfMFlvUuceEyPpotzlq.png'} style={{ width: '270px', height: '150px', borderRadius: '10px' }} />}
|
|
|
|
avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${subject_data.attachment_json.url}`} fallback="../fallback.svg" />}
|
|
|
|
title={false}
|
|
|
|
title={false}
|
|
|
|
description={
|
|
|
|
description={
|
|
|
|
<>
|
|
|
|
<>
|
|
|
|
<Card.Grid hoverable={false} style={{ width: '100%', padding: 0, boxShadow: 'none' }}>
|
|
|
|
<Card.Grid hoverable={false} style={{ width: '100%', padding: 0, boxShadow: 'none' }}>
|
|
|
|
<Paragraph className={styles.item} ellipsis={{ rows: 4 }} style={{ paddingLeft: 10 }}>
|
|
|
|
<Paragraph className={styles.item} ellipsis={{ rows: 4 }} style={{ paddingLeft: 10 }}>
|
|
|
|
{subject_data ? subject_data.subject_describe : '--'}
|
|
|
|
{subject_data ?
|
|
|
|
|
|
|
|
<div dangerouslySetInnerHTML={{__html:subject_data.subject_describe}}/>
|
|
|
|
|
|
|
|
: '--'}
|
|
|
|
</Paragraph>
|
|
|
|
</Paragraph>
|
|
|
|
<Row>
|
|
|
|
|
|
|
|
<Col span={16} style={{ display: 'inline-block', padding: 10 }}><span>章节模拟考试进度：</span><span style={{ display: 'inline-block', width: '80%' }}><Progress percent={total_process * 100} /></span></Col>
|
|
|
|
</Card.Grid>
|
|
|
|
</Row>
|
|
|
|
<Card.Grid hoverable={false} style={{width:'25%',textAlign:'center',boxShadow: 'none'}}>
|
|
|
|
<Row>
|
|
|
|
|
|
|
|
<Col span={4} style={{ padding: 10 }}>
|
|
|
|
|
|
|
|
<Button type="primary"
|
|
|
|
<Button type="primary"
|
|
|
|
|
|
|
|
style={{width:'10rem',height:'6rem'}}
|
|
|
|
onClick={() => {
|
|
|
|
onClick={() => {
|
|
|
|
console.log('last_data', last_data)
|
|
|
|
console.log('last_data', last_data)
|
|
|
|
const info = subject_data.subject_id + "," + cookie.load('person_id')
|
|
|
|
const info = subject_data.subject_id + "," + cookie.load('person_id')
|
|
|
|
@ -127,13 +131,27 @@ const CardList = () => {
|
|
|
|
|
|
|
|
|
|
|
|
}}
|
|
|
|
}}
|
|
|
|
>错题练习</Button>
|
|
|
|
>错题练习</Button>
|
|
|
|
</Col>
|
|
|
|
|
|
|
|
</Row>
|
|
|
|
|
|
|
|
</Card.Grid>
|
|
|
|
</Card.Grid>
|
|
|
|
|
|
|
|
<Card.Grid hoverable={false} style={{width:'50%',textAlign:'center',boxShadow: 'none'}}>
|
|
|
|
|
|
|
|
<span style={{ display: 'inline-block', width:'100%' }}>
|
|
|
|
|
|
|
|
<Progress width={70}
|
|
|
|
|
|
|
|
type="circle"
|
|
|
|
|
|
|
|
percent={parseInt(total_process * 100)}
|
|
|
|
|
|
|
|
format={(percent) => percent === 100 ? '100%' : `${percent}%`}
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</span>
|
|
|
|
|
|
|
|
<span>章节模拟考试进度</span>
|
|
|
|
|
|
|
|
</Card.Grid>
|
|
|
|
|
|
|
|
|
|
|
|
</>
|
|
|
|
</>
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
</Card>
|
|
|
|
</Card>
|
|
|
|
|
|
|
|
:<div/>
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
@ -178,7 +196,7 @@ const CardList = () => {
|
|
|
|
<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 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?.finish_count}题/{item?.question_count}题</div>
|
|
|
|
<div style={{ paddingRight: '1rem', width: '10%', display: 'inline-block' }}>{item?.finish_count}题/{item?.question_count}题</div>
|
|
|
|
<div style={{ paddingRight: '1rem', width: '30%', display: 'inline-block' }}>
|
|
|
|
<div style={{ paddingRight: '1rem', width: '30%', display: 'inline-block' }}>
|
|
|
|
<Progress percent={item?.progress * 100} />
|
|
|
|
<Progress percent={item?parseInt(item.process * 100):0} format={(percent) => percent === 100 ? '100%' : `${percent}%`}/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div style={{ paddingRight: '1rem', width: '20%', display: 'inline-block', textAlign: 'right' }}>
|
|
|
|
<div style={{ paddingRight: '1rem', width: '20%', display: 'inline-block', textAlign: 'right' }}>
|
|
|
|
<Button type="primary" onClick={() => {
|
|
|
|
<Button type="primary" onClick={() => {
|
|
|
|
|
