Skip to content

X
xiaomai-cloud-class-web
Commit 8ed646dd by wufan
Options

feat:上课数据路由方式变更为子路由

parent 5254c186
Showing with 29 additions and 32 deletions
src/components/Breadcrumbs.tsx
...@@ -21,7 +21,6 @@ const Breadcrumbs = (props: BreadcrumbsProps) => { ...@@ -21,7 +21,6 @@ const Breadcrumbs = (props: BreadcrumbsProps) => {
const { goBack, navList, text } = props; const { goBack, navList, text } = props;
function _onClick(): any { function _onClick(): any {
console.log("返回来")
goBack ? goBack() : window.RCHistory.goBack(); goBack ? goBack() : window.RCHistory.goBack();
} }
const isString = _.isString(navList); const isString = _.isString(navList);
......
src/core/variables.less
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
//old //old
//color //color
@xm-color-primary: #FF7519; @xm-color-primary:#FFB714;
@xm-color-primary_active: #020201; @xm-color-primary_active: #020201;
@xm-color-primary-darker: #ff8534; @xm-color-primary-darker: #ff8534;
@xm-color-selected: #F58E2C; @xm-color-selected: #F58E2C;
......
src/modules/course-manage/DataList/DataList.jsx
...@@ -26,7 +26,6 @@ class DataList extends React.Component { ...@@ -26,7 +26,6 @@ class DataList extends React.Component {
<Breadcrumbs <Breadcrumbs
navList="上课数据" navList="上课数据"
goBack={() => { goBack={() => {
console.log("准备返回");
RCHistory.goBack(); RCHistory.goBack();
}} }}
/> />
......
src/modules/course-manage/components/LiveCourseFilter.less
.live-course-filter { .live-course-filter {
position: relative; position: relative;
.search-condition { .search-condition {
width: calc(100% - 80px); width: calc(100% - 80px);
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
&__item { &__item {
width: 30%; width: 30%;
margin-right: 3%; margin-right: 3%;
...@@ -17,18 +17,20 @@ ...@@ -17,18 +17,20 @@
position: absolute; position: absolute;
right: 12px; right: 12px;
} }
.resetBtn{ .resetBtn {
color:#999999; color: #999999;
font-size:18px; font-size: 18px;
margin-right:8px; margin-right: 8px;
} }
.fold-btn{ .fold-btn {
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
line-height: 20px; line-height: 20px;
.fold-icon{ .fold-icon {
font-size: 12px; font-size: 12px;
} }
} }
}
} .data-icon {
\ No newline at end of file cursor: pointer;
}
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
*/ */
import React from 'react'; import React from 'react';
import { Table, Modal, Tooltip, Badge, message, Dropdown, Button,Switch} from 'antd'; import { Table, Modal, message, Dropdown, Button,Switch} from 'antd';
import { Route, withRouter } from 'react-router-dom';
// import Bus from '@/core/bus'; // import Bus from '@/core/bus';
// import User from "@/core/user"; // import User from "@/core/user";
// import User_t from "@/teacher/core/user"; // import User_t from "@/teacher/core/user";
...@@ -30,6 +30,8 @@ import './LiveCourseList.less'; ...@@ -30,6 +30,8 @@ import './LiveCourseList.less';
import { QuestionCircleOutlined } from '@ant-design/icons'; import { QuestionCircleOutlined } from '@ant-design/icons';
import { appId, shareUrl, LIVE_SHARE } from '@/domains/course-domain/constants'; import { appId, shareUrl, LIVE_SHARE } from '@/domains/course-domain/constants';
import CourseService from "@/domains/course-domain/CourseService"; import CourseService from "@/domains/course-domain/CourseService";
import DataList from '../DataList/DataList';
const { confirm } = Modal; const { confirm } = Modal;
const courseStateShow = { const courseStateShow = {
UN_START: { UN_START: {
...@@ -135,8 +137,11 @@ class LiveCourseList extends React.Component { ...@@ -135,8 +137,11 @@ class LiveCourseList extends React.Component {
// 前往上课数据页面 // 前往上课数据页面
handleLinkToClassData = (item) => { handleLinkToClassData = (item) => {
// TODOLIST 确定后端是否是根据liveCourseId 返回数据 const { match } = this.props;
window.RCHistory.push(`/live-course-data?type=large&id=${item.liveCourseId}`)
window.RCHistory.push({
pathname: `${match.url}/live-course-data?type=large&id=${item.liveCourseId}`
});
} }
parseColumns = () => { parseColumns = () => {
const menu = (item) => ( const menu = (item) => (
...@@ -208,7 +213,7 @@ class LiveCourseList extends React.Component { ...@@ -208,7 +213,7 @@ class LiveCourseList extends React.Component {
dataIndex: "quota", dataIndex: "quota",
render: (val, item) => { render: (val, item) => {
return ( return (
<span className="iconfont icon" onClick={() => { <span className="iconfont icon data-icon" onClick={() => {
this.handleLinkToClassData(item) this.handleLinkToClassData(item)
}}>&#xe7d6;</span> }}>&#xe7d6;</span>
); );
...@@ -390,6 +395,8 @@ class LiveCourseList extends React.Component { ...@@ -390,6 +395,8 @@ class LiveCourseList extends React.Component {
const { openDownloadModal, const { openDownloadModal,
downloadUrl, url, columns, downloadUrl, url, columns,
} = this.state; } = this.state;
const { match } = this.props;
return ( return (
<div className="live-course-list"> <div className="live-course-list">
<Table <Table
...@@ -426,9 +433,10 @@ class LiveCourseList extends React.Component { ...@@ -426,9 +433,10 @@ class LiveCourseList extends React.Component {
/> />
)} )}
<iframe src={url} style={{ display: "none" }} /> <iframe src={url} style={{ display: "none" }} />
<Route path={`${match.url}/live-course-data`} component={DataList} />
</div> </div>
) )
} }
} }
export default LiveCourseList; export default withRouter(LiveCourseList);
\ No newline at end of file \ No newline at end of file
src/routes/config/mainRoutes.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-04-29 10:26:32 * @Date: 2020-04-29 10:26:32
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2020-12-14 11:13:16 * @LastEditTime: 2020-12-16 16:39:03
* @Description: 内容线路由配置 * @Description: 内容线路由配置
*/ */
import EmployeesManagePage from '@/modules/store-manage/EmployeesManagePage'; import EmployeesManagePage from '@/modules/store-manage/EmployeesManagePage';
...@@ -53,11 +53,6 @@ const mainRoutes = [ ...@@ -53,11 +53,6 @@ const mainRoutes = [
name: '创建直播课' name: '创建直播课'
}, },
{ {
path: '/live-course-data',
component: DataList,
name: '上课数据'
},
{
path: '/resource-disk', path: '/resource-disk',
component:ClassBook, component:ClassBook,
name: '资料云盘' name: '资料云盘'
......
src/routes/config/menuList.tsx
...@@ -14,11 +14,6 @@ export const menuList: any = [ ...@@ -14,11 +14,6 @@ export const menuList: any = [
// groupCode: "CourseVideoClass", // groupCode: "CourseVideoClass",
// link: '/CourseVideoClass' // link: '/CourseVideoClass'
// } // }
{
groupName: "直播课-上课数据",
groupCode: "CourseData",
link: '/live-course-data'
},
] ]
}, },
{ {
......
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