Skip to content

X
xiaomai-cloud-class-web
Commit d6e770c5 by zhujian
Options

fix

parents 2dc02c4e a8783b47
Showing with 616 additions and 638 deletions
src/components/ContactWidget.tsx
...@@ -9,7 +9,7 @@ interface ContactWidgetProps { ...@@ -9,7 +9,7 @@ interface ContactWidgetProps {
placement: TooltipPlacement placement: TooltipPlacement
children: React.ReactElement children: React.ReactElement
visible?: boolean visible?: boolean
trigger: ActionType | ActionType[] trigger: string | string[]
} }
function Content() { function Content() {
...@@ -28,7 +28,7 @@ function Content() { ...@@ -28,7 +28,7 @@ function Content() {
export default function ContactWidget(props:ContactWidgetProps) { export default function ContactWidget(props:ContactWidgetProps) {
return <Popover return <Popover
className="contact-widget-popover" overlayClassName="contact-widget-popover"
placement={props.placement} placement={props.placement}
arrowPointAtCenter arrowPointAtCenter
content={Content} content={Content}
......
src/index.html
...@@ -62,6 +62,5 @@ ...@@ -62,6 +62,5 @@
To begin the development, run `npm start` or `yarn start`. To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`. To create a production bundle, use `npm run build` or `yarn build`.
--> -->
</body> </body>
</html> </html>
src/modules/college-manage/EmployeeManage.tsx
...@@ -166,7 +166,7 @@ function EmployeeManage() { ...@@ -166,7 +166,7 @@ function EmployeeManage() {
}, },
}, },
{ {
title: "身份", title: "角色",
dataIndex: "role", dataIndex: "role",
key: "role", key: "role",
render: (val: string) => { render: (val: string) => {
...@@ -276,7 +276,7 @@ function EmployeeManage() { ...@@ -276,7 +276,7 @@ function EmployeeManage() {
return ( return (
<div className="page employee-manage-page"> <div className="page employee-manage-page">
<div className="content-header">员工管理</div> <div className="content-header">角色管理</div>
<div className="box"> <div className="box">
<div className="box-header"> <div className="box-header">
<div <div
...@@ -326,7 +326,7 @@ function EmployeeManage() { ...@@ -326,7 +326,7 @@ function EmployeeManage() {
</div> </div>
<div> <div>
身份： 角色：
{_.map(roleIds, (item: any) => { {_.map(roleIds, (item: any) => {
return ( return (
<CheckBox <CheckBox
......
src/modules/college-manage/modal/SetEmployeeModal.jsx
...@@ -77,7 +77,7 @@ export default class SetEmployeeModal extends React.Component { ...@@ -77,7 +77,7 @@ export default class SetEmployeeModal extends React.Component {
))} ))}
</div> </div>
<div className="detail-box"> <div className="detail-box">
<div className="title">员工身份：</div> <div className="title">员工角色：</div>
<RadioGroup <RadioGroup
value={roleCode} value={roleCode}
onChange={(e) => { onChange={(e) => {
......
src/modules/common/CourseCatalogSelect.jsx 0 → 100644
import React, { useEffect, useState } from 'react'
import { TreeSelect } from 'antd'
import User from '@/common/js/user'
import Service from '@/common/js/service'
function CourseCatalogSelect(props) {
let {
showSearch = true,
value = '',
treeNodeFilterProp = 'title',
style = { width: 240 },
dropdownStyle = { maxHeight: 300, overflow: 'auto' },
placeholder = '请选择课程类型',
allowClear = true,
onChange = () => {},
} = props
let [courseCatalogList, setCourseCatalogList] = useState([])
useEffect(() => {
//获取分类列表
function getCourseCatalogList() {
Service.Hades('public/hades/queryCategoryTree', { source: 0, tenantId: User.getStoreId(), count: false, userId: User.getUserId() }).then((res) => {
const { categoryList = [] } = res.result
let list = renderTreeNodes(categoryList)
setCourseCatalogList(list)
})
}
function renderTreeNodes(list) {
let newTreeData = list.map((item) => {
item.title = item.categoryName
item.value = item.id
item.key = item.id
console.log(value, item.value, value === item.value, 'item.categoryName')
if (item.sonCategoryList) {
item.children = renderTreeNodes(item.sonCategoryList)
}
return item
})
return newTreeData
}
getCourseCatalogList()
}, [])
return (
<TreeSelect
treeNodeLabelProp='categoryName'
showSearch={showSearch}
treeNodeFilterProp={treeNodeFilterProp}
style={style}
value={value}
dropdownStyle={dropdownStyle}
treeData={courseCatalogList}
placeholder={placeholder}
allowClear={allowClear}
treeDefaultExpandAll
onChange={(value, label) => {
onChange(value, label)
}}
/>
)
}
export default CourseCatalogSelect
src/modules/common/index.js 0 → 100644
export { default as RangePicker } from './DateRangePicker'
export { default as CourseCatalogSelect } from './CourseCatalogSelect'
src/modules/course-manage/components/AddLiveBasic.jsx
...@@ -6,25 +6,21 @@ ...@@ -6,25 +6,21 @@
* @Description: 新建/编辑直播课-基本信息 * @Description: 新建/编辑直播课-基本信息
*/ */
import React from 'react'; import React from 'react'
import { Input, Button, message, Cascader, Modal } from 'antd'; import { Input, Button, message, Cascader } from 'antd'
import UploadOss from '@/core/upload'; import { CourseCatalogSelect } from '@/modules/common'
import { ImgCutModalNew } from '@/components'; import StoreService from '@/domains/store-domain/storeService'
import StoreService from '@/domains/store-domain/storeService'; import SelectPrepareFileModal from '@/modules/prepare-lesson/modal/SelectPrepareFileModal'
import SelectPrepareFileModal from '@/modules/prepare-lesson/modal/SelectPrepareFileModal'; import Upload from '@/core/upload'
import Upload from '@/core/upload';
import Cropper from 'react-cropper';
import ImgClipModal from '@/components/ImgClipModal' import ImgClipModal from '@/components/ImgClipModal'
import 'cropperjs/dist/cropper.css'; import 'cropperjs/dist/cropper.css'
import './AddLiveBasic.less'; import './AddLiveBasic.less'
const defaultCover = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'; const defaultCover = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'
const fieldNames = { label: 'categoryName', value: 'id', children: 'sonCategoryList' }; const fieldNames = { label: 'categoryName', value: 'id', children: 'sonCategoryList' }
let cutFlag = false;
let timer = null;
class AddLiveBasic extends React.Component { class AddLiveBasic extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props)
this.state = { this.state = {
imageFile: null, imageFile: null,
showCutModal: false, showCutModal: false,
...@@ -32,63 +28,50 @@ class AddLiveBasic extends React.Component { ...@@ -32,63 +28,50 @@ class AddLiveBasic extends React.Component {
showSelectFileModal: false, showSelectFileModal: false,
cutImageBlob: null, cutImageBlob: null,
hasImgReady: false, // 图片是否上传成功 hasImgReady: false, // 图片是否上传成功
cropperInstace:null cropperInstace: null,
} }
} }
componentWillUnmount() {} componentWillUnmount() {}
componentDidMount() { componentDidMount() {
this.getCourseCatalogList(); this.getCourseCatalogList()
} }
getCourseCatalogList = () => { getCourseCatalogList = () => {
StoreService.getCourseCatalogList({ current: 1, size: 1000 }).then((res) => { StoreService.getCourseCatalogList({ current: 1, size: 1000 }).then((res) => {
this.setState({ this.setState({
courseCatalogList: res.result.records, courseCatalogList: res.result.records,
}); })
}); })
} }
// 使用默认封面图 // 使用默认封面图
handleResetCoverUrl = () => { handleResetCoverUrl = () => {
const { const {
data: { coverUrl }, data: { coverUrl },
} = this.props; } = this.props
const isDefaultCover = coverUrl === defaultCover; const isDefaultCover = coverUrl === defaultCover
// 如果已经是默认图的话，不做任何任何处理 // 如果已经是默认图的话，不做任何任何处理
if (isDefaultCover) return; if (isDefaultCover) return
message.success('已替换为默认图'); message.success('已替换为默认图')
this.props.onChange('coverUrl', defaultCover); this.props.onChange('coverUrl', defaultCover)
setTimeout(() => { setTimeout(() => {
this.props.onChange('coverId', null); this.props.onChange('coverId', null)
}, 1000); }, 1000)
}; }
catalogChange = (value) => { handleChangeCatalogList = (value) => {
const changeValueLength = value.length; this.props.onChange('categoryId', value)
switch (changeValueLength) {
case 1:
this.props.onChange('categoryId', value[0]);
break;
case 2:
this.props.onChange('categoryId', value[1]);
break;
default:
this.props.onChange('categoryId', null);
break;
} }
};
handleSelectCover = (file) => { handleSelectCover = (file) => {
this.setState({ this.setState({
visible: true, visible: true,
imageFile:file imageFile: file,
}); })
} }
//获取resourceId //获取resourceId
getSignature = (blob, fileName) => { getSignature = (blob) => {
const { choosedBannerId } = this.state;
Upload.uploadBlobToOSS(blob, 'cover' + new Date().valueOf(), null, 'signInfo').then((signInfo) => { Upload.uploadBlobToOSS(blob, 'cover' + new Date().valueOf(), null, 'signInfo').then((signInfo) => {
this.setState( this.setState(
{ {
...@@ -97,26 +80,25 @@ class AddLiveBasic extends React.Component { ...@@ -97,26 +80,25 @@ class AddLiveBasic extends React.Component {
visible: false, visible: false,
}, },
() => this.updateCover() () => this.updateCover()
); )
}); })
}; }
updateCover = () =>{ updateCover = () => {
const {coverClicpPath,coverId} = this.state const { coverClicpPath, coverId } = this.state
this.setState({ this.setState({
showSelectFileModal: false, showSelectFileModal: false,
}); })
this.props.onChange('coverUrl', coverClicpPath); this.props.onChange('coverUrl', coverClicpPath)
setTimeout(() => { setTimeout(() => {
this.props.onChange('coverId', coverId); this.props.onChange('coverId', coverId)
}, 1000); }, 1000)
}; }
render() { render() {
const { showCutModal, imageFile, courseCatalogList, showSelectFileModal, visible, cutImageBlob, hasImgReady } = this.state; const { imageFile, showSelectFileModal, visible } = this.state
const { data, pageType, isEdit } = this.props; const { data } = this.props
const { courseName, categoryName, coverUrl } = data; const { courseName, coverUrl, categoryId } = data
const fileName = '';
// 当前是否使用的是默认图片 // 当前是否使用的是默认图片
const isDefaultCover = coverUrl === defaultCover; const isDefaultCover = coverUrl === defaultCover
return ( return (
<div className='add-live__basic-info'> <div className='add-live__basic-info'>
<div className='course-name'> <div className='course-name'>
...@@ -129,7 +111,7 @@ class AddLiveBasic extends React.Component { ...@@ -129,7 +111,7 @@ class AddLiveBasic extends React.Component {
maxLength={40} maxLength={40}
style={{ width: 240 }} style={{ width: 240 }}
onChange={(e) => { onChange={(e) => {
this.props.onChange('courseName', e.target.value); this.props.onChange('courseName', e.target.value)
}} }}
/> />
</div> </div>
...@@ -142,7 +124,7 @@ class AddLiveBasic extends React.Component { ...@@ -142,7 +124,7 @@ class AddLiveBasic extends React.Component {
onClick={() => { onClick={() => {
this.setState({ this.setState({
showSelectFileModal: true, showSelectFileModal: true,
}); })
}}> }}>
上传图片 上传图片
</Button> </Button>
...@@ -161,40 +143,14 @@ class AddLiveBasic extends React.Component { ...@@ -161,40 +143,14 @@ class AddLiveBasic extends React.Component {
<span className='label'> <span className='label'>
<span className='require'>*</span>课程分类： <span className='require'>*</span>课程分类：
</span> </span>
{pageType === 'add' && ( <CourseCatalogSelect
<Cascader value={categoryId}
options={courseCatalogList} onChange={(value, label) => {
displayRender={(label) => label.join('-')} this.handleChangeCatalogList(value, label)
fieldNames={fieldNames} }}
onChange={this.catalogChange}
style={{ width: 240 }}
placeholder='请选择课程分类'
suffixIcon={
<span className='icon iconfont' style={{ fontSize: '12px', color: '#BFBFBF' }}>
&#xe835;
</span>
}
/>
)}
{pageType === 'edit' && categoryName && (
<Cascader
disabled={!isEdit ? true : false}
defaultValue={[categoryName]}
options={courseCatalogList}
displayRender={(label) => label.join('-')}
fieldNames={fieldNames}
onChange={this.catalogChange}
style={{ width: 240 }}
placeholder='请选择课程分类'
suffixIcon={
<span className='icon iconfont' style={{ fontSize: '12px', color: '#BFBFBF' }}>
&#xe835;
</span>
}
/> />
)}
</div> </div>
{showSelectFileModal && {showSelectFileModal && (
<SelectPrepareFileModal <SelectPrepareFileModal
key='basic' key='basic'
operateType='select' operateType='select'
...@@ -204,17 +160,24 @@ class AddLiveBasic extends React.Component { ...@@ -204,17 +160,24 @@ class AddLiveBasic extends React.Component {
tooltip='支持文件类型：jpg、jpeg、png' tooltip='支持文件类型：jpg、jpeg、png'
isOpen={showSelectFileModal} isOpen={showSelectFileModal}
onClose={() => { onClose={() => {
this.setState({ showSelectFileModal: false }); this.setState({ showSelectFileModal: false })
}} }}
onSelect={this.handleSelectCover} onSelect={this.handleSelectCover}
/> />
} )}
{ visible && {visible && (
<ImgClipModal visible={visible} imgUrl={imageFile.ossUrl} onConfirm={this.getSignature} onClose={()=>{this.setState({ visible: false });}}/> <ImgClipModal
} visible={visible}
imgUrl={imageFile.ossUrl}
onConfirm={this.getSignature}
onClose={() => {
this.setState({ visible: false })
}}
/>
)}
</div> </div>
); )
} }
} }
export default AddLiveBasic; export default AddLiveBasic
src/modules/course-manage/components/LiveCourseFilter.jsx
...@@ -104,7 +104,7 @@ class LiveCourseFilter extends React.Component { ...@@ -104,7 +104,7 @@ class LiveCourseFilter extends React.Component {
delete query.endTime delete query.endTime
} else { } else {
query.startTime = dates[0]?.startOf('day').valueOf() query.startTime = dates[0]?.startOf('day').valueOf()
query.endTime = dates[0]?.endOf('day').valueOf() query.endTime = dates[1]?.endOf('day').valueOf()
} }
this.setState( this.setState(
{ {
......
src/modules/course-manage/graphics-course/components/GraphicsCourseFilter.jsx
...@@ -98,7 +98,7 @@ class GraphicsCourseFilter extends React.Component { ...@@ -98,7 +98,7 @@ class GraphicsCourseFilter extends React.Component {
delete query.endTime delete query.endTime
} else { } else {
query.beginTime = dates[0]?.startOf('day').valueOf() query.beginTime = dates[0]?.startOf('day').valueOf()
query.endTime = dates[0]?.endOf('day').valueOf() query.endTime = dates[1]?.endOf('day').valueOf()
} }
this.setState( this.setState(
{ {
......
src/modules/course-manage/modal/ChargeExplainModal.jsx
...@@ -6,66 +6,54 @@ ...@@ -6,66 +6,54 @@
* @LastEditTime: 2020-12-22 20:30:54 * @LastEditTime: 2020-12-22 20:30:54
*/ */
import React from 'react' import React from 'react'
import { Modal, Button, Table } from "antd"; import { Modal, Button, Table } from 'antd'
import "./AccountChargeModal"; import './AccountChargeModal'
const data = [ const data = [
{ person: "上台人数1v1", price: "3元/人/小时" }, { person: '上台人数1v1', price: '3元/人/小时' },
{ person: "上台人数1v2", price: "3元/人/小时" }, { person: '上台人数1v2', price: '3元/人/小时' },
{ person: "上台人数1v3", price: "3元/人/小时" }, { person: '上台人数1v3', price: '3元/人/小时' },
{ person: "上台人数1v4", price: "3元/人/小时" }, { person: '上台人数1v4', price: '3元/人/小时' },
{ person: "上台人数1v5", price: "3元/人/小时" }, { person: '上台人数1v5', price: '3元/人/小时' },
{ person: "上台人数1v6", price: "3元/人/小时" }, { person: '上台人数1v6', price: '3元/人/小时' },
{ person: "上台人数1v7", price: "4元/人/小时" }, { person: '上台人数1v7', price: '4元/人/小时' },
{ person: "上台人数1v8", price: "4元/人/小时" }, { person: '上台人数1v8', price: '4元/人/小时' },
{ person: "上台人数1v9", price: "8元/人/小时" }, { person: '上台人数1v9', price: '8元/人/小时' },
{ person: "上台人数1v10", price: "8元/人/小时" }, { person: '上台人数1v10', price: '8元/人/小时' },
{ person: "上台人数1v11", price: "8元/人/小时" }, { person: '上台人数1v11', price: '8元/人/小时' },
{ person: "上台人数1v12", price: "8元/人/小时" }, { person: '上台人数1v12', price: '8元/人/小时' },
]; ]
function ChargeExplainModal(props) { function ChargeExplainModal(props) {
return ( return (
<Modal <Modal
title="计费说明" title='计费说明'
visible={true} visible={true}
className="charge-explain-modal" className='charge-explain-modal'
width={880} width={880}
maskClosable={false} maskClosable={false}
closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>} closeIcon={<span className='icon iconfont modal-close-icon'>&#xe6ef;</span>}
onCancel={() => { onCancel={() => {
props.close(); props.close()
}} }}
footer={[ footer={[
<Button <Button
type="primary" type='primary'
onClick={() => { onClick={() => {
props.close(); props.close()
}} }}>
>
关闭 关闭
</Button>, </Button>,
]} ]}>
>
<div> <div>
<div className="explain-title">1）直播课时费</div> <div className='explain-title'>1）直播课时费</div>
<p className="main-explain-block"> <p className='main-explain-block'>每节课上课费用 = 上台人数单价 × 有效出勤学生和老师人数 × 排课时长</p>
每节课上课费用 = 上台人数单价 × 有效出勤学生和老师人数 × 排课时长
</p>
<ul> <ul>
<li> <li>1. 上课老师、学生和助教在教室中的累计时长满10分钟即为有效出勤；</li>
1. 上课老师、学生和助教在教室中的累计时长满10分钟即为有效出勤； <li>2. 排课时长指创建课节设置的课节时长，最小计费单位为0.5小时，不足0.5小时按0.5小时计算；</li>
</li> <li>3. 上台人数单价：以排课时设定的上台人数上限为准，不同直播教室类型的课时单价不同。</li>
<li>
2.
排课时长指创建课节设置的课节时长，最小计费单位为0.5小时，不足0.5小时按0.5小时计算；
</li>
<li>
3.
上台人数单价：以排课时设定的上台人数上限为准，不同直播教室类型的课时单价不同。
</li>
</ul> </ul>
<p className="main-explain-text" style={{marginTop: 16,marginBottom: 8}}> <p className='main-explain-text' style={{ marginTop: 16, marginBottom: 8 }}>
温馨提醒：上台人数1vN，1为授课老师，N为同时与老师视频互动学生数；直播课时费将在老师下课后立即结算。 温馨提醒：上台人数1vN，1为授课老师，N为同时与老师视频互动学生数；直播课时费将在老师下课后立即结算。
</p> </p>
<table style={{ width: 333 }}> <table style={{ width: 333 }}>
...@@ -82,47 +70,43 @@ function ChargeExplainModal(props) { ...@@ -82,47 +70,43 @@ function ChargeExplainModal(props) {
<td>{item.person}</td> <td>{item.person}</td>
<td>{item.price}</td> <td>{item.price}</td>
</tr> </tr>
); )
})} })}
</tbody> </tbody>
</table> </table>
<p className="main-explain-text"> <p className='main-explain-text'>
示例：王老师排了一节45分钟的课程，选择的直播教室类型为5人上台，安排了1位助教、12位学生。那么，排课时长45分钟记为1小时；全员累计在线时长≥10min，老师+助教+学生共计1+1+12=14人；课时单价3元/人/小时。所以，此节课的直播课时费=1x14x3=42元 示例：王老师排了一节45分钟的课程，选择的直播教室类型为5人上台，安排了1位助教、12位学生。那么，排课时长45分钟记为1小时；全员累计在线时长≥10min，老师+助教+学生共计1+1+12=14人；课时单价3元/人/小时。所以，此节课的直播课时费=1x14x3=42元
</p> </p>
<div className="explain-title mt16">2）录制费</div> <div className='explain-title mt16'>2）录制费</div>
<p className="main-explain-block">录制费 = 录课单价 × 回放视频时长</p> <p className='main-explain-block'>录制费 = 录课单价 × 回放视频时长</p>
<ul> <ul>
<li>1. 结算时间：从回放视频生成后立即结算</li> <li>1. 结算时间：从回放视频生成后立即结算</li>
<li> 2. 回放视频时长：0.5h起收，不足0.5h的按0.5h结算</li> <li> 2. 回放视频时长：0.5h起收，不足0.5h的按0.5h结算</li>
<li> 3. 单价：2元/小时</li> <li> 3. 单价：2元/小时</li>
</ul> </ul>
<p className="main-explain-text"> <p className='main-explain-text'>示例：生成了49分26秒的回放视频，不足1h按1h计算，总费用=1(h)*2元/h=2元</p>
示例：生成了49分26秒的回放视频，不足1h按1h计算，总费用=1(h)*2元/h=2元 <div className='explain-title mt16'>3）流量费</div>
</p> <p className='main-explain-block'>观看回放视频流量费 = 流量单价 × 回放流量</p>
<div className="explain-title mt16">3）流量费</div> <p className='main-explain-text'>
<p className="main-explain-block">
观看回放视频流量费 = 流量单价 × 回放流量
</p>
<p className="main-explain-text">
目前收费报价：0元（限时免费） 目前收费报价：0元（限时免费）
<br /> 若后续变更收费，将提前30日通告收费方式及价格标准 <br /> 若后续变更收费，将提前30日通告收费方式及价格标准
</p> </p>
<div className="explain-title mt16">4）存储费</div> <div className='explain-title mt16'>4）存储费</div>
<p className="main-explain-block">存储实际扣费 = 存储单价 × 存储文件大小</p> <p className='main-explain-block'>存储实际扣费 = 存储单价 × 存储文件大小</p>
<p className="main-explain-text"> <p className='main-explain-text'>
目前收费报价：0元（限时免费） 目前收费报价：0元（限时免费）
<br /> <br />
若后续变更收费，将提前30日通告收费方式及价格标准 若后续变更收费，将提前30日通告收费方式及价格标准
</p> </p>
<div className="explain-title mt16">5）其他说明</div> <div className='explain-title mt16'>5）其他说明</div>
<div className="main-explain-text"> <div className='main-explain-text'>
余额不足时将限制使用创建直播课、老师和学生进入直播间、老师和学生观看回放视频、在资料云盘或直播间上传文件等功能，请注意及时充值。（余额＜300元时将发送短信提醒，请注意查看。） 余额不足时将限制使用创建直播课、老师和学生进入直播间、老师和学生观看回放视频、在素材库或直播间上传文件等功能，请注意及时充值。（余额＜300元时将发送短信提醒，请注意查看。）
</div> </div>
</div> </div>
</Modal> </Modal>
); )
} }
export default ChargeExplainModal; export default ChargeExplainModal
src/modules/course-manage/offline-course/components/OfflineCourseFilter.jsx
...@@ -136,10 +136,10 @@ class OfflineCourseFilter extends React.Component { ...@@ -136,10 +136,10 @@ class OfflineCourseFilter extends React.Component {
<Row type='flex' justify='space-between' align='top'> <Row type='flex' justify='space-between' align='top'>
<div className='search-condition'> <div className='search-condition'>
<div className='search-condition__item'> <div className='search-condition__item'>
<span className='search-name'>线下课名称：</span> <span className='search-name'>线下活动名称：</span>
<Search <Search
value={courseName} value={courseName}
placeholder='搜索线下课名称' placeholder='搜索线下活动名称'
onChange={(e) => { onChange={(e) => {
this.handleChangeQuery('courseName', e.target.value) this.handleChangeQuery('courseName', e.target.value)
}} }}
......
src/modules/course-manage/offline-course/components/OfflineCourseFilter.less
.video-course-filter { .video-course-filter {
position: relative; position: relative;
.video-list-table{ .video-list-table {
// tr:nth-child(even){ // tr:nth-child(even){
// background: transparent !important; // background: transparent !important;
...@@ -24,13 +23,14 @@ ...@@ -24,13 +23,14 @@
margin-bottom: 12px; margin-bottom: 12px;
align-items: center; align-items: center;
display: flex; display: flex;
.search-name{ .search-name {
width: 114px;
vertical-align: middle; vertical-align: middle;
} }
.shelf-status{ .shelf-status {
width:84px; width: 84px;
display:inline-block; display: inline-block;
text-align:right; text-align: right;
} }
} }
} }
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
line-height: 20px; line-height: 20px;
.fold-icon { .fold-icon {
font-size: 12px; font-size: 12px;
margin-left:4px; margin-left: 4px;
} }
} }
} }
......
src/modules/course-manage/offline-course/components/OfflineCourseOpt.jsx
...@@ -7,22 +7,22 @@ ...@@ -7,22 +7,22 @@
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
import React from 'react'; import React from 'react'
import { Button } from 'antd'; import { Button } from 'antd'
import './OfflineCourseOpt.less'; import './OfflineCourseOpt.less'
export default function OfflineCourseOpt() { export default function OfflineCourseOpt() {
return ( return (
<div className="video-course-opt"> <div className='video-course-opt'>
<Button <Button
type="primary" type='primary'
onClick={() => { onClick={() => {
RCHistory.push('/create-offline-course?type=add'); RCHistory.push('/create-offline-course?type=add')
}} }}
className="mr12" className='mr12'>
>新建线下课</Button> 新建线下活动
</Button>
</div> </div>
); )
} }
src/modules/course-manage/offline-course/index.jsx
import React from 'react'; import React from 'react'
import OfflineCourseFilter from './components/OfflineCourseFilter'; import OfflineCourseFilter from './components/OfflineCourseFilter'
import OfflineCourseOpt from './components/OfflineCourseOpt'; import OfflineCourseOpt from './components/OfflineCourseOpt'
import OfflineCourseList from './components/OfflineCourseList'; import OfflineCourseList from './components/OfflineCourseList'
import Service from '@/common/js/service'; import Service from '@/common/js/service'
import User from '@/common/js/user' import User from '@/common/js/user'
class OfflineCoursePage extends React.Component { class OfflineCoursePage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props)
this.state = { this.state = {
query: { query: {
size: 10, size: 10,
current: 1, current: 1,
storeId:User.getStoreId() storeId: User.getStoreId(),
}, },
dataSource: [], // 线下课列表 dataSource: [], // 线下课列表
totalCount: 0, // 线下课数据总条数 totalCount: 0, // 线下课数据总条数
...@@ -23,54 +22,47 @@ class OfflineCoursePage extends React.Component { ...@@ -23,54 +22,47 @@ class OfflineCoursePage extends React.Component {
componentWillMount() { componentWillMount() {
// 获取线下课列表 // 获取线下课列表
this.handleFetchScheduleList(); this.handleFetchScheduleList()
} }
// 获取线下课列表 // 获取线下课列表
handleFetchScheduleList = (_query = {}) => { handleFetchScheduleList = (_query = {}) => {
const query = { const query = {
...this.state.query, ...this.state.query,
..._query ..._query,
}; }
// 更新请求参数 // 更新请求参数
this.setState({ query }); this.setState({ query })
Service.Hades('public/hades/getOfflineCoursePage', query).then((res) => { Service.Hades('public/hades/getOfflineCoursePage', query).then((res) => {
const { result = {} } = res || {}; const { result = {} } = res || {}
const { records = [], total = 0 } = result; const { records = [], total = 0 } = result
this.setState({ this.setState({
dataSource: records, dataSource: records,
totalCount: Number(total) totalCount: Number(total),
}); })
}) })
} }
render() { render() {
const { dataSource, totalCount, query } = this.state; const { dataSource, totalCount, query } = this.state
return ( return (
<div className="page video-course-page"> <div className='page video-course-page'>
<div className="content-header">线下课</div> <div className='content-header'>线下活动</div>
<div className="box"> <div className='box'>
{/* 搜索模块 */} {/* 搜索模块 */}
<OfflineCourseFilter <OfflineCourseFilter onChange={this.handleFetchScheduleList} />
onChange={this.handleFetchScheduleList}
/>
{/* 操作模块 */} {/* 操作模块 */}
{window.ctx.xmState.storeUserPermissionList.includes('AddOfflineClass') && <OfflineCourseOpt />} {window.ctx.xmState.storeUserPermissionList.includes('AddOfflineClass') && <OfflineCourseOpt />}
{/* 线下课列表模块 */} {/* 线下课列表模块 */}
<OfflineCourseList <OfflineCourseList query={query} dataSource={dataSource} totalCount={totalCount} onChange={this.handleFetchScheduleList} />
query={query}
dataSource={dataSource}
totalCount={totalCount}
onChange={this.handleFetchScheduleList}
/>
</div> </div>
</div> </div>
) )
} }
} }
export default OfflineCoursePage; export default OfflineCoursePage
src/modules/prepare-lesson/components/DiskList.jsx
...@@ -5,57 +5,43 @@ ...@@ -5,57 +5,43 @@
* @Last Modified time: 2020-06-23 14:54:14 * @Last Modified time: 2020-06-23 14:54:14
* @Description: 网络磁盘（我的文件、公共文件、员工文件） * @Description: 网络磁盘（我的文件、公共文件、员工文件）
*/ */
import React from 'react'; import React from 'react'
import { DISK_MAP } from '@/common/constants/academic/lessonEnum'
import { DISK_MAP } from "@/common/constants/academic/lessonEnum";
function DiskList(props) { function DiskList(props) {
const { diskList, currentRootDisk } = props
const { diskList, currentRootDisk } = props;
return ( return (
<div className="disk-list__wrap"> <div className='disk-list__wrap'>
<div className="disk-list"> <div className='disk-list'>
{ {diskList.map((item) => {
diskList.map((item) => { const isActive = item.disk === currentRootDisk.disk
const isActive = item.disk === currentRootDisk.disk;
return ( return (
<div <div
key={item.disk} key={item.disk}
className={`item ${isActive ? 'active' : ''}`} className={`item ${isActive ? 'active' : ''}`}
onClick={() => { props.onChange(item)}} onClick={() => {
> props.onChange(item)
{ }}>
item.disk === 'MYSELF' && {item.disk === 'MYSELF' && <span className='icon iconfont'>&#xe7a5;</span>}
<span className="icon iconfont">&#xe7a5;</span> {item.disk === 'COMMON' && <span className='icon iconfont'>&#xe79d;</span>}
} {item.disk === 'EMPLOYEE' && <span className='icon iconfont'>&#xe7a3;</span>}
{ <span className='disk-name'>{item.folderName}</span>
item.disk === 'COMMON' &&
<span className="icon iconfont">&#xe79d;</span>
}
{
item.disk === 'EMPLOYEE' &&
<span className="icon iconfont">&#xe7a3;</span>
}
<span className="disk-name">{ item.folderName }</span>
</div> </div>
) )
}) })}
}
</div> </div>
<a <a
className="guide-href" className='guide-href'
href={window.NewVersion ? 'https://mp.weixin.qq.com/s/s0XN0Gk4Xul192SmTd6znw' : 'https://mp.weixin.qq.com/s/2EMWaaa3LQwkJd59bmy8pA'} href={window.NewVersion ? 'https://mp.weixin.qq.com/s/s0XN0Gk4Xul192SmTd6znw' : 'https://mp.weixin.qq.com/s/2EMWaaa3LQwkJd59bmy8pA'}
target="_blank" target='_blank'>
> 进一步了解素材库
进一步了解资料云盘
</a> </a>
</div> </div>
) )
}; }
export default DiskList; export default DiskList
\ No newline at end of file
src/modules/prepare-lesson/index.jsx
import React from 'react'; import React from 'react'
import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom'
import { Modal, Button } from 'antd'; import { Modal, Button } from 'antd'
import User from '@/common/js/user'; import User from '@/common/js/user'
import FolderManage from './components/FolderManage'; import FolderManage from './components/FolderManage'
import DiskList from './components/DiskList'; import DiskList from './components/DiskList'
import { DISK_MAP } from "@/common/constants/academic/lessonEnum"; import { DISK_MAP } from '@/common/constants/academic/lessonEnum'
import './index.less'; import './index.less'
const { teacherId, gmtCreate } = window.currentUserInstInfo; const { teacherId, gmtCreate } = window.currentUserInstInfo
// 判断是否是5.0或4.0T端 // 判断是否是5.0或4.0T端
const isTeacher = !!teacherId; const isTeacher = !!teacherId
// 判断是新用户还是老用户（gmtCreate小于上线日期的话就是老用户） // 判断是新用户还是老用户（gmtCreate小于上线日期的话就是老用户）
const onlineDate = +new Date('2020-07-17 00:00:00'); const onlineDate = +new Date('2020-07-17 00:00:00')
const isOldUser = gmtCreate <= onlineDate; const isOldUser = gmtCreate <= onlineDate
const defaultRootDisk = { const defaultRootDisk = {
folderName: '我的文件', folderName: '我的文件',
disk: 'MYSELF', disk: 'MYSELF',
uploadPower: false uploadPower: false,
} }
class PrepareLessonPage extends React.Component { class PrepareLessonPage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props)
const prepareLessonTips = localStorage.getItem('prepare_lesson_tips'); const prepareLessonTips = localStorage.getItem('prepare_lesson_tips')
this.state = { this.state = {
prepareLessonTips, prepareLessonTips,
diskList: [], // 可见磁盘目录 diskList: [], // 可见磁盘目录
currentRootDisk: defaultRootDisk currentRootDisk: defaultRootDisk,
} }
} }
componentWillMount() { componentWillMount() {
this.handleFetchDiskList(); this.handleFetchDiskList()
} }
handleFetchDiskList = async () => { handleFetchDiskList = async () => {
const res = await axios.Apollo('public/apollo/getUserDisk', {}); const res = await axios.Apollo('public/apollo/getUserDisk', {})
const { result = [] } = res; const { result = [] } = res
const diskList = result.map((item) => { const diskList = result.map((item) => {
return { return {
...item, ...item,
folderName: DISK_MAP[item.disk] folderName: DISK_MAP[item.disk],
} }
}); })
this.setState({ this.setState({
diskList, diskList,
currentRootDisk: diskList[0] || defaultRootDisk currentRootDisk: diskList[0] || defaultRootDisk,
}); })
} }
handleChangeDisk = (disk) => { handleChangeDisk = (disk) => {
this.setState({ this.setState({
currentRootDisk: disk currentRootDisk: disk,
}); })
} }
render() { render() {
const { currentRootDisk, prepareLessonTips, diskList } = this.state; const { currentRootDisk, prepareLessonTips, diskList } = this.state
return ( return (
<div className="prepare-lesson-page page"> <div className='prepare-lesson-page page'>
<div className="content-header">资料云盘</div> <div className='content-header'>素材库</div>
<div className="box content-body"> <div className='box content-body'>
<DiskList <DiskList diskList={diskList} currentRootDisk={currentRootDisk} onChange={this.handleChangeDisk} />
diskList={diskList} <FolderManage currentRootDisk={currentRootDisk} />
currentRootDisk={currentRootDisk}
onChange={this.handleChangeDisk}
/>
<FolderManage
currentRootDisk={currentRootDisk}
/>
</div> </div>
{/* 老用户显示弹窗提示 */} {/* 老用户显示弹窗提示 */}
<Modal <Modal
title="备课本改版" title='备课本改版'
visible={!prepareLessonTips && isOldUser} visible={!prepareLessonTips && isOldUser}
footer={null} footer={null}
width={680} width={680}
maskClosable={false} maskClosable={false}
closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>} closeIcon={<span className='icon iconfont modal-close-icon'>&#xe6ef;</span>}
className="prepare-lesson-upgrade-modal" className='prepare-lesson-upgrade-modal'
onCancel={() => { onCancel={() => {
this.setState({ this.setState({
prepareLessonTips: true prepareLessonTips: true,
}) })
}} }}>
> <div className='title'>“备课本” 升级为 “素材库” 了！</div>
<div className="title">“备课本” 升级为 “资料云盘” 了！</div> <div className='upgrade-list'>
<div className="upgrade-list"> <div className='upgrade-list__item'>
<div className="upgrade-list__item"> <img src='https://xiaomai-image.oss-cn-hangzhou.aliyuncs.com/1594780611301.png' alt='' />
<img src="https://xiaomai-image.oss-cn-hangzhou.aliyuncs.com/1594780611301.png" alt=""/> <div className='item-title'>存储更便捷</div>
<div className="item-title">存储更便捷</div> <div className='item-sub-title'>讲次关联模式升级文件夹模式，存储不再受讲次限制</div>
<div className="item-sub-title">讲次关联模式升级文件夹模式，存储不再受讲次限制</div>
</div> </div>
<div className="upgrade-list__item"> <div className='upgrade-list__item'>
<img src="https://xiaomai-image.oss-cn-hangzhou.aliyuncs.com/1594780629259.png" alt=""/> <img src='https://xiaomai-image.oss-cn-hangzhou.aliyuncs.com/1594780629259.png' alt='' />
<div className="item-title">结构更清晰</div> <div className='item-title'>结构更清晰</div>
<div className="item-sub-title">新增“我的文件”“公共文件”“员工文件”，满足机构存储需求</div> <div className='item-sub-title'>新增“我的文件”“公共文件”“员工文件”，满足机构存储需求</div>
</div> </div>
<div className="upgrade-list__item"> <div className='upgrade-list__item'>
<img src="https://xiaomai-image.oss-cn-hangzhou.aliyuncs.com/1594780641665.png" alt=""/> <img src='https://xiaomai-image.oss-cn-hangzhou.aliyuncs.com/1594780641665.png' alt='' />
<div className="item-title">同步更方便</div> <div className='item-title'>同步更方便</div>
<div className="item-sub-title">支持主管直接查看员工文件，优质资料一目了然</div> <div className='item-sub-title'>支持主管直接查看员工文件，优质资料一目了然</div>
</div> </div>
</div> </div>
<div <div
className="footer" className='footer'
onClick={() => { onClick={() => {
this.setState({ prepareLessonTips: true }); this.setState({ prepareLessonTips: true })
localStorage.setItem('prepare_lesson_tips', true); localStorage.setItem('prepare_lesson_tips', true)
}} }}>
>我知道了</div> 我知道了
</div>
</Modal> </Modal>
</div> </div>
) )
} }
} }
export default PrepareLessonPage; export default PrepareLessonPage
\ No newline at end of file
src/modules/resource-disk/index.jsx
import React from 'react'; import React from 'react'
import Service from '@/common/js/service'; import Service from '@/common/js/service'
import { DISK_MAP } from '@/domains/resource-disk/constants'; import { DISK_MAP } from '@/domains/resource-disk/constants'
import FolderManage from './components/FolderManage'; import FolderManage from './components/FolderManage'
import DiskList from './components/DiskList'; import DiskList from './components/DiskList'
import './index.less'; import './index.less'
const defaultRootDisk = { const defaultRootDisk = {
folderName: '公共文件', folderName: '公共文件',
disk: 'COMMON', disk: 'COMMON',
uploadPower: true uploadPower: true,
} }
class PrepareLessonPage extends React.Component { class PrepareLessonPage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props)
this.state = { this.state = {
// 目前只有公共文件，先由前端定义 // 目前只有公共文件，先由前端定义
diskList: [ diskList: [
{ {
folderName: '公共文件', folderName: '公共文件',
disk: 'COMMON', disk: 'COMMON',
uploadPower: true uploadPower: true,
} },
], // 可见磁盘目录 ], // 可见磁盘目录
currentRootDisk: defaultRootDisk currentRootDisk: defaultRootDisk,
} }
} }
handleChangeDisk = (disk) => { handleChangeDisk = (disk) => {
this.setState({ this.setState({
currentRootDisk: disk currentRootDisk: disk,
}); })
} }
render() { render() {
const { currentRootDisk, diskList } = this.state; const { currentRootDisk, diskList } = this.state
console.log('currentRootDisk',currentRootDisk); console.log('currentRootDisk', currentRootDisk)
return ( return (
<div className="prepare-lesson-page page"> <div className='prepare-lesson-page page'>
<div className="content-header">资料云盘</div> <div className='content-header'>素材库</div>
<div className="box content-body"> <div className='box content-body'>
<DiskList <DiskList diskList={diskList} currentRootDisk={currentRootDisk} onChange={this.handleChangeDisk} />
diskList={diskList} <FolderManage currentRootDisk={currentRootDisk} />
currentRootDisk={currentRootDisk}
onChange={this.handleChangeDisk}
/>
<FolderManage
currentRootDisk={currentRootDisk}
/>
</div> </div>
</div> </div>
) )
} }
} }
export default PrepareLessonPage; export default PrepareLessonPage
\ No newline at end of file
src/modules/resource-disk/modal/ScanFileModal.jsx
...@@ -34,7 +34,7 @@ class ScanFileModal extends React.Component { ...@@ -34,7 +34,7 @@ class ScanFileModal extends React.Component {
style={{ width: 632, objectFit: "cover" }} style={{ width: 632, objectFit: "cover" }}
/> />
)} )}
{fileType === "VIDEO" && ( {(fileType ==="VIDEO" || fileType === "MP4") && (
<div> <div>
<Player <Player
src={item.mediaUrl || item.ossAddress || item.ossUrl} src={item.mediaUrl || item.ossAddress || item.ossUrl}
......
src/modules/root/Header.jsx
...@@ -154,7 +154,7 @@ function Header(props) { ...@@ -154,7 +154,7 @@ function Header(props) {
}); });
}}> }}>
<span className='menu-before iconfont icon'>&#xe84e;</span> <span className='menu-before iconfont icon'>&#xe84e;</span>
<span>进入管理后台</span> <span>多学院管理面板</span>
<span className='menu-after iconfont icon'>&#xe79b;</span> <span className='menu-after iconfont icon'>&#xe79b;</span>
</div> </div>
)} )}
......
src/modules/store-manage/EmployeeAddOrEditModal.tsx
...@@ -273,7 +273,7 @@ function AddEmployeeModal(props: AddEmployeeModalProps) { ...@@ -273,7 +273,7 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
</Form.Item> </Form.Item>
)} )}
<Form.Item <Form.Item
label="员工身份" label="员工角色"
name="role" name="role"
rules={[{ required: false }]} rules={[{ required: false }]}
style={{marginBottom:'-2px !important'}} style={{marginBottom:'-2px !important'}}
......
src/modules/store-manage/EmployeesManagePage.tsx
...@@ -300,7 +300,7 @@ function EmployeesManagePage() { ...@@ -300,7 +300,7 @@ function EmployeesManagePage() {
return ( return (
<div className=" page employee-manage-page"> <div className=" page employee-manage-page">
<div className="content-header">员工管理</div> <div className="content-header">角色管理</div>
<div className="box"> <div className="box">
<div className="box-header"> <div className="box-header">
<div <div
......
src/modules/store-manage/StoreDecorationPage.less
.store-decoration-page { .store-decoration-page {
.box { .box {
padding-top:11px!important; padding-top: 11px !important;
} }
thead { thead {
display: none; display: none;
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
} }
.banner-thumbnail { .banner-thumbnail {
width: 230px; width: 230px;
height: 79px; height: 96px;
} }
.web-banner-thumbnail { .web-banner-thumbnail {
width: 389px; width: 389px;
height: 67px; height: 162px;
} }
.index-num { .index-num {
...@@ -51,18 +51,17 @@ ...@@ -51,18 +51,17 @@
.operation { .operation {
.edit { .edit {
color: #2966FF; color: #2966ff;
cursor: pointer; cursor: pointer;
} }
.divider-line { .divider-line {
color:#BFBFBF color: #bfbfbf;
} }
.delete { .delete {
color: #2966FF; color: #2966ff;
cursor: pointer; cursor: pointer;
} }
} }
} }
.clip-box { .clip-box {
display: flex; display: flex;
...@@ -86,7 +85,7 @@ ...@@ -86,7 +85,7 @@
.preview-url { .preview-url {
width: 500px; width: 500px;
height: 73px; height: 73px;
background: #E6E6E6; background: #e6e6e6;
} }
#preview-url-box { #preview-url-box {
...@@ -112,11 +111,11 @@ ...@@ -112,11 +111,11 @@
} }
.banner-thumbnail { .banner-thumbnail {
width: 230px; width: 230px;
height: 79px; height: 96px;
} }
.web-banner-thumbnail { .web-banner-thumbnail {
width: 389px; width: 389px;
height: 67px; height: 162px;
} }
.index-num { .index-num {
height: 33px; height: 33px;
......
src/modules/teach-tool/components/CourseCategoryManage.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-02-23 18:28:50 * @Date: 2021-02-23 18:28:50
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2021-06-24 13:39:30 * @LastEditTime: 2021-07-23 15:02:34
* @Description: 助学工具-课程分类 * @Description: 助学工具-课程分类
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
......
src/modules/teach-tool/components/CourseCategoryManage.less
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
height: 44px; height: 44px;
padding: 0; padding: 0;
span { span {
line-height: 44px; line-height: 47px;
vertical-align: middle; vertical-align: middle;
} }
.ant-tree-node-content-wrapper.ant-tree-node-selected { .ant-tree-node-content-wrapper.ant-tree-node-selected {
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
*.node-title-div { *.node-title-div {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between;
.title-opts { .title-opts {
visibility: hidden; visibility: hidden;
margin-right: 16px; margin-left: 24px;
margin-bottom: 4px;
} }
} }
} }
......
src/modules/teach-tool/components/CourseCategorySiderTree.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-02-22 10:59:43 * @Date: 2021-02-22 10:59:43
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-07-13 11:54:21 * @LastEditTime: 2021-07-27 13:37:07
* @Description: 助学工具-侧边课程分类树 * @Description: 助学工具-侧边课程分类树
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -184,7 +184,7 @@ class CourseCategorySiderTree extends Component { ...@@ -184,7 +184,7 @@ class CourseCategorySiderTree extends Component {
return ( return (
<div className='category-tree-sider'> <div className='category-tree-sider'>
{['QUESTION_INDEX', 'PAPER_INDEX'].includes(this.props.fromModule) && ( {this.props.type !== 'modal-select' && (
<div className='sider-title'>{this.props.fromModule === 'QUESTION_INDEX' ? '题目分类' : '试卷分类'}</div> <div className='sider-title'>{this.props.fromModule === 'QUESTION_INDEX' ? '题目分类' : '试卷分类'}</div>
)} )}
<Search <Search
...@@ -195,7 +195,7 @@ class CourseCategorySiderTree extends Component { ...@@ -195,7 +195,7 @@ class CourseCategorySiderTree extends Component {
}} }}
enterButton={<span className='icon iconfont'>&#xe832;</span>} enterButton={<span className='icon iconfont'>&#xe832;</span>}
/> />
{['QUESTION_INDEX', 'PAPER_INDEX'].includes(this.props.fromModule) && User.getUserRole() !== 'CloudLecturer' && this.props.type !== 'modal-select' && ( {['QUESTION_INDEX', 'PAPER'].includes(this.props.fromModule) && User.getUserRole() !== 'CloudLecturer' && this.props.type !== 'modal-select' && (
<div className='sider-btn'> <div className='sider-btn'>
<Button <Button
onClick={() => { onClick={() => {
...@@ -207,7 +207,7 @@ class CourseCategorySiderTree extends Component { ...@@ -207,7 +207,7 @@ class CourseCategorySiderTree extends Component {
</Button> </Button>
</div> </div>
)} )}
<div className='sider-tree'> <div className={`sider-tree ${this.props.type === 'modal-select' ? 'modal-sider-tree' : 'page-sider-tree'}`}>
<DirectoryTree <DirectoryTree
expandedKeys={expandedKeys} expandedKeys={expandedKeys}
autoExpandParent={autoExpandParent} autoExpandParent={autoExpandParent}
......
src/modules/teach-tool/components/CourseCategorySiderTree.less
...@@ -16,15 +16,21 @@ ...@@ -16,15 +16,21 @@
margin-bottom: 16px; margin-bottom: 16px;
} }
.modal-sider-tree {
height: calc(60vh - 61px);
}
.page-sider-tree {
height: calc(100vh - 300px);
}
.sider-tree { .sider-tree {
width: 244px; width: 244px;
overflow: scroll; overflow: scroll;
height: calc(100vh - 300px);
.empty-tree-tip { .empty-tree-tip {
text-align: center; text-align: center;
margin-top: 100%; margin-top: 100%;
.empty-tree-btn { .empty-tree-btn {
color: #2966FF; color: #2966ff;
cursor: pointer; cursor: pointer;
} }
} }
...@@ -44,7 +50,7 @@ ...@@ -44,7 +50,7 @@
white-space: nowrap; white-space: nowrap;
} }
.ant-tree-node-content-wrapper.ant-tree-node-selected { .ant-tree-node-content-wrapper.ant-tree-node-selected {
color: #2966FF; color: #2966ff;
} }
} }
.ant-tree-treenode-selected:hover::before, .ant-tree-treenode-selected:hover::before,
......
src/modules/teach-tool/components/XMAudio.less
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
.xm-audio { .xm-audio {
display: flex; display: flex;
align-items: center; align-items: center;
width: 280px; width: 315px;
padding: 10px 20px; padding: 10px 0 10px 20px;
border-radius: 5px; border-radius: 5px;
background-color: #ffffff; background-color: #ffffff;
.audio-image { .audio-image {
......
src/modules/teach-tool/examination-manager/SelectPaperModal.tsx
/*
* @Author: yuananting
* @Date: 2021-06-16 10:14:37
* @LastEditors: yuananting
* @LastEditTime: 2021-07-27 14:04:03
* @Description: 描述一下咯
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
import React, { useState, useRef, useEffect, useContext } from 'react' import React, { useState, useRef, useEffect, useContext } from 'react'
import { message, Modal } from 'antd'; import { message, Modal } from 'antd';
import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
...@@ -12,14 +20,14 @@ function SelectPaperModal(props: any) { ...@@ -12,14 +20,14 @@ function SelectPaperModal(props: any) {
useEffect(() => { useEffect(() => {
itemRef.current = item itemRef.current = item
console.log(item, 'khjkhjkhjk')
}, [item]) }, [item])
return <Modal return <Modal
maskClosable={false} maskClosable={false}
width={900} width={1080}
title="选择试卷" title="选择试卷"
visible={true} visible={true}
centered={true}
onOk={() => { onOk={() => {
props.onSelect(itemRef.current); props.onSelect(itemRef.current);
props.close(); props.close();
...@@ -27,9 +35,7 @@ function SelectPaperModal(props: any) { ...@@ -27,9 +35,7 @@ function SelectPaperModal(props: any) {
} }
onCancel={() => { props.close() }} onCancel={() => { props.close() }}
> >
<div style={{ maxHeight: 500 }}>
<PaperContent paperId={item.paperId} onSelect={(item: any) => { setItem(item) }} type='modal-select'></PaperContent> <PaperContent paperId={item.paperId} onSelect={(item: any) => { setItem(item) }} type='modal-select'></PaperContent>
</div>
</Modal > </Modal >
} }
......
src/modules/teach-tool/examination-manager/index.less
...@@ -18,4 +18,8 @@ ...@@ -18,4 +18,8 @@
background: #fafafa; background: #fafafa;
} }
} }
.ant-table-wrapper {
max-height: calc(100vh - 280px);
overflow: scroll;
}
} }
src/modules/teach-tool/paper-manage/OperatePaper.less
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
.table-style { .table-style {
border: 1px solid #f0f0f0 !important; border: 1px solid #f0f0f0 !important;
margin-bottom: 70px; margin-bottom: 70px;
max-height: calc(~'100vh - 465px'); max-height: calc(~'100vh - 437px');
min-height: 323px;
overflow: scroll; overflow: scroll;
} }
.ant-tabs { .ant-tabs {
......
src/modules/teach-tool/paper-manage/PaperContent.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-03-27 14:55:14 * @Date: 2021-03-27 14:55:14
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-04-07 10:25:44 * @LastEditTime: 2021-07-27 13:33:51
* @Description: 助学工具-试卷主页面 * @Description: 助学工具-试卷主页面
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -19,14 +19,14 @@ class PaperContent extends Component { ...@@ -19,14 +19,14 @@ class PaperContent extends Component {
render() { render() {
return ( return (
<div className={this.props.type == "modal-select"? "paper-content-page paper-content-modal":"paper-content-page"} > <div className="paper-content-page" >
<div <div
style={{ borderRight: "0.5px solid #EEEEEE", paddingRight: "4px" }} style={{ borderRight: "0.5px solid #EEEEEE", paddingRight: "4px" }}
> >
<div className="sider" > <div className="sider" >
<CourseCategorySiderTree <CourseCategorySiderTree
type={this.props.type} type={this.props.type}
fromModule="PAPER_INDEX" fromModule="PAPER"
/> />
</div> </div>
</div> </div>
......
src/modules/teach-tool/paper-manage/PaperContent.less
.paper-content-page { .paper-content-page {
display: flex; display: flex;
&.paper-content-modal{
max-height: 500px;
.sider,.content{
max-height: 100%;
overflow: auto;
}
.content{
height: auto;
overflow: auto;
}
}
.sider { .sider {
min-width: 244px; min-width: 244px;
} }
.content { .content {
width: 100%; width: 100%;
margin-left: 24px; margin-left: 24px;
height: calc(100vh - 160px); .modal-paper-list {
.ant-table-wrapper {
overflow: scroll;
height: calc(60vh - 109px);
border: 1px solid #e8e8e8;
}
}
.page-paper-list {
height: calc(100vh - 260px);
overflow: scroll;
}
.ant-table-column-sorters {
padding: 0;
}
.ant-table-tbody > tr > td {
border: none;
}
} }
} }
src/modules/teach-tool/paper-manage/components/PaperList.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-02-25 11:23:47 * @Date: 2021-02-25 11:23:47
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-07-13 15:16:52 * @LastEditTime: 2021-07-27 13:59:01
* @Description: 助学工具-题库-试卷列表数据 * @Description: 助学工具-题库-试卷列表数据
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -616,7 +616,7 @@ class PaperList extends Component { ...@@ -616,7 +616,7 @@ class PaperList extends Component {
</div> </div>
)} )}
<div className="paper-list-content"> <div className={`paper-list-content ${this.props.type == "modal-select" ? "modal-paper-list" : "page-paper-list"}`}>
{this.props.type !== "modal-select" ? ( {this.props.type !== "modal-select" ? (
<XMTable <XMTable
rowKey={(record) => record.paperId} rowKey={(record) => record.paperId}
...@@ -642,7 +642,6 @@ class PaperList extends Component { ...@@ -642,7 +642,6 @@ class PaperList extends Component {
rowSelection={rowSelection} rowSelection={rowSelection}
columns={this.parseColumns()} columns={this.parseColumns()}
pagination={false} pagination={false}
bordered
renderEmpty={{ renderEmpty={{
image: college, image: college,
description: <span style={{ display: 'block', paddingBottom: 24 }}>还没有试卷</span> description: <span style={{ display: 'block', paddingBottom: 24 }}>还没有试卷</span>
...@@ -656,7 +655,6 @@ class PaperList extends Component { ...@@ -656,7 +655,6 @@ class PaperList extends Component {
current={current - 1} current={current - 1}
pageSize={size} pageSize={size}
total={total} total={total}
size={this.props.type == "modal-select" ? "small" : "middle"}
toPage={(page) => { toPage={(page) => {
const _query = { ...query, current: page + 1 }; const _query = { ...query, current: page + 1 };
this.setState({ query: _query }, () => this.setState({ query: _query }, () =>
......
src/modules/teach-tool/paper-manage/components/PaperList.less
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.select-box { .select-box {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 12px;
.select-container { .select-container {
margin-right: 24px; margin-right: 24px;
.con { .con {
...@@ -74,9 +75,6 @@ ...@@ -74,9 +75,6 @@
} }
.paper-list-content { .paper-list-content {
position: relative; position: relative;
margin-top: 12px;
height: calc(100vh - 260px);
overflow: scroll;
.empty-list-tip { .empty-list-tip {
color: #2966ff; color: #2966ff;
cursor: pointer; cursor: pointer;
......
src/modules/teach-tool/paper-manage/components/SelectQuestionList.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-02-25 11:23:47 * @Date: 2021-02-25 11:23:47
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-05-30 18:17:05 * @LastEditTime: 2021-07-27 14:00:12
* @Description: 助学工具-新建试卷-选择题目列表 * @Description: 助学工具-新建试卷-选择题目列表
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -431,7 +431,6 @@ class SelectQuestionList extends Component { ...@@ -431,7 +431,6 @@ class SelectQuestionList extends Component {
columns={this.parseColumns()} columns={this.parseColumns()}
pagination={false} pagination={false}
onChange={this.handleChangeTable} onChange={this.handleChangeTable}
bordered
/> />
<div className="box-footer"> <div className="box-footer">
<PageControl <PageControl
......
src/modules/teach-tool/paper-manage/modal/PreviewPaperModal.less
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
.voice-box { .voice-box {
margin-bottom: 12px; margin-bottom: 12px;
box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
padding: 10px 20px;
width: 320px; width: 320px;
} }
} }
......
src/modules/teach-tool/paper-manage/modal/SelectQuestionModal.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-03-29 10:52:26 * @Date: 2021-03-29 10:52:26
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-06-07 14:45:02 * @LastEditTime: 2021-07-27 13:53:14
* @Description: 助学工具-试卷-新建选择题目弹窗 * @Description: 助学工具-试卷-新建选择题目弹窗
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -40,6 +40,7 @@ class SelectQuestionModal extends Component { ...@@ -40,6 +40,7 @@ class SelectQuestionModal extends Component {
title="选择题目" title="选择题目"
visible={true} visible={true}
width={1080} width={1080}
centered={true}
onOk={() => { onOk={() => {
this.props.setSelectedQuestion( this.props.setSelectedQuestion(
this.listRef.current.state.selectQuestionKeys.map((item, index) => { this.listRef.current.state.selectQuestionKeys.map((item, index) => {
...@@ -60,15 +61,15 @@ class SelectQuestionModal extends Component { ...@@ -60,15 +61,15 @@ class SelectQuestionModal extends Component {
}} }}
onCancel={this.props.close} onCancel={this.props.close}
> >
<div className="box content-body" style={{maxHeight:500}}> <div className="box content-body">
<div <div
style={{ borderRight: "0.5px solid #EEEEEE", paddingRight: "4px",overflowY:'auto',overflowX:'hidden'}} style={{ borderRight: "0.5px solid #EEEEEE", paddingRight: "4px" }}
> >
<div className="sider"> <div className="sider">
<CourseCategorySiderTree fromModule="QUESTION_MODAL" /> <CourseCategorySiderTree fromModule="QUESTION_MODAL" type="modal-select" />
</div> </div>
</div> </div>
<div className="content" style={{height:'auto',overflowY:'auto'}}> <div className="content">
<SelectQuestionList ref={this.listRef} /> <SelectQuestionList ref={this.listRef} />
</div> </div>
</div> </div>
......
src/modules/teach-tool/paper-manage/modal/SelectQuestionModal.less
.select-question-modal { .select-question-modal {
.content-body { .content-body {
display: flex; display: flex;
height: calc(~'100% - 48px');
.sider { .sider {
min-width: 244px; min-width: 244px;
} }
.content { .content {
width: 100%; width: 100%;
margin-left: 24px; margin-left: 24px;
height: calc(100vh - 160px); .select-question-list {
.select-question-content {
.ant-table-wrapper {
overflow: scroll;
height: calc(60vh - 159px);
border: 1px solid #E8E8E8;
}
}
}
} }
} }
.ant-table-column-sorters { .ant-table-column-sorters {
padding: 0; padding: 0;
} }
} .ant-table-tbody > tr > td {
.select-question-modal.ant-modal { border: none;
max-height: 70% !important; }
} }
\ No newline at end of file
src/modules/teach-tool/question-manage/Index.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-02-21 17:51:01 * @Date: 2021-02-21 17:51:01
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-04-07 10:45:07 * @LastEditTime: 2021-07-27 13:11:51
* @Description: 助学工具-题库 * @Description: 助学工具-题库
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -26,7 +26,7 @@ class QuestionIndex extends Component { ...@@ -26,7 +26,7 @@ class QuestionIndex extends Component {
style={{ borderRight: "0.5px solid #EEEEEE", paddingRight: "4px" }} style={{ borderRight: "0.5px solid #EEEEEE", paddingRight: "4px" }}
> >
<div className="sider"> <div className="sider">
<CourseCategorySiderTree fromModule="QUESTION_INDEX" /> <CourseCategorySiderTree fromModule="QUESTION_INDEX" type="" />
</div> </div>
</div> </div>
<div className="content"> <div className="content">
......
src/modules/teach-tool/question-manage/components/OperateQuestionTab.less
...@@ -314,7 +314,6 @@ ...@@ -314,7 +314,6 @@
.audio-box { .audio-box {
position: relative; position: relative;
box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
padding: 10px 20px;
width: 320px; width: 320px;
margin-bottom: 12px; margin-bottom: 12px;
.icon_sider { .icon_sider {
......
src/modules/teach-tool/question-manage/modal/PreviewQuestionModal.less
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
.voice-box { .voice-box {
margin-bottom: 12px; margin-bottom: 12px;
box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
padding: 10px 20px;
width: 320px; width: 320px;
} }
} }
...@@ -144,7 +143,6 @@ ...@@ -144,7 +143,6 @@
.voice-box { .voice-box {
margin-bottom: 12px; margin-bottom: 12px;
box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
padding: 10px 20px;
width: 320px; width: 320px;
} }
} }
...@@ -248,7 +246,6 @@ ...@@ -248,7 +246,6 @@
margin-bottom: 16px; margin-bottom: 16px;
.audio-box { .audio-box {
box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.1);
padding: 10px 20px;
width: 320px; width: 320px;
margin-bottom: 12px; margin-bottom: 12px;
} }
......
src/routes/config/mainRoutes.tsx
...@@ -5,37 +5,37 @@ ...@@ -5,37 +5,37 @@
* @LastEditTime: 2021-05-13 16:39:51 * @LastEditTime: 2021-05-13 16:39:51
* @Description: 内容线路由配置 * @Description: 内容线路由配置
*/ */
import Home from '@/modules/home/Home'; import Home from '@/modules/home/Home'
import EmployeesManagePage from '@/modules/store-manage/EmployeesManagePage'; import EmployeesManagePage from '@/modules/store-manage/EmployeesManagePage'
import EmployeeManage from '@/modules/college-manage/EmployeeManage'; import EmployeeManage from '@/modules/college-manage/EmployeeManage'
import personalInfoPage from '@/modules/personalInfo'; import personalInfoPage from '@/modules/personalInfo'
import UserManagePage from '@/modules/store-manage/UserManagePage'; import UserManagePage from '@/modules/store-manage/UserManagePage'
import UserManage from '@/modules/college-manage/UserManagePage'; import UserManage from '@/modules/college-manage/UserManagePage'
import StoreDecorationPage from '@/modules/store-manage/StoreDecorationPage'; import StoreDecorationPage from '@/modules/store-manage/StoreDecorationPage'
import CourseCatalogPage from '@/modules/store-manage/CourseCatalogPage'; import CourseCatalogPage from '@/modules/store-manage/CourseCatalogPage'
import LiveCoursePage from '@/modules/course-manage/LiveCoursePage'; import LiveCoursePage from '@/modules/course-manage/LiveCoursePage'
import AddLivePage from '@/modules/course-manage/AddLive'; import AddLivePage from '@/modules/course-manage/AddLive'
import VideoCoursePage from '@/modules/course-manage/video-course'; import VideoCoursePage from '@/modules/course-manage/video-course'
import GraphicsCoursePage from '@/modules/course-manage/graphics-course'; import GraphicsCoursePage from '@/modules/course-manage/graphics-course'
import OfflineCoursePage from '@/modules/course-manage/offline-course'; import OfflineCoursePage from '@/modules/course-manage/offline-course'
import AddVideoCoursePage from '@/modules/course-manage/video-course/AddVideoCourse'; import AddVideoCoursePage from '@/modules/course-manage/video-course/AddVideoCourse'
import AddGraphicsCoursePage from '@/modules/course-manage/graphics-course/AddGraphicsCourse'; import AddGraphicsCoursePage from '@/modules/course-manage/graphics-course/AddGraphicsCourse'
import AddOfflineCoursePage from '@/modules/course-manage/offline-course/AddOfflineCourse'; import AddOfflineCoursePage from '@/modules/course-manage/offline-course/AddOfflineCourse'
// import DataList from '@/modules/course-manage/DataList/DataList'; // import DataList from '@/modules/course-manage/DataList/DataList';
// import ClassBook from '@/modules/resource-disk'; // import ClassBook from '@/modules/resource-disk';
import ResourceDisk from '@/modules/resource-disk'; import ResourceDisk from '@/modules/resource-disk'
import SwitchRoute from '@/modules/root/SwitchRoute'; import SwitchRoute from '@/modules/root/SwitchRoute'
import PlanPage from '@/modules/plan-manage/PlanPage'; import PlanPage from '@/modules/plan-manage/PlanPage'
import AddPlanPage from '@/modules/plan-manage/AddPlan'; import AddPlanPage from '@/modules/plan-manage/AddPlan'
import LearningDataPage from '@/modules/plan-manage/LearningData'; import LearningDataPage from '@/modules/plan-manage/LearningData'
import StoreInfoPage from '@/modules/store-manage/StoreInfo'; import StoreInfoPage from '@/modules/store-manage/StoreInfo'
import CourseCategoryManage from '@/modules/teach-tool/components/CourseCategoryManage'; import CourseCategoryManage from '@/modules/teach-tool/components/CourseCategoryManage'
import QuestionManageIndex from '@/modules/teach-tool/question-manage/Index'; import QuestionManageIndex from '@/modules/teach-tool/question-manage/Index'
import PaperManageIndex from '@/modules/teach-tool/paper-manage/Index'; import PaperManageIndex from '@/modules/teach-tool/paper-manage/Index'
import ExaminationManagerIndex from '@/modules/teach-tool/examination-manager/Index'; import ExaminationManagerIndex from '@/modules/teach-tool/examination-manager/Index'
import ExaminationManagerTestDetail from '@/modules/teach-tool/examination-manager/TestDetailPage'; import ExaminationManagerTestDetail from '@/modules/teach-tool/examination-manager/TestDetailPage'
import KnowledgeBase from '@/modules/knowledge-base/index'; import KnowledgeBase from '@/modules/knowledge-base/index'
import CollegeInfoPage from '@/modules/college-manage/CollegeInfoPage'; import CollegeInfoPage from '@/modules/college-manage/CollegeInfoPage'
const mainRoutes = [ const mainRoutes = [
{ {
...@@ -46,12 +46,12 @@ const mainRoutes = [ ...@@ -46,12 +46,12 @@ const mainRoutes = [
{ {
path: '/employees-manage', path: '/employees-manage',
component: EmployeesManagePage, component: EmployeesManagePage,
name: '员工管理', name: '角色管理',
}, },
{ {
path: '/college-employee', path: '/college-employee',
component: EmployeeManage, component: EmployeeManage,
name: '员工管理', name: '角色管理',
}, },
{ {
path: '/personal-info', path: '/personal-info',
...@@ -91,7 +91,7 @@ const mainRoutes = [ ...@@ -91,7 +91,7 @@ const mainRoutes = [
{ {
path: '/offline-course', path: '/offline-course',
component: OfflineCoursePage, component: OfflineCoursePage,
name: '线下课', name: '线下活动',
}, },
{ {
path: '/create-live-course', path: '/create-live-course',
...@@ -117,12 +117,12 @@ const mainRoutes = [ ...@@ -117,12 +117,12 @@ const mainRoutes = [
{ {
path: '/create-offline-course', path: '/create-offline-course',
component: AddOfflineCoursePage, component: AddOfflineCoursePage,
name: '创建线下课', name: '创建线下活动',
}, },
{ {
path: '/resource-disk', path: '/resource-disk',
component: ResourceDisk, component: ResourceDisk,
name: '资料云盘', name: '素材库',
}, },
{ {
path: '/question-manage-index', path: '/question-manage-index',
...@@ -180,6 +180,6 @@ const mainRoutes = [ ...@@ -180,6 +180,6 @@ const mainRoutes = [
component: LearningDataPage, component: LearningDataPage,
name: '学习数据', name: '学习数据',
}, },
]; ]
export default mainRoutes; export default mainRoutes
src/routes/config/menuList.tsx
...@@ -28,8 +28,8 @@ export const menuList: any = [ ...@@ -28,8 +28,8 @@ export const menuList: any = [
link: '/live-course', link: '/live-course',
}, },
{ {
groupName: "线上课", groupName: '线上课',
groupCode: "CourseVideoClass", groupCode: 'CourseVideoClass',
link: '/video-course', link: '/video-course',
}, },
{ {
...@@ -38,7 +38,7 @@ export const menuList: any = [ ...@@ -38,7 +38,7 @@ export const menuList: any = [
link: '/graphics-course', link: '/graphics-course',
}, },
{ {
groupName: '线下课', groupName: '线下活动',
groupCode: 'OfflineClass', groupCode: 'OfflineClass',
link: '/offline-course', link: '/offline-course',
}, },
...@@ -91,7 +91,7 @@ export const menuList: any = [ ...@@ -91,7 +91,7 @@ export const menuList: any = [
selectImg: 'https://image.xiaomaiketang.com/xm/hJKCfibC22.png', selectImg: 'https://image.xiaomaiketang.com/xm/hJKCfibC22.png',
}, },
{ {
groupName: '资料云盘', groupName: '素材库',
groupCode: 'CloudDisk', groupCode: 'CloudDisk',
icon: '&#xe8aa;', icon: '&#xe8aa;',
link: '/resource-disk', link: '/resource-disk',
...@@ -99,14 +99,14 @@ export const menuList: any = [ ...@@ -99,14 +99,14 @@ export const menuList: any = [
selectImg: 'https://image.xiaomaiketang.com/xm/5sN4MzjxYc.png', selectImg: 'https://image.xiaomaiketang.com/xm/5sN4MzjxYc.png',
}, },
{ {
groupName: '人员管理', groupName: '权限管理',
groupCode: 'PersonManage', groupCode: 'PersonManage',
icon: '&#xe8a4;', icon: '&#xe8a4;',
img: 'https://image.xiaomaiketang.com/xm/PRCnrt35y8.png', img: 'https://image.xiaomaiketang.com/xm/PRCnrt35y8.png',
selectImg: 'https://image.xiaomaiketang.com/xm/GhkwbdpwfK.png', selectImg: 'https://image.xiaomaiketang.com/xm/GhkwbdpwfK.png',
children: [ children: [
{ {
groupName: '员工管理', groupName: '角色管理',
groupCode: 'ShopStaff', groupCode: 'ShopStaff',
link: '/college-employee', link: '/college-employee',
}, },
...@@ -151,4 +151,4 @@ export const menuList: any = [ ...@@ -151,4 +151,4 @@ export const menuList: any = [
}, },
], ],
}, },
]; ]
src/routes/config/redirectRoutes.tsx
import LiveCoursePage from "@/modules/course-manage/LiveCoursePage"; import LiveCoursePage from '@/modules/course-manage/LiveCoursePage'
import ResourceDisk from "@/modules/resource-disk"; import ResourceDisk from '@/modules/resource-disk'
const redirectRoutes = [ const redirectRoutes = [
{ {
path: "/redirect-to-live-course", path: '/redirect-to-live-course',
component: LiveCoursePage, component: LiveCoursePage,
name: "课程管理", name: '课程管理',
}, },
{ {
path: "/redirect-to-resource-disk", path: '/redirect-to-resource-disk',
component: ResourceDisk, component: ResourceDisk,
name: "资料云盘", name: '素材库',
}, },
]; ]
export default redirectRoutes; export default redirectRoutes
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