Skip to content

X
xiaomai-cloud-class-web
Commit f751e670 by zhangleyuan
Options

feat:修改任务排序的样式

parent ba565f31
Showing with 101 additions and 100 deletions
src/modules/plan-manage/components/TrainingTask.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2021-02-20 16:45:51 * @Date: 2021-02-20 16:45:51
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2021-03-12 14:24:23 * @LastEditTime: 2021-03-12 16:49:01
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -255,7 +255,7 @@ class TrainingTask extends React.Component { ...@@ -255,7 +255,7 @@ class TrainingTask extends React.Component {
} }
renderTaskItem = (record,index)=>{ renderTaskItem = (record,index)=>{
return <div className="task-item"> return <div className="plan-sort-task-item">
<div className="task-con"> <div className="task-con">
<div className="task-instro"> <div className="task-instro">
<span onClick={()=>this.openOrCloseTask(index)}> <span onClick={()=>this.openOrCloseTask(index)}>
...@@ -325,7 +325,7 @@ class TrainingTask extends React.Component { ...@@ -325,7 +325,7 @@ class TrainingTask extends React.Component {
</div> </div>
} }
renderCourseItem = (record,index,parentIndex)=>{ renderCourseItem = (record,index,parentIndex)=>{
return <div className="course-item"> return <div className="plan-course-sort-item">
<div className="course-info"> <div className="course-info">
<span className="course-type">{CourseType[record.courseType].text}</span> <span className="course-type">{CourseType[record.courseType].text}</span>
{record.type==='input'? {record.type==='input'?
...@@ -375,6 +375,7 @@ class TrainingTask extends React.Component { ...@@ -375,6 +375,7 @@ class TrainingTask extends React.Component {
disableAutoscroll disableAutoscroll
helperClass="row-dragging" helperClass="row-dragging"
onSortEnd={this.onTaskSortEnd} onSortEnd={this.onTaskSortEnd}
className="plan-task-sort-container"
> >
{dataSource.map((item, index) => {dataSource.map((item, index) =>
<SortableTaskItem taskItem={this.renderTaskItem(item,index)} index={index}> <SortableTaskItem taskItem={this.renderTaskItem(item,index)} index={index}>
......
src/modules/plan-manage/components/TrainingTask.less
...@@ -5,103 +5,7 @@ ...@@ -5,103 +5,7 @@
.ant-form-item{ .ant-form-item{
margin-bottom:0 !important; margin-bottom:0 !important;
} }
.task-item{
.task-con{
display:flex;
padding:16px;
background: #F7F8F9;
border-radius: 2px;
justify-content: space-between;
align-items: center;
.task-instro{
display:flex;
align-items: center;
.open-icon{
color:#999999;
font-size:10px;
}
.task-name-con{
display:flex;
align-items: center;
color:#333333;
font-size:14px;
.number{
margin-right:10px;
margin-left:10px;
}
.task-name-input{
width: 300px;
height: 32px;
background: #FFFFFF;
border-radius: 4px;
}
}
}
}
.operate{
.operate__item{
cursor:pointer;
margin-left:16px;
color:#666666;
font-size:14px;
.icon{
color:#999;
}
.text{
margin-left:8px;
}
}
}
.course-box{
.course-item{
display:flex;
padding:16px 16px 16px 51px;
justify-content: space-between;
align-items: center;
.course-info{
.ant-form{
display:inline-block;
}
.course-name-input{
margin-right:8px;
}
.course-type{
font-size:11px;
color:#666666;
padding:1px 8px;
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;
}
}
}
.add-course-con{
padding:16px 51px;
color: #5289FA;
font-size:14px;
.add-course-btn-disabled{
font-size:14px;
color:#ccc;
}
}
}
}
.add-task-con{ .add-task-con{
height: 52px; height: 52px;
background: #F7F8F9; background: #F7F8F9;
...@@ -118,3 +22,99 @@ ...@@ -118,3 +22,99 @@
} }
} }
} }
.plan-sort-task-item{
.task-con{
display:flex;
padding:16px;
background: #F7F8F9;
border-radius: 2px;
justify-content: space-between;
align-items: center;
.task-instro{
display:flex;
align-items: center;
.open-icon{
color:#999999;
font-size:10px;
}
.task-name-con{
display:flex;
align-items: center;
color:#333333;
font-size:14px;
.number{
margin-right:10px;
margin-left:10px;
}
.task-name-input{
width: 300px;
height: 32px;
background: #FFFFFF;
border-radius: 4px;
}
}
}
}
.operate{
.operate__item{
cursor:pointer;
margin-left:16px;
color:#666666;
font-size:14px;
.icon{
color:#999;
}
.text{
margin-left:8px;
}
}
}
.course-box{
.add-course-con{
padding:16px 51px;
color: #5289FA;
font-size:14px;
.add-course-btn-disabled{
font-size:14px;
color:#ccc;
}
}
}
}
.plan-course-sort-item{
display:flex;
padding:16px 16px 16px 51px;
justify-content: space-between;
align-items: center;
.course-info{
.ant-form{
display:inline-block;
}
.course-name-input{
margin-right:8px;
}
.course-type{
font-size:11px;
color:#666666;
padding:1px 8px;
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;
}
}
}
src/modules/plan-manage/modal/UnbundEmployeeModal.jsx
...@@ -85,7 +85,7 @@ class UnbundEmployeeModal extends React.Component { ...@@ -85,7 +85,7 @@ class UnbundEmployeeModal extends React.Component {
confirmUnbund = ()=>{ confirmUnbund = ()=>{
const { selectOperatorList } = this.state; const { selectOperatorList } = this.state;
if(selectOperatorList.length ===0){ if(selectOperatorList.length ===0){
message.success('请选择员工'); message.warning('请选择需要解绑的员工');
return false; return false;
} }
const params = { const params = {
......
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