Skip to content

X
xiaomai-cloud-class-web
Commit 64da5d5c by zangsuyun
Options

style:ui测试

parent a2628d26
Showing with 20 additions and 12 deletions
src/modules/knowledge-base/components/CourseData.jsx
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-15 16:51:40 * @Date: 2021-03-15 16:51:40
* @LastEditors: zangsuyun * @LastEditors: zangsuyun
* @LastEditTime: 2021-03-30 10:33:10 * @LastEditTime: 2021-04-10 16:13:07
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -339,7 +339,6 @@ class CourseData extends React.Component { ...@@ -339,7 +339,6 @@ class CourseData extends React.Component {
</div> </div>
<Table <Table
bordered
size="small" size="small"
scroll={{ y: 600 }} scroll={{ y: 600 }}
columns={this.getStudentColumns()} columns={this.getStudentColumns()}
......
src/modules/knowledge-base/components/KnowledgeBase.less
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
flex-wrap: wrap; flex-wrap: wrap;
&__item { &__item {
width: 45%; width: 33%;
max-width: 600px; max-width: 600px;
margin-right: 3%; margin-right: 3%;
margin-bottom: 12px; margin-bottom: 12px;
......
src/modules/knowledge-base/components/KnowledgeBaseList.jsx
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-12 14:49:40 * @Date: 2021-03-12 14:49:40
* @LastEditors: zangsuyun * @LastEditors: zangsuyun
* @LastEditTime: 2021-04-10 10:55:13 * @LastEditTime: 2021-04-10 16:07:58
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -153,6 +153,7 @@ class KnowledgeBaseList extends React.Component { ...@@ -153,6 +153,7 @@ class KnowledgeBaseList extends React.Component {
title: "抱歉，不能在线预览", title: "抱歉，不能在线预览",
content: "由于文件较大，不支持在线预览，请下载后再查看", content: "由于文件较大，不支持在线预览，请下载后再查看",
// icon: <Icon type="question-circle" theme="filled" style={{ color: '#FF8534' }}></Icon>, // icon: <Icon type="question-circle" theme="filled" style={{ color: '#FF8534' }}></Icon>,
cancelText: "取消",
okText: "下载", okText: "下载",
onOk: () => { onOk: () => {
this.handleDownload(folder) this.handleDownload(folder)
...@@ -189,7 +190,7 @@ class KnowledgeBaseList extends React.Component { ...@@ -189,7 +190,7 @@ class KnowledgeBaseList extends React.Component {
key: "name", key: "name",
dataIndex: "name", dataIndex: "name",
width: 391, width: 391,
// fixed: "left", fixed: "left",
render: (val, record) => { render: (val, record) => {
const { coverUrl, mediaCourseUrl } = record.source; const { coverUrl, mediaCourseUrl } = record.source;
let hasCover = false; let hasCover = false;
...@@ -394,10 +395,11 @@ class KnowledgeBaseList extends React.Component { ...@@ -394,10 +395,11 @@ class KnowledgeBaseList extends React.Component {
title: "课程类型", title: "课程类型",
key: "type", key: "type",
dataIndex: "type", dataIndex: "type",
align:'center',
// width: 100, // width: 100,
render: (val, record) => { render: (val, record) => {
return ( return (
<div className="record__item"> <div className="">
{val ? ENUM.CourseTypeEnum[val] : "-"} {val ? ENUM.CourseTypeEnum[val] : "-"}
</div> </div>
); );
...@@ -407,6 +409,7 @@ class KnowledgeBaseList extends React.Component { ...@@ -407,6 +409,7 @@ class KnowledgeBaseList extends React.Component {
title: "创建人", title: "创建人",
key: "createName", key: "createName",
dataIndex: "createName", dataIndex: "createName",
align:'center',
render: (val) => { render: (val) => {
return ( return (
<div> <div>
...@@ -423,10 +426,12 @@ class KnowledgeBaseList extends React.Component { ...@@ -423,10 +426,12 @@ class KnowledgeBaseList extends React.Component {
title: "观看用户数", title: "观看用户数",
key: "watchUserCount", key: "watchUserCount",
dataIndex: "watchUserCount", dataIndex: "watchUserCount",
align:'right',
render: (val, item) => { render: (val, item) => {
return val ? ( return val ? (
<div <div
className="operate" className="operate"
style={{display:'block'}}
onClick={() => this.handleLinkToClassData(item)} onClick={() => this.handleLinkToClassData(item)}
> >
<span className="operate__item">{val}</span> <span className="operate__item">{val}</span>
...@@ -437,11 +442,15 @@ class KnowledgeBaseList extends React.Component { ...@@ -437,11 +442,15 @@ class KnowledgeBaseList extends React.Component {
}, },
}, },
{ {
title: "",
width: 48,
},
{
title: "操作", title: "操作",
key: "operate", key: "operate",
dataIndex: "operate", dataIndex: "operate",
width: 160, width: 160,
// fixed: "right", fixed: "right",
render: (val, record, index) => { render: (val, record, index) => {
console.log(this.props.categoryId); console.log(this.props.categoryId);
return this.props.categoryId === "0" ? ( return this.props.categoryId === "0" ? (
...@@ -554,7 +563,7 @@ class KnowledgeBaseList extends React.Component { ...@@ -554,7 +563,7 @@ class KnowledgeBaseList extends React.Component {
dataSource={dataSource} dataSource={dataSource}
columns={this.parseColumns()} columns={this.parseColumns()}
pagination={false} pagination={false}
// scroll={{ x: 1500 }} scroll={{ x: 900 }}
bordered bordered
className="video-list-table" className="video-list-table"
/> />
......
src/modules/knowledge-base/index.jsx
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-12 10:43:10 * @Date: 2021-03-12 10:43:10
* @LastEditors: zangsuyun * @LastEditors: zangsuyun
* @LastEditTime: 2021-04-08 11:52:42 * @LastEditTime: 2021-04-10 16:39:30
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
import React from "react"; import React from "react";
...@@ -95,7 +95,7 @@ export default class KnowledgeBase extends React.Component { ...@@ -95,7 +95,7 @@ export default class KnowledgeBase extends React.Component {
</div> </div>
<div <div
className="liner" className="liner"
style={{ backgroundColor: "rgb(238, 238, 238)", width: 0.5, margin: "1px 24px 1px 2px" }} style={{ backgroundColor: "rgb(238, 238, 238)", width: 0.5, margin: "1px 16px 1px 2px" }}
></div> ></div>
<div className="right" style={{ width: "calc(100% - 285px)" }}> <div className="right" style={{ width: "calc(100% - 285px)" }}>
<KnowledgeBaseFilter onChange={this.handleFetchScheduleList} /> <KnowledgeBaseFilter onChange={this.handleFetchScheduleList} />
......
src/modules/knowledge-base/modal/LiveList.less
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
.course-name { .course-name {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #333333; color: #666666;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
line-height: 20px; line-height: 20px;
max-width: 244px; max-width: 244px;
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
.ant-tabs-nav .ant-tabs-tab { .ant-tabs-nav .ant-tabs-tab {
padding: 6px 12px !important; padding: 6px 12px !important;
margin: 0; margin: 0;
border: 1px solid #e8e8e8; border: 0.5px solid #e8e8e8;
font-size: 14px !important; font-size: 14px !important;
color: #999; color: #999;
......
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