zhangjie 2 vuotta sitten
vanhempi
commit
6fe9db2055

+ 7 - 9
src/modules/paper/components/AuditPaperUnsubmit.vue

@@ -105,15 +105,13 @@ export default {
       this.toPage(1);
     },
     toEdit(row) {
-      window.open(
-        this.getRouterPath({
-          name: "EditPaper",
-          params: {
-            id: row.id,
-            parentView: "audit-paper",
-          },
-        })
-      );
+      this.$router.push({
+        name: "EditPaper",
+        params: {
+          id: row.id,
+          parentView: "audit-paper",
+        },
+      });
     },
     async toSubmit(row) {
       const confirm = await this.$confirm(`确定要提交该试卷吗?`, "提示", {

+ 1 - 0
src/modules/paper/views/EditPaper.vue

@@ -670,6 +670,7 @@ export default {
         });
       });
       this.paper = res.data;
+      this.paper.title = this.paper.title || this.paper.name;
       this.showCheckDuplicate();
 
       if (!this.checkPaperQuestionAllHasScore()) {

+ 3 - 3
src/modules/question/components/AuditQuestionApply.vue

@@ -21,13 +21,13 @@
         :data="dataList"
       >
         <el-table-column label="试题">
-          <template slot-scope="scope">
+          <div slot-scope="scope" @click="toDetail(scope.row)">
             <rich-text
               class="row-question-body"
               title="点击查看试题"
               :text-json="scope.row.quesBody"
             ></rich-text>
-          </template>
+          </div>
         </el-table-column>
         <el-table-column label="课程">
           <template slot-scope="scope">
@@ -85,7 +85,7 @@
 
 <script>
 import { auditQuestionApplyPageListApi, withdrawQuestionApi } from "../api";
-import QuestionPreviewDialog from "../components/QuestionPreviewDialog.vue";
+import QuestionPreviewDialog from "./QuestionPreviewDialog.vue";
 
 export default {
   name: "AuditQuestionApply",

+ 3 - 3
src/modules/question/components/AuditQuestionAudited.vue

@@ -19,13 +19,13 @@
         :data="dataList"
       >
         <el-table-column label="试题">
-          <template slot-scope="scope">
+          <div slot-scope="scope" @click="toDetail(scope.row)">
             <rich-text
               class="row-question-body"
               title="点击查看试题"
               :text-json="scope.row.quesBody"
             ></rich-text>
-          </template>
+          </div>
         </el-table-column>
         <el-table-column label="课程">
           <template slot-scope="scope">
@@ -80,7 +80,7 @@
 
 <script>
 import { auditQuestionAuditedPageListApi } from "../api";
-import QuestionPreviewDialog from "../components/QuestionPreviewDialog.vue";
+import QuestionPreviewDialog from "./QuestionPreviewDialog.vue";
 
 export default {
   name: "AuditQuestionAudited",

+ 14 - 4
src/modules/question/components/AuditQuestionUnsubmit.vue

@@ -19,13 +19,13 @@
         :data="dataList"
       >
         <el-table-column label="试题">
-          <template slot-scope="scope">
+          <div slot-scope="scope" @click="toViewQuestion(scope.row)">
             <rich-text
               class="row-question-body"
               title="点击查看试题"
               :text-json="scope.row.quesBody"
             ></rich-text>
-          </template>
+          </div>
         </el-table-column>
         <el-table-column label="课程">
           <template slot-scope="scope">
@@ -79,16 +79,22 @@
       :question="curQuestion"
       @modified="getList"
     ></question-edit-dialog>
+    <!-- QuestionPreviewDialog -->
+    <question-preview-dialog
+      ref="QuestionPreviewDialog"
+      :question="curQuestion"
+    ></question-preview-dialog>
   </div>
 </template>
 
 <script>
 import { auditQuestionsUnsubmitPageListApi, submitQuestionApi } from "../api";
-import QuestionEditDialog from "../components/QuestionEditDialog.vue";
+import QuestionEditDialog from "./QuestionEditDialog.vue";
+import QuestionPreviewDialog from "./QuestionPreviewDialog.vue";
 
 export default {
   name: "AuditQuestionUnsubmit",
-  components: { QuestionEditDialog },
+  components: { QuestionEditDialog, QuestionPreviewDialog },
   data() {
     return {
       filter: { creatorName: "" },
@@ -124,6 +130,10 @@ export default {
       this.pageSize = val;
       this.toPage(1);
     },
+    toViewQuestion(row) {
+      this.curQuestion = row;
+      this.$refs.QuestionPreviewDialog.open();
+    },
     toEdit(row) {
       const courseInfo = {
         courseId: row.course.id,

+ 3 - 3
src/modules/question/components/AuditQuestionWait.vue

@@ -19,13 +19,13 @@
         :data="dataList"
       >
         <el-table-column label="试题">
-          <template slot-scope="scope">
+          <div slot-scope="scope" @click="toDetail(scope.row)">
             <rich-text
               class="row-question-body"
               title="点击查看试题"
               :text-json="scope.row.quesBody"
             ></rich-text>
-          </template>
+          </div>
         </el-table-column>
         <el-table-column label="课程">
           <template slot-scope="scope">
@@ -109,7 +109,7 @@
 </template>
 
 <script>
-import QuestionPreviewDialog from "../components/QuestionPreviewDialog.vue";
+import QuestionPreviewDialog from "./QuestionPreviewDialog.vue";
 import AuditQuestionDialog from "./AuditQuestionDialog.vue";
 import { auditQuestionWaitPageListApi } from "../api";
 

+ 6 - 2
src/modules/question/components/QuestionEditDialog.vue

@@ -90,7 +90,7 @@ import SelectQuestion from "./edit/SelectQuestion.vue";
 import TextAnswerQuestion from "./edit/TextAnswerQuestion.vue";
 import NestedQuestion from "./edit/NestedQuestion.vue";
 import BankedClozeQuestion from "./edit/BankedClozeQuestion.vue";
-import { randomCode } from "@/plugins/utils";
+import { deepCopy, randomCode } from "@/plugins/utils";
 import { updateQuestionApi, sourceDetailPageListApi } from "../api";
 import ModifySourceDetail from "./ModifySourceDetail.vue";
 
@@ -159,7 +159,11 @@ export default {
       this.loading = false;
       this.hasModifyQuestion = false;
 
-      let questionModel = Object.assign({}, initQuestionModel, this.question);
+      let questionModel = Object.assign(
+        {},
+        initQuestionModel,
+        deepCopy(this.question)
+      );
 
       if (this.isEdit) {
         this.sourceDetailList = this.sourceDetailAllList;

+ 0 - 1
src/modules/question/views/QuestionManage.vue

@@ -335,7 +335,6 @@ export default {
       this.$refs.QuestionImportDialog.open();
     },
     toViewQuestion(row) {
-      console.log(row);
       this.curQuestion = row;
       this.$refs.QuestionPreviewDialog.open();
     },

+ 0 - 20
src/modules/questions/views/CheckDuplicateList.vue

@@ -24,25 +24,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="试卷名称">
-          <el-select
-            v-model="formSearch.basePaperId"
-            filterable
-            :remote-method="getPapers"
-            remote
-            clearable
-            placeholder="请选择"
-            @clear="getPapers('')"
-          >
-            <el-option
-              v-for="item in paperList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="题型">
           <source-detail-select
             v-model="formSearch"
@@ -218,7 +199,6 @@ export default {
     return {
       selectedQuesIds: [],
       formSearch: {
-        basePaperId: "",
         questionType: "",
         sourceDetailId: "",
         courseId: "",