Merge branch 'feature/zhangleyuan/20201124/cloud-class_third-stage' into dev

c3832b56 · zhangleyuan · 96f45fa9 · 2644de69 · c3832b56 · c3832b56
Commit c3832b56 authored Jan 15, 2021 by zhangleyuan
11 changed files
--- a/src/domains/basic-domain/constants.ts
+++ b/src/domains/basic-domain/constants.ts
 /*
 * @Author: 陈剑宇
 * @Date: 2020-05-07 14:43:01
- * @LastEditTime: 2021-01-11 15:21:59
+ * @LastEditTime: 2021-01-14 19:31:30
 * @LastEditors: zhangleyuan
 * @Description: 
 * @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
@@ -9,7 +9,7 @@
 import { MapInterface } from '@/domains/basic-domain/interface'
 // 默认是 dev 环境
-const ENV: string = process.env.DEPLOY_ENV || 'dev';
+const ENV: string = process.env.DEPLOY_ENV || 'rc';
 console.log("process.env.DEPLOY_ENV",process)
 const BASIC_HOST_MAP: MapInterface = {
  dev: 'https://dev-heimdall.xiaomai5.com/',

--- a/src/domains/course-domain/constants.ts
+++ b/src/domains/course-domain/constants.ts
@@ -7,7 +7,7 @@
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
 import { MapInterface } from '@/domains/basic-domain/interface'
-const ENV: string = process.env.DEPLOY_ENV || 'dev';
+const ENV: string = process.env.DEPLOY_ENV || 'rc';
 const appIdMap: MapInterface = {
  dev: 'wx3ea60e78ddfa277e',

--- a/src/modules/course-manage/AddLive.jsx
+++ b/src/modules/course-manage/AddLive.jsx
@@ -444,36 +444,11 @@ handleChangeBasicInfo = (field, value) => {
        }
      }
      if(!teacherId){
-          message.warning('上课老师不能为空');
+          message.warning('请选择上课老师');
          resolve(false);
          return; 
      }
      resolve(true)
-      // if(!teacherId) {
-      //   message.warning('上课老师不能为空');
-      //   resolve(false);
-      //   return; 
-      // } else if(!applyMode) { 
-      //   message.warning('请选择分享设置');
-      //   resolve(false);
-      //   return;
-      // } else {
-      //   const textIntro = liveCourseMediaRequests.filter(item => { return item.mediaType === 'TEXT'; });
-      //   for (let i = 0, len = textIntro.length; i < len; i++) {
-      //     if (textIntro[i].mediaContent && textIntro[i].mediaContentLength.length > 1000) {
-      //       message.warning(`第${i+1}个文字简介的字数超过了1000个字`);
-      //       resolve(false);
-      //       return;
-      //     }
-      //   }  
-      // }
-      // if(window.NewVersion && type === 'add') {
-      //   this.handleValidateLackConsumeModal(consumeHourNum, calendarTime, consumeStudentList).then(res => {  
-      //     resolve(res)
-      //   })
-      // } else {
-      //   resolve(true);
-      // }
    });
  }
@@ -537,7 +512,7 @@ handleChangeBasicInfo = (field, value) => {
        />
        <div className="box">
          <div className="show-tips">
-            <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦助教保有依据国家规定及平台规则进行处理的权利" />
+            <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企培保有依据国家规定及平台规则进行处理的权利" />
          </div>
          <div className="add-live-page__form">
            <div className="basic-info__wrap">

--- a/src/modules/course-manage/components/AddLiveBasic.jsx
+++ b/src/modules/course-manage/components/AddLiveBasic.jsx
@@ -257,7 +257,7 @@ class AddLiveBasic extends React.Component {
        <div className="course-catalog">
          <span className="label"><span className="require">*</span>课程分类：</span>
          { pageType === 'add' &&
-            <Cascader defaultValue={[categoryName]} options={courseCatalogList} displayRender={	label => label.join('-')}  fieldNames={fieldNames} onChange={this.catalogChange} style={{ width: 240 }} placeholder="请选择课程分类" />
+            <Cascader options={courseCatalogList} displayRender={	label => label.join('-')}  fieldNames={fieldNames} onChange={this.catalogChange} style={{ width: 240 }} placeholder="请选择课程分类" />
          }
          { (pageType === 'edit' && categoryName) && 
            <Cascader disabled={!isEdit ? true: false} defaultValue={[categoryName]} options={courseCatalogList} displayRender={	label => label.join('-')}  fieldNames={fieldNames} onChange={this.catalogChange} style={{ width: 240 }} placeholder="请选择课程分类" />

--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -9,22 +9,13 @@
 import React from 'react';
 import { Table, Modal, message, Dropdown, Button,Switch,Tooltip} from 'antd';
 import { Route, withRouter } from 'react-router-dom';
-// import Bus from '@/core/bus';
-// import User from "@/core/user";
-// import User_t from "@/teacher/core/user";
 import { PageControl } from "@/components";
-// import { LIVE_SHARE_MAP } from '@/common/constants/academic/cloudClass';
 import DownloadLiveModal from '@/components/DownloadLiveModal';
-// import LiveStudentListModal from '../modal/LiveStudentListModal';
-// import CheckBalanceModal from '../modal/CheckBalanceModal';
-// import StartLiveModal from '../modal/StartLiveModal';
-// import ClassRecordModal from '../modal/ClassRecordModal';
-// import PlayBackRecordModal from '../modal/PlayBackRecordModal';
 import ManageCoursewareModal from '../modal/ManageCoursewareModal';
 import ShareLiveModal from '../modal/ShareLiveModal';
-// import AccountChargeModal from '../modal/AccountChargeModal';
-// import SelectStudent from '../modal/select-student';
 import './LiveCourseList.less';
 import { QuestionCircleOutlined } from '@ant-design/icons';
@@ -34,7 +25,7 @@ import BaseService from "@/domains/basic-domain/baseService";
 import DataList from '../DataList/DataList';
 import User from '@/common/js/user';
 import _ from "underscore";
-import user from '@/common/js/user';
 const { confirm } = Modal;
 const courseStateShow = {
@@ -89,6 +80,7 @@ class LiveCourseList extends React.Component {
      <ShareLiveModal
        needStr={needStr}
        data={shareData}
+        type="liveClass"
        close={() => {
          this.setState({
            shareLiveModal:  null
@@ -149,8 +141,10 @@ class LiveCourseList extends React.Component {
        </div>
      </div>
    );
+    let columns
-    const columns = [
+    const userRole =  User.getUserRole();
+    if(userRole !=="CloudLecturer"){
+      columns = [
        {
          title: "直播课",
          width: "25%",
@@ -272,7 +266,7 @@ class LiveCourseList extends React.Component {
                  <span className="operate__item split" key="view_play_back_split"> | </span>
                  </>
                }
-              { (item.courseState==="FINISH") && 
+                { (item.courseState==="FINISH" || item.haveRecord==="YES") && 
                    <>
                      <div
@@ -325,6 +319,101 @@ class LiveCourseList extends React.Component {
          }
        }
      ];
+    }else{
+      columns = [
+        {
+          title: "直播课",
+          width: "25%",
+          key: "course",
+          dataIndex: "courseName",
+          render: (val, record) => {
+            let hasCover = false;
+            return (
+              <div className="record__item">
+                { 
+                  record.courseMediaVOS.map((item,index)=>{
+                    if( item.contentType === "COVER"){
+                      hasCover = true;
+                      return <img className="course-cover" src={item.mediaUrl} />
+                    }    
+                  })
+                }
+                { !hasCover  && 
+                  <img className="course-cover" src={'https://image.xiaomaiketang.com/xm/YNfi45JwFA.png'} />
+                }
+                <div>
+                   <div className="course-name">{record.courseName}</div>
+                   <div>
+                      <span className="course-time">{formatDate("YYYY-MM-DD H:i",parseInt(record.startTime))}~{formatDate("H:i", parseInt(record.endTime))}</span>
+                      <span className="course-status" style={{color:courseStateShow[record.courseState].color,border:`1px solid ${courseStateShow[record.courseState].color}`}}>{courseStateShow[record.courseState].title}</span>
+                   </div>
+                   <div className="teacher-assistant">
+                      <span className="teacher">讲师：{record.teacherName}</span>
+                      { record.admins.length >0 &&
+                        <>
+                          <span  className="split"> | </span>
+                          <span className="assistant">助教：
+                              { record.admins.map((item,index)=>{
+                                  return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span>
+                                })
+                              }
+                          </span>
+                        </>
+                      }
+                   </div>
+                </div>
+              </div>
+            )
+          }
+        },
+        {
+          title: "课程分类",
+          width: "10%",
+          key: "couseCatalog",
+          dataIndex: "couseCatalog",
+          render: (val, item) => {
+            return (
+              <div className="categoryName">{item.categoryName}</div>
+            )
+          },
+        },
+        {
+          title: "课件管理",
+          width: "8%",
+          key: "courseware",
+          dataIndex: "courseware",
+          render: (val, item) => {
+            return (
+              <span className="courseware"
+                onClick={() => {
+                this.setState({
+                  editData: item,
+                  openCoursewareModal: true,
+                });
+              }}>{item.courseDocumentCount}个</span>
+            );
+          },
+        },
+        {
+          title: '上课数据',
+          width: "9%",
+          key: "quota",
+          dataIndex: "quota",
+          render: (val, item) => {
+            return (
+              <span className="iconfont icon quota-icon"  onClick={() => {
+                this.handleLinkToClassData(item)
+              }}>&#xe7d6;</span>
+            );
+          },
+        },
+      ];
+    }
    this.setState({ columns })
  }
  renderMoreOperate = (item) => {

--- a/src/modules/course-manage/components/LiveCourseList.less
+++ b/src/modules/course-manage/components/LiveCourseList.less
@@ -77,9 +77,11 @@
    color: #5289FA;
    line-height: 20px;
    text-align:right;
+    cursor:pointer;
  }
  .quota-icon{
    color:#5289FA;
+    cursor:pointer;
  }
  .operate {
    display: flex;

--- a/src/modules/course-manage/components/LiveCourseOpt.jsx
+++ b/src/modules/course-manage/components/LiveCourseOpt.jsx
@@ -11,6 +11,7 @@ import { Button, Modal, message } from 'antd';
 import Service from '@/common/js/service';
 import './liveCourseOpt.less';
 import BaseService from "@/domains/basic-domain/baseService";
+import User from '@/common/js/user'
 class LiveCourseOpt extends React.Component {
  constructor(props) {
    super(props);
@@ -41,10 +42,13 @@ class LiveCourseOpt extends React.Component {
    })
  }
  render() {
+    const userRole =  User.getUserRole();
    return (
      <div className="live-course-opt">
        <div className="opt__left">
+          { userRole !== "CloudLecturer" &&
            <Button type="primary" onClick={this.handleCreateLiveCouese}>新建直播课</Button>
+          }
          <Button onClick={this.handleDownloadClient}>下载直播客户端</Button>
        </div>
      </div>

--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -93,8 +93,8 @@ class ShareLiveModal extends React.Component {
      // 如果是默认图, 显示视频的第一帧, 否则显示上传的视频封面
      ? ((!coverUrl || isDefaultCover)
        ? `${scheduleVideoUrl}?x-oss-process=video/snapshot,t_0,m_fast&anystring=anystring`
-        : `${coverUrl}${!needStr ? '&anystring=anystring': ''}`)
+        : `${coverUrl}`)
-      : `${coverUrl}${(!needStr && !isDefaultCover) ? '&anystring=anystring' : ''}`
+      : `${coverUrl}`
    return (
@@ -113,6 +113,12 @@ class ShareLiveModal extends React.Component {
          </div>
          <div className="course-name-title">{type === 'videoClass' ? `${courseName}开课啦`: `邀请你观看直播：`}</div>
+          {
+            type === "liveClass" && 
+            <div class="live-couse-name">{courseName}</div>
+          }
          <img
            src={coverImgSrc}
            crossOrigin="*"
@@ -132,13 +138,26 @@ class ShareLiveModal extends React.Component {
        <div className="right">
          <div className="share-poster right__item">
            <div className="title">① 海报分享</div>
-            <div className="sub-title">学生可通过微信识别二维码，报名观看直播</div>
+            { type === "liveClass" && 
+              <div className="sub-title">用户可通过微信扫描海报二维码，观看直播</div>
+            }
+            { type === "videoClass" && 
+              <div className="sub-title">用户可通过微信识别二维码，报名观看视频</div>
+            }
            <div className="content" onClick={this.handleDownloadPoster}>下载海报</div>
          </div>
          <div className="share-url right__item">
            <div className="title">② 链接分享</div>
-            <div className="sub-title">学生可通过微信打开链接，报名观看直播</div>
+            { type === "liveClass" && 
+              <div className="sub-title">用户可通过微信打开以下链接，观看直播</div>
+            }
+             { type === "videoClass" && 
+              <div className="sub-title">用户可通过打开链接，报名观看视频</div>
+            }
            <div className="content">
              <div className="share-url" id="shareUrl">{shareUrl}</div>
              <Button type="primary" onClick={this.handleCopy}>复制</Button>

--- a/src/modules/course-manage/modal/ShareLiveModal.less
+++ b/src/modules/course-manage/modal/ShareLiveModal.less
@@ -14,6 +14,11 @@
      line-height: 20px;
      margin-bottom: 4px;
    }
+    .live-couse-name{
+      font-size:16px;
+      color:#333333;
+      font-weight: 600;
+    }
      .course-name {
        color: #333;
        font-size: 16px;

--- a/src/modules/course-manage/video-course/AddVideoCourse.jsx
+++ b/src/modules/course-manage/video-course/AddVideoCourse.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-05 10:07:47
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-12 11:34:42
+ * @LastEditTime: 2021-01-14 18:59:12
 * @Description: 视频课新增/编辑页
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -436,7 +436,7 @@ class AddVideoCourse extends React.Component {
        <div className="box">
          <div className="show-tips">
-            <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦助教保有依据国家规定及平台规则进行处理的权利" />
+            <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企培保有依据国家规定及平台规则进行处理的权利" />
          </div>
          <div className="form">

--- 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-13 17:19:43
+ * @LastEditTime: 2021-01-14 19:34:09
 * @Description: 视频课-列表模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -23,7 +23,7 @@ import User from '@/common/js/user'
 import './VideoCourseList.less';
-const ENV = process.env.DEPLOY_ENV || 'dev';
+const ENV = process.env.DEPLOY_ENV || 'rc';
 class VideoCourseList extends React.Component {
@@ -98,11 +98,17 @@ class VideoCourseList extends React.Component {
        dataIndex: 'createName',
        render: (val) => {
          return (
+              <div>
+                { val &&
                  <Tooltip title={val}>
                    <div>
                    {val.length > 4 ? `${val.slice(0,4)}...` : val}
                  </div>
                </Tooltip>
+                }
+             </div>
          )
        }
      },