구자현
08-20
240820 구자현 학습완료 로직 수정
@483e01d509e86eed1349d71a6b51a3687169af05
--- client/views/pages/main/Chapter/Chapter1.vue
+++ client/views/pages/main/Chapter/Chapter1.vue
... | ... | @@ -43,7 +43,8 @@ |
| 43 | 43 |
}, |
| 44 | 44 |
methods: {
|
| 45 | 45 |
complete() {
|
| 46 |
- this.$router.push({ name: 'Dashboard', query: { value: 1 } });
|
|
| 46 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 47 |
+ this.$router.push({ name: 'Dashboard', query: { value: 1, unit_id, book_id } });
|
|
| 47 | 48 |
}, |
| 48 | 49 |
goToPage(page) {
|
| 49 | 50 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter1_2.vue
+++ client/views/pages/main/Chapter/Chapter1_2.vue
... | ... | @@ -72,7 +72,8 @@ |
| 72 | 72 |
}, |
| 73 | 73 |
methods: {
|
| 74 | 74 |
complete() {
|
| 75 |
- this.$router.push({ name: 'Dashboard', query: { value: 1 } });
|
|
| 75 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 76 |
+ this.$router.push({ name: 'Dashboard', query: { value: 1, unit_id, book_id } });
|
|
| 76 | 77 |
}, |
| 77 | 78 |
goToPage(page) {
|
| 78 | 79 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter1_3.vue
+++ client/views/pages/main/Chapter/Chapter1_3.vue
... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 |
<button class="completeBtn" @click="complete"> 학습 종료 </button> |
| 16 | 16 |
</div> |
| 17 | 17 |
<div class="flex justify-between align-center"> |
| 18 |
- <div class="pre-btn" @click="goToPage('Dashboard')"><img src="../../../../resources/img/left.png" alt="">
|
|
| 18 |
+ <div class="pre-btn" @click="goToPage('Chapter1_2')"><img src="../../../../resources/img/left.png" alt="">
|
|
| 19 | 19 |
</div> |
| 20 | 20 |
<div class="content title-box"> |
| 21 | 21 |
<div class="listenGroup"> |
... | ... | @@ -47,7 +47,8 @@ |
| 47 | 47 |
}, |
| 48 | 48 |
methods: {
|
| 49 | 49 |
complete() {
|
| 50 |
- this.$router.push({ name: 'Dashboard', query: { value: 1 } });
|
|
| 50 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 51 |
+ this.$router.push({ name: 'Dashboard', query: { value: 1, unit_id, book_id } });
|
|
| 51 | 52 |
}, |
| 52 | 53 |
goToPage(page) {
|
| 53 | 54 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2.vue
+++ client/views/pages/main/Chapter/Chapter2.vue
... | ... | @@ -190,7 +190,8 @@ |
| 190 | 190 |
}, |
| 191 | 191 |
methods: {
|
| 192 | 192 |
complete() {
|
| 193 |
- this.$router.push({ name: "Dashboard", query: { value: 2 } });
|
|
| 193 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 194 |
+ this.$router.push({ name: 'Dashboard', query: { value: 2, unit_id, book_id } });
|
|
| 194 | 195 |
}, |
| 195 | 196 |
goToPage(page) {
|
| 196 | 197 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_10.vue
+++ client/views/pages/main/Chapter/Chapter2_10.vue
... | ... | @@ -113,7 +113,8 @@ |
| 113 | 113 |
}, |
| 114 | 114 |
methods: {
|
| 115 | 115 |
complete() {
|
| 116 |
- this.$router.push({ name: 'Dashboard', query: { value: 3 } });
|
|
| 116 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 117 |
+ this.$router.push({ name: 'Dashboard', query: { value: 3, unit_id, book_id } });
|
|
| 117 | 118 |
}, |
| 118 | 119 |
goToPage(page) {
|
| 119 | 120 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_11.vue
+++ client/views/pages/main/Chapter/Chapter2_11.vue
... | ... | @@ -95,7 +95,8 @@ |
| 95 | 95 |
}, |
| 96 | 96 |
methods: {
|
| 97 | 97 |
complete() {
|
| 98 |
- this.$router.push({ name: 'Dashboard', query: { value: 3 } });
|
|
| 98 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 99 |
+ this.$router.push({ name: 'Dashboard', query: { value: 3, unit_id, book_id } });
|
|
| 99 | 100 |
}, |
| 100 | 101 |
goToPage(page) {
|
| 101 | 102 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_13.vue
+++ client/views/pages/main/Chapter/Chapter2_13.vue
... | ... | @@ -126,7 +126,8 @@ |
| 126 | 126 |
}, |
| 127 | 127 |
methods: {
|
| 128 | 128 |
complete() {
|
| 129 |
- this.$router.push({ name: 'Dashboard', query: { value: 3 } });
|
|
| 129 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 130 |
+ this.$router.push({ name: 'Dashboard', query: { value: 3, unit_id, book_id } });
|
|
| 130 | 131 |
}, |
| 131 | 132 |
goToPage(page) {
|
| 132 | 133 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_2.vue
+++ client/views/pages/main/Chapter/Chapter2_2.vue
... | ... | @@ -108,7 +108,8 @@ |
| 108 | 108 |
}, |
| 109 | 109 |
methods: {
|
| 110 | 110 |
complete() {
|
| 111 |
- this.$router.push({ name: "Dashboard", query: { value: 2 } });
|
|
| 111 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 112 |
+ this.$router.push({ name: 'Dashboard', query: { value: 2, unit_id, book_id } });
|
|
| 112 | 113 |
}, |
| 113 | 114 |
goToPage(page) {
|
| 114 | 115 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_3.vue
+++ client/views/pages/main/Chapter/Chapter2_3.vue
... | ... | @@ -164,7 +164,8 @@ |
| 164 | 164 |
}, |
| 165 | 165 |
methods: {
|
| 166 | 166 |
complete() {
|
| 167 |
- this.$router.push({ name: 'Dashboard', query: { value: 2 } });
|
|
| 167 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 168 |
+ this.$router.push({ name: 'Dashboard', query: { value: 2, unit_id, book_id } });
|
|
| 168 | 169 |
}, |
| 169 | 170 |
goToPage(page) {
|
| 170 | 171 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_4.vue
+++ client/views/pages/main/Chapter/Chapter2_4.vue
... | ... | @@ -111,7 +111,8 @@ |
| 111 | 111 |
}, |
| 112 | 112 |
methods: {
|
| 113 | 113 |
complete() {
|
| 114 |
- this.$router.push({ name: "Dashboard", query: { value: 2 } });
|
|
| 114 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 115 |
+ this.$router.push({ name: 'Dashboard', query: { value: 2, unit_id, book_id } });
|
|
| 115 | 116 |
}, |
| 116 | 117 |
goToPage(page) {
|
| 117 | 118 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_5.vue
+++ client/views/pages/main/Chapter/Chapter2_5.vue
... | ... | @@ -100,7 +100,8 @@ |
| 100 | 100 |
}, |
| 101 | 101 |
methods: {
|
| 102 | 102 |
complete() {
|
| 103 |
- this.$router.push({ name: 'Dashboard', query: { value: 3 } });
|
|
| 103 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 104 |
+ this.$router.push({ name: 'Dashboard', query: { value: 3, unit_id, book_id } });
|
|
| 104 | 105 |
}, |
| 105 | 106 |
goToPage(page) {
|
| 106 | 107 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_6.vue
+++ client/views/pages/main/Chapter/Chapter2_6.vue
... | ... | @@ -93,7 +93,8 @@ |
| 93 | 93 |
}, |
| 94 | 94 |
methods: {
|
| 95 | 95 |
complete() {
|
| 96 |
- this.$router.push({ name: 'Dashboard', query: { value: 3 } });
|
|
| 96 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 97 |
+ this.$router.push({ name: 'Dashboard', query: { value: 3, unit_id, book_id } });
|
|
| 97 | 98 |
}, |
| 98 | 99 |
goToPage(page) {
|
| 99 | 100 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_7.vue
+++ client/views/pages/main/Chapter/Chapter2_7.vue
... | ... | @@ -72,7 +72,8 @@ |
| 72 | 72 |
}, |
| 73 | 73 |
methods: {
|
| 74 | 74 |
complete() {
|
| 75 |
- this.$router.push({ name: 'Dashboard', query: { value: 4 } });
|
|
| 75 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 76 |
+ this.$router.push({ name: 'Dashboard', query: { value: 4, unit_id, book_id } });
|
|
| 76 | 77 |
}, |
| 77 | 78 |
goToPage(page) {
|
| 78 | 79 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_8.vue
+++ client/views/pages/main/Chapter/Chapter2_8.vue
... | ... | @@ -83,7 +83,8 @@ |
| 83 | 83 |
}, |
| 84 | 84 |
methods: {
|
| 85 | 85 |
complete() {
|
| 86 |
- this.$router.push({ name: 'Dashboard', query: { value: 11 } });
|
|
| 86 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 87 |
+ this.$router.push({ name: 'Dashboard', query: { value: 11, unit_id, book_id } });
|
|
| 87 | 88 |
}, |
| 88 | 89 |
goToPage(page) {
|
| 89 | 90 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter2_9.vue
+++ client/views/pages/main/Chapter/Chapter2_9.vue
... | ... | @@ -180,7 +180,8 @@ |
| 180 | 180 |
}, |
| 181 | 181 |
methods: {
|
| 182 | 182 |
complete() {
|
| 183 |
- this.$router.push({ name: "Dashboard", query: { value: 2 } });
|
|
| 183 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 184 |
+ this.$router.push({ name: 'Dashboard', query: { value: 2, unit_id, book_id } });
|
|
| 184 | 185 |
}, |
| 185 | 186 |
goToPage(page) {
|
| 186 | 187 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Chapter/Chapter3.vue
+++ client/views/pages/main/Chapter/Chapter3.vue
... | ... | @@ -91,7 +91,8 @@ |
| 91 | 91 |
}, |
| 92 | 92 |
methods: {
|
| 93 | 93 |
complete() {
|
| 94 |
- this.$router.push({ name: "Dashboard", query: { value: 8 } });
|
|
| 94 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 95 |
+ this.$router.push({ name: 'Dashboard', query: { value: 8, unit_id, book_id } });
|
|
| 95 | 96 |
}, |
| 96 | 97 |
goToPage(page) {
|
| 97 | 98 |
this.$router.push({ name: page });
|
--- client/views/pages/main/Dashboard.vue
+++ client/views/pages/main/Dashboard.vue
... | ... | @@ -530,7 +530,8 @@ |
| 530 | 530 |
} |
| 531 | 531 |
}, |
| 532 | 532 |
goToPage(page) {
|
| 533 |
- this.$router.push({ name: page });
|
|
| 533 |
+ const { unit_id, book_id } = this.$route.query;
|
|
| 534 |
+ this.$router.push({ name: page, query: { unit_id, book_id } });
|
|
| 534 | 535 |
}, |
| 535 | 536 |
openCameraModal() {
|
| 536 | 537 |
this.closeModal(); |
... | ... | @@ -905,9 +906,10 @@ |
| 905 | 906 |
SvgIcon, |
| 906 | 907 |
}, |
| 907 | 908 |
mounted() {
|
| 908 |
- const { schdl_id, book_id, unit_id } = this.$route.query;
|
|
| 909 |
+ const { book_id, unit_id } = this.$route.query;
|
|
| 909 | 910 |
console.log('main mounted');
|
| 910 | 911 |
this.fetchSchedule(unit_id, book_id); |
| 912 |
+ this.fetchRoadmapData(unit_id, book_id); |
|
| 911 | 913 |
this.fetchRabbit(); |
| 912 | 914 |
}, |
| 913 | 915 |
computed: {
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?