Skip to content

X
xiaomai-cloud-class-web
Commit 27a89940 by yuananting
Options

fix:解决合并周优化的分支冲突

parents 1f5b217c 961679f4
Showing with 419 additions and 371 deletions
src/modules/course-manage/components/LiveCourseList.jsx
......@@ -11,7 +11,7 @@ import college from '@/common/lottie/college';
import { PageControl, XMTable } from '@/components';
import DownloadLiveModal from '@/components/DownloadLiveModal';
import BaseService from '@/domains/basic-domain/baseService';
import { appId, LIVE_SHARE } from '@/domains/course-domain/constants';
import { LIVE_SHARE } from '@/domains/course-domain/constants';
import CourseService from '@/domains/course-domain/CourseService';
import { QuestionCircleOutlined } from '@ant-design/icons';
import { Dropdown, message, Modal, Switch, Tooltip } from 'antd';
......@@ -66,7 +66,6 @@ class LiveCourseList extends React.Component {
}
// 显示分享弹窗
handleShowShareModal = (item, needStr = false) => {
const _appId = appId;
const { liveCourseId } = item;
const htmlUrl = `${LIVE_SHARE}live_detail/${liveCourseId}?id=${User.getStoreId()}`;
......@@ -93,13 +92,8 @@ class LiveCourseList extends React.Component {
};
//改变上架状态
changeShelfState = (index,item,checked) => {
let _shelfState = checked ? "YES" : "NO"
// if (_shelfState === 'NO') {
// _shelfState = 'YES';
// } else {
// _shelfState = 'NO';
// }
changeShelfState = (index, item, checked) => {
let _shelfState = checked ? 'YES' : 'NO';
const params = {
liveCourseId: item.liveCourseId,
shelfState: _shelfState,
......@@ -111,7 +105,7 @@ class LiveCourseList extends React.Component {
} else {
message.success('已取消展示');
}
this.props.changeShelfState(index,_shelfState)
this.props.changeShelfState(index, _shelfState);
}
});
};
......@@ -125,25 +119,15 @@ class LiveCourseList extends React.Component {
});
};
parseColumns = () => {
const menu = (item) => (
<div className='live-course-more-menu'>
<div>上课记录</div>
<div
onClick={() => {
this.handleShowRepeatModal(item);
}}>
回放记录
</div>
</div>
);
let columns;
const userRole = User.getUserRole();
if (userRole !== 'CloudLecturer') {
columns = [
{
title: '直播课',
width: '23%',
key: 'course',
fixed: 'left',
dataIndex: 'courseName',
render: (val, record) => {
let hasCover = false;
......@@ -152,21 +136,28 @@ class LiveCourseList extends React.Component {
{record.courseMediaVOS.map((item, index) => {
if (item.contentType === 'COVER') {
hasCover = true;
return <img className='course-cover' src={item.mediaUrl} />;
return <img key={item.mediaContent + index} className='course-cover' src={item.mediaUrl} alt='' />;
} else {
return null;
}
})}
{!hasCover && <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} />}
{!hasCover && <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} alt='' />}
<div>
{record.courseName.length > 17 ? (
<Tooltip title={record.courseName}>
<Choose>
<When condition={record.courseName.length > 14}>
<Tooltip title={record.courseName}>
<div className='course-name'>{record.courseName}</div>
</Tooltip>
</When>
<Otherwise>
{' '}
<div className='course-name'>{record.courseName}</div>
</Tooltip>
) : (
<div className='course-name'>{record.courseName}</div>
)}
</Otherwise>
</Choose>
<div>
<span className='course-time'>
{formatDate('YYYY-MM-DD H:i', parseInt(record.startTime))}~{formatDate('H:i', parseInt(record.endTime))}
{window.formatDate('YYYY-MM-DD H:i', parseInt(record.startTime))}~{window.formatDate('H:i', parseInt(record.endTime))}
</span>
<span
className='course-status'
......@@ -175,31 +166,35 @@ class LiveCourseList extends React.Component {
</span>
</div>
<div className='teacher-assistant'>
{record.teacherName && record.teacherName.length > 4 ? (
<Tooltip title={record.teacherName}>
<Choose>
<When condition={record.teacherName && record.teacherName.length > 4}>
<Tooltip title={record.teacherName}>
<span className='teacher'>讲师：{record.teacherName}</span>
</Tooltip>
</When>
<Otherwise>
<span className='teacher'>讲师：{record.teacherName}</span>
</Tooltip>
) : (
<span className='teacher'>讲师：{record.teacherName}</span>
)}
</Otherwise>
</Choose>
{record.admins.length > 0 && (
<>
<span className='split'> | </span>
{this.handleAdminName(record.admins).length > 4 ? (
<If condition={record.admins.length > 0}>
<span className='split'> | </span>
<Choose>
<When condition={this.handleAdminName(record.admins).length > 4}>
<Tooltip title={this.handleAdminName(record.admins)}>
<span className='assistant'>
助教：
{record.admins.map((item, index) => {
return (
<span>
<span key={item.adminId + index}>
{item.adminName} {index < record.admins.length - 1 && <span> 、</span>}{' '}
</span>
);
})}
</span>
</Tooltip>
) : (
</When>
<Otherwise>
<span className='assistant'>
助教：
{record.admins.map((item, index) => {
......@@ -210,9 +205,9 @@ class LiveCourseList extends React.Component {
);
})}
</span>
)}
</>
)}
</Otherwise>
</Choose>
</If>
</div>
</div>
</div>
......@@ -287,10 +282,13 @@ class LiveCourseList extends React.Component {
key: 'shelfState',
dataIndex: 'shelfState',
render: (val, item, index) => {
return <Switch
checked={item.shelfState === "YES"}
defaultChecked={item.shelfState === 'YES' ? true : false}
onChange={(checked) => this.changeShelfState(index,item,checked)} />;
return (
<Switch
checked={item.shelfState === 'YES'}
defaultChecked={item.shelfState === 'YES' ? true : false}
onChange={(checked) => this.changeShelfState(index, item, checked)}
/>
);
},
},
{
......@@ -301,7 +299,7 @@ class LiveCourseList extends React.Component {
sorter: true,
render: (val, item) => {
// -29000：与后端约定 在初始化学院时，创建时间（标志位-29000）默认展示为'-'
return <span>{val === -29000 ? '-' : formatDate('YYYY-MM-DD H:i', val)}</span>;
return <span style={{ whiteSpace: 'nowrap' }}>{val === -29000 ? '-' : window.formatDate('YYYY-MM-DD H:i', val)}</span>;
},
},
{
......@@ -312,27 +310,31 @@ class LiveCourseList extends React.Component {
render: (val, record) => {
return (
<div className='related-task'>
{record.relatedPlanList ? (
<Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
{record.relatedPlanList.map((item, index) => {
return (
<span>
{item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '}
</span>
);
})}
</Tooltip>
) : (
<span></span>
)}
<Choose>
<When condition={record.relatedPlanLis}>
<Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
{record.relatedPlanList.map((item, index) => {
return (
<span>
{item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '}
</span>
);
})}
</Tooltip>
</When>
<Otherwise>
<span></span>
</Otherwise>
</Choose>
</div>
);
},
},
{
title: '操作',
width: '15%',
width: 210,
key: 'operate',
fixed: 'right',
dataIndex: 'operate',
render: (val, item) => {
return (
......@@ -424,21 +426,25 @@ class LiveCourseList extends React.Component {
{record.courseMediaVOS.map((item, index) => {
if (item.contentType === 'COVER') {
hasCover = true;
return <img className='course-cover' src={item.mediaUrl} />;
return <img className='course-cover' src={item.mediaUrl} alt='' />;
}
})}
{!hasCover && <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} />}
{!hasCover && <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} alt='' />}
<div>
{record.courseName.length > 17 ? (
<Tooltip title={record.courseName}>
<Choose>
<When condition={record.courseName.length > 17}>
<Tooltip title={record.courseName}>
<div className='course-name'>{record.courseName}</div>
</Tooltip>
</When>
<Otherwise>
<div className='course-name'>{record.courseName}</div>
</Tooltip>
) : (
<div className='course-name'>{record.courseName}</div>
)}
</Otherwise>
</Choose>
<div>
<span className='course-time'>
{formatDate('YYYY-MM-DD H:i', parseInt(record.startTime))}~{formatDate('H:i', parseInt(record.endTime))}
{window.formatDate('YYYY-MM-DD H:i', parseInt(record.startTime))}~{window.formatDate('H:i', parseInt(record.endTime))}
</span>
<span
className='course-status'
......@@ -447,18 +453,21 @@ class LiveCourseList extends React.Component {
</span>
</div>
<div className='teacher-assistant'>
{record.teacherName && record.teacherName.length > 4 ? (
<Tooltip title={record.teacherName}>
<Choose>
<When condition={record.teacherName && record.teacherName.length > 4}>
<Tooltip title={record.teacherName}>
<span className='teacher'>讲师：{record.teacherName}</span>
</Tooltip>
</When>
<Otherwise>
<span className='teacher'>讲师：{record.teacherName}</span>
</Tooltip>
) : (
<span className='teacher'>讲师：{record.teacherName}</span>
)}
</Otherwise>
</Choose>
{record.admins.length > 0 && (
<>
<span className='split'> | </span>
{this.handleAdminName(record.admins).length > 4 ? (
<If condition={record.admins.length > 0}>
<span className='split'> | </span>
<Choose>
<When condition={this.handleAdminName(record.admins).length > 4}>
<Tooltip title={this.handleAdminName(record.admins)}>
<span className='assistant'>
助教：
......@@ -471,7 +480,8 @@ class LiveCourseList extends React.Component {
})}
</span>
</Tooltip>
) : (
</When>
<Otherwise>
<span className='assistant'>
助教：
{record.admins.map((item, index) => {
......@@ -482,9 +492,9 @@ class LiveCourseList extends React.Component {
);
})}
</span>
)}
</>
)}
</Otherwise>
</Choose>
</If>
</div>
</div>
</div>
......@@ -544,7 +554,7 @@ class LiveCourseList extends React.Component {
dataIndex: 'created',
sorter: true,
render: (val, item) => {
return <span>{formatDate('YYYY-MM-DD H:i', val)}</span>;
return <span>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
},
},
{
......@@ -555,19 +565,22 @@ class LiveCourseList extends React.Component {
render: (val, record) => {
return (
<div className='related-task'>
{record.relatedPlanList ? (
<Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
{record.relatedPlanList.map((item, index) => {
return (
<span>
{item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '}
</span>
);
})}
</Tooltip>
) : (
<span></span>
)}
<Choose>
<When condition={record.relatedPlanList}>
<Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
{record.relatedPlanList.map((item, index) => {
return (
<span>
{item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '}
</span>
);
})}
</Tooltip>
</When>
<Otherwise>
<span></span>
</Otherwise>
</Choose>
</div>
);
},
......@@ -578,7 +591,7 @@ class LiveCourseList extends React.Component {
};
handleAdminName = (adminArray) => {
let adminStr = '';
adminArray.map((item, index) => {
adminArray.forEach((item, index) => {
if (index < adminArray.length - 1) {
adminStr = adminStr + item.adminName + '、';
} else {
......@@ -590,7 +603,7 @@ class LiveCourseList extends React.Component {
handlePlanName = (planArray) => {
let planStr = '';
planArray.map((item, index) => {
planArray.forEach((item, index) => {
if (index < planArray.length - 1) {
planStr = planStr + item.planName + '、';
} else {
......@@ -687,7 +700,7 @@ class LiveCourseList extends React.Component {
}
};
onShowSizeChange = (current, size) => {
if (current == size) {
if (current === size) {
return;
}
let _query = this.props.query;
......@@ -795,6 +808,7 @@ class LiveCourseList extends React.Component {
size='middle'
pagination={false}
columns={columns}
scroll={{ x: 1300 }}
loading={loading}
dataSource={courseList}
onChange={this.handleChangeTable}
......@@ -818,7 +832,6 @@ class LiveCourseList extends React.Component {
{openCoursewareModal && (
<ManageCoursewareModal
data={editData}
type={type}
onCancel={() => {
this.props.onChange();
this.setState({ openCoursewareModal: false });
......@@ -846,7 +859,7 @@ class LiveCourseList extends React.Component {
onConfirm={this.onConfirmSelectPlanList}
/>
)}
<iframe src={url} style={{ display: 'none' }} />
<iframe src={url} style={{ display: 'none' }} title='navigation' />
<Route path={`${match.url}/live-course-data`} component={DataList} />
</div>
);
......
src/modules/course-manage/components/LiveCourseList.less
.live-course-list {
margin-top: 12px;
.record__item {
overflow: hidden;
display: flex;
align-items: center;
.course-cover {
......@@ -11,63 +11,61 @@
border-radius: 2px;
margin-right: 8px;
}
.course-name{
.course-name {
font-size: 14px;
font-weight: 500;
color: #333333;
line-height: 20px;
font-weight: bold;
max-width:244px;
max-width: 200px;
overflow: hidden;
text-overflow:ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
}
.course-time{
.course-time {
font-size: 12px;
font-weight: 400;
color: #666666;
line-height: 20px;
}
.course-status {
font-size:12px;
line-height:18px;
display:inline-block;
border-radius:2px;
padding:0 8px;
margin-left:4px;
font-size: 12px;
line-height: 18px;
display: inline-block;
border-radius: 2px;
padding: 0 8px;
margin-left: 4px;
}
.teacher-assistant{
display:flex;
.teacher{
.teacher-assistant {
display: flex;
.teacher {
font-size: 12px;
color: #666666;
max-width: 96px;
overflow: hidden;
text-overflow:ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
display:inline-block;
padding-top:2px;
display: inline-block;
padding-top: 2px;
}
.assistant{
.assistant {
font-size: 12px;
color: #666666;
max-width: 96px;
overflow: hidden;
text-overflow:ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
display:inline-block;
padding-top:2px;
display: inline-block;
padding-top: 2px;
}
.split {
margin: 0 4px;
color: #BFBFBF;
color: #bfbfbf;
display: inline-blcok;
}
}
}
.related-task{
.related-task {
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
......@@ -76,37 +74,37 @@
line-clamp: 2;
-webkit-box-orient: vertical;
}
.categoryName{
.categoryName {
font-size: 14px;
color: #666666;
line-height: 20px;
}
.courseware{
.courseware {
font-size: 14px;
color: #2966FF;
color: #2966ff;
line-height: 20px;
text-align:right;
cursor:pointer;
text-align: right;
cursor: pointer;
}
.quota-icon{
color:#2966FF;
cursor:pointer;
.quota-icon {
color: #2966ff;
cursor: pointer;
}
.operate {
display: flex;
align-items: center;
flex-wrap: wrap;
.operate__item {
color: #2966FF;
color: #2966ff;
cursor: pointer;
&.split {
margin: 0 8px;
color: #BFBFBF;
color: #bfbfbf;
}
}
}
.operate-text {
color: #2966FF;
color: #2966ff;
cursor: pointer;
}
.course-start-end {
......@@ -135,7 +133,27 @@
font-size: 12px;
}
}
tbody {
tr {
&:nth-child(even) {
background: transparent !important;
td {
background: #fff !important;
}
}
&:nth-child(odd) {
background: #fafafa !important;
td {
background: #fafafa !important;
}
}
&:hover {
td {
background: #f3f6fa !important;
}
}
}
}
}
.live-course-more-menu {
background: white;
......@@ -155,4 +173,4 @@
.type {
font-weight: 700;
}
}
\ No newline at end of file
}
src/modules/course-manage/offline-course/components/OfflineCourseList.jsx
......@@ -10,7 +10,7 @@ import Service from '@/common/js/service';
import User from '@/common/js/user';
import college from '@/common/lottie/college';
import { PageControl, XMTable } from '@/components';
import { appId, LIVE_SHARE } from '@/domains/course-domain/constants';
import { LIVE_SHARE } from '@/domains/course-domain/constants';
import CourseService from '@/domains/course-domain/CourseService';
import ShareLiveModal from '@/modules/course-manage/modal/ShareLiveModal';
import OfflineCourseData from '@/modules/course-manage/offline-course/OfflineCourseData';
......@@ -78,7 +78,7 @@ class OfflineCourseList extends React.Component {
} ${moment(startTime).format('HH:mm')} ~ ${moment(endTime).format('HH:mm')}`;
return (
<div className='record__item'>
<img className='course-cover' src={coverUrl || defaultCoverUrl} />
<img className='course-cover' src={coverUrl || defaultCoverUrl} alt='' />
<div style={{ width: 175 }}>
<Tooltip title={courseName}>
<div className='course-name'>{courseName}</div>
......@@ -152,14 +152,14 @@ class OfflineCourseList extends React.Component {
},
{
title: '报名时间',
width: 181,
width: 200,
key: 'apply',
dataIndex: 'apply',
sorter: true,
render: (val, item) => {
return (
<div>
{item.startTimeApply ? `${formatDate('MM-DD H:i', item.startTimeApply)} ~ ${formatDate('MM-DD H:i', item.endTimeApply)}` : '-'}
<div style={{ whiteSpace: 'nowrap' }}>
{item.startTimeApply ? `${window.formatDate('MM-DD H:i', item.startTimeApply)} ~ ${window.formatDate('MM-DD H:i', item.endTimeApply)}` : '-'}
{item.whetherApplyFull === 'YES' && (
<span
style={{
......@@ -185,7 +185,7 @@ class OfflineCourseList extends React.Component {
dataIndex: 'created',
sorter: true,
render: (val) => {
return formatDate('YYYY-MM-DD H:i', val);
return <span style={{ whiteSpace: 'nowrap' }}>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
},
},
{
......@@ -360,8 +360,6 @@ class OfflineCourseList extends React.Component {
// 显示分享弹窗
handleShowShareModal = (record, needStr = false) => {
const { courseId } = record;
const _appId = appId;
const htmlUrl = `${LIVE_SHARE}offline_detail/${courseId}?id=${User.getStoreId()}`;
const longUrl = htmlUrl;
const { courseName, courseMediaVOS } = record;
......@@ -437,7 +435,7 @@ class OfflineCourseList extends React.Component {
columns={this.parseColumns()}
onChange={this.handleChangeTable}
pagination={false}
scroll={{ x: 1500 }}
scroll={{ x: 1300 }}
bordered
className='offline-list-table'
/>
......
src/modules/course-manage/video-course/components/VideoCourseList.jsx
import React from "react"
import { Table, Modal, message, Tooltip, Switch, Dropdown } from "antd"
import _ from "underscore"
import { PageControl } from "@/components"
import { LIVE_SHARE } from "@/domains/course-domain/constants"
import React from 'react';
import { Modal, message, Tooltip, Switch, Dropdown } from 'antd';
import _ from 'underscore';
import { PageControl } from '@/components';
import { LIVE_SHARE } from '@/domains/course-domain/constants';
import { Route, withRouter } from 'react-router-dom';
import ShareLiveModal from "@/modules/course-manage/modal/ShareLiveModal"
import WatchDataModal from "../modal/WatchDataModal"
import CourseService from "@/domains/course-domain/CourseService"
import RelatedPlanModal from "../../modal/RelatedPlanModal"
import User from "@/common/js/user"
import ShareLiveModal from '@/modules/course-manage/modal/ShareLiveModal';
import CourseService from '@/domains/course-domain/CourseService';
import RelatedPlanModal from '../../modal/RelatedPlanModal';
import User from '@/common/js/user';
import VideoCourseDetail from '../VideoCourseDetail';
import WatchData from "./WatchData";
import WatchData from './WatchData';
import { XMTable } from '@/components';
import college from '@/common/lottie/college';
import "./VideoCourseList.less"
import './VideoCourseList.less';
class VideoCourseList extends React.Component {
constructor(props) {
......@@ -36,20 +35,20 @@ class VideoCourseList extends React.Component {
}
}
// 跳转课程详情页
handleLinkToCourseDetail = (courseId) => {
const { match } = this.props;
window.RCHistory.push(`${match.url}/video-course-detail?courseId=${courseId}`)
}
// 跳转课程详情页
handleLinkToCourseDetail = (courseId) => {
const { match } = this.props;
window.RCHistory.push(`${match.url}/video-course-detail?courseId=${courseId}`);
};
// 观看数据弹窗
handleShowWatchDataModal = (item) => {
const { match } = this.props;
window.RCHistory.push({
pathname: `${match.url}/course-data?courseName=${item.courseName}&courseId=${item.id}`
})
}
pathname: `${match.url}/course-data?courseName=${item.courseName}&courseId=${item.id}`,
});
};
// 请求表头
parseColumns = () => {
......@@ -57,22 +56,16 @@ class VideoCourseList extends React.Component {
const { ShelfLoading } = this.state;
const columns = [
{
title: "线上课",
key: "scheduleName",
dataIndex: "scheduleName",
title: '线上课',
key: 'scheduleName',
dataIndex: 'scheduleName',
width: 321,
fixed: 'left',
render: (val, record) => {
const { coverUrl } = record;
return (
<div className='record__item'>
<img
className='course-cover'
src={
coverUrl || 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png'
}
alt='封面图'
/>
<img className='course-cover' src={coverUrl || 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png'} alt='封面图' />
<Choose>
<When condition={record.courseName.length > 25}>
<Tooltip title={record.courseName}>
......@@ -100,8 +93,8 @@ class VideoCourseList extends React.Component {
</If>
</span>
),
key: "categoryName",
dataIndex: "categoryName",
key: 'categoryName',
dataIndex: 'categoryName',
width: 150,
render: (val, record) => {
return (
......@@ -123,12 +116,12 @@ class VideoCourseList extends React.Component {
title: '课节数',
key: 'chapterNum',
dataIndex: 'chapterNum',
className: "chapterNum",
className: 'chapterNum',
width: 100,
align: 'right',
render: (val,item) => {
return <div onClick={()=>this.handleLinkToCourseDetail(item.id)}>{val || 1}</div>
}
render: (val, item) => {
return <div onClick={() => this.handleLinkToCourseDetail(item.id)}>{val || 1}</div>;
},
},
{
title: (
......@@ -142,7 +135,7 @@ class VideoCourseList extends React.Component {
关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。
</div>
}>
<i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px' }}>
<i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px', fontWeight: 'normal' }}>
&#xe61d;
</i>
</Tooltip>
......@@ -165,19 +158,23 @@ class VideoCourseList extends React.Component {
},
},
{
title: "观看学员数",
title: '观看学员数',
width: 150,
key: "watchUserCount",
dataIndex: "watchUserCount",
key: 'watchUserCount',
dataIndex: 'watchUserCount',
align: 'right',
render: (val, item) => {
return <div className='watchUserCount' onClick={() => this.handleShowWatchDataModal(item)}>{val || 0}</div>
}
return (
<div className='watchUserCount' onClick={() => this.handleShowWatchDataModal(item)}>
{val || 0}
</div>
);
},
},
{
title: "创建人",
key: "createName",
dataIndex: "createName",
title: '创建人',
key: 'createName',
dataIndex: 'createName',
width: 100,
render: (val) => {
return (
......@@ -188,8 +185,8 @@ class VideoCourseList extends React.Component {
</Tooltip>
)}
</div>
)
}
);
},
},
{
title: '创建时间',
......@@ -198,7 +195,7 @@ class VideoCourseList extends React.Component {
dataIndex: 'created',
sorter: true,
render: (val) => {
return formatDate('YYYY-MM-DD H:i', val);
return window.formatDate('YYYY-MM-DD H:i', val);
},
},
{
......@@ -208,7 +205,7 @@ class VideoCourseList extends React.Component {
dataIndex: 'updated',
sorter: true,
render: (val) => {
return formatDate('YYYY-MM-DD H:i', val);
return window.formatDate('YYYY-MM-DD H:i', val);
},
},
{
......@@ -224,7 +221,7 @@ class VideoCourseList extends React.Component {
<Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
{record.relatedPlanList.map((item, index) => {
return (
<span>
<span key={item.planId}>
{item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}
</span>
);
......@@ -248,7 +245,7 @@ class VideoCourseList extends React.Component {
render: (val, record) => {
return (
<div className='operate'>
<If condition={type === "internal"}>
<If condition={type === 'internal'}>
<div className='operate__item' onClick={() => this.handleShowShareModal(record)}>
分享
</div>
......@@ -304,7 +301,7 @@ class VideoCourseList extends React.Component {
handlePlanName = (planArray) => {
let planStr = '';
planArray.map((item, index) => {
planArray.forEach((item, index) => {
if (index < planArray.length - 1) {
planStr = planStr + item.planName + '、';
} else {
......
src/modules/plan-manage/components/PlanList.jsx
......@@ -8,9 +8,9 @@
*/
import React, { useState } from 'react';
import { Table, Modal, message, Tooltip, Switch, Dropdown } from 'antd';
import { Modal, message, Tooltip, Switch, Dropdown } from 'antd';
import { withRouter } from 'react-router-dom';
import { PageControl, XMTable } from "@/components";
import { PageControl, XMTable } from '@/components';
import PlanService from '@/domains/plan-domain/planService';
import SharePlanModal from '../modal/SharePlanModal';
import { LIVE_SHARE } from '@/domains/course-domain/constants';
......@@ -29,6 +29,7 @@ function PlanList(props) {
key: 'planName',
dataIndex: 'planName',
width: '18%',
fixed: 'left',
render: (val, record) => {
return (
<div className='plan_name_item'>
......@@ -86,7 +87,7 @@ function PlanList(props) {
dataIndex: 'created',
sorter: true,
render: (val) => {
return window.formatDate('YYYY-MM-DD H:i', val);
return <span style={{ whiteSpace: 'nowrap' }}>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
},
},
{
......@@ -96,12 +97,12 @@ function PlanList(props) {
dataIndex: 'updated',
sorter: true,
render: (val) => {
return window.formatDate('YYYY-MM-DD H:i', val);
return <span style={{ whiteSpace: 'nowrap' }}>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
},
},
{
title: '参培人数',
width: 76,
width: '10%',
key: 'cultureCustomerNum',
dataIndex: 'cultureCustomerNum',
sorter: true,
......@@ -114,7 +115,7 @@ function PlanList(props) {
key: 'operate',
dataIndex: 'operate',
fixed: 'right',
width: 176,
width: '14.5%',
render: (val, record) => {
return (
<div className='operate'>
......@@ -317,7 +318,7 @@ function PlanList(props) {
scroll={{ x: 1400 }}
className='plan-list-table'
renderEmpty={{
description: <span style={{ display: 'block', paddingBottom: 24 }}>暂无数据</span>
description: <span style={{ display: 'block', paddingBottom: 24 }}>暂无数据</span>,
}}
/>
<div className='box-footer'>
......
src/modules/plan-manage/components/TrainingTask.less
.training-task{
thead{
display:none;
}
.ant-form-item{
margin-bottom:0 !important;
}
.training-task {
thead {
display: none;
}
.ant-form-item {
margin-bottom: 0 !important;
}
.add-task-con{
height: 52px;
background: #F7F8F9;
border-radius: 2px;
padding:16px;
margin-top:16px;
.add-task-btn-disabled{
color:#CCCCCC;
font-size:14px;
}
.add-task-btn{
color: #2966FF;
font-size:14px;
}
.add-task-con {
height: 52px;
background: #f7f8f9;
border-radius: 2px;
padding: 16px;
margin-top: 16px;
.add-task-btn-disabled {
color: #cccccc;
font-size: 14px;
}
.add-task-btn {
color: #2966ff;
font-size: 14px;
}
}
}
.plan-sort-task-item{
.task-con{
display:flex;
padding:16px;
background: #F7F8F9;
.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;
.task-instro {
display: flex;
align-items: center;
.open-icon{
color:#999999;
font-size:10px;
.open-icon {
color: #999999;
font-size: 10px;
}
.task-name-con{
display:flex;
.task-name-con {
display: flex;
align-items: center;
color:#333333;
font-size:14px;
.number{
margin-right:10px;
margin-left:10px;
color: #333333;
font-size: 14px;
.number {
margin-right: 10px;
margin-left: 10px;
}
.task-name-input{
.task-name-input {
width: 300px;
height: 32px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
}
}
}
}
.operate{
.operate {
display: none;
.operate__item{
cursor:pointer;
margin-left:16px;
color:#666666;
font-size:14px;
.icon{
font-size:14px;
color:#999;
.operate__item {
cursor: pointer;
margin-left: 16px;
color: #666666;
font-size: 14px;
.icon {
font-size: 14px;
color: #999;
}
.text{
margin-left:8px;
.text {
margin-left: 8px;
}
}
}
&:hover{
.operate{
display:block;
&:hover {
.operate {
display: block;
}
}
}
.course-box{
.add-course-con{
padding:16px 51px;
color: #2966FF;
font-size:14px;
.add-course-btn-disabled{
font-size:14px;
color:#ccc;
}
.course-box {
.add-course-con {
padding: 16px 51px;
color: #2966ff;
font-size: 14px;
.add-course-btn-disabled {
font-size: 14px;
color: #ccc;
pointer-events: none;
}
}
}
}
.plan-course-sort-item{
display:flex;
padding:16px 16px 16px 0px;
margin-left:51px;
.plan-course-sort-item {
display: flex;
padding: 16px 16px 16px 0px;
margin-left: 51px;
justify-content: space-between;
align-items: center;
border-bottom:1px dotted #E8E8E8;
&:hover{
.course-operate{
display:block;
border-bottom: 1px dotted #e8e8e8;
&:hover {
.course-operate {
display: block;
}
}
.course-operate{
.course-operate {
display: none;
.operate__item{
cursor:pointer;
margin-left:16px;
color:#666666;
font-size:14px;
.icon{
font-size:14px;
color:#999;
.operate__item {
cursor: pointer;
margin-left: 16px;
color: #666666;
font-size: 14px;
.icon {
font-size: 14px;
color: #999;
}
.text{
margin-left:8px;
.text {
margin-left: 8px;
}
}
}
.course-info{
.ant-form{
display:inline-block;
.course-info {
.ant-form {
display: inline-block;
}
.course-name-input{
margin-right:8px;
.course-name-input {
margin-right: 8px;
}
.course-type{
font-size:11px;
color:#666666;
padding:0px 6px;
border: 1px solid #999999;
margin-right:4px;
border-radius: 2px;
line-height: 16px;
.course-type {
font-size: 11px;
color: #666666;
padding: 0px 6px;
border: 1px solid #999999;
margin-right: 4px;
border-radius: 2px;
line-height: 16px;
}
.course-name{
color:#666666;
font-size:14px;
margin-right:8px;
.course-name {
color: #666666;
font-size: 14px;
margin-right: 8px;
}
.tip{
font-size:14px;
color:#FF4F4F;
margin-right:2px;
.tip {
font-size: 14px;
color: #ff4f4f;
margin-right: 2px;
}
.course-state{
color:#999;
font-size:14px;
.course-state {
color: #999;
font-size: 14px;
}
}
}
src/modules/plan-manage/modal/relatedCourseModal.jsx
......@@ -491,7 +491,7 @@ class SelectOperatorModal extends React.Component {
} else {
_list = _.reject(selectLive, (item) => item.liveCourseId === record.liveCourseId);
}
if (_list.length + currentTaskCourseData.length + selectVideo.length + selectPicture.length > 20) {
if (_list.length + currentTaskCourseData.length + selectVideo.internal.length + selectVideo.external.length + selectPicture.length > 20) {
message.warning('无法继续选择，一个任务最多关联20个课程');
return;
}
......@@ -502,14 +502,14 @@ class SelectOperatorModal extends React.Component {
const { selectVideo, currentTaskCourseData, selectLive, selectPicture, videoCourseDivision } = this.state;
let { [videoCourseDivision]: selectList } = selectVideo;
let otherVideoCourseDivision = videoCourseDivision === 'internal' ? 'external' : 'internal';
let _list = [];
if (selected || !_.find(selectList, (item) => item.id === record.id)) {
_list = _.uniq(selectList.concat([record]), false, (item) => item.id);
} else {
_list = _.reject(selectList, (item) => item.id === record.id);
}
if (_list.length + currentTaskCourseData.length + selectLive.length + selectPicture.length > 20) {
if (_list.length + selectVideo[otherVideoCourseDivision]?.length + currentTaskCourseData.length + selectLive.length + selectPicture.length > 20) {
message.warning('无法继续选择，一个任务最多关联20个课程');
return;
}
......@@ -529,7 +529,7 @@ class SelectOperatorModal extends React.Component {
} else {
_list = _.reject(selectPicture, (item) => item.id === record.id);
}
if (_list.length + currentTaskCourseData.length + selectLive.length + selectVideo.length > 20) {
if (_list.length + currentTaskCourseData.length + selectLive.length + selectVideo.internal.length + selectVideo.external.length > 20) {
message.warning('无法继续选择，一个任务最多关联20个课程');
return;
}
......@@ -750,9 +750,10 @@ class SelectOperatorModal extends React.Component {
} else {
_list = _.reject(selectLive, (item) => _.find(changeRows, (data) => data.liveCourseId === item.liveCourseId));
}
if (_list.length + currentTaskCourseData.length + selectVideo.length + selectPicture.length > 20) {
if (_list.length + currentTaskCourseData.length + selectVideo.internal.length + selectVideo.external.length + selectPicture.length > 20) {
message.warning('无法继续选择，一个任务最多关联20个课程');
const extraLength = _list.length + currentTaskCourseData.length + selectVideo.length + selectPicture.length - 20;
const extraLength =
_list.length + currentTaskCourseData.length + selectVideo.internal.length + selectVideo.external.length + +selectPicture.length - 20;
_list.splice(_list.length - extraLength, extraLength);
}
this.setState({ selectLive: _list });
......@@ -836,14 +837,24 @@ class SelectOperatorModal extends React.Component {
},
onSelectAll: (selected, _selectedRows, changeRows) => {
let _list = [];
let otherVideoCourseDivision = videoCourseDivision === 'internal' ? 'external' : 'internal';
if (selected) {
_list = _.uniq(selectVideo[videoCourseDivision].concat(changeRows), false, (item) => item.id);
} else {
_list = _.reject(selectVideo[videoCourseDivision], (item) => _.find(changeRows, (data) => data.id === item.id));
}
if (_list.length + currentTaskCourseData.length + selectLive.length + selectPicture.length > 20) {
if (
_list.length + selectVideo[otherVideoCourseDivision]?.length + currentTaskCourseData.length + selectLive.length + selectPicture.length >
20
) {
message.warning('无法继续选择，一个任务最多关联20个课程');
const extraLength = _list.length + currentTaskCourseData.length + selectLive.length + selectPicture.length - 20;
const extraLength =
_list.length +
selectVideo[otherVideoCourseDivision]?.length +
currentTaskCourseData.length +
selectLive.length +
selectPicture.length -
20;
_list.splice(_list.length - extraLength, extraLength);
}
this.setState({
......@@ -936,9 +947,10 @@ class SelectOperatorModal extends React.Component {
} else {
_list = _.reject(selectPicture, (item) => _.find(changeRows, (data) => data.id === item.id));
}
if (_list.length + currentTaskCourseData.length + selectVideo.length + selectLive.length > 20) {
if (_list.length + currentTaskCourseData.length + selectVideo.internal.length + selectVideo.external.length + selectLive.length > 20) {
message.warning('无法继续选择，一个任务最多关联20个课程');
const extraLength = _list.length + currentTaskCourseData.length + selectVideo.length + selectLive.length - 20;
const extraLength =
_list.length + currentTaskCourseData.length + selectVideo.internal.length + selectVideo.external.length + selectLive.length - 20;
_list.splice(_list.length - extraLength, extraLength);
}
this.setState({ selectPicture: _list });
......
src/modules/root/Header.jsx
/*
* @Author: 吴文洁
* @Date: 2019-09-10 18:26:03
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-24 19:28:14
* @LastEditors: yuananting
* @LastEditTime: 2021-07-06 14:37:49
* @Description:
*/
import React, { useRef, useContext, useEffect, useState } from 'react';
......@@ -271,14 +271,14 @@ function Header(props) {
onChange={(e) => {
setStoreId(e.target.value);
User.setStoreId(e.target.value);
list.map((item)=>{
if(item.id === e.target.value){
list.map((item) => {
if (item.id === e.target.value) {
User.setStoreUserId(item.storeUserId);
}
})
});
User.setUserId(User.getUserId());
User.setToken(User.getToken());
User.setEnterpriseId(User.getEnterpriseId())
User.setEnterpriseId(User.getEnterpriseId());
window.RCHistory.push('/home');
window.location.reload();
}}
......@@ -320,10 +320,10 @@ function Header(props) {
</div>
)}
<div className='right-box'>
<div className='right-bg-img'>
<img src='https://image.xiaomaiketang.com/xm/WCwjyyXYda.png'></img>
</div>
<div className='link-to-store'>
<div className='right-bg-img'>
<img src='https://image.xiaomaiketang.com/xm/WCwjyyXYda.png'></img>
</div>
<div className='link'>
<span className='link-btn'>
<span className='icon iconfont tool-tip-right'>&#xe85d;</span>
......
src/modules/root/Header.less
......@@ -196,7 +196,6 @@
margin-left: 62px;
.college-container {
position: relative;
width: 360px;
height: 50px;
display: flex;
align-items: center;
......@@ -310,13 +309,9 @@
display: flex;
align-items: center;
}
.right-bg-img {
img {
width: 277px;
height: 60px;
}
}
.link-to-store {
position: relative;
display: flex;
height: 49px;
line-height: 49px;
......@@ -329,6 +324,14 @@
.iconfont {
color: #fff;
}
.right-bg-img {
position: absolute;
right: 347px;
img {
width: 277px;
height: 60px;
}
}
.link {
cursor: pointer;
position: relative;
......
src/modules/teach-tool/examination-manager/Index.tsx
......@@ -134,11 +134,12 @@ function ExaminationManager(props: any) {
},
{
title: '创建时间',
width: 150,
dataIndex: 'examCreateTime',
align: fixStr.right,
sorter: true,
sortOrder: field === 'examCreateTime' ? order : sortStatus.type,
render: (text: any, record: any) => <span>{moment(text).format('YYYY-MM-DD HH:mm')}</span>,
render: (text: any, record: any) => <span style={{ whiteSpace: 'nowrap' }}>{moment(text).format('YYYY-MM-DD HH:mm')}</span>,
},
{
title: '操作',
......
src/modules/teach-tool/paper-manage/components/PaperList.less
......@@ -2,38 +2,38 @@
.select-box {
display: flex;
align-items: center;
.select-container{
.select-container {
margin-right: 24px;
.con{
background: #E9EFFF;
.con {
background: #e9efff;
border-radius: 4px;
padding: 3px 16px;
display: inline-flex;
align-items: center;
justify-content: space-between;
.tip{
font-size:14px;
color:#2966FF;
margin-right:8px;
.tip {
font-size: 14px;
color: #2966ff;
margin-right: 8px;
}
.text{
font-size:14px;
color:#666;
margin-right:30px;
.text {
font-size: 14px;
color: #666;
margin-right: 30px;
}
.clear{
color:#5289FA;
font-size:14px;
.clear {
color: #5289fa;
font-size: 14px;
}
}
}
}
}
.ant-radio-wrapper{
.ant-radio-wrapper {
left: -10px;
}
.paper-list-filter {
position: relative;
.search-condition {
width: calc(100% - 80px);
display: flex;
......@@ -75,8 +75,10 @@
.paper-list-content {
position: relative;
margin-top: 12px;
height: calc(100vh - 260px);
overflow: scroll;
.empty-list-tip {
color: #2966FF;
color: #2966ff;
cursor: pointer;
}
.record-name {
......@@ -88,7 +90,7 @@
display: flex;
&__item {
color: #2966FF;
color: #2966ff;
cursor: pointer;
&.split {
......@@ -98,7 +100,7 @@
}
}
}
&.modal-select{
&.modal-select {
.search-condition {
width: calc(100% - 80px);
display: flex;
......
src/modules/teach-tool/question-manage/Index.less
......@@ -7,7 +7,10 @@
.content {
width: 100%;
margin-left: 24px;
height: calc(100vh - 160px);
.question-list-content {
height: calc(100vh - 260px);
overflow: scroll;
}
}
}
}
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