Skip to content

X
xiaomai-cloud-class-web
Commit 422e709c by yuananting
Options

Merge branch 'feature/yuananting/20210801/task-center' of… 

Merge branch 'feature/yuananting/20210801/task-center' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210801/task-center
parents 3ebe2c4f 2a5cbc9b
Showing with 153 additions and 127 deletions
src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:12:45 * @Date: 2020-08-05 10:12:45
* @LastEditors: yuananting * @LastEditors: wufan
* @LastEditTime: 2021-07-30 09:57:43 * @LastEditTime: 2021-08-06 17:42:37
* @Description: 线上课-列表模块 * @Description: 线上课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -293,7 +293,7 @@ class GraphicsCourseList extends React.Component { ...@@ -293,7 +293,7 @@ class GraphicsCourseList extends React.Component {
onClick={() => { onClick={() => {
this.handleRelatedModalShow(item); this.handleRelatedModalShow(item);
}}> }}>
关联培训计划 关联培训任务
</div> </div>
)} )}
<div <div
......
src/modules/course-manage/modal/RelatedPlanModal.jsx
...@@ -3,7 +3,7 @@ import college from '@/common/lottie/college'; ...@@ -3,7 +3,7 @@ import college from '@/common/lottie/college';
import { PageControl, XMTable } from '@/components'; import { PageControl, XMTable } from '@/components';
import CourseService from '@/domains/course-domain/CourseService'; import CourseService from '@/domains/course-domain/CourseService';
import PlanService from '@/domains/plan-domain/planService'; import PlanService from '@/domains/plan-domain/planService';
import { Input, Modal } from 'antd'; import { Input, Modal, Tooltip } from 'antd';
import React from 'react'; import React from 'react';
import _ from 'underscore'; import _ from 'underscore';
import './RelatedPlanModal.less'; import './RelatedPlanModal.less';
...@@ -65,15 +65,34 @@ class RelatedPlanModal extends React.Component { ...@@ -65,15 +65,34 @@ class RelatedPlanModal extends React.Component {
); );
}; };
renderTitle = () => {
return <div className="tip-title" >
<p>为了不影响学员学习，系统已对数据进行筛选</p>
<p>1、课程不能直接关联「已发布」的培训任务筛选；</p>
<p>2、一个课程不能重复出现在同一培训任务中</p>
</div>
}
renderTableTitle = ()=> {
return <div>
<Tooltip title={this.renderTitle()} arrowPointAtCenter overlayClassName="table-title-tooltip">
培训任务<span className='icon iconfont table-title'>&#xe6f2;</span>
</Tooltip>
</div>
}
// 请求表头 // 请求表头
parsePlanColumns = () => { parsePlanColumns = () => {
const columns = [ const columns = [
{ {
title: '培训任务', title: this.renderTableTitle(),
key: 'planName', key: 'planName',
dataIndex: 'planName', dataIndex: 'planName',
render: (val, record) => { render: (val, record) => {
return <span>{val}</span>; return <span>{val}
</span>;
}, },
}, },
]; ];
...@@ -216,8 +235,6 @@ class RelatedPlanModal extends React.Component { ...@@ -216,8 +235,6 @@ class RelatedPlanModal extends React.Component {
taskBaseVOList = selectPlan.taskBaseVOList; taskBaseVOList = selectPlan.taskBaseVOList;
} }
console.log('taskBaseVOList', taskBaseVOList);
return ( return (
<div> <div>
<XMTable <XMTable
......
src/modules/course-manage/modal/RelatedPlanModal.less
.related-plan-modal{ .table-title-tooltip {
.search-container{ width: 500px;
margin-bottom:16px; }
.related-plan-modal {
.table-title {
margin-left: 8px;
margin-left: 5px;
cursor: pointer;
color: rgb(191, 191, 191);
font-size: 14px;
font-weight: normal;
}
.search-container {
margin-bottom: 16px;
}
.select-container {
margin-bottom: 12px;
.con {
background: #e9efff;
border-radius: 4px;
padding: 6px 16px;
display: inline-flex;
align-items: center;
justify-content: space-between;
.tip {
font-size: 14px;
color: #2966ff;
margin-right: 8px;
}
.text {
font-size: 14px;
color: #666;
margin-right: 30px;
}
.clear {
color: #2966ff;
font-size: 14px;
}
} }
.select-container{ }
margin-bottom:12px; .plan-table {
.con{ .taskName {
background: #E9EFFF; color: #666666;
border-radius: 4px; font-size: 14px;
padding:6px 16px;
display: inline-flex;
align-items: center;
justify-content: space-between;
.tip{
font-size:14px;
color:#2966FF;
margin-right:8px;
}
.text{
font-size:14px;
color:#666;
margin-right:30px;
}
.clear{
color:#2966FF;
font-size:14px;
}
}
} }
.plan-table{ .task-learn-percentage {
.taskName{ color: #666666;
color:#666666; font-size: 14px;
font-size:14px; }
} .course-info {
.task-learn-percentage{ margin-left: 57px;
color:#666666; .course-type {
font-size:14px; font-size: 11px;
color: #666666;
padding: 0px 6px;
line-height: 16px;
border: 1px solid #999999;
margin-right: 4px;
border-radius: 2px;
}
.course-name {
color: #666666;
font-size: 14px;
margin-right: 8px;
}
.tip {
font-size: 14px;
color: #ff4f4f;
margin-right: 2px;
}
.course-state {
color: #999;
font-size: 14px;
}
}
.ant-table-content {
border: 1px solid #e8e8e8;
tr {
td {
border: none;
} }
.course-info{ .child-table {
margin-left:57px; .ant-table-content {
.course-type{ border: none;
font-size:11px; thead {
color:#666666; display: none;
padding:0px 6px;
line-height: 16px;
border: 1px solid #999999;
margin-right:4px;
border-radius: 2px;
}
.course-name{
color:#666666;
font-size:14px;
margin-right:8px;
} }
.tip{ tbody tr td {
font-size:14px; border-bottom: none;
color:#FF4F4F;
margin-right:2px;
}
.course-state{
color:#999;
font-size:14px;
} }
}
} }
.ant-table-content{ }
border:1px solid #e8e8e8; .odd-row {
tr{ background: transparent;
td{ td {
border:none; background: #fff;
} }
.child-table{ & + .ant-table-expanded-row {
.ant-table-content{ background: transparent;
border:none; td {
thead{ background: #fff;
display:none; }
} }
tbody tr td{ &:hover {
border-bottom:none; & + .ant-table-expanded-row {
} background: transparent;
} td {
background: #f3f6fa !important;
}
}
.odd-row{
background:transparent;
td{
background: #FFF;
}
& + .ant-table-expanded-row{
background:transparent;
td{
background: #FFF;
}
}
&:hover{
& + .ant-table-expanded-row{
background:transparent;
td{
background: #F3f6fa !important;
}
}
}
} }
.even-row{ }
background:transparent; }
td{ }
background: #FAFAFA; .even-row {
} background: transparent;
& + .ant-table-expanded-row{ td {
background:transparent; background: #fafafa;
td{ }
background: #FAFAFA; & + .ant-table-expanded-row {
} background: transparent;
} td {
&:hover{ background: #fafafa;
& + .ant-table-expanded-row{ }
background:transparent; }
td{ &:hover {
background: #F3f6fa !important; & + .ant-table-expanded-row {
} background: transparent;
} td {
} background: #f3f6fa !important;
} }
}
} }
}
} }
} }
\ No newline at end of file }
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