From 58a573847672a91f187575cf2e5768959774384c Mon Sep 17 00:00:00 2001
From: 18571350067 <d20019898>
Date: Thu, 30 Dec 2021 10:09:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E4=BB=B6=E6=96=B0=E5=A2=9E/=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E8=BF=94=E5=9B=9E=E6=90=BA=E5=B8=A6type=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=88=86=E7=B1=BB=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/course/CoursewareAddOrUpdate.vue |  2 +-
 src/views/course/CoursewareList.vue        | 12 +++++++++---
 src/views/course/question/QuestionAdd.vue  |  5 ++++-
 src/views/course/question/QuestionList.vue |  2 ++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/course/CoursewareAddOrUpdate.vue b/src/views/course/CoursewareAddOrUpdate.vue
index d3354bf..7d8593e 100644
--- a/src/views/course/CoursewareAddOrUpdate.vue
+++ b/src/views/course/CoursewareAddOrUpdate.vue
@@ -315,7 +315,7 @@ export default {
     //返回
     goback() {
       if (this.$route.query.courseId) {
-        this.$router.push({ path: '/course/CoursewareList', query: { id: this.$route.query.courseId } })
+        this.$router.push({ path: '/course/CoursewareList', query: { id: this.$route.query.courseId, type: this.$route.query.types } })
       } else {
         this.$router.push({ path: '/course/Resource', query: {} })
       }
diff --git a/src/views/course/CoursewareList.vue b/src/views/course/CoursewareList.vue
index 2227261..9127a79 100644
--- a/src/views/course/CoursewareList.vue
+++ b/src/views/course/CoursewareList.vue
@@ -80,7 +80,7 @@ export default {
     coursewareAdd() {
       this.$router.push({
         path: '/course/CoursewareAddOrUpdate',
-        query: { courseId: this.$route.query.id, isResources: 0 },
+        query: { courseId: this.$route.query.id, ifResources: 0, types: this.$route.query.type },
       })
     },
 
@@ -88,13 +88,19 @@ export default {
     edit(record) {
       this.$router.push({
         path: '/course/CoursewareAddOrUpdate',
-        query: { coursewareId: record.id, courseId: this.$route.query.id, type: record.type },
+        query: {
+          coursewareId: record.id,
+          courseId: this.$route.query.id,
+          type: record.type,
+          types: this.$route.query.type,
+        },
       })
     },
 
     //返回
     goback() {
-      this.$router.push({ path: '/course/CourseList/'+this.$route.query.type, query: {} })
+      console.log('type', this.$route.query.type)
+      this.$router.push({ path: '/course/CourseList/' + this.$route.query.type, query: {} })
     },
 
     // 刪除課件
diff --git a/src/views/course/question/QuestionAdd.vue b/src/views/course/question/QuestionAdd.vue
index b01c725..fe6533c 100644
--- a/src/views/course/question/QuestionAdd.vue
+++ b/src/views/course/question/QuestionAdd.vue
@@ -211,6 +211,8 @@ export default {
   },
 
   methods: {
+
+    //返回
     close() {
       this.$router.push({
         path: '/course/question/QuestionList',
@@ -218,7 +220,8 @@ export default {
           id: this.$route.query.courseId,
           questionId: this.$route.query.id,
           isactive: this.isactive,
-          opt: this.$route.query.opt
+          opt: this.$route.query.opt,
+          type: this.$route.query.types
         },
       })
     },
diff --git a/src/views/course/question/QuestionList.vue b/src/views/course/question/QuestionList.vue
index e13b456..97df505 100644
--- a/src/views/course/question/QuestionList.vue
+++ b/src/views/course/question/QuestionList.vue
@@ -165,6 +165,7 @@ export default {
           isactive: this.isactive,
           // id: this.questionId,
           opt: this.add,
+          types : this.$route.query.type,
         },
       })
     },
@@ -176,6 +177,7 @@ export default {
           isactive: this.isactive,
           questionType: this.questionDetail.questionType,
           courseId: this.$route.query.id,
+          types : this.$route.query.type,
         },
       })
     },