Skip to content

X
xiaomai-cloud-class-web
Commit 1402a09b by guomingpang
Options

fix:merge hotfix/hotfix/pangguoming/20210601/plan_list_add_cover to master

parents 5bd610bd e340da37
Showing with 210 additions and 146 deletions
src/core/antd.less
......@@ -4,7 +4,7 @@
* @Last Modified by: chenshu
* @Last Modified time: 2020-08-31 14:55:30
*/
@import "./variables.less";
@import './variables.less';
@active-color: #2966ff;
......@@ -234,7 +234,7 @@
}
.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
font-weight: 500!important;
font-weight: 500 !important;
}
.ant-tabs-nav .ant-tabs-tab-active {
......@@ -259,7 +259,7 @@
//display: none!important;
&:after {
content: "";
content: '';
display: inline-block;
position: absolute;
width: 30px;
......@@ -660,8 +660,8 @@ td.ant-table-column-sort {
background-color: #2966ff !important;
opacity: 0.8 !important;
}
&:active{
background-color:#5C8AFF !important;
&:active {
background-color: #5c8aff !important;
}
}
......
src/core/page.less
......@@ -7,7 +7,7 @@
left: 0px;
right: 0;
bottom: 0;
z-index:3;
z-index: 3;
background-color: #fff;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
......@@ -20,12 +20,12 @@
bottom: 0;
z-index: 102;
overflow: auto;
margin:0 16px;
.box{
&:first-child{
margin: 0 16px;
.box {
&:first-child {
margin-bottom: 8px;
}
&:last-child{
&:last-child {
margin-bottom: 16px;
}
}
......@@ -48,10 +48,10 @@
.content-header {
padding: 16px 16px 8px 16px;
line-height: 30px;
font-size:24px;
color:#333;
font-weight:bold;
background: #FFF;
font-size: 24px;
color: #333;
font-weight: bold;
background: #fff;
h1 {
font-weight: normal;
display: inline-block;
......
src/modules/course-manage/video-course/components/VideoCourseList.jsx
......@@ -450,7 +450,7 @@ class VideoCourseList extends React.Component {
},
() => {
this.props.onChange();
},
}
);
};
render() {
......
src/modules/home/Home.less
......@@ -139,6 +139,7 @@
background: #fff;
width: ~'calc(50% - 8px)';
padding: 16px;
overflow: hidden;
.study-title {
font-size: 14px;
color: #333;
......
src/modules/knowledge-base/index.jsx
import React from 'react';
import React from 'react'
import KnowledgeBaseFilter from './components/KnowledgeBaseFilter';
import KnowledgeBaseOpt from './components/KnowledgeBaseOpt';
import KnowledgeBaseList from './components/KnowledgeBaseList';
import Classification from './components/Classification';
import KnowledgeBaseFilter from './components/KnowledgeBaseFilter'
import KnowledgeBaseOpt from './components/KnowledgeBaseOpt'
import KnowledgeBaseList from './components/KnowledgeBaseList'
import Classification from './components/Classification'
import KnowledgeAPI from '@/data-source/knowledge/request-api'
import User from '@/common/js/user'
import KnowledgeAPI from '@/data-source/knowledge/request-api';
import User from '@/common/js/user';
export default class KnowledgeBase extends React.Component {
constructor(props) {
super(props)
super(props);
this.state = {
query: {
size: 10,
......@@ -23,51 +22,51 @@ export default class KnowledgeBase extends React.Component {
totalCount: 0, // 知识库数据总条数
categoryId: '0',
updateCategoryFlag: false,
}
};
}
componentWillMount() {
// 获取知识库列表
this.handleFetchScheduleList()
this.handleFetchScheduleList();
// this.getCategoryTree()
}
getSelectedCategoryId = (categoryId) => {
this.setState({
categoryId,
})
this.handleFetchScheduleList({ categoryId, current: 1 })
}
});
this.handleFetchScheduleList({ categoryId, current: 1 });
};
// 更新分类树
updateCategoryTree = () => {
this.setState({
updateCategoryFlag: !this.state.updateCategoryFlag,
})
}
});
};
// 获取知识库列表
handleFetchScheduleList = (_query = {}, flag = true) => {
const query = {
...this.state.query,
..._query,
}
};
// 更新请求参数
this.setState({ query })
this.setState({ query });
flag &&
KnowledgeAPI.queryPageKnowledgeForManager(query).then((res) => {
// KnowledgeAPI.videoSchedulePage(query).then((res) => {
const { result = {} } = res || {}
const { records = [], total = 0 } = result
const { result = {} } = res || {};
const { records = [], total = 0 } = result;
this.setState({
dataSource: records,
totalCount: Number(total),
})
})
}
});
});
};
render() {
const { dataSource, totalCount, query, categoryId, updateCategoryFlag } = this.state
const { dataSource, totalCount, query, categoryId, updateCategoryFlag } = this.state;
return (
<div className='page'>
<div className='content-header'>知识库</div>
......@@ -77,11 +76,8 @@ export default class KnowledgeBase extends React.Component {
<div className='left' style={{ width: 245 }}>
<Classification updateCategoryFlag={updateCategoryFlag} categoryId={categoryId} getSelectedCategoryId={this.getSelectedCategoryId} />
</div>
<div
className="liner"
style={{ backgroundColor: "rgb(238, 238, 238)", width: 0.5, margin: "1px 16px 1px 2px" }}
></div>
<div className="right" style={{ width: "calc(100% - 265px)" }}>
<div className='liner' style={{ backgroundColor: 'rgb(238, 238, 238)', width: 0.5, margin: '1px 16px 1px 2px' }}></div>
<div className='right' style={{ width: 'calc(100% - 265px)' }}>
<KnowledgeBaseFilter onChange={this.handleFetchScheduleList} />
{/* 操作模块 */}
......@@ -101,6 +97,6 @@ export default class KnowledgeBase extends React.Component {
</div>
</div>
</div>
)
);
}
}
src/modules/knowledge-base/modal/AddCourse.jsx
......@@ -3,7 +3,7 @@
* @Author: zangsuyun
* @Date: 2021-03-13 09:54:26
* @LastEditors: fusanqiasng
* @LastEditTime: 2021-05-31 18:23:28
* @LastEditTime: 2021-06-01 10:26:46
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -258,7 +258,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchLiveList();
},
}
);
};
......@@ -272,7 +272,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchVideoList();
},
}
);
};
......@@ -286,7 +286,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchPictureList();
},
}
);
};
......@@ -593,7 +593,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchVideoList();
},
}
);
};
......@@ -615,7 +615,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchLiveList();
},
}
);
};
......@@ -629,7 +629,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchPictureList();
},
}
);
};
handAddCourse = () => {
......@@ -696,7 +696,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchVideoList();
},
}
);
};
......@@ -858,7 +858,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchLiveList();
},
}
);
}}
onShowSizeChange={this.onShowLiveSizeChange}
......@@ -893,6 +893,7 @@ class AddCourse extends React.Component {
<TreeSelect
treeNodeFilterProp='categoryName'
showSearch
value={videoQuery[videoCourseDivision].categoryId || null}
style={{ minWidth: 'calc(100% - 75px)' }}
value={videoQuery[videoCourseDivision].categoryId || null}
dropdownMatchSelectWidth={false}
......@@ -950,7 +951,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchVideoList();
},
}
);
}}
onShowSizeChange={this.onShowVideoSizeChange}
......@@ -1030,7 +1031,7 @@ class AddCourse extends React.Component {
},
() => {
this.handleFetchPictureList();
},
}
);
}}
onShowSizeChange={this.onShowPictureSizeChange}
......
src/modules/knowledge-base/modal/LiveList.less
......@@ -71,13 +71,13 @@
}
.courseware {
font-size: 14px;
color: #2966FF;
color: #2966ff;
line-height: 20px;
text-align: right;
cursor: pointer;
}
.quota-icon {
color: #2966FF;
color: #2966ff;
cursor: pointer;
}
.operate {
......@@ -85,7 +85,7 @@
align-items: center;
flex-wrap: wrap;
.operate__item {
color: #2966FF;
color: #2966ff;
cursor: pointer;
&.split {
margin: 0 8px;
......@@ -94,7 +94,7 @@
}
}
.operate-text {
color: #2966FF;
color: #2966ff;
cursor: pointer;
}
.course-start-end {
......@@ -127,8 +127,8 @@
.add-course-modal {
.ant-tabs-nav .ant-tabs-tab-active {
// border: 1px solid #2966FF;
color: #2966FF;
}
color: #2966ff;
}
.ant-modal-content tr > td {
padding: 12px 8px !important;
}
......
src/modules/plan-manage/AddPlan.jsx
......@@ -2,7 +2,11 @@
* @Author: zhangleyuan
* @Date: 2021-02-20 16:13:39
* @LastEditors: wufan
<<<<<<< HEAD
* @LastEditTime: 2021-05-30 17:40:39
=======
* @LastEditTime: 2021-05-30 20:39:16
>>>>>>> hotfix/pangguoming/20210601/plan_list_add_cover
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......
src/modules/plan-manage/components/EmployeeShareData.jsx
......@@ -134,6 +134,7 @@ class EmployeeShareData extends React.Component {
)
}
},
//产品暂时性隐藏
// {
// title: '手机号',
// key: 'storeUserPhone',
......
src/modules/plan-manage/components/PlanList.less
.plan-list{
margin-top:12px;
.course-number{
text-align:right;
margin-right:45px;
.plan-list {
margin-top: 12px;
.course-number {
text-align: right;
margin-right: 45px;
}
.plan-list-table {
thead.ant-table-thead {
tr {
th {
padding: 10px 12px;
}
}
}
.plan-list-table{
tbody {
tr{
&:nth-child(even){
background: transparent !important;
td{
background:#FFF !important;
}
tbody {
tr {
td.ant-table-cell {
padding: 16px 12px;
color: #333;
}
&:nth-child(even) {
background: transparent;
td {
background: #fff;
}
&:nth-child(odd){
background: #FAFAFA !important;
td{
background: #FAFAFA !important;
}
}
&:nth-child(odd) {
background: #fafafa;
td {
background: #fafafa;
}
&:hover{
td{
background:#F3f6fa !important;
}
}
&:hover {
td {
background: #f3f6fa;
}
}
}
}
.plan-name{
text-overflow: -o-ellipsis-lastline;
}
.plan_name_item {
display: flex;
align-items: center;
.plan-cover {
width: 106px;
height: 60px;
border-radius: 2px;
margin-right: 8px;
}
.plan-name {
width: 188px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
height: 40px;
}
.operate-text {
color: #2966FF;
}
.operate-text {
color: #2966ff;
cursor: pointer;
}
.operate {
display: flex;
&__item {
color: #2966ff;
cursor: pointer;
}
.operate {
display: flex;
&__item {
color: #2966FF;
cursor: pointer;
&.split {
margin: 0 8px;
color: #BFBFBF;
}
&.split {
margin: 0 8px;
color: #bfbfbf;
}
}
.join-number{
text-align:right;
margin-right:12px;
}
.more-operate{
line-height:20px;
}
}
\ No newline at end of file
}
.join-number {
text-align: right;
margin-right: 12px;
}
.more-operate {
line-height: 20px;
}
}
src/modules/plan-manage/modal/relatedCourseModal.less
......@@ -12,7 +12,47 @@
text-align: left;
display: inline-block;
span {
color: #5289fa;
color: #2966ff;
}
}
.search-container {
margin-bottom: 16px;
}
.select-area {
margin-bottom: 12px;
display: flex;
justify-content: space-between;
.select-box {
display: inline-box;
width: 186px;
background: #e9efff;
border-radius: 4px;
padding: 6px 16px;
margin-right: 8px;
display: flex;
justify-content: space-between;
.tip-icon {
color: #2966ff;
font-size: 14px;
margin-right: 4px;
}
.select-num {
color: #666666;
font-size: 14px;
}
.clear-btn {
text-align: right;
color: #2966ff;
font-size: 14px;
}
}
.related-box {
padding: 6px 16px;
background: #e9efff;
border-radius: 4px;
flex: 1;
color: #666666;
font-size: 14px;
}
}
.search-container {
......
src/modules/root/WechatLogin.less
......@@ -9,42 +9,40 @@
color: #999999;
line-height: 20px;
}
.rwm{
position: relative;
width: 210px;
height: 210px;
text-align: center;
display: inline-block;
margin-top: 24px;
border: 1px solid #e8e8e8;
border-radius: 2px;
padding:15px;
.error{
position: absolute;
width: 200px;
height: 200px;
background: rgba(255, 255, 255, 0.95);
display: flex;
align-items:center;
justify-content:center;
left:5px;
top:5px;
div{
margin: 0 10px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
line-height: 20px;
}
.ope{
cursor: pointer;
color:rgba(82, 137, 250, 1);
}
}
.rwm {
position: relative;
width: 210px;
height: 210px;
text-align: center;
display: inline-block;
margin-top: 24px;
border: 1px solid #e8e8e8;
border-radius: 2px;
padding: 15px;
.error {
position: absolute;
width: 200px;
height: 200px;
background: rgba(255, 255, 255, 0.95);
display: flex;
align-items: center;
justify-content: center;
left: 5px;
top: 5px;
div {
margin: 0 10px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
line-height: 20px;
}
.ope {
cursor: pointer;
color: rgba(82, 137, 250, 1);
}
}
}
.ant-tabs-tab-active {
.ant-tabs-tab-btn {
......
src/modules/teach-tool/examination-manager/Index.tsx
......@@ -129,6 +129,7 @@ function ExaminationManager(props: any) {
{
title: "创建时间",
dataIndex: "examCreateTime",
align:fixStr.right,
sorter: true,
sortOrder: field === "examCreateTime" ? order : sortStatus.type,
render: (text: any, record: any) => <span>{moment(text).format("YYYY-MM-DD HH:mm")}</span>,
......
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