zhangjie 2 lat temu
rodzic
commit
296a4fb9b7

+ 1 - 1
src/modules/paper/components/AuditPaperApply.vue

@@ -110,7 +110,7 @@ export default {
     },
     toDetail(row) {
       this.$router.push({
-        name: "PreviewPaper",
+        name: "ViewPaper",
         params: {
           id: row.id,
         },

+ 16 - 12
src/modules/paper/components/QuestionGroupStruct.vue

@@ -65,7 +65,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="!useDifficult || USE_ONLY_DIFFICULT"
+            v-if="(!useDifficult && !useProperty) || USE_ONLY_DIFFICULT"
             label="数量"
             width="150"
           >
@@ -491,6 +491,15 @@ export default {
     },
     getDataList() {
       let dataList = deepCopy(this.dataList);
+      let structInfo = {
+        classifyIdList: this.useClassify ? this.selectedFolderIds : [],
+        questionDistributeInfo: null,
+        questionCount: this.getTotalQuestionCount(),
+        useClassify: this.useClassify,
+        useDifficult: this.useDifficult,
+        useProperty: this.useProperty,
+        curCoursePropertyId: this.curCoursePropertyId,
+      };
 
       if (this.USE_ONLY_DIFFICULT) {
         dataList[0].difficultDistributeInfo = this.tableData.map((item) => {
@@ -500,10 +509,12 @@ export default {
             selectCount: item.selectCount,
           };
         });
-        return dataList;
+        structInfo.propertyDistributeInfo = dataList;
+        return structInfo;
       } else if (this.useClassify && !this.useProperty) {
         dataList = deepCopy(this.tableData);
-        return dataList;
+        structInfo.propertyDistributeInfo = dataList;
+        return structInfo;
       } else if (!this.useClassify && this.useProperty) {
         dataList[0].propertyDistributeInfo = this.tableData;
       }
@@ -522,15 +533,8 @@ export default {
         return item;
       });
 
-      return {
-        classifyIdList: this.useClassify ? this.selectedFolderIds : [],
-        questionDistributeInfo: dataList,
-        questionCount: this.getTotalQuestionCount(),
-        useClassify: this.useClassify,
-        useDifficult: this.useDifficult,
-        useProperty: this.useProperty,
-        curCoursePropertyId: this.curCoursePropertyId,
-      };
+      structInfo.propertyDistributeInfo = dataList;
+      return structInfo;
     },
     // source relate
     gerSourceData(k) {

+ 1 - 0
src/modules/question/components/PropertyTreeSelect.vue

@@ -138,6 +138,7 @@ export default {
   },
   methods: {
     resetData() {
+      this.$refs.PropertyTree.setCheckedKeys([]);
       this.selectedPropName = "";
       this.selectedPropList = [];
       this.selectedPropIds = [];

+ 0 - 1
src/modules/questions/routes/routes.js

@@ -228,7 +228,6 @@ export const otherRoutes = [
   {
     path: "/preview_paper/:paperId", //预览试卷
     component: PreviewPaper,
-    name: "PreviewPaper",
   },
   {
     path: "/view_paper/:id", //试卷查看

+ 12 - 11
src/modules/questions/views/ViewPaper.vue

@@ -27,13 +27,13 @@
         </div>
       </div>
       <div class="header-btns">
-        <el-button
+        <!-- <el-button
           type="primary"
           plain
           icon="icon icon-share"
           @click="releasePaper(paper.id)"
           >释放</el-button
-        >
+        > -->
         <el-button type="danger" plain icon="icon icon-back" @click="back"
           >返回</el-button
         >
@@ -762,15 +762,16 @@ export default {
     },
     //返回
     back() {
-      if (sessionStorage.getItem("question_back") == "true") {
-        this.$router.push({
-          path: "/questions/paper_storage/0",
-        });
-      } else {
-        this.$router.push({
-          path: "/questions/paper_storage/1",
-        });
-      }
+      window.history.go(-1);
+      // if (sessionStorage.getItem("question_back") == "true") {
+      //   this.$router.push({
+      //     path: "/questions/paper_storage/0",
+      //   });
+      // } else {
+      //   this.$router.push({
+      //     path: "/questions/paper_storage/1",
+      //   });
+      // }
     },
     paperDetailShow(paperDetail) {
       if (this.reduplicateGroup.length == 0) {