Merge branch 'master' into feature/zhangleyuan/20210619/yongzong-optimize

4de4930c · zhangleyuan · dbbb5ea8 · c380d5ba · 4de4930c · 4de4930c
Commit 4de4930c authored Jul 01, 2021 by zhangleyuan
7 changed files
--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -6,67 +6,67 @@
 * @Description: 大班直播分享弹窗
 */
-import React from 'react'
+import React from 'react';
-import { Modal, Button, message } from 'antd'
+import { Modal, Button, message } from 'antd';
-import domtoimage from 'dom-to-image'
+import domtoimage from 'dom-to-image';
-import qrcode from '@/libs/qrcode/qrcode.js'
+import qrcode from '@/libs/qrcode/qrcode.js';
-import User from '@/common/js/user'
+import User from '@/common/js/user';
-import $ from 'jquery'
+import $ from 'jquery';
-import _ from 'underscore'
+import _ from 'underscore';
-import CourseService from '@/domains/course-domain/CourseService'
+import CourseService from '@/domains/course-domain/CourseService';
-import './ShareLiveModal.less'
+import './ShareLiveModal.less';
 class ShareLiveModal extends React.Component {
  constructor(props) {
-    super(props)
+    super(props);
    this.state = {
      shareUrl: 'https://xiaomai5.com/liveShare?courseId=12',
-    }
+    };
  }
  componentDidMount() {
    // 获取短链接
-    this.handleConvertShortUrl()
+    this.handleConvertShortUrl();
  }
  handleConvertShortUrl = () => {
-    const { longUrl } = this.props.data
+    const { longUrl } = this.props.data;
    // 发请求
    CourseService.getQrcode({
      urls: [longUrl],
    }).then((res) => {
-      const { result = [] } = res
+      const { result = [] } = res;
      this.setState(
        {
          shareUrl: result[0].shortUrl,
        },
        () => {
-          const qrcodeWrapDom = document.querySelector('#qrcodeWrap')
+          const qrcodeWrapDom = document.querySelector('#qrcodeWrap');
          const qrcodeNode = new qrcode({
            text: this.state.shareUrl,
            size: 98,
-          })
+          });
-          qrcodeWrapDom.appendChild(qrcodeNode)
+          qrcodeWrapDom.appendChild(qrcodeNode);
-          const qrcodeWrapDomDownload = document.querySelector('#qrcodeWrap-dowload')
+          const qrcodeWrapDomDownload = document.querySelector('#qrcodeWrap-dowload');
          const qrcodeNodeDownLoad = new qrcode({
            text: this.state.shareUrl,
            size: 196,
-          })
+          });
-          qrcodeWrapDomDownload.appendChild(qrcodeNodeDownLoad)
+          qrcodeWrapDomDownload.appendChild(qrcodeNodeDownLoad);
-        }
-      )
-    })
        }
+      );
+    });
+  };
  componentWillUnmount() {
    // 页面销毁之前清空定时器
-    clearTimeout(this.timer)
+    clearTimeout(this.timer);
  }
  // 下载海报
@@ -79,31 +79,31 @@ class ShareLiveModal extends React.Component {
      () => {
        this.setState({ time: new Date().valueOf() }, () => {
          setTimeout(() => {
-            let node = document.getElementById('poster-dowload')
+            let node = document.getElementById('poster-dowload');
            domtoimage.toPng(node).then((imgData) => {
-              console.log(imgData)
+              console.log(imgData);
-              const download = document.createElement('a')
+              const download = document.createElement('a');
-              const { courseName } = this.props.data
+              const { courseName } = this.props.data;
-              $(download).attr('href', imgData).attr('download', `${courseName}.png`).get(0).click()
+              $(download).attr('href', imgData).attr('download', `${courseName}.png`).get(0).click();
-            })
+            });
-          }, 1000)
+          }, 1000);
-        })
+        });
-      }
-    )
      }
+    );
+  };
  // 复制分享链接
  handleCopy = () => {
-    const textContent = document.getElementById('shareUrl').innerText
+    const textContent = document.getElementById('shareUrl').innerText;
-    window.copyText(textContent)
+    window.copyText(textContent);
-    message.success('复制成功!')
+    message.success('复制成功!');
-  }
+  };
  render() {
-    const { courseDivision, data, type, title } = this.props
+    const { courseDivision, data, type, title } = this.props;
-    const { courseName, scheduleVideoUrl, courseMediaVOS, coverUrl } = data
+    const { courseName, scheduleVideoUrl, courseMediaVOS, coverUrl } = data;
-    const { shareUrl, showImg, time } = this.state
+    const { shareUrl, showImg, time } = this.state;
    // 判断是否是默认图, 默认图不需要在URL后面增加字符串
    let coverImgSrc = '';
    switch (type) {
@@ -111,15 +111,21 @@ class ShareLiveModal extends React.Component {
        if (courseMediaVOS && courseMediaVOS.length > 0) {
          data.courseMediaVOS.map((item, index) => {
            if (item.contentType === 'COVER') {
-              coverImgSrc = item.mediaUrl
+              coverImgSrc = item.mediaUrl;
+            } else {
+              coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
            }
-          })
+          });
        } else {
          coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
        }
        break;
      case 'videoClass': // 视频课
-        coverImgSrc = coverUrl || (courseDivision === 'internal' ? `${scheduleVideoUrl}?x-oss-process=video/snapshot,t_0,m_fast&anystring=anystring` : 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png')
+        coverImgSrc =
+          coverUrl ||
+          (courseDivision === 'internal'
+            ? `${scheduleVideoUrl}?x-oss-process=video/snapshot,t_0,m_fast&anystring=anystring`
+            : 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png');
        break;
      case 'graphicsClass': // 图文课
        coverImgSrc = coverUrl || 'https://image.xiaomaiketang.com/xm/wFnpZtp2yB.png';
@@ -214,8 +220,8 @@ class ShareLiveModal extends React.Component {
          </div>
        </div>
      </Modal>
-    )
+    );
  }
 }
-export default ShareLiveModal
+export default ShareLiveModal;
--- a/src/modules/plan-manage/components/EmployeeShareData.jsx
+++ b/src/modules/plan-manage/components/EmployeeShareData.jsx
 import React from 'react';
-import { withRouter } from "react-router-dom";
+import { withRouter } from 'react-router-dom';
-import {Table, Modal,Input,message} from 'antd';
+import { Input } from 'antd';
-import { PageControl } from "@/components";
+import { PageControl, XMTable } from '@/components';
-import PlanService from '@/domains/plan-domain/planService'
+import college from '@/common/lottie/college';
+import PlanService from '@/domains/plan-domain/planService';
 import User from '@/common/js/user';
 import Bus from '@/core/bus';
 import './EmployeeShareData.less';
@@ -10,103 +11,129 @@ import './EmployeeShareData.less';
 const { Search } = Input;
 const UserRole = {
  Store_Manager: {
-    text: "学院管理员"
+    text: '学院管理员',
  },
  Cloud_Manager: {
-    text:"管理员"
+    text: '管理员',
  },
  Cloud_Operator: {
-    text:'运营师'
+    text: '运营师',
  },
  Cloud_Lecture: {
-    text:"讲师"
+    text: '讲师',
  },
 };
 class EmployeeShareData extends React.Component {
  constructor(props) {
    super(props);
-    const id = getParameterByName("id");
+    const id = getParameterByName('id');
    this.state = {
      id,
-      dataSource:[],
+      dataSource: [],
-      size:10,
+      size: 10,
      query: {
        current: 1,
      },
-      totalCount:0,
+      totalCount: 0,
-    }
+    };
  }
-  componentDidMount(){
+  componentDidMount() {
    this.handleFetchDataList();
  }
-  handleFetchDataList = ()=>{
+  handleFetchDataList = () => {
-    const { query ,size,id}  = this.state;
+    const { query, size, id } = this.state;
-    const params ={
+    const params = {
      ...query,
      size,
-      planId:id,
+      planId: id,
-      storeId:User.getStoreId(),
+      storeId: User.getStoreId(),
-    }
+    };
    PlanService.getPlanUserRecordPage(params).then((res) => {
-      const { result = {} } = res ;
+      const { result = {} } = res;
      const { records = [], total = 0 } = result;
      this.setState({
        dataSource: records,
-          totalCount: Number(total)
+        totalCount: Number(total),
      });
    });
-  }
+  };
  onShowSizeChange = (current, size) => {
    if (current == size) {
-      return
+      return;
    }
-    this.setState({
+    this.setState(
-      size
+      {
-    },()=>{this.handleFetchDataList()})
+        size,
+      },
+      () => {
+        this.handleFetchDataList();
      }
-  handleChangeTable = (pagination, filters, sorter)=> {
+    );
+  };
+  handleChangeTable = (pagination, filters, sorter) => {
    const { columnKey, order } = sorter;
    const { query } = this.state;
    let _columnKey;
    let _order;
-    if (columnKey === 'learnNum' && order === 'ascend') { _columnKey="LEARN_NUM"; _order = 'SORT_ASC'; }
+    if (columnKey === 'learnNum' && order === 'ascend') {
-    if (columnKey === 'learnNum' && order === 'descend') { _columnKey="LEARN_NUM"; _order = 'SORT_DESC'; }
+      _columnKey = 'LEARN_NUM';
+      _order = 'SORT_ASC';
+    }
+    if (columnKey === 'learnNum' && order === 'descend') {
+      _columnKey = 'LEARN_NUM';
+      _order = 'SORT_DESC';
+    }
-    if (columnKey === 'learnFinishNum' && order === 'ascend') { _columnKey="FINISH_NUM"; _order = 'SORT_ASC'; }
+    if (columnKey === 'learnFinishNum' && order === 'ascend') {
-    if (columnKey === 'learnFinishNum' && order === 'descend') { _columnKey="FINISH_NUM"; _order = 'SORT_DESC'; }
+      _columnKey = 'FINISH_NUM';
+      _order = 'SORT_ASC';
+    }
+    if (columnKey === 'learnFinishNum' && order === 'descend') {
+      _columnKey = 'FINISH_NUM';
+      _order = 'SORT_DESC';
+    }
-    if (columnKey === 'learnNoFinishNum' && order === 'ascend') { _columnKey="NOT_NUM"; _order = 'SORT_ASC'; }
+    if (columnKey === 'learnNoFinishNum' && order === 'ascend') {
-    if (columnKey === 'learnNoFinishNum' && order === 'descend') { _columnKey="NOT_NUM"; _order = 'SORT_DESC'; }
+      _columnKey = 'NOT_NUM';
+      _order = 'SORT_ASC';
+    }
+    if (columnKey === 'learnNoFinishNum' && order === 'descend') {
+      _columnKey = 'NOT_NUM';
+      _order = 'SORT_DESC';
+    }
    const _query = {
      ...query,
-      sortMap:{}
+      sortMap: {},
    };
-    _query.sortMap[_columnKey]=_order;
+    _query.sortMap[_columnKey] = _order;
-    this.setState({
+    this.setState(
-      query:_query
+      {
-    },()=>this.handleFetchDataList())
+        query: _query,
-  }
+      },
-  handleChangNickname = (value)=>{
+      () => this.handleFetchDataList()
+    );
+  };
+  handleChangNickname = (value) => {
    const isPhone = (value || '').match(/^\d+$/);
    const { query } = this.state;
-      if(isPhone){
+    if (isPhone) {
      query.userPhone = value;
      query.userName = null;
-      }else{
+    } else {
      query.userName = value;
      query.userPhone = null;
    }
    query.current = 1;
    this.setState({
-        query
+      query,
-      })
+    });
-  }
+  };
-  watchDataView = (record)=>{
+  watchDataView = (record) => {
-    Bus.trigger('watchDataView',record);
+    Bus.trigger('watchDataView', record);
-  } 
+  };
  // 请求表头
  parselumns = () => {
    const columns = [
@@ -115,24 +142,16 @@ class EmployeeShareData extends React.Component {
        key: 'storeUserName',
        dataIndex: 'storeUserName',
        render: (val, record) => {
-          return (
+          return <div>{val}</div>;
-            <div>
+        },
-              {val}
-            </div>
-          )
-        }
      },
      {
        title: '角色',
        key: 'roleEnum',
        dataIndex: 'roleEnum',
        render: (val, record) => {
-          return (
+          return <div>{UserRole[record.roleEnum].text}</div>;
-            <div>
+        },
-              {UserRole[record.roleEnum].text}
-            </div>
-          )
-        }
      },
      //产品暂时性隐藏
      // {
@@ -151,28 +170,20 @@ class EmployeeShareData extends React.Component {
        title: '最近分享成功时间',
        key: 'recentlyForwardTime',
        dataIndex: 'recentlyForwardTime',
-        width:240,
+        width: 240,
        render: (val, record) => {
-          return (
+          return <div>{formatDate('YYYY-MM-DD H:i', val)}</div>;
-            <div>
+        },
-              {formatDate('YYYY-MM-DD H:i', val)}
-            </div>
-          )
-        }
      },
      {
        title: '学习人数',
        key: 'learnNum',
        dataIndex: 'learnNum',
-        width:110,
+        width: 110,
-        sorter:true,
+        sorter: true,
        render: (val, record) => {
-          return (
+          return <div className='learn-num'>{val}</div>;
-            <div className="learn-num">
+        },
-              {val}
-            </div>
-          )
-        }
      },
      // {
      //   title: '已学完',
@@ -208,24 +219,39 @@ class EmployeeShareData extends React.Component {
        dataIndex: 'operate',
        render: (val, record) => {
          return (
-            <span className="operate-item" onClick={()=>this.watchDataView(record)}>数据详情</span>
+            <span className='operate-item' onClick={() => this.watchDataView(record)}>
-          )
+              数据详情
-        }
+            </span>
-      }
+          );
+        },
+      },
    ];
    return columns;
-  }
+  };
  render() {
-    const { dataSource,query,size,totalCount} = this.state;
+    const { dataSource, query, size, totalCount } = this.state;
    return (
-      <div className="employee-share-data">
+      <div className='employee-share-data'>
-        <div className="search-container">
+        <div className='search-container'>
-            <Search placeholder="搜索员工姓名或手机号"  onChange={(e) => { this.handleChangNickname(e.target.value)}}  onSearch={ () => { this.handleFetchDataList()}}  style={{ width: 200 }}  enterButton={<span className="icon iconfont">&#xe832;</span>}/>
+          <Search
+            placeholder='搜索员工姓名或手机号'
+            onChange={(e) => {
+              this.handleChangNickname(e.target.value);
+            }}
+            onSearch={() => {
+              this.handleFetchDataList();
+            }}
+            style={{ width: 200 }}
+            enterButton={<span className='icon iconfont'>&#xe832;</span>}
+          />
        </div>
        <div>
-              <Table
+          <XMTable
-                  rowKey={record => record.id}
+            renderEmpty={{
+              image: college,
+              description: '暂无数据',
+            }}
+            rowKey={(record) => record.id}
            dataSource={dataSource}
            columns={this.parselumns()}
            pagination={false}
@@ -233,25 +259,30 @@ class EmployeeShareData extends React.Component {
            showSorterTooltip={false}
            bordered
          />
-              {dataSource.length >0 &&
+          {dataSource.length > 0 && (
-                <div className="box-footer">
+            <div className='box-footer'>
              <PageControl
                current={query.current - 1}
                pageSize={size}
                total={totalCount}
                toPage={(page) => {
-                            const _query = {...query, current: page + 1};
+                  const _query = { ...query, current: page + 1 };
-                            this.setState({
+                  this.setState(
-                              query:_query
+                    {
-                            },()=>{ this.handleFetchDataList()})
+                      query: _query,
+                    },
+                    () => {
+                      this.handleFetchDataList();
+                    }
+                  );
                }}
                onShowSizeChange={this.onShowSizeChange}
              />
            </div>
-                }
+          )}
        </div>
      </div>
-    )
+    );
  }
 }

--- a/src/modules/plan-manage/components/UserLearningData.jsx
+++ b/src/modules/plan-manage/components/UserLearningData.jsx
--- a/src/modules/plan-manage/modal/relatedCourseModal.jsx
+++ b/src/modules/plan-manage/modal/relatedCourseModal.jsx
--- a/src/modules/teach-tool/examination-manager/ExamData.tsx
+++ b/src/modules/teach-tool/examination-manager/ExamData.tsx
--- a/src/modules/teach-tool/paper-manage/OperatePaper.jsx
+++ b/src/modules/teach-tool/paper-manage/OperatePaper.jsx
--- a/src/modules/teach-tool/paper-manage/OperatePaper.less
+++ b/src/modules/teach-tool/paper-manage/OperatePaper.less
@@ -6,6 +6,7 @@
    }
    .table-style {
      border: 1px solid #f0f0f0 !important;
+      margin-bottom: 70px;
    }
    .ant-tabs {
      color: #666666;