刘洋 1 gadu atpakaļ
vecāks
revīzija
4463a0f400

+ 3 - 2
src/modules/paper/api.js

@@ -114,11 +114,12 @@ export const paperAuditInfoApi = ({ paperId, curPage, pageSize }) => {
     }
   );
 };
-export const paperBlueInfoApi = ({ paperId, coursePropertyId, rootOrgId }) => {
+export const paperBlueInfoApi = ({ paperId, courseId, rootOrgId }) => {
   return $httpWithMsg.get(`${QUESTION_API}/paper/blue`, {
     params: {
       id: paperId,
-      coursePropertyId,
+      // coursePropertyId,
+      courseId,
       rootOrgId,
     },
   });

+ 6 - 5
src/modules/paper/components/PaperBlueInfo.vue

@@ -8,7 +8,8 @@
     custom-class="side-dialog"
     @open="visibleChange"
   >
-    <el-form>
+    <h2 style="color: #262626; margin-bottom: 10px">知识点</h2>
+    <!-- <el-form>
       <el-form-item label="可选属性">
         <property-select
           v-model="coursePropertyId"
@@ -17,7 +18,7 @@
         >
         </property-select>
       </el-form-item>
-    </el-form>
+    </el-form> -->
     <el-table
       :data="paperData.data"
       style="width: 100%"
@@ -72,7 +73,7 @@ export default {
   data() {
     return {
       modalIsShow: false,
-      coursePropertyId: "",
+      // coursePropertyId: "",
       paperData: { head: [] },
       headFirst: [],
       headSecond: [],
@@ -89,11 +90,11 @@ export default {
       this.modalIsShow = true;
     },
     async getPaperData() {
-      if (!this.coursePropertyId) return;
+      // if (!this.coursePropertyId) return;
       const res = await paperBlueInfoApi({
         paperId: this.paperId,
         courseId: this.courseId,
-        coursePropertyId: this.coursePropertyId,
+        // coursePropertyId: this.coursePropertyId,
         rootOrgId: this.$store.state.user.rootOrgId,
       });
       this.paperData = res.data;

+ 9 - 5
src/modules/paper/views/EditPaper.vue

@@ -70,9 +70,7 @@
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button type="primary" size="small" @click="toSavePaper">
-            保存
-          </el-button>
+
           <el-button
             v-if="checkDuplicateBtnShow"
             type="primary"
@@ -91,7 +89,9 @@
           >
             删除
           </el-button>
-
+          <el-button type="primary" size="small" @click="toSavePaper">
+            保存
+          </el-button>
           <!-- <el-button
             size="small"
             type="primary"
@@ -942,6 +942,10 @@ export default {
     },
     // 保存试卷
     async toSavePaper() {
+      const confirm = await this.$confirm(`确定保存吗?`, "系统通知", {
+        type: "warning",
+      }).catch(() => {});
+      if (confirm !== "confirm") return;
       const res = await paperSaveApi(this.paper).catch(() => {});
 
       if (!res) return;
@@ -949,7 +953,7 @@ export default {
     },
     // 删除试卷
     async toDeletePaper() {
-      const confirm = await this.$confirm(`确定要删除该试卷吗?`, "提示", {
+      const confirm = await this.$confirm(`确定要删除该试卷吗?`, "系统通知", {
         type: "warning",
       }).catch(() => {});
       if (confirm !== "confirm") return;

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

@@ -20,7 +20,7 @@
               placeholder="题目内容"
             ></el-input>
           </el-form-item>
-          <el-form-item label="属性">
+          <el-form-item label="知识点">
             <!-- <property-tree-select
             v-model="filter.questionProperty"
             :course-id="filter.courseId"

+ 5 - 3
src/modules/questions/views/PaperBlue.vue

@@ -118,13 +118,15 @@ export default {
         });
     },
     onSelChange() {
-      this.$http
+      this.$httpWithMsg
         .get(
           QUESTION_API +
             "/paper/blue?id=" +
             this.paperId +
-            "&coursePropertyId=" +
-            this.coursePropertyId +
+            "&courseId=" +
+            this.courseId +
+            // "&coursePropertyId=" +
+            // this.coursePropertyId +
             "&rootOrgId=" +
             this.user.rootOrgId
         )

+ 1 - 5
src/modules/questions/views/PropertyInfo.vue

@@ -299,11 +299,7 @@ export default {
   },
   mounted() {
     setTimeout(() => {
-      this.$store.commit("UPDATE_CURRENT_PATHS", [
-        "课程管理",
-        "知识点",
-        "属性结构",
-      ]);
+      this.$store.commit("UPDATE_CURRENT_PATHS", ["课程管理", "知识点"]);
     }, 200);
   },
   methods: {