Merge branch 'dev' of…

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

Merge branch 'dev' of…
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
07d95621 · guomingpang · 394dc6d5 · fded7da2 · 07d95621 · 07d95621
Commit 07d95621 authored Jul 13, 2021 by guomingpang
22 changed files
--- a/src/bu-components/PreviewFileModal.less
+++ b/src/bu-components/PreviewFileModal.less
@@ -33,6 +33,7 @@
            }
        }
        .operate{
+            display:inline-block;
            margin-top:24px;
            .btn {
                padding:5px 12px;

--- a/src/common/constants/academic/lessonEnum.js
+++ b/src/common/constants/academic/lessonEnum.js
@@ -133,13 +133,13 @@ const FileTypeIcon = {
  PPTX: "https://image.xiaomaiketang.com/xm/847pFAdYGW.png",
  PDF: "https://image.xiaomaiketang.com/xm/rrEJMNkhTG.png",
  MP3: "https://image.xiaomaiketang.com/xm/ykjnSWDyQ6.png",
-  MP4: "https://image.xiaomaiketang.com/xm/TKwbQGYDBR.png",
+  MP4: "https://image.xiaomaiketang.com/xm/yK3ASiS8ch.png",
  JPG: "https://image.xiaomaiketang.com/xm/XRkX8JBTPs.png",
  JPEG: "https://image.xiaomaiketang.com/xm/XRkX8JBTPs.png",
  PNG: "https://image.xiaomaiketang.com/xm/XRkX8JBTPs.png",
  GIF: "https://image.xiaomaiketang.com/xm/XRkX8JBTPs.png",
  BMP: "https://image.xiaomaiketang.com/xm/XRkX8JBTPs.png",
-  VIDEO: "https://image.xiaomaiketang.com/xm/TKwbQGYDBR.png"
+  VIDEO: 'https://image.xiaomaiketang.com/xm/yK3ASiS8ch.png'
 };
 const UploadIcon = "https://image.xiaomaiketang.com/xm/4DXNrZWWsd.png";

--- a/src/common/js/axios.ts
+++ b/src/common/js/axios.ts
 /*
 * @Author: 吴文洁
 * @Date: 2020-08-31 09:34:31
- * @LastEditors: Please set LastEditors
+ * @LastEditors: yuananting
- * @LastEditTime: 2021-06-24 19:34:21
+ * @LastEditTime: 2021-07-12 17:40:26
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -115,6 +115,10 @@ class Axios {
            window.RCHistory.replace('/login');
            return Promise.reject();
          break;
+          case 504:
+            message.error('网络状况不稳定，如果出现数据异常，请刷新页面');
+            Promise.reject();
+          break;
          default:
            message.error(error.message);
          break;

--- a/src/data-source/base/request-apis.ts
+++ b/src/data-source/base/request-apis.ts
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-12-01 17:21:21
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-22 14:56:34
+ * @LastEditTime: 2021-07-09 15:33:33
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -62,6 +62,9 @@ export function saveYoZoFileVersionId(params: object) {
 export function yoZoUpload(ossUrl:String,appId:String,uploadSign:String){
  return axios.post(`https://dmc.yozocloud.cn/api/file/http?fileUrl=${ossUrl}&appId=${appId}&sign=${uploadSign}`)
 }
+export function saveFileVersionIdByCourseChapter(params: object) {
+  return Service.Hades('public/hades/saveFileVersionIdByCourseChapter', params);
+}
 export const getOssClient = (
  data: object,
  instId: string,

--- a/src/domains/basic-domain/baseService.ts
+++ b/src/domains/basic-domain/baseService.ts
@@ -2,12 +2,12 @@
 * @Author: wufan
 * @Date: 2020-12-01 17:20:49
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-22 14:57:01
+ * @LastEditTime: 2021-07-09 15:33:59
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
-import { getUserStore, getUserPermission ,logout,getStoreUser,sendBizAuthCode,editUserPhone,checkBizAuthCode,sendNewPhoneAuthCode,sendLoginAuthCode,login,getLastedVersion, getEnterpriseUser,getWXWorkLoginNoCheck,getLesseeVersionMsg,getYoZoSign,saveYoZoFileVersionId,yoZoUpload} from '@/data-source/base/request-apis';
+import { getUserStore, getUserPermission ,logout,getStoreUser,sendBizAuthCode,editUserPhone,checkBizAuthCode,sendNewPhoneAuthCode,sendLoginAuthCode,login,getLastedVersion, getEnterpriseUser,getWXWorkLoginNoCheck,getLesseeVersionMsg,getYoZoSign,saveYoZoFileVersionId,yoZoUpload,saveFileVersionIdByCourseChapter} from '@/data-source/base/request-apis';
 export default class StoreService {
    // 获取员工列表 
@@ -73,4 +73,7 @@ export default class StoreService {
  static yoZoUpload(ossUrl:String,appId:String,uploadSign:String){
    return yoZoUpload(ossUrl,appId,uploadSign);
  }
+  static saveFileVersionIdByCourseChapter(params: any){
+    return saveFileVersionIdByCourseChapter(params);
+  }
 }
\ No newline at end of file
--- a/src/modules/course-manage/modal/PreviewCourseModal.jsx
+++ b/src/modules/course-manage/modal/PreviewCourseModal.jsx
@@ -169,7 +169,7 @@ class PreviewCourseModal extends React.Component {
                  <video
                    controls
                    src={courseChapterList.length && courseChapterList[0].mediaUrl || scheduleVideoUrl }
-                    poster={coverUrl ? coverUrl : `https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png`}
+                    poster={coverUrl ? coverUrl : `https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png`}
                    className='course-url'
                  />
                </When>

--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -116,7 +116,7 @@ class ShareLiveModal extends React.Component {
        }
        break;
      case 'videoClass': // 视频课
-        coverImgSrc = coverUrl || 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png';
+        coverImgSrc = coverUrl || 'https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png';
        break;
      case 'graphicsClass': // 图文课
        coverImgSrc = coverUrl || 'https://image.xiaomaiketang.com/xm/wFnpZtp2yB.png';

--- a/src/modules/course-manage/video-course/AddVideoCourse.jsx
+++ b/src/modules/course-manage/video-course/AddVideoCourse.jsx
--- a/src/modules/course-manage/video-course/VideoCourseDetail.tsx
+++ b/src/modules/course-manage/video-course/VideoCourseDetail.tsx
 /*
 * @Author: wufan
 * @Date: 2020-04-28 18:05:30
- * @LastEditors: yuananting
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-09 16:21:13
+ * @LastEditTime: 2021-07-13 15:26:11
 * @Description: 线上课课程课节详情
 */
@@ -12,12 +12,15 @@ import { withRouter } from "react-router-dom";
 import CourseService from '@/domains/course-domain/CourseService'
 import underscore  from 'underscore';
 import ScanFileModal from '@/modules/resource-disk/modal/ScanFileModal.jsx';
+import { FileTypeIcon } from '@/common/constants/academic/lessonEnum'
+import BaseService from "@/domains/basic-domain/baseService";
+import {YZ_APPId,YZ_PREVIEW_URL} from '@/domains/basic-domain/constants';
+import PreviewFileModal from '@/bu-components/PreviewFileModal';
 import './VideoCourseDetail.less';
 declare var getParameterByName: any;
 declare var window: any;
+const FileTypeIconMap:any = FileTypeIcon
 function VideoCourseDetail(){
    const courseId =  window.getParameterByName("courseId"); // 课程ID
    const [coverUrl,setCoverUrl] = useState("");
@@ -27,7 +30,11 @@ function VideoCourseDetail(){
    const [courseName,setCourseName] = useState("");
    const [categoryName,setCategoryName] = useState("");
    const [scanFileModal,setScanFileModal] = useState<any>(null);
+    const [showPreviewModal,setShowPreviewModal] = useState(false); //是否显示loading
+    // const [previewing,setPreviewing] = useState(false); //是否正在预览
+    const [previewStatus,setPreviewStatus] = useState('UPLOAD'); //预览文件的生成状态 
+    const [url,setUrl] =  useState('');
+    let previewing = false;
    useEffect(()=>{
        handleFetchScheudleDetail(courseId);
    },[courseId])
@@ -73,10 +80,10 @@ function VideoCourseDetail(){
      setCourseChapterList(courseChapterVOList);
    })
  }
+  async function handleScanFileModal(fileType: string = "MP4", fileObj:any){
-  function handleScanFileModal(fileType: string = "MP4", fileObj: Object){
+    const {fileVersionId,name,mediaUrl,id} = fileObj;
+    if(fileType === "VIDEO"){
-    const scanFileModal = (
+      const scanFileModal = (
        <ScanFileModal
          fileType={fileType}
          item={fileObj}
@@ -86,6 +93,65 @@ function VideoCourseDetail(){
        />
      );
      setScanFileModal(scanFileModal)
+    }else{
+      if(!fileVersionId){
+        setShowPreviewModal(true);
+        previewing = true;
+        setPreviewStatus('UPLOAD');
+        const uploadParams ={
+          fileUrl:mediaUrl,
+          yoZoTypeEnum:'UPLOAD'
+        }
+        const uploadSign:any = await BaseService.getYoZoSign(uploadParams);
+        BaseService.yoZoUpload(mediaUrl,YZ_APPId,uploadSign).then(async function (response){
+          const saveParams ={ 
+            fileVersionId:response.data.data.fileVersionId,
+            courseChapterId:id
+          }
+          BaseService.saveFileVersionIdByCourseChapter(saveParams);
+          if(previewing){
+            const  previewParams ={
+              fileVersionId:response.data.data.fileVersionId,
+              yoZoTypeEnum:'VIEW',
+              htmlTitle:name
+            }
+            const previewSign = await BaseService.getYoZoSign(previewParams);
+            const url = `${YZ_PREVIEW_URL}?fileVersionId=${response.data.data.fileVersionId}&appId=${YZ_APPId}&sign=${previewSign}&htmlTitle=${name}`
+            setPreviewStatus('UPLOAD_SUCCESS');
+            setUrl(url)
+          }
+        })
+      }else{
+        const  previewParams ={
+          fileVersionId,
+          yoZoTypeEnum:'VIEW',
+          htmlTitle:name
+        }
+        const previewSign = await BaseService.getYoZoSign(previewParams);
+        const url = `${YZ_PREVIEW_URL}?fileVersionId=${fileVersionId}&appId=${YZ_APPId}&sign=${previewSign}&htmlTitle=${name}`
+        const a = document.createElement('a');
+        document.body.appendChild(a);
+        a.setAttribute('href', url);
+        a.setAttribute('target', '_blank');
+        a.click();
+        document.body.removeChild(a)
+      }
+    }
+  }
+  // function  previewingSet(){
+  //   return new Promise(async (resolve) => {
+  //     setShowPreviewModal(true);
+  //     setPreviewing(true);
+  //     setPreviewStatus('UPLOAD');
+  //     resolve(true);
+  //   })
+  // }
+  function cancelPreview(){
+    setShowPreviewModal(false);
+    // setPreviewing(false);
+    previewing = false;
+    setPreviewStatus('UPLOAD');
  }
@@ -101,7 +167,7 @@ function VideoCourseDetail(){
                <div className="course-detail">
                    <div className='course-detail__img'>
                        {/* 如果视频和封面都没有上传的话, 那么就显示缺省, 如果上传了视频, 那么封面图就默认显示视频的第一帧, 如果上传了封面图, 那么就显示上传的封面图 */}
-                        <img src={coverUrl || `https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png`} alt='' />
+                        <img src={coverUrl || `https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png`} alt='' />
                    </div>
                    <div className="course-detail__info">
                        <div className="info__title">{courseName}</div>
@@ -116,9 +182,9 @@ function VideoCourseDetail(){
                        <If condition={courseChapterList.length > 0}>
                            {
                                underscore.map(courseChapterList,(item: any,index: number) => {
-                                return <div className='course-ware' onClick={()=>{handleScanFileModal("MP4",item)}} key={index}>
+                                return <div className='course-ware' onClick={()=>{handleScanFileModal(item.mediaType,item)}} key={index}>
                                        <div className="course-ware__index">{index < 9 ? `0${index + 1 } ` : index + 1}</div>
-                                        <img className='course-ware__img' src='https://image.xiaomaiketang.com/xm/TKwbQGYDBR.png' alt='' />
+                                        <img className='course-ware__img' src={FileTypeIconMap[item.mediaType]} alt='' />
                                        <div className='course-ware__name'>{item.name}</div>
                                </div>
                                })
@@ -127,6 +193,9 @@ function VideoCourseDetail(){
                    </div>
                </div>
            </div>
+            { showPreviewModal &&
+             <PreviewFileModal onCancel={()=>cancelPreview()} previewStatus={previewStatus} url={url}/>
+            }
            {scanFileModal}
    </div>
 }

--- a/src/modules/course-manage/video-course/components/ChapterList.jsx
+++ b/src/modules/course-manage/video-course/components/ChapterList.jsx
@@ -7,15 +7,17 @@ function ChapterList(props){
    return  <div className='chapter-list-component'>
        <If condition={courseChapterList.length > 0}>
            {
-            _.map(courseChapterList,(item,index) => {
+                _.map(courseChapterList,(item,index) => {
-                return <div className='course-ware'>
+                    return <div className='course-ware'>
-                    <div className='course-ware__index'>{index < 9 ? `0${index + 1 } ` : `${index + 1 } `}</div>
+                         <div className='course-ware__index'>{index < 9 ? `0${index + 1 } ` : `${index + 1 } `}</div>
-                    <div className="course-ware__detail">
+                        <div className="course-ware__detail">
-                        <div className='course-ware__detail__name'>{item.mediaName}</div>
+                            <div className='course-ware__detail__name'>{item.mediaName}</div>
-                        <div className='course-ware__detail__duration'>{window.formatDuration(item.videoDuration)}</div>
+                            { item.mediaType === 'VIDEO' &&
+                                <div className='course-ware__detail__duration'>{window.formatDuration(item.videoDuration)}</div>
+                            }
+                        </div>
                    </div>
-                </div>
+                })
-            })
            }
        </If>

--- a/src/modules/course-manage/video-course/components/LearningDetailModal.jsx
+++ b/src/modules/course-manage/video-course/components/LearningDetailModal.jsx
@@ -2,6 +2,7 @@ import User from "@/common/js/user";
 import CourseService from "@/domains/course-domain/CourseService";
 import React from "react";
 import { Modal } from "antd";
+import { FileTypeIcon } from '@/common/constants/academic/lessonEnum'
 import "./LearningDetailModal.less";
 class LearningDetailModal extends React.Component {
@@ -58,12 +59,8 @@ class LearningDetailModal extends React.Component {
                      <div className="course-ware__index">{`${
                        index > 9 ? index + 1 : `0${index + 1}`
                      } `}</div>
-                      <img
+                     <img className='course-ware__img' src={FileTypeIcon[item.mediaType]} alt='' />
-                        className="course-ware__img"
+                    <div className="course-ware__name">{item.courseChapterName && item.courseChapterName.replace('.MP4','')}</div>
-                        src="https://image.xiaomaiketang.com/xm/TKwbQGYDBR.png"
-                        alt=""
-                      />
-                      <div className="course-ware__name">{item.courseChapterName && item.courseChapterName.replace('.MP4','')}</div>
                    </div>
                    <div className={`progress ${item.progress === 100 ? 'finish' :''}`}>{`${item.progress === 100 ? '已完成' : `${item.progress}%`}`}</div>

--- a/src/modules/course-manage/video-course/components/VideoCourseList.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.jsx
@@ -65,7 +65,13 @@ class VideoCourseList extends React.Component {
          const { coverUrl } = record;
          return (
            <div className='record__item'>
-              <img className='course-cover' src={coverUrl || 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png'} alt='封面图' />
+              <img
+                className='course-cover'
+                src={
+                  coverUrl ||  'https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png'
+                }
+                alt='封面图'
+              />
              <Choose>
                <When condition={record.courseName.length > 25}>
                  <Tooltip title={record.courseName}>

--- a/src/modules/knowledge-base/components/KnowledgeBaseList.jsx
+++ b/src/modules/knowledge-base/components/KnowledgeBaseList.jsx
@@ -3,7 +3,7 @@
 * @Author: zangsuyun
 * @Date: 2021-03-12 14:49:40
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-11 16:44:59
+ * @LastEditTime: 2021-07-13 15:28:04
 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
 */

--- a/src/modules/knowledge-base/modal/AddCourse.jsx
+++ b/src/modules/knowledge-base/modal/AddCourse.jsx
@@ -421,7 +421,7 @@ class AddCourse extends React.Component {
                  coverUrl ||
                  (videoCourseDivision === 'internal'
                    ? `${mediaCourseUrl}?x-oss-process=video/snapshot,t_0,m_fast`
-                    : 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png')
+                    : 'https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png')
                }
                alt=''
              />

--- a/src/modules/plan-manage/modal/UserLearnDetailModal.jsx
+++ b/src/modules/plan-manage/modal/UserLearnDetailModal.jsx
 /*
 * @Author: yuananting
 * @Date: 2021-07-05 10:50:30
- * @LastEditors: yuananting
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-06 15:16:47
+ * @LastEditTime: 2021-07-09 17:36:15
 * @Description: 描述一下咯
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -13,6 +13,7 @@ import PlanService from '@/domains/plan-domain/planService';
 import User from '@/common/js/user';
 import './UserLearnDetailModal.less';
 import _ from 'underscore';
+import { FileTypeIcon } from '@/common/constants/academic/lessonEnum'
 const defaultCover = 'https://image.xiaomaiketang.com/xm/rEAetaTEh3.png';
 const CourseType = {
  LIVE: {
@@ -195,7 +196,7 @@ class UserLearnDetailModal extends React.Component {
              <span>
                {chapterIndex + 1}.{index + 1}&nbsp;
              </span>
-              <img className='chapter-img' src='https://image.xiaomaiketang.com/xm/TKwbQGYDBR.png' />
+              <img className='chapter-img' src={FileTypeIcon[record.mediaType]} />
              <span>{record.name}</span>
            </div>
          );

--- a/src/modules/plan-manage/modal/relatedCourseModal.jsx
+++ b/src/modules/plan-manage/modal/relatedCourseModal.jsx
@@ -397,7 +397,7 @@ class SelectOperatorModal extends React.Component {
          const { coverUrl } = record;
          return (
            <div className='course-info'>
-              <img className='course-cover' src={coverUrl || 'https://image.xiaomaiketang.com/xm/mt3ZQRxGKB.png'} alt='' />
+              <img className='course-cover' src={coverUrl || 'https://image.xiaomaiketang.com/xm/TwtGPQGE4K.png'} alt='' />
              <div className='course-name'>{record.courseName}</div>
            </div>
          );

--- a/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
+++ b/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
@@ -101,7 +101,7 @@ class SelectPrepareFileModal extends React.Component {
  // 获取文件列表
  handleFetchFolderList = (params = {}, loadMore = false) => {
    // 根据当前根节点获取文件列表
-    const { selectTypeList } = this.props;
+    const { selectTypeList,queryTypeEnum} = this.props;
    const { query, folderList, currentRootDisk } = this.state;
    const _params = {
      ...query,
@@ -114,6 +114,9 @@ class SelectPrepareFileModal extends React.Component {
    if (selectTypeList) {
      _params.folderFileType = selectTypeList
    }
+    if(queryTypeEnum){
+      _params.queryTypeEnum = queryTypeEnum
+    }
    Service.Hades(FOLDERLIST_URL_MAP[currentRootDisk.disk], _params).then((res) => {
      const { result = {} } = res;

--- a/src/modules/teach-tool/components/CourseCategorySiderTree.jsx
+++ b/src/modules/teach-tool/components/CourseCategorySiderTree.jsx
 /*
 * @Author: yuananting
 * @Date: 2021-02-22 10:59:43
- * @LastEditors: fusanqiasng
+ * @LastEditors: yuananting
- * @LastEditTime: 2021-06-15 11:20:48
+ * @LastEditTime: 2021-07-13 11:54:21
 * @Description: 助学工具-侧边课程分类树
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -20,7 +20,7 @@ class CourseCategorySiderTree extends Component {
  constructor(props) {
    super(props);
    this.state = {
-      selectedKeys: ['QUESTION_INDEX', 'PAPER_INDEX'].includes(props.fromModule) ? [getParameterByName('categoryId') || 'null'] : ['null'],
+      selectedKeys: ['null'],
      treeData: props.treeData || [],
      autoExpandParent: false,
    };

--- a/src/modules/teach-tool/examination-manager/AddExam.tsx
+++ b/src/modules/teach-tool/examination-manager/AddExam.tsx
--- a/src/modules/teach-tool/paper-manage/OperatePaper.jsx
+++ b/src/modules/teach-tool/paper-manage/OperatePaper.jsx
 /*
 * @Author: yuananting
 * @Date: 2021-03-27 16:15:13
- * @LastEditors: fusanqiasng
+ * @LastEditors: yuananting
- * @LastEditTime: 2021-07-01 16:30:38
+ * @LastEditTime: 2021-07-13 12:01:37
 * @Description: 助学工具-新建/复制/编辑试卷
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -118,7 +118,7 @@ class OperatePaper extends Component {
          portionScore: 0,
          totalQuestion: 0,
        },
-      ]
+      ],
    };
  }
@@ -352,20 +352,6 @@ class OperatePaper extends Component {
    return result;
  };
-  validatePaperName = (paperName) => {
-    if (this.state.check && !paperName) {
-      return '请输入试卷名称';
-    }
-    if (this.checkExist(paperName)) {
-      return '该试卷名称已存在';
-    }
-    if (paperName && paperName.length > 40) {
-      return '试卷名称最多40字';
-    }
-  };
  // 保存试卷
  savePaper = (saveType) => {
    this.setState({ check: true });
@@ -373,8 +359,17 @@ class OperatePaper extends Component {
    const categoryId = getParameterByName('categoryId');
    const { match } = this.props;
    let questionList = [];
-    if (!formData.passRate || !formData.paperName || this.checkExist(formData.paperName) || (formData.paperName && formData.paperName.length > 40)) {
+    if(!formData.paperName) {
-      return;
+      return message.warning('请输入试卷名称')
+    }
+    if(formData.paperName.length > 40) {
+      return message.warning('试卷名称最多40字')
+    }
+    if (this.checkExist(formData.paperName)) {
+      return message.warning('该试卷名称已存在')
+    } 
+    if(!formData.passRate) {
+      return message.warning('请输入及格线')
    }
    if (selectQuestionList.length === 0) {
      return message.warning('请选择题目');
@@ -410,18 +405,14 @@ class OperatePaper extends Component {
                  });
                } else {
                  message.success(currentOperate === 'new' ? '新建成功' : '复制成功');
-                  window.RCHistory.push({
+                  window.RCHistory.goBack();
-                    pathname: `/paper-manage-index?categoryId=${categoryId}`,
-                  });
                  Bus.trigger('queryPaperPageList', categoryId, selectQuestionList.length);
                  Bus.trigger('queryCategoryTree', 'remain');
                }
              }
            })
            .catch((e) => {
-              window.RCHistory.push({
+              window.RCHistory.goBack();
-                pathname: `/paper-manage-index?categoryId=${categoryId}`,
-              });
              Bus.trigger('queryPaperPageList', categoryId, selectQuestionList.length);
              Bus.trigger('queryCategoryTree', 'remain');
            });
@@ -438,17 +429,13 @@ class OperatePaper extends Component {
                  });
                } else {
                  message.success('编辑成功');
-                  window.RCHistory.push({
+                  window.RCHistory.goBack();
-                    pathname: `/paper-manage-index?categoryId=${categoryId}`,
-                  });
                  Bus.trigger('queryPaperPageList', categoryId, selectQuestionList.length);
                }
              }
            })
            .catch((e) => {
-              window.RCHistory.push({
+              window.RCHistory.goBack();
-                pathname: `/paper-manage-index?categoryId=${categoryId}`,
-              });
              Bus.trigger('queryPaperPageList', categoryId, selectQuestionList.length);
            });
        }
@@ -482,9 +469,7 @@ class OperatePaper extends Component {
      cancelText: '留在本页',
      icon: <span className='icon iconfont default-confirm-icon'>&#xe6f4;</span>,
      onOk: () => {
-        window.RCHistory.push({
+        window.RCHistory.goBack()
-          pathname: `/paper-manage-index?categoryId=${getParameterByName('categoryId')}`,
-        });
        Bus.trigger('queryCategoryTree', 'remain');
        Bus.trigger('queryPaperPageList', getParameterByName('categoryId'), 0);
      },
@@ -822,8 +807,8 @@ class OperatePaper extends Component {
                  name='paperName'
                  label='试卷名称：'
                  required
-                  validateStatus={this.validatePaperName(paperName) ? 'error' : ''}
+                  validateStatus={(check && (!paperName || paperName.length > 40 || this.checkExist(paperName))) ? 'error' : ''}
-                  help={this.validatePaperName(paperName)}>
+                  help={check && (!paperName ? '请输入试卷名称' : (paperName.length > 40 ? '试卷名称最多40字' : (this.checkExist(paperName) && '该试卷名称已存在')))}>
                  <Input
                    value={paperName}
                    autoComplete='off'

--- a/src/modules/teach-tool/paper-manage/components/PaperList.jsx
+++ b/src/modules/teach-tool/paper-manage/components/PaperList.jsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-02-25 11:23:47
 * @LastEditors: yuananting
- * @LastEditTime: 2021-06-03 17:13:30
+ * @LastEditTime: 2021-07-13 15:16:52
 * @Description: 助学工具-题库-试卷列表数据
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -362,9 +362,9 @@ class PaperList extends Component {
              {isPermiss && (
                <div
                  className="record-operate__item"
-                  onClick={() => this.copyPaper(record)}
+                  onClick={() => this.organizeExam(record)}
                >
-                  复制
+                  组织考试
                </div>
              )}
              {isPermiss && (
@@ -391,7 +391,7 @@ class PaperList extends Component {
          <span onClick={() => this.editPaper(item)}>编辑</span>
        </Menu.Item>
        <Menu.Item key="organizeExam">
-          <span onClick={() => this.organizeExam(item)}>组织考试</span>
+          <span onClick={() => this.copyPaper(item)}>复制</span>
        </Menu.Item>
        <Menu.Item key="del">
          <span onClick={() => this.confirmDeletePaper(item)}>删除</span>

--- a/src/modules/teach-tool/question-manage/OperateQuestion.jsx
+++ b/src/modules/teach-tool/question-manage/OperateQuestion.jsx
 /*
 * @Author: yuananting
 * @Date: 2021-02-25 13:46:35
- * @LastEditors: wufan
+ * @LastEditors: yuananting
- * @LastEditTime: 2021-05-24 11:32:47
+ * @LastEditTime: 2021-07-13 11:51:56
 * @Description: 助学工具-题库-新建/编辑题目
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -161,9 +161,7 @@ class OperateQuestion extends Component {
        <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>
      ),
      onOk: () => {
-        window.RCHistory.push({
+        window.RCHistory.goBack();
-          pathname: `/question-manage-index?categoryId=${getParameterByName("categoryId")}`,
-        });
        Bus.trigger("queryCategoryTree", "remain");
        Bus.trigger("queryQuestionPageList", getParameterByName("categoryId"));
      },
@@ -248,9 +246,7 @@ class OperateQuestion extends Component {
            this.handleRest(type);
          }
          if (next === "close") {
-            window.RCHistory.push({
+            window.RCHistory.goBack();
-              pathname: `/question-manage-index?categoryId=${categoryId}`,
-            });
            Bus.trigger("queryCategoryTree", "remain")
            Bus.trigger("queryQuestionPageList", categoryId)
          }
@@ -271,9 +267,7 @@ class OperateQuestion extends Component {
            this.handleRest(type);
          }
          if (next === "close") {
-            window.RCHistory.push({
+            window.RCHistory.goBack();
-              pathname: `/question-manage-index?categoryId=${categoryId}`,
-            });
            Bus.trigger("queryCategoryTree", "remain")
            Bus.trigger("queryQuestionPageList", categoryId)
          }