zhangjie пре 1 месец
родитељ
комит
52da3d1182

+ 7 - 3
src/modules/question/components/ai-question/AiQuestionCreateDialog.vue

@@ -33,13 +33,15 @@
               v-for="item in questionTypes"
               :key="item.id"
               :type="
-                formModel.questionType === item.questionType
+                formModel.questionType === item.questionType &&
+                formModel.questionTypeName === item.name
                   ? 'primary'
                   : 'default'
               "
               size="small"
+              style="margin: 0 5px 6px"
               @click="switchType(item)"
-              >{{ item.questionTypeName }}</el-button
+              >{{ item.name }}</el-button
             >
           </el-form-item>
 
@@ -278,16 +280,18 @@ export default {
       );
 
       if (this.questionTypes.length > 0) {
-        this.formModel.questionType = this.questionTypes[0].questionType;
+        this.switchType(this.questionTypes[0]);
       }
     },
     switchType(item) {
       this.formModel.questionType = item.questionType;
+      this.formModel.questionTypeName = item.name;
       this.$refs.form.validateField("questionType");
     },
     getInitForm() {
       return {
         questionType: "SINGLE_CHOICE",
+        questionTypeName: "",
         questionCount: 1,
         optionCount: 4,
         syllabus: false,

+ 12 - 17
src/modules/question/views/QuestionManage.vue

@@ -176,7 +176,7 @@
                     >手动创建</el-button
                   >
                 </el-dropdown-item>
-                <el-dropdown-item>
+                <!-- <el-dropdown-item>
                   <el-button
                     v-if="authButtons.includes('import_test_paper-ai')"
                     size="mini"
@@ -185,7 +185,7 @@
                     @click="toGPTQuestion"
                     >智能录题</el-button
                   >
-                </el-dropdown-item>
+                </el-dropdown-item> -->
               </el-dropdown-menu>
             </el-dropdown>
             <svg-btn name="ai" @click="toAIQuestion">AI命题</svg-btn>
@@ -354,11 +354,6 @@
       show-log
       @on-edit="toEditQuestion"
     ></question-preview-dialog>
-    <!-- QuestionStatisticsDialog -->
-    <question-statistics-dialog
-      ref="QuestionStatisticsDialog"
-      :course-id="filter.courseId"
-    ></question-statistics-dialog>
     <!-- QuestionSafetySetDialog -->
     <question-safety-set-dialog
       ref="QuestionSafetySetDialog"
@@ -407,6 +402,12 @@
       @modified="getList"
     ></ai-question-create-dialog>
 
+    <!-- StatisticsQuestionDialog -->
+    <StatisticsQuestionDialog
+      ref="StatisticsQuestionDialog"
+      :course-id="filter.courseId"
+    />
+
     <router-view></router-view>
   </div>
 </template>
@@ -425,7 +426,6 @@ import {
   checkOptionRepeatApi,
   asyncTaskDownloadApi,
 } from "../api";
-import QuestionStatisticsDialog from "../components/QuestionStatisticsDialog.vue";
 import QuestionSafetySetDialog from "../components/QuestionSafetySetDialog.vue";
 import QuestionFolderDialog from "../components/QuestionFolderDialog.vue";
 import QuestionImportDialog from "../components/QuestionImportDialog.vue";
@@ -436,6 +436,8 @@ import PropertyTreeSelect from "../components/PropertyTreeSelect.vue";
 import QuestionImportEdit from "../components/QuestionImportEdit.vue";
 import GptQuestionDialog from "../components/GptQuestionDialog.vue";
 import AiQuestionCreateDialog from "../components/ai-question/AiQuestionCreateDialog.vue";
+import StatisticsQuestionDialog from "../../statistics/components/StatisticsQuestionDialog.vue";
+
 import TaskProgressDialog from "@/components/TaskProgressDialog.vue";
 import { mapActions, mapGetters, mapMutations } from "vuex";
 import { USER_SIGNIN } from "../../portal/store/user";
@@ -445,7 +447,6 @@ import { downloadByApi } from "@/plugins/download";
 export default {
   name: "QuestionMamage",
   components: {
-    QuestionStatisticsDialog,
     QuestionSafetySetDialog,
     QuestionFolderDialog,
     QuestionImportDialog,
@@ -458,6 +459,7 @@ export default {
     QuestionFolder,
     TaskProgressDialog,
     AiQuestionCreateDialog,
+    StatisticsQuestionDialog,
   },
   data() {
     return {
@@ -596,14 +598,7 @@ export default {
         this.$message.error("请先选择课程!");
         return;
       }
-      // this.$refs.QuestionStatisticsDialog.open();
-      this.$router.push({
-        name: "QuestionTypeStatistics",
-        query: {
-          courseId: this.filter.courseId,
-          courseName: this.curCourse.name,
-        },
-      });
+      this.$refs.StatisticsQuestionDialog.open();
     },
     toSafetySet() {
       this.$refs.QuestionSafetySetDialog.open();