Skip to content

X
xiaomai-cloud-class-web
Commit 61c991d4 by zhangleyuan
Options

feat:处理选择同一张图片不被触发的问题

parent d1d25fc5
Showing with 39 additions and 10 deletions
src/modules/course-manage/components/LiveCourseFilter.jsx
...@@ -178,7 +178,7 @@ class LiveCourseFilter extends React.Component { ...@@ -178,7 +178,7 @@ class LiveCourseFilter extends React.Component {
<span>讲师：</span> <span>讲师：</span>
<Select <Select
placeholder="请选择讲师" placeholder="请选择讲师"
style={{ width: 240, marginTop: 6 }} style={{ width: 240}}
showSearch showSearch
allowClear allowClear
filterOption={(input, option) => option} filterOption={(input, option) => option}
...@@ -214,7 +214,7 @@ class LiveCourseFilter extends React.Component { ...@@ -214,7 +214,7 @@ class LiveCourseFilter extends React.Component {
value={courseState} value={courseState}
onChange={(value) => { this.handleChangeQuery('courseState', value) }} onChange={(value) => { this.handleChangeQuery('courseState', value) }}
> >
<Option value="UN_START">待上课</Option> <Option value="UN_START">待开课</Option>
<Option value="STARTING">上课中</Option> <Option value="STARTING">上课中</Option>
<Option value="FINISH">已完成</Option> <Option value="FINISH">已完成</Option>
<Option value="EXPIRED">未成功开课</Option> <Option value="EXPIRED">未成功开课</Option>
......
src/modules/course-manage/components/LiveCourseFilter.less
...@@ -11,6 +11,12 @@ ...@@ -11,6 +11,12 @@
width: 30%; width: 30%;
margin-right: 3%; margin-right: 3%;
margin-bottom: 12px; margin-bottom: 12px;
.search-name{
vertical-align: middle;
display:inline-block;
height:32px;
line-height:32px;
}
} }
} }
.reset-fold-area { .reset-fold-area {
......
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -37,7 +37,7 @@ const { confirm } = Modal; ...@@ -37,7 +37,7 @@ const { confirm } = Modal;
const courseStateShow = { const courseStateShow = {
UN_START: { UN_START: {
code: 1, code: 1,
title: "待上课", title: "待开课",
color: "#FDBE31", color: "#FDBE31",
}, },
STARTING: { STARTING: {
...@@ -48,12 +48,12 @@ const courseStateShow = { ...@@ -48,12 +48,12 @@ const courseStateShow = {
FINISH: { FINISH: {
code: 3, code: 3,
title: "已完成", title: "已完成",
color: "#2FC83C", color: "#3BBDAA",
}, },
EXPIRED: { EXPIRED: {
code: 4, code: 4,
title: "未成功开课", title: "未成功开课",
color: "#CCCCCC", color: "#999",
}, },
}; };
class LiveCourseList extends React.Component { class LiveCourseList extends React.Component {
...@@ -180,6 +180,7 @@ class LiveCourseList extends React.Component { ...@@ -180,6 +180,7 @@ class LiveCourseList extends React.Component {
<> <>
<span className="split"> | </span> <span className="split"> | </span>
<span className="assistant">助教： <span className="assistant">助教：
{ record.admins.map((item,index)=>{ { record.admins.map((item,index)=>{
return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span> return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span>
}) })
...@@ -217,7 +218,7 @@ class LiveCourseList extends React.Component { ...@@ -217,7 +218,7 @@ class LiveCourseList extends React.Component {
editData: item, editData: item,
openCoursewareModal: true, openCoursewareModal: true,
}); });
}}>{item.courseDocumentCount}</span> }}>{item.courseDocumentCount}个</span>
); );
}, },
}, },
......
src/modules/course-manage/components/LiveCourseList.less
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
color: #333333; color: #333333;
line-height: 20px; line-height: 20px;
font-weight: bold; font-weight: bold;
max-width:238px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
} }
.course-time{ .course-time{
font-size: 12px; font-size: 12px;
...@@ -35,12 +39,28 @@ ...@@ -35,12 +39,28 @@
.teacher{ .teacher{
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
line-height: 20px; // .teacher-name{
// max-width:60px;
// display:inline-block;
// overflow: hidden;
// text-overflow:ellipsis;
// white-space: nowrap;
// height:16px;
// line-height:16px;
// }
} }
.assistant{ .assistant{
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
line-height: 20px; // .assistant-name{
// max-width:60px;
// display:inline-block;
// overflow: hidden;
// text-overflow:ellipsis;
// white-space: nowrap;
// height:16px;
// line-height:16px;
// }
} }
.split { .split {
margin: 0 4px; margin: 0 4px;
...@@ -56,6 +76,7 @@ ...@@ -56,6 +76,7 @@
font-size: 14px; font-size: 14px;
color: #5289FA; color: #5289FA;
line-height: 20px; line-height: 20px;
text-align:right;
} }
.quota-icon{ .quota-icon{
color:#5289FA; color:#5289FA;
......
src/modules/course-manage/modal/PreviewCourseModal.jsx
...@@ -14,7 +14,7 @@ import './PreviewCourseModal.less'; ...@@ -14,7 +14,7 @@ import './PreviewCourseModal.less';
const courseStateShow = { const courseStateShow = {
UN_START: { UN_START: {
title: "待上课", title: "待开课",
}, },
STARTING: { STARTING: {
title: "上课中", title: "上课中",
......
src/modules/personalInfo/index.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: zhangleyuan * @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31 * @Date: 2020-11-27 15:06:31
* @LastEditors: zhangleyuan * @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-22 15:29:22 * @LastEditTime: 2020-12-28 14:27:02
* @Description: 描述一下 * @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -113,6 +113,7 @@ function PersonalInfoPage() { ...@@ -113,6 +113,7 @@ function PersonalInfoPage() {
<input <input
type="file" type="file"
accept="image/*" accept="image/*"
value={''}
id="CrpperAvatarPic" id="CrpperAvatarPic"
style={{ display: 'none' }} style={{ display: 'none' }}
onChange={_handleUpdateAvatar} /> onChange={_handleUpdateAvatar} />
......
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