fix:解决周优化考试引用试卷名称的合并冲突

0e51ade3 · yuananting · 394dc6d5 · 6e337d86 · 0e51ade3 · 0e51ade3
Commit 0e51ade3 authored Jul 13, 2021 by yuananting
6 changed files
--- 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/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)
          }