Merge branch 'feature/yuananting/20210221/question-bank-tools' into dev

5d4609a0 · yuananting · 8fe8995a · 8b5aea7c · 5d4609a0 · 5d4609a0
Commit 5d4609a0 authored Mar 18, 2021 by yuananting
9 changed files
--- a/src/modules/teach-tool/AddNewQuestion.jsx
+++ b/src/modules/teach-tool/AddNewQuestion.jsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-02-25 13:46:35
 * @LastEditors: yuananting
- * @LastEditTime: 2021-03-18 11:15:19
+ * @LastEditTime: 2021-03-18 14:12:22
 * @Description: 助学工具-题库-题目管理-新增题目
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -12,7 +12,7 @@ import Breadcrumbs from "@/components/Breadcrumbs";
 import ShowTips from "@/components/ShowTips";
 import "./AddNewQuestion.less";
 import NewQuestionTab from "./components/NewQuestionTab";
-import { defineOptionInfo, defineQuestionInfo } from "./components/model";
+import { defineJudgeOptionInfo, defineOptionInfo, defineQuestionInfo } from "./components/model";
 import QuestionBankService from "@/domains/question-bank-domain/QuestionBankService";
 import User from "@/common/js/user";
 import UploadOss from "@/core/upload";
@@ -37,12 +37,14 @@ class AddNewQuestion extends Component {
      judgeContent: defineQuestionInfo("JUDGE"), // 判断题
      gapFillingContent: defineQuestionInfo("GAP_FILLING"), // 填空题
      indefiniteChoiceContent: defineQuestionInfo("INDEFINITE_CHOICE"), // 不定项选择题
+      currentOperate: "new",
    };
  }
  componentDidMount() {
    if (getParameterByName("id")) {
      // 编辑
+      this.setState({ currentOperate: "edit" });
      this.queryQuestionDetails();
    }
  }
@@ -78,19 +80,29 @@ class AddNewQuestion extends Component {
  };
  handleRest = (type) => {
+    this.setState({ currentOperate: "add" });
    switch (type) {
      case "SINGLE_CHOICE":
-        this.setState({
+        let singleChoiceContent = defineQuestionInfo("SINGLE_CHOICE");
-          singleChoiceContent: defineQuestionInfo("SINGLE_CHOICE"),
+        for (var i = 0; i < 4; i++) {
-        }, () => this.state.singleChoiceContent.optionList.push(defineOptionInfo()));
+          singleChoiceContent.optionList.push(defineOptionInfo());
+        }
+        this.setState({ singleChoiceContent });
        break;
      case "MULTI_CHOICE":
-        this.setState({
+        let multiChoiceContent = defineQuestionInfo("MULTI_CHOICE");
-          multiChoiceContent: defineQuestionInfo("MULTI_CHOICE"),
+        for (var i = 0; i < 4; i++) {
-        }, () => this.state.multiChoiceContent.optionList.push(defineOptionInfo()));
+          multiChoiceContent.optionList.push(defineOptionInfo());
+        }
+        this.setState({ multiChoiceContent });
        break;
      case "JUDGE":
-        this.setState({ judgeContent: defineQuestionInfo("JUDGE") });
+        let judgeContent = defineQuestionInfo("JUDGE");
+        var judgeOptions = ["正确", "错误"];
+        judgeOptions.forEach(item=>{
+          judgeContent.optionList.push(defineJudgeOptionInfo(item));
+        })
+        this.setState({ judgeContent });
        break;
      case "GAP_FILLING":
        this.setState({
@@ -98,10 +110,11 @@ class AddNewQuestion extends Component {
        });
        break;
      case "INDEFINITE_CHOICE":
-        this.setState({
+        let indefiniteChoiceContent = defineQuestionInfo("INDEFINITE_CHOICE");
-          indefiniteChoiceContent: defineQuestionInfo("INDEFINITE_CHOICE"),
+        for (var i = 0; i < 4; i++) {
-        }, () => this.state.indefiniteChoiceContent.optionList.push(defineOptionInfo()));
+          indefiniteChoiceContent.optionList.push(defineOptionInfo());
-        break;
+        }
+        this.setState({ indefiniteChoiceContent });
    }
  };
@@ -127,8 +140,7 @@ class AddNewQuestion extends Component {
    });
    let params = {};
    let categoryId = getParameterByName("categoryId");
+    if (getParameterByName("id") && this.state.currentOperate === "edit") {
-    if (getParameterByName("id")) {
      params = {
        ...content,
        id: getParameterByName("id"),
@@ -142,10 +154,10 @@ class AddNewQuestion extends Component {
        if (res.success) {
          message.success("保存成功");
          if (next === "add") {
-            // this.handleRest(type);
+            this.handleRest(type);
-            window.RCHistory.push({
+            // window.RCHistory.push({
-              pathname: `/create-new-question?categoryId=${params.categoryId}&key=${type}`,
+            //   pathname: `/create-new-question?categoryId=${params.categoryId}&key=${type}`,
-            });
+            // });
          }
          if (next === "close") {
            window.RCHistory.push({
@@ -166,9 +178,7 @@ class AddNewQuestion extends Component {
        if (res.success) {
          message.success("保存成功");
          if (next === "add") {
-            window.RCHistory.push({
+            this.handleRest(type);
-              pathname: `/create-new-question?categoryId=${params.categoryId}&key=${type}`,
-            });
          }
          if (next === "close") {
            window.RCHistory.push({
@@ -254,7 +264,7 @@ class AddNewQuestion extends Component {
    return (
      <div className="page add-new-question">
        <Breadcrumbs
-          navList={getParameterByName("id") ? "编辑题目" : "新增题目"}
+          navList={getParameterByName("id") && this.state.currentOperate==="edit" ? "编辑题目" : "新增题目"}
          goBack={() => this.handleGoBack()}
        />
        <div className="box">
@@ -279,7 +289,6 @@ class AddNewQuestion extends Component {
                }}
                questionInfo={singleChoiceContent}
                onSetState={(newContent) => {
-                  console.log("newContent:", newContent);
                  Object.assign(singleChoiceContent, newContent);
                }}
                onLogger={this.handleLogger}
@@ -328,7 +337,6 @@ class AddNewQuestion extends Component {
                questionInfo={gapFillingContent}
                onSetState={(newContent) => {
                  Object.assign(gapFillingContent, newContent);
-                  console.log("gapFillingContent:", newContent);
                }}
              />
            </TabPane>

--- a/src/modules/teach-tool/QuestionCategoryManage.less
+++ b/src/modules/teach-tool/QuestionCategoryManage.less
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-02-23 19:41:42
 * @LastEditors: yuananting
- * @LastEditTime: 2021-03-18 09:32:37
+ * @LastEditTime: 2021-03-18 13:58:30
 * @Description: 助学工具-题库-题目分类管理样式
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -53,10 +53,11 @@
          }
        }
      }
-      // .ant-tree-treenode-selected:hover::before,
+      .ant-tree-treenode-selected:hover::before,
-      // .ant-tree-treenode-selected::before {
+      .ant-tree-treenode-selected::before {
-      //   background: rgb(255 251 240);
+        background: #ffb714;
-      // }
+        opacity: 0.06;
+      }
    }
  }
  .xm-show-tip {

--- a/src/modules/teach-tool/components/NewQuestionTab.jsx
+++ b/src/modules/teach-tool/components/NewQuestionTab.jsx
--- a/src/modules/teach-tool/components/QuestionBankSider.less
+++ b/src/modules/teach-tool/components/QuestionBankSider.less
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-02-22 12:02:34
 * @LastEditors: yuananting
- * @LastEditTime: 2021-03-18 09:34:06
+ * @LastEditTime: 2021-03-18 13:59:24
 * @Description: 助学工具-题库-题库主页面侧边栏样式
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -54,6 +54,11 @@
          color: #666666;
        }
      }
+      .ant-tree-treenode-selected:hover::before,
+      .ant-tree-treenode-selected::before {
+        background: #ffb714;
+        opacity: 0.06;
+      }
    }
  }
 }
--- a/src/modules/teach-tool/components/QuestionEditor.jsx
+++ b/src/modules/teach-tool/components/QuestionEditor.jsx
@@ -12,7 +12,7 @@ const MEDIA_MAP = [
  {
    title: "录音",
    icon: <React.Fragment>&#xe7bb;</React.Fragment>,
-    key: "RECORD",
+    key: "AUDIO",
  },
  {
    title: "图片",
@@ -56,12 +56,18 @@ class QuestionEditor extends Component {
  }
  shouldComponentUpdate(nextProps, nextState) {
-    const { detailInfo } = nextProps;
+    const { detailInfo, blanksList } = nextProps;
    if (this.state.detailInfo !== detailInfo) {
      this.setState({ detailInfo: nextProps.detailInfo }, () => {
        this.renderEditor();
      });
    }
+    if (blanksList !== this.state.blanksList) {
+      console.log("+++++++", blanksList)
+      this.setState({
+        blanksList
+      })
+    }
    return true;
  }
@@ -148,6 +154,7 @@ class QuestionEditor extends Component {
        this.setState({ isShowSingleInput: true });
      }
      if (this.state.isGapFilling) {
+        console.log(9999, this.state.isGapFilling)
        this.props.changeBlankCount(this.state.blanksList);
      }
      this.setState(
@@ -204,7 +211,7 @@ class QuestionEditor extends Component {
  }
  insertBlank = (blanks) => {
-    var blanks = `<input class="add-fill-line" disabled answerTagList="" id=${window.random_string(
+    var blanks = `<input class="add-fill-line" disabled correctAnswerList="[]" id=${window.random_string(
      16
    )} value="填空"/>`;
    this.editorRoot.cmd.do("insertHTML", blanks);
@@ -215,7 +222,7 @@ class QuestionEditor extends Component {
    this.setState({
      visiblePlacehold: false,
    });
-    // this.props.changeBlankCount(_blanksList);
+    this.props.changeBlankCount(_blanksList);
  };
  render() {
@@ -233,7 +240,7 @@ class QuestionEditor extends Component {
    } = this.state;
    const {
      placehold,
-      mediaBtn = ["VOICE", "RECORD", "PICTURE", "VIDEO"],
+      mediaBtn = ["VOICE", "AUDIO", "PICTURE", "VIDEO"],
      limitLength = 1000,
      markKey,
    } = this.props;

--- a/src/modules/teach-tool/components/QuestionManageContent.jsx
+++ b/src/modules/teach-tool/components/QuestionManageContent.jsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-02-25 11:23:47
 * @LastEditors: yuananting
- * @LastEditTime: 2021-03-18 10:24:47
+ * @LastEditTime: 2021-03-18 14:21:22
 * @Description: 助学工具-题库-题目管理主页面列表数据
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -69,7 +69,7 @@ class QuestionManageContent extends Component {
      query: {
        current: 1,
        size: 10,
-        order: "ACCURACY_DESC", // 排序规则[ ACCURACY_DESC, ACCURACY_ASC, CREATED_DESC, CREATED_ASC, UPDATED_DESC, UPDATED_ASC ]
+        order: "UPDATED_DESC", // 排序规则[ ACCURACY_DESC, ACCURACY_ASC, CREATED_DESC, CREATED_ASC, UPDATED_DESC, UPDATED_ASC ]
        categoryId: null, // 当前题库分类Id
        questionName: null, // 题目名称
        questionType: null, // 题目类型

--- a/src/modules/teach-tool/modal/BatchImportQuestionModal.jsx
+++ b/src/modules/teach-tool/modal/BatchImportQuestionModal.jsx
@@ -39,7 +39,6 @@ class BatchImportQuestionModal extends Component {
  // 选择云盘资源
  handleSelectExcel = (file) => {
-    console.log(file);
    this.setState({ uploadFile: file });
    this.setState({
      showSelectFileModal: false,
@@ -133,6 +132,9 @@ class BatchImportQuestionModal extends Component {
              </div>
              <div className="step-section">
                <h4 className="step-title">2.选择需要导入的Excel文件</h4>
+                <p style={{ marginBottom: 16, color: "gray" }}>
+                  导入限制：一次最多导入1000个题目
+                </p>
                <Button
                  type="primary"
                  className="add-btn"
@@ -220,9 +222,9 @@ class BatchImportQuestionModal extends Component {
                    type="primary"
                    className="down-btn"
                    onClick={() => {
-                      this.setState({ status: "init" })
+                      this.setState({ status: "init" });
-                      this.setState({ uploadFile: null })
+                      this.setState({ uploadFile: null });
-                      this.setState({ showSelectFileModal: true })
+                      this.setState({ showSelectFileModal: true });
                    }}
                  >
                    重新上传文件

--- a/src/modules/teach-tool/modal/BatchImportQuestionModal.less
+++ b/src/modules/teach-tool/modal/BatchImportQuestionModal.less
@@ -6,7 +6,6 @@
    .step-title {
      font-size: 16px;
      font-weight: 400;
-      margin-bottom: 16px;
      color: #333;
    }
    .tip-box {

--- a/src/modules/teach-tool/modal/QuestionPreviewModal.jsx
+++ b/src/modules/teach-tool/modal/QuestionPreviewModal.jsx
@@ -87,8 +87,8 @@ class QuestionPreviewModal extends Component {
    const voiceDescList = _.filter(questionAnswerDescList, (descItem) => {
      return descItem.type === "VOICE";
    });
-    const recordDescList = _.filter(questionAnswerDescList, (descItem) => {
+    const audioDescList = _.filter(questionAnswerDescList, (descItem) => {
-      return descItem.type === "RECORD";
+      return descItem.type === "AUDIO";
    });
    const videoDeacList = _.filter(questionAnswerDescList, (descItem) => {
      return descItem.type === "VIDEO";
@@ -327,12 +327,12 @@ class QuestionPreviewModal extends Component {
                      })}
                    </div>
                  )}
-                  {recordDescList.length > 0 && (
+                  {audioDescList.length > 0 && (
                    <div className="desc-audio-box">
-                      {_.map(recordDescList, (recordItem, recordIndex) => {
+                      {_.map(audioDescList, (audioItem, audioIndex) => {
-                        let { content, size } = recordItem;
+                        let { content, size } = audioItem;
                        return (
-                          <div className="audio-box" key={recordIndex}>
+                          <div className="audio-box" key={audioIndex}>
                            <XMAudio
                              forbidParse
                              url={content}
@@ -340,7 +340,7 @@ class QuestionPreviewModal extends Component {
                                size = durationSize;
                                this.setState({});
                              }}
-                              index={recordIndex}
+                              index={audioIndex}
                              size={size || 1000}
                            />
                          </div>