feat:处理查看回放在上课中显示出来

8c7d3a25 · zhangleyuan · 2644de69 · 8c7d3a25 · 8c7d3a25 · 8c7d3a25
Commit 8c7d3a25 authored Jan 15, 2021 by zhangleyuan
9 changed files
--- a/src/modules/course-manage/AddLive.jsx
+++ b/src/modules/course-manage/AddLive.jsx
@@ -82,6 +82,7 @@ class AddLive extends React.Component {
        teacherId: null,
        teacherName: null,
        assistant:[],
+        assistantNames:[],
        liveDate: null,
        timeHorizonStart: null,
        timeHorizonEnd: null,
@@ -169,6 +170,7 @@ class AddLive extends React.Component {
        const timeHorizonStart = startTime;
        const timeHorizonEnd = endTime;
        const assistant = _.pluck(admins, "adminId");
+        const assistantNames =  _.pluck(admins, "adminName");
        const addLiveClassInfo = {
          assistant,
          liveDate,
@@ -179,6 +181,7 @@ class AddLive extends React.Component {
          timeHorizonEnd,
          startTime,
          endTime,
+          assistantNames
        }
        // liveCourseMediaRequests = liveCourseMediaRequests.length

--- a/src/modules/course-manage/DataList/DataList.less
+++ b/src/modules/course-manage/DataList/DataList.less
@@ -95,6 +95,9 @@
    &.avatar-name-phone {
      justify-content: flex-start;
      padding-left: 26px;
+      .avatar{
+        border-radius:50%;
+      }
      .name {
        height: 22px;
        font-size: 16px;

--- a/src/modules/course-manage/components/AddLiveClass.jsx
+++ b/src/modules/course-manage/components/AddLiveClass.jsx
@@ -48,6 +48,7 @@ class AddLiveClass extends React.Component {
    this.getTeacherList();
    this.getAssistantList();
  }
  getTeacherList(current = 1, selectList){
    const { teacherQuery,teacherList} = this.state;
    const _query = {
@@ -68,6 +69,7 @@ class AddLiveClass extends React.Component {
  // 获取助教老师列表
  getAssistantList = (current = 1, selectList) => {
    const { assistantQuery,assistantList} = this.state;
    const _query = {
      ...assistantQuery,
      current,
@@ -134,7 +136,9 @@ class AddLiveClass extends React.Component {
      liveDate,
      timeHorizonStart,
      timeHorizonEnd,
-      assistant
+      assistant,
+      assistantNames,
+      teacherName
    } = data;
    console.log("teacherId",teacherId);
    return (
@@ -245,14 +249,17 @@ class AddLiveClass extends React.Component {
            <span className="label"><span className="require">* </span>讲师：</span>
            <Select
              placeholder="请选择讲师"
+              // key={teacherName}
+              // defaultValue={teacherName}
+              value={teacherId}
              style={{ width: 240, marginTop: 6 }}
              disabled={!isEdit ? true: false}
              showSearch
-              value={teacherId}
              filterOption={(input, option) => option}
              onPopupScroll={this.handleScrollTeacherList}
              onChange={(value,option) => {
-                this.props.onChange('teacherId', value,option.children) 
+                console.log("value",value);
+                this.props.onChange('teacherId',value,option.children) 
              }}
              onSearch={(value) => {
                teacherQuery.nickName = value
@@ -271,12 +278,15 @@ class AddLiveClass extends React.Component {
                }
              })}
            </Select>
          </div>
          <div className="assistant-teacher">
                <span className="label">助教：</span>
                <Select
                  id="assistant"
                  placeholder="请选择助教老师"
+                  // key={assistantNames}
+                  // defaultValue={assistantNames}
                  value={assistant}
                  disabled={!isEdit ? true: false}
                  mode={'multiple'}
@@ -285,8 +295,9 @@ class AddLiveClass extends React.Component {
                  style={{ width: 240, marginTop: 6 }}
                  filterOption={(input, option) => option}
                  onPopupScroll={this.handleScrollAssistantList}
-              onChange={(value) => {
+                  onChange={(value,option) => {
-                this.props.onChange('assistant', value) 
+                    console.log('option',option);
+                    this.props.onChange('assistant',value) 
                  }}
                  onSearch={(value) => {
                    assistantQuery.nickName = value
@@ -297,6 +308,7 @@ class AddLiveClass extends React.Component {
                    })
                  }}
                >
                {_.map(assistantList, (item, index) => {
                  if(item.userId !== teacherId){
                    return (

--- a/src/modules/course-manage/components/LiveCourseFilter.jsx
+++ b/src/modules/course-manage/components/LiveCourseFilter.jsx
@@ -126,7 +126,6 @@ class LiveCourseFilter extends React.Component {
  handleReset = () => {
    this.setState({
      query: {
-        ...this.state.query,
        courseName: null,
        startTime: null,
        endTime: null,
@@ -134,6 +133,7 @@ class LiveCourseFilter extends React.Component {
        teacherName: null,
        courseState: undefined,
        current: 1,
+        shelfState:null,
      },
    }, () => {
      this.props.onChange(this.state.query);
@@ -187,7 +187,7 @@ class LiveCourseFilter extends React.Component {
                    onPopupScroll={this.handleScrollTeacherList}
                    value={teacherId}
                    onChange={(value) => {
-                      this.handleChangeQuery('teacherId', value) 
+                      this.handleChangeQuery('teacherId', value);
                    }}
                    onSearch={(value) => {
                      teacherQuery.nickName = value
@@ -197,6 +197,18 @@ class LiveCourseFilter extends React.Component {
                        this.getTeacherList()
                      })
                    }}
+                    onClear ={(value)=>{
+                        this.setState({
+                          teacherQuery:{
+                            size: 10,
+                            current: 1,
+                            nickName:null
+                          }
+                        }, () => {
+                          this.getTeacherList()
+                        })
+                      }
+                    }
                  >
                    {_.map(teacherList, (item, index) => {
                      return (

--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -236,7 +236,7 @@ class LiveCourseList extends React.Component {
        {
          title: <span>
            <span>店铺展示</span>
-            <Tooltip title="开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
+            <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
          </span>,
          width: "7%",
          dataIndex: "courseware",
@@ -266,7 +266,7 @@ class LiveCourseList extends React.Component {
                  <span className="operate__item split" key="view_play_back_split"> | </span>
                  </>
                }
-                { (item.courseState==="FINISH" || item.haveRecord==="YES") && 
+                { (item.courseState==="FINISH" && item.haveRecord==="YES") && 
                    <>
                      <div

--- a/src/modules/course-manage/components/LiveCourseList.less
+++ b/src/modules/course-manage/components/LiveCourseList.less
@@ -126,8 +126,14 @@
      font-size: 12px;
    }
  }
-}
+}
+.ant-tooltip{
+  max-width:700px !important;
+}
+.ant-tooltip-inner{
+  max-width:700px !important;
+}
 .live-course-more-menu {
  background: white;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);

--- a/src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-05 10:11:57
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-09 11:50:00
+ * @LastEditTime: 2021-01-15 13:52:10
 * @Description: 视频课-搜索模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -166,6 +166,18 @@ class VideoCourseFilter extends React.Component {
                    this.getTeacherList()
                  })
                }}
+                onClear ={(value)=>{
+                  this.setState({
+                    teacherQuery:{
+                      size: 10,
+                      current: 1,
+                      nickName:null
+                    }
+                  }, () => {
+                    this.getTeacherList()
+                  })
+                }
+              }
              >
                {_.map(teacherList, (item, index) => {
                  return (

--- a/src/modules/course-manage/video-course/components/VideoCourseList.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-05 10:12:45
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-14 19:34:09
+ * @LastEditTime: 2021-01-15 11:22:50
 * @Description: 视频课-列表模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -115,7 +115,7 @@ class VideoCourseList extends React.Component {
      {
        title: <span>
          <span>店铺展示</span>
-          <Tooltip title="开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。"><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
+          <Tooltip  title={<div>开启后，用户可在店铺内查看到此课程。若课程“未成功开课”，则系统会自动“关闭”店铺展示。<br/>关闭后，店铺内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf'}}>&#xe61d;</i></Tooltip>
        </span>,
        width: "7%",
        dataIndex: "courseware",

--- a/src/modules/course-manage/video-course/components/VideoCourseList.less
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.less
@@ -51,3 +51,9 @@
    }
  }
 }
+.ant-tooltip{
+  max-width:700px !important;
+}
+.ant-tooltip-inner{
+  max-width:700px !important;
+}
\ No newline at end of file