Skip to content

X
xiaomai-cloud-class-web
Commit 00b1684a by guomingpang
Options

style：课程管理列表，时间不换行，列表优化

parent cca0d6c9
Showing with 125 additions and 110 deletions
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -66,7 +66,6 @@ class LiveCourseList extends React.Component { ...@@ -66,7 +66,6 @@ class LiveCourseList extends React.Component {
} }
// 显示分享弹窗 // 显示分享弹窗
handleShowShareModal = (item, needStr = false) => { handleShowShareModal = (item, needStr = false) => {
const _appId = appId;
const { liveCourseId } = item; const { liveCourseId } = item;
const htmlUrl = `${LIVE_SHARE}live_detail/${liveCourseId}?id=${User.getStoreId()}`; const htmlUrl = `${LIVE_SHARE}live_detail/${liveCourseId}?id=${User.getStoreId()}`;
...@@ -93,13 +92,8 @@ class LiveCourseList extends React.Component { ...@@ -93,13 +92,8 @@ class LiveCourseList extends React.Component {
}; };
//改变上架状态 //改变上架状态
changeShelfState = (index,item,checked) => { changeShelfState = (index, item, checked) => {
let _shelfState = checked ? "YES" : "NO" let _shelfState = checked ? 'YES' : 'NO';
// if (_shelfState === 'NO') {
// _shelfState = 'YES';
// } else {
// _shelfState = 'NO';
// }
const params = { const params = {
liveCourseId: item.liveCourseId, liveCourseId: item.liveCourseId,
shelfState: _shelfState, shelfState: _shelfState,
...@@ -111,7 +105,7 @@ class LiveCourseList extends React.Component { ...@@ -111,7 +105,7 @@ class LiveCourseList extends React.Component {
} else { } else {
message.success('已取消展示'); message.success('已取消展示');
} }
this.props.changeShelfState(index,_shelfState) this.props.changeShelfState(index, _shelfState);
} }
}); });
}; };
...@@ -125,17 +119,6 @@ class LiveCourseList extends React.Component { ...@@ -125,17 +119,6 @@ class LiveCourseList extends React.Component {
}); });
}; };
parseColumns = () => { parseColumns = () => {
const menu = (item) => (
<div className='live-course-more-menu'>
<div>上课记录</div>
<div
onClick={() => {
this.handleShowRepeatModal(item);
}}>
回放记录
</div>
</div>
);
let columns; let columns;
const userRole = User.getUserRole(); const userRole = User.getUserRole();
if (userRole !== 'CloudLecturer') { if (userRole !== 'CloudLecturer') {
...@@ -144,6 +127,7 @@ class LiveCourseList extends React.Component { ...@@ -144,6 +127,7 @@ class LiveCourseList extends React.Component {
title: '直播课', title: '直播课',
width: '23%', width: '23%',
key: 'course', key: 'course',
fixed: 'left',
dataIndex: 'courseName', dataIndex: 'courseName',
render: (val, record) => { render: (val, record) => {
let hasCover = false; let hasCover = false;
...@@ -152,21 +136,28 @@ class LiveCourseList extends React.Component { ...@@ -152,21 +136,28 @@ class LiveCourseList extends React.Component {
{record.courseMediaVOS.map((item, index) => { {record.courseMediaVOS.map((item, index) => {
if (item.contentType === 'COVER') { if (item.contentType === 'COVER') {
hasCover = true; 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> <div>
{record.courseName.length > 17 ? ( <Choose>
<Tooltip title={record.courseName}> <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> <div className='course-name'>{record.courseName}</div>
</Tooltip> </Otherwise>
) : ( </Choose>
<div className='course-name'>{record.courseName}</div>
)}
<div> <div>
<span className='course-time'> <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>
<span <span
className='course-status' className='course-status'
...@@ -175,31 +166,35 @@ class LiveCourseList extends React.Component { ...@@ -175,31 +166,35 @@ class LiveCourseList extends React.Component {
</span> </span>
</div> </div>
<div className='teacher-assistant'> <div className='teacher-assistant'>
{record.teacherName && record.teacherName.length > 4 ? ( <Choose>
<Tooltip title={record.teacherName}> <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> <span className='teacher'>讲师：{record.teacherName}</span>
</Tooltip> </Otherwise>
) : ( </Choose>
<span className='teacher'>讲师：{record.teacherName}</span>
)}
{record.admins.length > 0 && ( <If condition={record.admins.length > 0}>
<> <span className='split'> | </span>
<span className='split'> | </span> <Choose>
{this.handleAdminName(record.admins).length > 4 ? ( <When condition={this.handleAdminName(record.admins).length > 4}>
<Tooltip title={this.handleAdminName(record.admins)}> <Tooltip title={this.handleAdminName(record.admins)}>
<span className='assistant'> <span className='assistant'>
助教： 助教：
{record.admins.map((item, index) => { {record.admins.map((item, index) => {
return ( return (
<span> <span key={item.adminId + index}>
{item.adminName} {index < record.admins.length - 1 && <span> 、</span>}{' '} {item.adminName} {index < record.admins.length - 1 && <span> 、</span>}{' '}
</span> </span>
); );
})} })}
</span> </span>
</Tooltip> </Tooltip>
) : ( </When>
<Otherwise>
<span className='assistant'> <span className='assistant'>
助教： 助教：
{record.admins.map((item, index) => { {record.admins.map((item, index) => {
...@@ -210,9 +205,9 @@ class LiveCourseList extends React.Component { ...@@ -210,9 +205,9 @@ class LiveCourseList extends React.Component {
); );
})} })}
</span> </span>
)} </Otherwise>
</> </Choose>
)} </If>
</div> </div>
</div> </div>
</div> </div>
...@@ -287,10 +282,13 @@ class LiveCourseList extends React.Component { ...@@ -287,10 +282,13 @@ class LiveCourseList extends React.Component {
key: 'shelfState', key: 'shelfState',
dataIndex: 'shelfState', dataIndex: 'shelfState',
render: (val, item, index) => { render: (val, item, index) => {
return <Switch return (
checked={item.shelfState === "YES"} <Switch
defaultChecked={item.shelfState === 'YES' ? true : false} checked={item.shelfState === 'YES'}
onChange={(checked) => this.changeShelfState(index,item,checked)} />; defaultChecked={item.shelfState === 'YES' ? true : false}
onChange={(checked) => this.changeShelfState(index, item, checked)}
/>
);
}, },
}, },
{ {
...@@ -301,7 +299,7 @@ class LiveCourseList extends React.Component { ...@@ -301,7 +299,7 @@ class LiveCourseList extends React.Component {
sorter: true, sorter: true,
render: (val, item) => { render: (val, item) => {
// -29000：与后端约定 在初始化学院时，创建时间（标志位-29000）默认展示为'-' // -29000：与后端约定 在初始化学院时，创建时间（标志位-29000）默认展示为'-'
return <span>{val === -29000 ? '-' : formatDate('YYYY-MM-DD H:i', val)}</span>; return <span style={{ whiteSpace: 'nowrap' }}>{val === -29000 ? '-' : formatDate('YYYY-MM-DD H:i', val)}</span>;
}, },
}, },
{ {
...@@ -312,27 +310,31 @@ class LiveCourseList extends React.Component { ...@@ -312,27 +310,31 @@ class LiveCourseList extends React.Component {
render: (val, record) => { render: (val, record) => {
return ( return (
<div className='related-task'> <div className='related-task'>
{record.relatedPlanList ? ( <Choose>
<Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter> <When condition={record.relatedPlanLis}>
{record.relatedPlanList.map((item, index) => { <Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
return ( {record.relatedPlanList.map((item, index) => {
<span> return (
{item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '} <span>
</span> {item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '}
); </span>
})} );
</Tooltip> })}
) : ( </Tooltip>
<span></span> </When>
)} <Otherwise>
<span></span>
</Otherwise>
</Choose>
</div> </div>
); );
}, },
}, },
{ {
title: '操作', title: '操作',
width: '15%', width: '10%',
key: 'operate', key: 'operate',
fixed: 'right',
dataIndex: 'operate', dataIndex: 'operate',
render: (val, item) => { render: (val, item) => {
return ( return (
...@@ -424,21 +426,25 @@ class LiveCourseList extends React.Component { ...@@ -424,21 +426,25 @@ class LiveCourseList extends React.Component {
{record.courseMediaVOS.map((item, index) => { {record.courseMediaVOS.map((item, index) => {
if (item.contentType === 'COVER') { if (item.contentType === 'COVER') {
hasCover = true; 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> <div>
{record.courseName.length > 17 ? ( <Choose>
<Tooltip title={record.courseName}> <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> <div className='course-name'>{record.courseName}</div>
</Tooltip> </Otherwise>
) : ( </Choose>
<div className='course-name'>{record.courseName}</div>
)}
<div> <div>
<span className='course-time'> <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>
<span <span
className='course-status' className='course-status'
...@@ -447,18 +453,21 @@ class LiveCourseList extends React.Component { ...@@ -447,18 +453,21 @@ class LiveCourseList extends React.Component {
</span> </span>
</div> </div>
<div className='teacher-assistant'> <div className='teacher-assistant'>
{record.teacherName && record.teacherName.length > 4 ? ( <Choose>
<Tooltip title={record.teacherName}> <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> <span className='teacher'>讲师：{record.teacherName}</span>
</Tooltip> </Otherwise>
) : ( </Choose>
<span className='teacher'>讲师：{record.teacherName}</span>
)}
{record.admins.length > 0 && ( <If condition={record.admins.length > 0}>
<> <span className='split'> | </span>
<span className='split'> | </span> <Choose>
{this.handleAdminName(record.admins).length > 4 ? ( <When condition={this.handleAdminName(record.admins).length > 4}>
<Tooltip title={this.handleAdminName(record.admins)}> <Tooltip title={this.handleAdminName(record.admins)}>
<span className='assistant'> <span className='assistant'>
助教： 助教：
...@@ -471,7 +480,8 @@ class LiveCourseList extends React.Component { ...@@ -471,7 +480,8 @@ class LiveCourseList extends React.Component {
})} })}
</span> </span>
</Tooltip> </Tooltip>
) : ( </When>
<Otherwise>
<span className='assistant'> <span className='assistant'>
助教： 助教：
{record.admins.map((item, index) => { {record.admins.map((item, index) => {
...@@ -482,9 +492,9 @@ class LiveCourseList extends React.Component { ...@@ -482,9 +492,9 @@ class LiveCourseList extends React.Component {
); );
})} })}
</span> </span>
)} </Otherwise>
</> </Choose>
)} </If>
</div> </div>
</div> </div>
</div> </div>
...@@ -555,19 +565,22 @@ class LiveCourseList extends React.Component { ...@@ -555,19 +565,22 @@ class LiveCourseList extends React.Component {
render: (val, record) => { render: (val, record) => {
return ( return (
<div className='related-task'> <div className='related-task'>
{record.relatedPlanList ? ( <Choose>
<Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter> <When condition={record.relatedPlanList}>
{record.relatedPlanList.map((item, index) => { <Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
return ( {record.relatedPlanList.map((item, index) => {
<span> return (
{item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '} <span>
</span> {item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}{' '}
); </span>
})} );
</Tooltip> })}
) : ( </Tooltip>
<span></span> </When>
)} <Otherwise>
<span></span>
</Otherwise>
</Choose>
</div> </div>
); );
}, },
...@@ -687,7 +700,7 @@ class LiveCourseList extends React.Component { ...@@ -687,7 +700,7 @@ class LiveCourseList extends React.Component {
} }
}; };
onShowSizeChange = (current, size) => { onShowSizeChange = (current, size) => {
if (current == size) { if (current === size) {
return; return;
} }
let _query = this.props.query; let _query = this.props.query;
...@@ -795,6 +808,7 @@ class LiveCourseList extends React.Component { ...@@ -795,6 +808,7 @@ class LiveCourseList extends React.Component {
size='middle' size='middle'
pagination={false} pagination={false}
columns={columns} columns={columns}
scroll={{ x: 1300 }}
loading={loading} loading={loading}
dataSource={courseList} dataSource={courseList}
onChange={this.handleChangeTable} onChange={this.handleChangeTable}
......
src/modules/course-manage/offline-course/components/OfflineCourseList.jsx
...@@ -78,7 +78,7 @@ class OfflineCourseList extends React.Component { ...@@ -78,7 +78,7 @@ class OfflineCourseList extends React.Component {
} ${moment(startTime).format('HH:mm')} ~ ${moment(endTime).format('HH:mm')}`; } ${moment(startTime).format('HH:mm')} ~ ${moment(endTime).format('HH:mm')}`;
return ( return (
<div className='record__item'> <div className='record__item'>
<img className='course-cover' src={coverUrl || defaultCoverUrl} /> <img className='course-cover' src={coverUrl || defaultCoverUrl} alt='' />
<div style={{ width: 175 }}> <div style={{ width: 175 }}>
<Tooltip title={courseName}> <Tooltip title={courseName}>
<div className='course-name'>{courseName}</div> <div className='course-name'>{courseName}</div>
...@@ -159,7 +159,7 @@ class OfflineCourseList extends React.Component { ...@@ -159,7 +159,7 @@ class OfflineCourseList extends React.Component {
render: (val, item) => { render: (val, item) => {
return ( return (
<div> <div>
{item.startTimeApply ? `${formatDate('MM-DD H:i', item.startTimeApply)} ~ ${formatDate('MM-DD H:i', item.endTimeApply)}` : '-'} {item.startTimeApply ? `${window.formatDate('MM-DD H:i', item.startTimeApply)} ~ ${window.formatDate('MM-DD H:i', item.endTimeApply)}` : '-'}
{item.whetherApplyFull === 'YES' && ( {item.whetherApplyFull === 'YES' && (
<span <span
style={{ style={{
...@@ -185,7 +185,7 @@ class OfflineCourseList extends React.Component { ...@@ -185,7 +185,7 @@ class OfflineCourseList extends React.Component {
dataIndex: 'created', dataIndex: 'created',
sorter: true, sorter: true,
render: (val) => { render: (val) => {
return formatDate('YYYY-MM-DD H:i', val); return <span style={{ whiteSpace: 'nowrap' }}>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
}, },
}, },
{ {
...@@ -437,7 +437,7 @@ class OfflineCourseList extends React.Component { ...@@ -437,7 +437,7 @@ class OfflineCourseList extends React.Component {
columns={this.parseColumns()} columns={this.parseColumns()}
onChange={this.handleChangeTable} onChange={this.handleChangeTable}
pagination={false} pagination={false}
scroll={{ x: 1500 }} scroll={{ x: 1300 }}
bordered bordered
className='offline-list-table' className='offline-list-table'
/> />
......
src/modules/plan-manage/components/PlanList.jsx
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
*/ */
import React, { useState } from 'react'; 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 { withRouter } from 'react-router-dom';
import { PageControl, XMTable } from "@/components"; import { PageControl, XMTable } from '@/components';
import PlanService from '@/domains/plan-domain/planService'; import PlanService from '@/domains/plan-domain/planService';
import SharePlanModal from '../modal/SharePlanModal'; import SharePlanModal from '../modal/SharePlanModal';
import { LIVE_SHARE } from '@/domains/course-domain/constants'; import { LIVE_SHARE } from '@/domains/course-domain/constants';
...@@ -29,6 +29,7 @@ function PlanList(props) { ...@@ -29,6 +29,7 @@ function PlanList(props) {
key: 'planName', key: 'planName',
dataIndex: 'planName', dataIndex: 'planName',
width: '18%', width: '18%',
fixed: 'left',
render: (val, record) => { render: (val, record) => {
return ( return (
<div className='plan_name_item'> <div className='plan_name_item'>
...@@ -86,7 +87,7 @@ function PlanList(props) { ...@@ -86,7 +87,7 @@ function PlanList(props) {
dataIndex: 'created', dataIndex: 'created',
sorter: true, sorter: true,
render: (val) => { 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,7 +97,7 @@ function PlanList(props) { ...@@ -96,7 +97,7 @@ function PlanList(props) {
dataIndex: 'updated', dataIndex: 'updated',
sorter: true, sorter: true,
render: (val) => { 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>;
}, },
}, },
{ {
...@@ -114,7 +115,7 @@ function PlanList(props) { ...@@ -114,7 +115,7 @@ function PlanList(props) {
key: 'operate', key: 'operate',
dataIndex: 'operate', dataIndex: 'operate',
fixed: 'right', fixed: 'right',
width: 176, width: 100,
render: (val, record) => { render: (val, record) => {
return ( return (
<div className='operate'> <div className='operate'>
...@@ -317,7 +318,7 @@ function PlanList(props) { ...@@ -317,7 +318,7 @@ function PlanList(props) {
scroll={{ x: 1400 }} scroll={{ x: 1400 }}
className='plan-list-table' className='plan-list-table'
renderEmpty={{ renderEmpty={{
description: <span style={{ display: 'block', paddingBottom: 24 }}>暂无数据</span> description: <span style={{ display: 'block', paddingBottom: 24 }}>暂无数据</span>,
}} }}
/> />
<div className='box-footer'> <div className='box-footer'>
......
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