Commit be216d6f by zhangleyuan

feat:UI优化

parent 00153e8b
......@@ -616,7 +616,9 @@ mr0 {
.ant-table-thead > tr > th{
font-weight:normal !important;
}
td.ant-table-column-sort{
background: none;
}
......
......@@ -3,6 +3,9 @@
.ant-tabs-tab.ant-tabs-tab-active{
font-weight:normal;
}
.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn{
font-weight:normal;
}
.plan-info{
margin:16px;
padding:16px;
......
......@@ -162,10 +162,11 @@ class EmployeeShareData extends React.Component {
title: '学习人数',
key: 'learnNum',
dataIndex: 'learnNum',
width:110,
sorter:true,
render: (val, record) => {
return (
<div>
<div className="learn-num">
{val}
</div>
)
......@@ -175,10 +176,11 @@ class EmployeeShareData extends React.Component {
title: '已学完',
key: 'learnFinishNum',
dataIndex: 'learnFinishNum',
width:110,
sorter:true,
render: (val, record) => {
return (
<div>
<div className="learn-finish-num">
{val}
</div>
)
......@@ -188,10 +190,11 @@ class EmployeeShareData extends React.Component {
title: '未学完',
key: 'learnNoFinishNum',
dataIndex: 'learnNoFinishNum',
width:110,
sorter:true,
render: (val, record) => {
return (
<div>
<div className="learn-no-finish-num">
{val}
</div>
)
......
......@@ -7,4 +7,16 @@
color:#5289FA;
cursor: pointer;
}
.learn-num{
text-align:right;
margin-right:20px;
}
.learn-finish-num{
text-align:right;
margin-right:30px;
}
.learn-no-finish-num{
text-align:right;
margin-right:35px;
}
}
\ No newline at end of file
......@@ -229,10 +229,11 @@ class UserLearningData extends React.Component {
</span>,
key: 'learnNum',
dataIndex: 'learnNum',
width:130,
sorter:true,
render: (val, record) => {
return (
<div>
<div className="learn-num">
<span>{record.courseFinishNum}</span>
<span>/</span>
<span>{record.courseNum}</span>
......
......@@ -13,4 +13,8 @@
color: #BFBFBF;
}
}
.learn-num{
text-align:right;
margin-right:20px;
}
}
\ No newline at end of file
......@@ -42,12 +42,15 @@ function UserLearningDataFilter(props) {
useEffect(() => {
Bus.bind('watchDataView',(record) => handleChangeCreatorQuery(record))
}, []);
});
useEffect(() => {
getCreatorList();
}, []);
function handleChangeCreatorQuery (record){
console.log('11');
const _creatorQuery = {...creatorQuery};
_creatorQuery.operateId = record.storeUserId;
setCreatorQuery(_creatorQuery);
......
......@@ -142,8 +142,7 @@ class ShareLiveModal extends React.Component {
<div className="share-url right__item">
<div className="title">② 链接分享</div>
<div className="sub-title">用户可通过微信打开以下链接,查看培训计划</div>
<div className="sub-title">用户可通过微信或浏览器打开以下链接,查看培训计划</div>
<div className="content url-content">
<div className="share-url" id="shareUrl">{shareUrl}</div>
<Button type="primary" onClick={this.handleCopy}>复制</Button>
......
......@@ -36,7 +36,7 @@ class UserLearnDetailModal extends React.Component {
constructor(props) {
super(props);
this.state = {
planDataSource:[],
planDataSource:{},
taskDataSource:[],
taskSize:10,
taskQuery: {
......@@ -72,11 +72,11 @@ class UserLearnDetailModal extends React.Component {
}
return item;
})
const planDataSource = [{
const planDataSource = {
planName,
learnFinishPercentage,
coverUrl:coverUrl || defaultCover
}]
}
this.setState({
storeCustomerName,
storeCustomerPhone,
......@@ -85,39 +85,6 @@ class UserLearnDetailModal extends React.Component {
})
})
}
parsePlanColumns = () => {
const columns = [
{
title: '培训计划名称',
key: 'planInfo',
dataIndex: 'planInfo',
render: (val, record) => {
return (
<div className="plan-instro">
<div className="img-con">
<img src={record.coverUrl}/>
</div>
<div className="plan-name">{record.planName}</div>
</div>
)
}
},
{
title: '学习进度',
key: 'learnFinishPercentage',
dataIndex: 'learnFinishPercentage',
width:167,
render: (val, record) => {
return (
<div className="plan-learn-percentage">
{val}%
</div>
)
}
}
];
return columns;
}
parseTaskColumns = () => {
const columns = [
......@@ -210,15 +177,18 @@ class UserLearnDetailModal extends React.Component {
<span>{storeCustomerPhone}</span>
</span>
</div>
<div className="plan-instro">
<div className="img-con">
<img src={planDataSource.coverUrl}/>
</div>
<div>
<Table
dataSource={planDataSource}
columns={this.parsePlanColumns()}
pagination={false}
bordered
className="plan-table"
/>
<div className="plan-name">{planDataSource.planName}</div>
<div className="task-learn-percentage">
<span>学习进度: {planDataSource.learnFinishPercentage}%</span>
</div>
</div>
</div>
<div>
<Table
rowKey={(record) => record.taskId}
......
......@@ -12,23 +12,10 @@
color:#333;
}
}
.plan-table{
margin-bottom:8px;
.ant-table-thead{
tr {
th{
padding:9px 24px;
}
}
}
tr{
td{
padding:8px 24px;
}
}
.plan-instro{
display: flex;
align-items: center;
margin-bottom:16px;
.img-con{
margin-right:8px;
img{
......@@ -39,15 +26,14 @@
}
}
.plan-name{
color:#666666;
color:#333;
font-size:14px;
}
.plan-learn-percentage{
color:#666666;
color:#333;
font-size:14px;
}
}
}
.task-table{
.ant-table-thead{
tr {
......@@ -62,7 +48,7 @@
}
}
.taskName{
color:#666666;
color:#333;
font-size:14px;
}
.task-learn-percentage{
......
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