

240913 정다정 지문 로고 변경
@adc9f626c342be57b76a2c98bfe20e6d292ef047
--- client/views/pages/main/Chapter/Chapter1_1.vue
+++ client/views/pages/main/Chapter/Chapter1_1.vue
... | ... | @@ -3,7 +3,7 @@ |
3 | 3 |
<div style="margin: 30px 0px 50px; width: 20%"> |
4 | 4 |
<router-link to="/MyPlan.page"> |
5 | 5 |
<div class="logo mb25"> |
6 |
- <img src="../../../../resources/img/logo2.png" alt="" /> |
|
6 |
+ <img src="../../../../resources/img/new_img/logo_v2.png" alt="" /> |
|
7 | 7 |
</div> |
8 | 8 |
</router-link> |
9 | 9 |
</div> |
... | ... | @@ -18,7 +18,7 @@ |
18 | 18 |
</div> |
19 | 19 |
</div> |
20 | 20 |
<div class="flex justify-between align-center"> |
21 |
- <div class="pre-btn" style="visibility: hidden" @click="goToPage('Chapter1_1')"> |
|
21 |
+ <div class="pre-btn" @click="goToPage('Chapter1_2')"> |
|
22 | 22 |
<img src="../../../../resources/img/left.png" alt="" /> |
23 | 23 |
</div> |
24 | 24 |
<div class="content title-box"> |
... | ... | @@ -206,7 +206,7 @@ |
206 | 206 |
fontSize: this.selectedLine === line ? '40px' : '', |
207 | 207 |
boxShadow: this.selectedLine === line ? 'rgba(0, 0, 0, 0.24) 0px 3px 8px' : '', |
208 | 208 |
fontWeight: this.selectedLine === line ? 'bold' : '', |
209 |
- cursour: 'pointer', |
|
209 |
+ cursor: 'pointer', |
|
210 | 210 |
}; |
211 | 211 |
}, |
212 | 212 |
|
--- client/views/pages/main/Chapter/Chapter1_3.vue
+++ client/views/pages/main/Chapter/Chapter1_3.vue
... | ... | @@ -1,125 +1,118 @@ |
1 | 1 |
<template> |
2 |
- <div id="Chapter1" class="content-wrap"> |
|
3 |
- <div style="margin: 30px 0px 50px; width: 20%"> |
|
4 |
- <router-link to="/MyPlan.page"> |
|
5 |
- <div class="logo mb25"> |
|
6 |
- <img src="../../../../resources/img/logo2.png" alt="" /> |
|
2 |
+ <div id="Chapter1" class="content-wrap"> |
|
3 |
+ <div style="margin: 30px 0px 50px; width: 20%"> |
|
4 |
+ <router-link to="/MyPlan.page"> |
|
5 |
+ <div class="logo mb25"> |
|
6 |
+ <img src="../../../../resources/img/new_img/logo_v2.png" alt="" /> |
|
7 |
+ </div> |
|
8 |
+ </router-link> |
|
7 | 9 |
</div> |
8 |
- </router-link> |
|
9 |
- </div> |
|
10 |
- <div |
|
11 |
- class="title-box mb25 flex align-center mt40" |
|
12 |
- style="justify-content: space-between" |
|
13 |
- > |
|
14 |
- <div> |
|
15 |
- <span class="title mr40">1. Hello WORLD</span> |
|
16 |
- <span class="subtitle">my name is dd</span> |
|
17 |
- </div> |
|
18 |
- <button class="completeBtn" @click="complete">학습 종료</button> |
|
19 |
- </div> |
|
20 |
- <div class="flex justify-between align-center"> |
|
21 |
- <div |
|
22 |
- class="pre-btn" |
|
23 |
- style="visibility: hidden" |
|
24 |
- @click="goToPage('Chapter1_2')" |
|
25 |
- > |
|
26 |
- <img src="../../../../resources/img/left.png" alt="" /> |
|
27 |
- </div> |
|
28 |
- <div class="content title-box"> |
|
29 |
- <div class="listenGroup"> |
|
30 |
- <p class="title mt25 title-bg">step1. Hello WORLD</p> |
|
31 |
- <!-- |
|
10 |
+ <div class="title-box mb25 flex align-center mt40" style="justify-content: space-between"> |
|
11 |
+ <div> |
|
12 |
+ <span class="title mr40">1. Hello WORLD</span> |
|
13 |
+ <span class="subtitle">my name is dd</span> |
|
14 |
+ </div> |
|
15 |
+ <button class="completeBtn" @click="complete">학습 종료</button> |
|
16 |
+ </div> |
|
17 |
+ <div class="flex justify-between align-center"> |
|
18 |
+ <div class="pre-btn" style="visibility: hidden" @click="goToPage('Chapter1_2')"> |
|
19 |
+ <img src="../../../../resources/img/left.png" alt="" /> |
|
20 |
+ </div> |
|
21 |
+ <div class="content title-box"> |
|
22 |
+ <div class="listenGroup"> |
|
23 |
+ <p class="title mt25 title-bg">step1. Hello WORLD</p> |
|
24 |
+ <!-- |
|
32 | 25 |
<img class="bg" src="../../../../resources/img/img39_s.png" data-num="1" /> |
33 | 26 |
--> |
34 |
- <img class="bg" :src="img_src" /> |
|
27 |
+ <img class="bg" :src="img_src" /> |
|
28 |
+ </div> |
|
29 |
+ </div> |
|
30 |
+ <div class="next-btn" @click="goToNextPage"> |
|
31 |
+ <img src="../../../../resources/img/right.png" alt="" /> |
|
32 |
+ </div> |
|
35 | 33 |
</div> |
36 |
- </div> |
|
37 |
- <div class="next-btn" @click="goToNextPage"> |
|
38 |
- <img src="../../../../resources/img/right.png" alt="" /> |
|
39 |
- </div> |
|
34 |
+ <TextToImage /> |
|
40 | 35 |
</div> |
41 |
- <TextToImage /> |
|
42 |
- </div> |
|
43 | 36 |
</template> |
44 | 37 |
|
45 | 38 |
<script> |
46 |
-import TextToImage from "../../../component/TextToImage.vue"; |
|
47 |
-import axios from "axios"; |
|
39 |
+import TextToImage from '../../../component/TextToImage.vue'; |
|
40 |
+import axios from 'axios'; |
|
48 | 41 |
export default { |
49 |
- data() { |
|
50 |
- return { |
|
51 |
- text_data: null, |
|
52 |
- img_src: null, |
|
53 |
- seq: this.$store.getters.seqNum, |
|
54 |
- }; |
|
55 |
- }, |
|
56 |
- methods: { |
|
57 |
- complete() { |
|
58 |
- const { unit_id, book_id } = this.$route.query; |
|
59 |
- this.$router.push({ |
|
60 |
- name: "Dashboard", |
|
61 |
- query: { value: this.seq, unit_id, book_id }, |
|
62 |
- }); |
|
42 |
+ data() { |
|
43 |
+ return { |
|
44 |
+ text_data: null, |
|
45 |
+ img_src: null, |
|
46 |
+ seq: this.$store.getters.seqNum, |
|
47 |
+ }; |
|
63 | 48 |
}, |
64 |
- goToPage(page) { |
|
65 |
- this.$router.push({ name: page }); |
|
66 |
- }, |
|
67 |
- goToNextPage() { |
|
68 |
- alert("지문 학습 완료!"); |
|
69 |
- this.complete(); |
|
70 |
- }, |
|
71 |
- // 지문 API |
|
72 |
- async fetchText() { |
|
73 |
- axios({ |
|
74 |
- url: "/text/selectOneText.json", |
|
75 |
- method: "post", |
|
76 |
- headers: { |
|
77 |
- "Content-Type": "application/json; charset=UTF-8", |
|
49 |
+ methods: { |
|
50 |
+ complete() { |
|
51 |
+ const { unit_id, book_id } = this.$route.query; |
|
52 |
+ this.$router.push({ |
|
53 |
+ name: 'Dashboard', |
|
54 |
+ query: { value: this.seq, unit_id, book_id }, |
|
55 |
+ }); |
|
78 | 56 |
}, |
79 |
- data: { |
|
80 |
- textId: this.textId, |
|
57 |
+ goToPage(page) { |
|
58 |
+ this.$router.push({ name: page }); |
|
81 | 59 |
}, |
82 |
- }) |
|
83 |
- .then((response) => { |
|
84 |
- this.text_data = response.data[0]; |
|
85 |
- console.log("지문 데이터 : ", this.text_data); |
|
86 |
- this.img_src = this.fetchImage(this.text_data.file_rpath); |
|
87 |
- }) |
|
88 |
- .catch((err) => { |
|
89 |
- console.log("지문 에러 : ", err); |
|
90 |
- }); |
|
60 |
+ goToNextPage() { |
|
61 |
+ alert('지문 학습 완료!'); |
|
62 |
+ this.complete(); |
|
63 |
+ }, |
|
64 |
+ // 지문 API |
|
65 |
+ async fetchText() { |
|
66 |
+ axios({ |
|
67 |
+ url: '/text/selectOneText.json', |
|
68 |
+ method: 'post', |
|
69 |
+ headers: { |
|
70 |
+ 'Content-Type': 'application/json; charset=UTF-8', |
|
71 |
+ }, |
|
72 |
+ data: { |
|
73 |
+ textId: this.textId, |
|
74 |
+ }, |
|
75 |
+ }) |
|
76 |
+ .then((response) => { |
|
77 |
+ this.text_data = response.data[0]; |
|
78 |
+ console.log('지문 데이터 : ', this.text_data); |
|
79 |
+ this.img_src = this.fetchImage(this.text_data.file_rpath); |
|
80 |
+ }) |
|
81 |
+ .catch((err) => { |
|
82 |
+ console.log('지문 에러 : ', err); |
|
83 |
+ }); |
|
84 |
+ }, |
|
85 |
+ // 이미지 불러오기 |
|
86 |
+ fetchImage(fileRpath) { |
|
87 |
+ return 'http://165.229.169.113:9080/' + fileRpath; |
|
88 |
+ }, |
|
91 | 89 |
}, |
92 |
- // 이미지 불러오기 |
|
93 |
- fetchImage(fileRpath) { |
|
94 |
- return "http://165.229.169.113:9080/" + fileRpath; |
|
90 |
+ watch: {}, |
|
91 |
+ computed: { |
|
92 |
+ textId() { |
|
93 |
+ //console.log("지문 화면 아이디 : ", this.$store.getters.getTextId); |
|
94 |
+ return this.$store.getters.getTextId; |
|
95 |
+ }, |
|
95 | 96 |
}, |
96 |
- }, |
|
97 |
- watch: {}, |
|
98 |
- computed: { |
|
99 |
- textId() { |
|
100 |
- //console.log("지문 화면 아이디 : ", this.$store.getters.getTextId); |
|
101 |
- return this.$store.getters.getTextId; |
|
97 |
+ components: { |
|
98 |
+ TextToImage: TextToImage, |
|
102 | 99 |
}, |
103 |
- }, |
|
104 |
- components: { |
|
105 |
- TextToImage: TextToImage, |
|
106 |
- }, |
|
107 |
- mounted() { |
|
108 |
- this.fetchText(); |
|
109 |
- }, |
|
100 |
+ mounted() { |
|
101 |
+ this.fetchText(); |
|
102 |
+ }, |
|
110 | 103 |
}; |
111 | 104 |
</script> |
112 | 105 |
<style scoped> |
113 | 106 |
.listenGroup .textbox { |
114 |
- width: 900px; |
|
107 |
+ width: 900px; |
|
115 | 108 |
} |
116 | 109 |
|
117 | 110 |
.completeBtn { |
118 |
- margin-right: 100px; |
|
119 |
- background-color: #ffba08; |
|
120 |
- padding: 10px 30px; |
|
121 |
- border-radius: 10px; |
|
122 |
- font-size: 28px; |
|
123 |
- font-family: "ONEMobilePOPOTF"; |
|
111 |
+ margin-right: 100px; |
|
112 |
+ background-color: #ffba08; |
|
113 |
+ padding: 10px 30px; |
|
114 |
+ border-radius: 10px; |
|
115 |
+ font-size: 28px; |
|
116 |
+ font-family: 'ONEMobilePOPOTF'; |
|
124 | 117 |
} |
125 | 118 |
</style> |
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?