Skip to content

X
xiaomai-cloud-class-web
Commit 99a3cb05 by zhangleyuan
Options

style:调整UI样式

parent 1223fa84
Showing with 37 additions and 22 deletions
src/modules/course-manage/modal/RelatedPlanModal.jsx
...@@ -122,7 +122,9 @@ class RelatedPlanModal extends React.Component { ...@@ -122,7 +122,9 @@ class RelatedPlanModal extends React.Component {
item.taskId = selectPlanList[key].taskBaseVOList[0].taskId; item.taskId = selectPlanList[key].taskBaseVOList[0].taskId;
} }
} }
_selectPlanList.push(item) if(item.taskId){
_selectPlanList.push(item)
}
} }
return _selectPlanList; return _selectPlanList;
} }
......
src/modules/plan-manage/AddPlan.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:13:39 * @Date: 2021-02-20 16:13:39
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-13 14:34:50 * @LastEditTime: 2021-03-13 14:58:38
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -92,6 +92,7 @@ function AddPlan() { ...@@ -92,6 +92,7 @@ function AddPlan() {
return _item return _item
}) })
} }
setTaskList(trainingTaskList);
setBasicData({ setBasicData({
planName, planName,
coverUrl:coverUrl || defaultCover, coverUrl:coverUrl || defaultCover,
...@@ -103,7 +104,6 @@ function AddPlan() { ...@@ -103,7 +104,6 @@ function AddPlan() {
percentCompleteLive, percentCompleteLive,
percentCompleteVideo percentCompleteVideo
}) })
setTaskList(trainingTaskList);
setHasGetDetail(true); setHasGetDetail(true);
}) })
} }
......
src/modules/plan-manage/LearningData.less
.plan-learn-data-list{ .plan-learn-data-list{
.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
font-weight:normal;
}
.plan-info{ .plan-info{
margin:16px; margin:16px;
padding:16px; padding:16px;
......
src/modules/plan-manage/components/BasicInfo.less
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
margin-top: 16px; margin-top: 16px;
&__wrap { &__wrap {
position: relative; position: relative;
display: flex;
.tag { .tag {
border-radius: 2px; border-radius: 2px;
background: #D6D6D6; background: #D6D6D6;
...@@ -43,9 +44,6 @@ ...@@ -43,9 +44,6 @@
} }
} }
.opt-btns{ .opt-btns{
display:flex;
align-items: center;
margin-top:12px;
.default-btn { .default-btn {
margin:0 8px; margin:0 8px;
color: #5289FA; color: #5289FA;
...@@ -56,6 +54,7 @@ ...@@ -56,6 +54,7 @@
} }
} }
.tips{ .tips{
margin-top:8px;
font-size:14px; font-size:14px;
color:#999; color:#999;
} }
...@@ -97,7 +96,7 @@ ...@@ -97,7 +96,7 @@
display: flex; display: flex;
margin-top:22px; margin-top:22px;
.standard-label{ .standard-label{
margin-top:2px; margin-top:3px;
} }
.live-standard-info{ .live-standard-info{
margin-bottom:10px; margin-bottom:10px;
......
src/modules/plan-manage/components/PlanList.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:46:46 * @Date: 2021-02-20 16:46:46
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-13 14:26:18 * @LastEditTime: 2021-03-13 15:24:41
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -28,7 +28,7 @@ function PlanList(props) { ...@@ -28,7 +28,7 @@ function PlanList(props) {
title: '培训计划', title: '培训计划',
key: 'planName', key: 'planName',
dataIndex: 'planName', dataIndex: 'planName',
width:'15%', width:'18%',
render: (val, record) => { render: (val, record) => {
return ( return (
<div className="plan-name"> <div className="plan-name">
...@@ -111,7 +111,8 @@ function PlanList(props) { ...@@ -111,7 +111,8 @@ function PlanList(props) {
title: '操作', title: '操作',
key: 'operate', key: 'operate',
dataIndex: 'operate', dataIndex: 'operate',
width: '20%', fixed: 'right',
width: 176,
render: (val, record) => { render: (val, record) => {
return ( return (
<div className="operate"> <div className="operate">
...@@ -145,6 +146,7 @@ function PlanList(props) { ...@@ -145,6 +146,7 @@ function PlanList(props) {
]; ];
return columns; return columns;
} }
function renderMoreOperate(item){ function renderMoreOperate(item){
return ( return (
<div className="live-course-more-menu"> <div className="live-course-more-menu">
...@@ -158,6 +160,7 @@ function PlanList(props) { ...@@ -158,6 +160,7 @@ function PlanList(props) {
</div> </div>
) )
} }
function handleChangeTable(pagination, filters, sorter){ function handleChangeTable(pagination, filters, sorter){
const { columnKey, order } = sorter; const { columnKey, order } = sorter;
const { query } = props; const { query } = props;
...@@ -330,6 +333,8 @@ function PlanList(props) { ...@@ -330,6 +333,8 @@ function PlanList(props) {
pagination={false} pagination={false}
onChange={handleChangeTable} onChange={handleChangeTable}
bordered bordered
size="middle"
scroll={{ x: 1400}}
/> />
<div className="box-footer"> <div className="box-footer">
<PageControl <PageControl
......
src/modules/plan-manage/components/PlanList.less
...@@ -10,20 +10,23 @@ ...@@ -10,20 +10,23 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.operate-text { .operate-text {
color: #5289FA;
cursor: pointer;
}
.operate {
display: flex;
&__item {
color: #5289FA; color: #5289FA;
cursor: pointer; cursor: pointer;
}
.operate { &.split {
display: flex; margin: 0 8px;
color: #BFBFBF;
&__item {
color: #5289FA;
cursor: pointer;
&.split {
margin: 0 8px;
color: #BFBFBF;
}
} }
} }
}
.more-operate{
line-height:20px;
}
} }
\ No newline at end of file
src/modules/plan-manage/components/TrainingTask.less
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
color:#666666; color:#666666;
font-size:14px; font-size:14px;
.icon{ .icon{
font-size:14px;
color:#999; color:#999;
} }
.text{ .text{
...@@ -94,6 +95,7 @@ ...@@ -94,6 +95,7 @@
color:#666666; color:#666666;
font-size:14px; font-size:14px;
.icon{ .icon{
font-size:14px;
color:#999; color:#999;
} }
.text{ .text{
......
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