Commit 735a13ce by zhujian

fix

parent 658b3bf3
import React, { useState, useEffect } from 'react';
export default function RichText(props) {
const [text, setText] = useState('')
useEffect(() => {
console.log(props.url,'props.urlprops.url')
if (props.url) {
fetch(props.url, { method: 'GET' }).then((response) => {
return response.text();
}).then((res) => {
setText(res)
})
}
}, [props.url])
return <div className="text" style={{ wordBreak: 'break-all' }} dangerouslySetInnerHTML={{ __html: text }}></div>
}
\ No newline at end of file
...@@ -44,7 +44,8 @@ function DataCenter(props: any) { ...@@ -44,7 +44,8 @@ function DataCenter(props: any) {
res.result.trainingStageList.map((item: any) => { res.result.trainingStageList.map((item: any) => {
item.open = true item.open = true
}) })
res.result.cover =res.result.courseMediaVOS.filter((item:any) => item.contentType === 'COVER')[0] res.result.cover =res.result.courseMediaVOS.filter((item:any) => item.contentType === 'COVER')[0] || {};
res.result.intro =res.result.courseMediaVOS.filter((item:any) => item.contentType === 'INTRO')[0] || {};
setInfo(res.result) setInfo(res.result)
}) })
} }
......
import React, { useEffect, useState } from 'react';
import { withRouter } from "react-router-dom";
function DataInfo(props: any) {
return <div className="info_banner">
</div>
}
export default withRouter(DataInfo)
\ No newline at end of file
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { withRouter } from "react-router-dom"; import { withRouter } from "react-router-dom";
import RichText from '@/components/RichText'
import ExpiredCourseList from '../../train-task/components/ExpiredCourseList'; import ExpiredCourseList from '../../train-task/components/ExpiredCourseList';
import ENUM from '../../enum'; import ENUM from '../../enum';
import './course.less' import './course.less'
...@@ -12,8 +13,15 @@ function CourseTable(props: any) { ...@@ -12,8 +13,15 @@ function CourseTable(props: any) {
setList(props.info.trainingStageList || []) setList(props.info.trainingStageList || [])
}, [props.info.trainingStageList]) }, [props.info.trainingStageList])
return <div className="courseTabContent"> return <div className="courseTabContent">
<div className="tips">{`培训目的:${'djkhdsjksdhdsj'}`}</div> <div className="tips">
{`培训目的:`}
<RichText url={props.info?.intro?.mediaUrl} />
</div>
<div className="coursecontent"> <div className="coursecontent">
{ {
...@@ -66,12 +74,12 @@ function CourseTable(props: any) { ...@@ -66,12 +74,12 @@ function CourseTable(props: any) {
</div> </div>
<div className="expired"> <div className="expired">
<div className="title">失效课程</div> <div className="title">失效课程</div>
<div className="list"> <div className="list">
<ExpiredCourseList expiredCourseList={list} /> <ExpiredCourseList expiredCourseList={list} />
</div> </div>
</div> </div>
</div> </div>
} }
......
...@@ -10,7 +10,7 @@ function DataInfo(props: any) { ...@@ -10,7 +10,7 @@ function DataInfo(props: any) {
return <div className="infoBox"> return <div className="infoBox">
<div className="left"> <div className="left">
<div className="banner"> <div className="banner">
<img src={ props.info.cover|| defaultCover} alt="" /> <img src={ props.info.cover?.mediaUrl|| defaultCover} alt="" />
</div> </div>
<div className="textBox"> <div className="textBox">
<div className="nameBox"> <div className="nameBox">
...@@ -39,7 +39,7 @@ function DataInfo(props: any) { ...@@ -39,7 +39,7 @@ function DataInfo(props: any) {
</div> </div>
<div className="right"> <div className="right">
<div className="prog"> <div className="prog">
<Progress type="circle" width={85} percent={75} strokeWidth={10} format={percent => <div className='wcl'>{`${(parseInt(props.info.finishCustomerNum /(props.info.cultureCustomerNum)*100 as any))}% `} <div>完成率</div></div>} /> <Progress type="circle" width={85} percent={parseInt(props.info.finishCustomerNum /(props.info.cultureCustomerNum)*100 as any)} strokeWidth={10} format={percent => <div className='wcl'>{`${(parseInt(props.info.finishCustomerNum /(props.info.cultureCustomerNum)*100 as any))}% `} <div>完成率</div></div>} />
</div> </div>
<div className="num"> <div className="num">
<div className="item"> {`指派人数:${props.info.cultureCustomerNum}`}</div> <div className="item"> {`指派人数:${props.info.cultureCustomerNum}`}</div>
......
...@@ -32,6 +32,8 @@ function ExamTable(props: any) { ...@@ -32,6 +32,8 @@ function ExamTable(props: any) {
{ {
title: '考试名称', title: '考试名称',
key: 'examName', key: 'examName',
dataIndex: 'examName',
}, },
{ {
title: '完成人数', title: '完成人数',
...@@ -43,12 +45,20 @@ function ExamTable(props: any) { ...@@ -43,12 +45,20 @@ function ExamTable(props: any) {
title: '平均分', title: '平均分',
key: 'averageScore', key: 'averageScore',
dataIndex: 'averageScore', dataIndex: 'averageScore',
render: (val: any, record: any) => {
return <div>{val || 0}</div>;
},
}, },
{ {
title: '及格人数', title: '及格人数',
key: 'passCnt', key: 'passCnt',
dataIndex: 'passCnt', dataIndex: 'passCnt',
render: (val: any, record: any) => {
return <div>{val || 0}</div>;
},
}, },
{ {
title: '及格率', title: '及格率',
...@@ -56,7 +66,7 @@ function ExamTable(props: any) { ...@@ -56,7 +66,7 @@ function ExamTable(props: any) {
dataIndex: 'passPercentage', dataIndex: 'passPercentage',
render: (val: any, record: any) => { render: (val: any, record: any) => {
return <div></div>; return <div>{val}%</div>;
}, },
}, },
......
...@@ -14,7 +14,7 @@ const { Option } = Select; ...@@ -14,7 +14,7 @@ const { Option } = Select;
declare var formatDate: any; declare var formatDate: any;
function StudyTable(props: any) { function StudyTable(props: any) {
console.log(props,'rtyjukl') console.log(props, 'rtyjukl')
const [query, setQuery] = useState<any>({ const [query, setQuery] = useState<any>({
current: 1, size: 10, current: 1, size: 10,
taskId: props.taskId, taskId: props.taskId,
...@@ -50,7 +50,12 @@ function StudyTable(props: any) { ...@@ -50,7 +50,12 @@ function StudyTable(props: any) {
key: 'storeCustomerName', key: 'storeCustomerName',
dataIndex: 'storeCustomerName', dataIndex: 'storeCustomerName',
render: (val: any, record: any) => { render: (val: any, record: any) => {
return <div>{val}</div>; return <div>{val}
<span
className="tag"
style={{ color: record.sourceEnum === 'WORK_WE_CHAT' ? '#2966FF' : '#1DCC65' }}
>{record.sourceEnum === 'WORK_WE_CHAT' ? '@企业微信' : '@微信'}</span>
</div>;
}, },
}, },
{ {
...@@ -65,8 +70,8 @@ function StudyTable(props: any) { ...@@ -65,8 +70,8 @@ function StudyTable(props: any) {
}, },
{ {
title: '岗位', title: '岗位',
key: 'learnState1', key: 'postNameList',
dataIndex: 'learnState1', dataIndex: 'postNameList',
}, },
{ {
......
.courseTabContent{ .courseTabContent{
padding-bottom: 24px; padding-bottom: 24px;
.tips{ .tips{
height: 48px; // height: 48px;
background: #F7F8F9; background: #F7F8F9;
font-size: 14px; font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
......
...@@ -44,20 +44,7 @@ export const menuList: any = [ ...@@ -44,20 +44,7 @@ export const menuList: any = [
}, },
], ],
}, },
{
groupName: '培训管理',
groupCode: 'TrainManage',
icon: '&#xe8a6;',
img: 'https://image.xiaomaiketang.com/xm/Yy6pZ6G6kS.png',
selectImg: 'https://image.xiaomaiketang.com/xm/Z8G6NMQhaH.png',
children: [
{
groupName: '培训计划',
groupCode: 'TrainPlan',
link: '/plan',
},
],
},
{ {
groupName: '任务中心', groupName: '任务中心',
groupCode: 'TrainManage', groupCode: 'TrainManage',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment