fix:合并助学工具默认图并解决冲突

f5d562e3 · wufan · 36884f87 · 6f9accee · f5d562e3 · f5d562e3
Commit f5d562e3 authored Jul 02, 2021 by wufan
14 changed files
--- a/src/modules/course-manage/components/AddLiveClass.jsx
+++ b/src/modules/course-manage/components/AddLiveClass.jsx
@@ -175,7 +175,10 @@ class AddLiveClass extends React.Component {
                    <Tooltip 
                      overlayStyle={{maxWidth: 300, zIndex: '9999'}} 
                      title={<div style={{width: '266px'}}>支持按上课日期批量创建直播课，创建后按“课程名称_日期”命名，例如：<br/>张三的语文课_9月18日<br/>张三的语文课_9月19日......</div>}>
-                      <span className="iconfont">&#xe61d;</span>
+                      <span 
+                        style={{ color: "rgba(191, 191, 191, 1)",fontWeight: 400 }}
+                        className="iconfont" 
+                      >&#xe61d;</span>
                    </Tooltip>：
                  </span>
                <div>

--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -175,7 +175,7 @@ class LiveCourseList extends React.Component {
                    </span>
                  </div>
                  <div className='teacher-assistant'>
-                    {record.teacherName?.length > 4 ? (
+                    {record.teacherName && record.teacherName.length > 4 ? (
                      <Tooltip title={record.teacherName}>
                        <span className='teacher'>讲师：{record.teacherName}</span>
                      </Tooltip>
@@ -303,6 +303,7 @@ class LiveCourseList extends React.Component {
          dataIndex: 'created',
          sorter: true,
          render: (val, item) => {
+            // -29000：与后端约定 在初始化学院时，创建时间（标志位-29000）默认展示为'-'
            return <span>{val === -29000 ? '-' : formatDate('YYYY-MM-DD H:i', val)}</span>;
          },
        },
@@ -449,7 +450,7 @@ class LiveCourseList extends React.Component {
                    </span>
                  </div>
                  <div className='teacher-assistant'>
-                    {record.teacherName.length > 4 ? (
+                    {record.teacherName && record.teacherName.length > 4 ? (
                      <Tooltip title={record.teacherName}>
                        <span className='teacher'>讲师：{record.teacherName}</span>
                      </Tooltip>

--- a/src/modules/course-manage/modal/ManageCoursewareModal.jsx
+++ b/src/modules/course-manage/modal/ManageCoursewareModal.jsx
@@ -171,8 +171,6 @@ class ManageCoursewareModal extends React.Component {
    const that = this;
    switch (fileType) {
      case 'PDF':
-      //   window.open(item.srcDocUrl, "_blank");
-      // break;
      case 'Excel':
      case 'EXCEL':
      case 'PPT':
@@ -181,27 +179,6 @@ class ManageCoursewareModal extends React.Component {
      case 'WORD':
      case 'DOCX':
      case 'DOC':
-        // let size = parseFloat(item.fileSize.replace(/M$|KB$/g, ''));
-        // if (item.fileSize.includes('KB')) {
-        //   size = 0;
-        // }
-        // if (((fileType == 'word' || fileType == 'PPT') && size > 10) || ((fileType == 'Excel') && size > 5)) {
-        //   Modal.confirm({
-        //     title: '抱歉，不能在线预览',
-        //     content: '由于文件较大，不支持在线预览，请下载后再查看',
-        //     icon: <QuestionCircleOutlined />,
-        //     okText:"下载",
-        //     onOk:() => {
-        //       const a = document.createElement('a');
-        //       a.href = item.srcDocUrl;
-        //       a.click();
-        //     }
-        //   });
-        // } else {
-        //   const scanUrl = "https://view.officeapps.live.com/op/view.aspx?src=" + encodeURIComponent(item.srcDocUrl);
-        //   window.open(scanUrl, "_blank");
-        // }
        if (!item.fileVersionId) {
          this.setState(
            {

--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -109,13 +109,8 @@ class ShareLiveModal extends React.Component {
    switch (type) {
      case 'liveClass': // 直播课
        if (courseMediaVOS && courseMediaVOS.length > 0) {
-          data.courseMediaVOS.map((item, index) => {
+          const coverItem = courseMediaVOS.filter((item) => item.contentType === 'COVER');
-            if (item.contentType === 'COVER') {
+          coverImgSrc = coverItem.length === 0 ? 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png' : coverItem[0].mediaUrl;
-              coverImgSrc = item.mediaUrl;
-            } else {
-              coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
-            }
-          });
        } else {
          coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
        }

--- a/src/modules/course-manage/video-course/components/VideoCourseList.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.jsx
@@ -147,7 +147,7 @@ class VideoCourseList extends React.Component {
                  关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。
                </div>
              }>
-              <i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px' }}>
+              <i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px', fontWeight: 'normal' }}>
                &#xe61d;
              </i>
            </Tooltip>

--- a/src/modules/plan-manage/components/UserLearningData.jsx
+++ b/src/modules/plan-manage/components/UserLearningData.jsx
@@ -330,7 +330,7 @@ class UserLearningData extends React.Component {
            <span>
              <span>学习进度</span>
              <Tooltip title='学员培训计划中达到“已完成”状态的课程数/总课程数'>
-                <i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px' }}>
+                <i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px', fontWeight: 'normal' }}>
                  &#xe61d;
                </i>
              </Tooltip>

--- a/src/modules/resource-disk/components/FolderList.jsx
+++ b/src/modules/resource-disk/components/FolderList.jsx
@@ -121,40 +121,6 @@ class FolderList extends React.Component {
        break;
    }
  }
-  // getYoZoSign = (data,type,folderName)=>{
-  //   return new Promise((resolve) => {
-  //     let uploadParams;
-  //     if(type==="UPLOAD"){
-  //      uploadParams ={
-  //         fileUrl:data,
-  //         instId:window.currentUserInstInfo.instId,
-  //         yoZoTypeEnum:'UPLOAD'
-  //       }
-  //     }else{
-  //       uploadParams ={
-  //         fileVersionId:data,
-  //         instId:window.currentUserInstInfo.instId,
-  //         yoZoTypeEnum:'VIEW',
-  //         htmlTitle:folderName
-  //       }
-  //     }
-  //     Service.Apollo('public/apollo/getYoZoSign', uploadParams).then(res => {
-  //       const { result = [] } = res;
-  //       resolve(result)
-  //     });
-  //   })
-  // }
-  // saveYoZoFileVersionId = (fileVersionId,folderId)=>{
-  //   const params ={ 
-  //     fileVersionId,
-  //     folderId,
-  //     instId: window.currentUserInstInfo.instId,
-  //   }
-  //   Service.Apollo('public/apollo/saveYoZoFileVersionId', params).then(res => {
-  //   });
-  // }
  // 预览文件
  handleScanFile = async (folder) => {
    const { folderFormat, folderSize, ossUrl,rights,fileVersionId,id,folderName} = folder;

--- a/src/modules/root/Login.jsx
+++ b/src/modules/root/Login.jsx
@@ -32,26 +32,6 @@ function Login(props) {
   */
  useEffect(() => {
-    // const enterpriseId = getParameterByName('enterpriseId');
-    // const userId = getParameterByName('userId');
-    // const from = getParameterByName('from');
-    // const storeId = getParameterByName('storeId');
-    // if (storeId) {
-    //   User.setCustomerStoreId(storeId);
-    // }
-    // if (from === 'customer' && enterpriseId && userId) {
-    //   if (!user.getToken() || enterpriseId !== user.getEnterpriseId() || userId !== User.getUserId()) {
-    //     getWXWorkLoginNoCheck(enterpriseId, userId);
-    //   } else {
-    //     window.RCHistory.push({
-    //       pathname: `/switch-route`,
-    //     });
-    //   }
-    // } else {
-    //   User.removeUserId();
-    //   User.removeToken();
-    //   User.removeEnterpriseId();
-    // }
    User.removeUserId();
    User.removeToken();
    User.removeEnterpriseId();

--- a/src/modules/teach-tool/examination-manager/ExamData.tsx
+++ b/src/modules/teach-tool/examination-manager/ExamData.tsx
--- a/src/modules/teach-tool/examination-manager/Index.tsx
+++ b/src/modules/teach-tool/examination-manager/Index.tsx
@@ -11,6 +11,8 @@ import { XMContext } from '@/store/context';
 import ExamShareModal from './ExamShareModal';
 import DataAnalysic from './DataAnalysic';
 import PreviewModal from './PreviewModal';
+import college from '@/common/lottie/college.json';
 import './index.less';
 const { RangePicker } = DatePicker;
 const { Search } = Input;
@@ -425,6 +427,7 @@ function ExaminationManager(props: any) {
            pagination={false}
            style={{ margin: '0px 0 16px' }}
            renderEmpty={{
+              image: college,
              description: <span style={{ display: 'block', paddingBottom: 24 }}>暂无数据</span>,
            }}></XMTable>
          {total > 0 && (

--- a/src/modules/teach-tool/examination-manager/UserData.tsx
+++ b/src/modules/teach-tool/examination-manager/UserData.tsx
--- a/src/modules/teach-tool/paper-manage/components/PaperList.jsx
+++ b/src/modules/teach-tool/paper-manage/components/PaperList.jsx
@@ -31,6 +31,8 @@ import _ from "underscore";
 import PaperPreviewModal from "../modal/PreviewPaperModal";
 import MoveModal from '../../modal/MoveModal';
 import Bus from "@/core/bus";
+import college from '@/common/lottie/college';
 const { Search } = Input;
@@ -625,6 +627,7 @@ class PaperList extends Component {
              bordered
              loading={loading}
              renderEmpty={{
+                image: college,
                description: <span style={{ display: 'block', paddingBottom: 24 }}>还没有试卷</span>
              }}
            />
@@ -641,6 +644,7 @@ class PaperList extends Component {
              pagination={false}
              bordered
              renderEmpty={{
+                image: college,
                description: <span style={{ display: 'block', paddingBottom: 24 }}>还没有试卷</span>
              }}
            />

--- a/src/modules/teach-tool/paper-manage/components/SelectQuestionList.jsx
+++ b/src/modules/teach-tool/paper-manage/components/SelectQuestionList.jsx
@@ -25,6 +25,8 @@ import AidToolService from "@/domains/aid-tool-domain/AidToolService";
 import _ from "underscore";
 import Bus from "@/core/bus";
 import moment from 'moment';
+import { XMTable } from '@/components';
+import college from '@/common/lottie/college';
 const { Search } = Input;
 const { RangePicker } = DatePicker;
@@ -201,19 +203,6 @@ class SelectQuestionList extends Component {
    return columns;
  };
-  // 自定义表格空状态
-  customizeRenderEmpty = () => {
-    return (
-      <Empty
-        image="https://image.xiaomaiketang.com/xm/emptyTable.png"
-        imageStyle={{
-          height: 100,
-        }}
-        description={"还没有题目"}
-      ></Empty>
-    );
-  };
  onShowSizeChange = (current, size) => {
    if (current == size) {
      return;
@@ -431,8 +420,11 @@ class SelectQuestionList extends Component {
          )}
        </div>
        <div className="select-question-content">
-          <ConfigProvider renderEmpty={this.customizeRenderEmpty}>
+            <XMTable 
-            <Table
+              renderEmpty={{
+                image: college,
+                description: '还没有题目'
+              }}
              rowSelection={rowSelection}
              rowKey={(record) => record.id}
              dataSource={dataSource}
@@ -441,7 +433,6 @@ class SelectQuestionList extends Component {
              onChange={this.handleChangeTable}
              bordered
            />
-          </ConfigProvider>
          <div className="box-footer">
            <PageControl
              current={current - 1}

--- a/src/modules/teach-tool/question-manage/components/QuestionList.jsx
+++ b/src/modules/teach-tool/question-manage/components/QuestionList.jsx
@@ -7,7 +7,7 @@
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
 import React, { Component } from 'react';
-import { Table, ConfigProvider, Empty, Row, Input, Select, Tooltip, Space, Button, Modal, message, Menu, Dropdown, DatePicker } from 'antd';
+import { Row, Input, Select, Tooltip, Space, Button, Modal, message, Menu, Dropdown, DatePicker } from 'antd';
 import _ from 'underscore';
 import { Route, withRouter } from 'react-router-dom';
 import { DownOutlined } from '@ant-design/icons';
@@ -21,6 +21,8 @@ import Bus from '@/core/bus';
 import moment from 'moment';
 import Service from '@/common/js/service';
 import MoveModal from '../../modal/MoveModal';
+import college from '@/common/lottie/college';
 import './QuestionList.less';
 const { RangePicker } = DatePicker;
@@ -671,6 +673,7 @@ class QuestionList extends Component {
            onChange={this.handleChangeTable}
            rowSelection={rowSelection}
            renderEmpty={{
+              image: college,
              description: (
                <span style={{ display: 'block', paddingBottom: 24 }}>
                  <span>还没有题目</span>