이은진
2024-08-08
Merge branch 'master' of http://210.180.118.83/jichoi/lms_front
@fe7cdc7a8cce9e7f6c2909afd811b40bf55a0a3a
--- client/resources/css/style.css
+++ client/resources/css/style.css
... | ... | @@ -1050,18 +1050,18 @@ |
| 1050 | 1050 |
|
| 1051 | 1051 |
/* 단원 버튼 */ |
| 1052 | 1052 |
.unit-pagination button {
|
| 1053 |
- font-size: 3rem; |
|
| 1053 |
+ font-size: 2rem; |
|
| 1054 | 1054 |
font-family: 'Pretendard-Regular'; |
| 1055 | 1055 |
padding: 5px 30px; |
| 1056 |
- border: #FFD56B 3px solid; |
|
| 1057 |
- border-radius: 10px; |
|
| 1056 |
+ border: #c6c6c6 3px solid; |
|
| 1057 |
+ border-radius: 5px; |
|
| 1058 | 1058 |
color: #331600; |
| 1059 |
- background-color: #FFF3D7 |
|
| 1059 |
+ background-color: #EAEDF4 |
|
| 1060 | 1060 |
} |
| 1061 | 1061 |
|
| 1062 | 1062 |
.unit-pagination .selected-btn {
|
| 1063 |
- background-color: #FFBA08; |
|
| 1064 |
- color: #fff; |
|
| 1065 |
- font-family: 'Pretendard-Bold'; |
|
| 1063 |
+ background-color:#c6c6c6; |
|
| 1064 |
+ /* color: #fff; */ |
|
| 1065 |
+ font-family: 'Pretendard-ExtraBold'; |
|
| 1066 | 1066 |
} |
| 1067 | 1067 |
/* ------------------------선생님 --------------------- */(No newline at end of file) |
--- client/views/pages/teacher/C_TextBookDetail.vue
+++ client/views/pages/teacher/C_TextBookDetail.vue
... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 |
</select> |
| 7 | 7 |
</div> |
| 8 | 8 |
<div class="board-wrap"> |
| 9 |
- <label for="" class="title2">단원</label> |
|
| 9 |
+ <label for="" class="title1">단원</label> |
|
| 10 | 10 |
<div class="unit-pagination flex mt10" style="gap: 10px;"> |
| 11 | 11 |
<button class="selected-btn">1</button> |
| 12 | 12 |
<button>2</button> |
--- client/views/pages/teacher/ExamList.vue
+++ client/views/pages/teacher/ExamList.vue
... | ... | @@ -5,6 +5,12 @@ |
| 5 | 5 |
<option value="">1단원</option> |
| 6 | 6 |
</select> |
| 7 | 7 |
</div> |
| 8 |
+ <label for="" class="title2">단원</label> |
|
| 9 |
+ <div class="unit-pagination flex mt10 mb20" style="gap: 10px;"> |
|
| 10 |
+ <button class="selected-btn">1</button> |
|
| 11 |
+ <button>2</button> |
|
| 12 |
+ <button>3</button> |
|
| 13 |
+ </div> |
|
| 8 | 14 |
<div class="search-wrap flex justify-end mb20"> |
| 9 | 15 |
<select name="" id="" class="mr10 data-wrap"> |
| 10 | 16 |
<option value="">중간</option> |
--- client/views/pages/teacher/QuestionList.vue
+++ client/views/pages/teacher/QuestionList.vue
... | ... | @@ -2,9 +2,15 @@ |
| 2 | 2 |
<div class="title-box flex justify-between mb40"> |
| 3 | 3 |
<p class="title">문제</p> |
| 4 | 4 |
<select name="" id=""> |
| 5 |
- <option value="">1단원</option> |
|
| 5 |
+ <option value="">A교재</option> |
|
| 6 | 6 |
</select> |
| 7 | 7 |
</div> |
| 8 |
+ <label for="" class="title2">단원</label> |
|
| 9 |
+ <div class="unit-pagination flex mt10 mb20" style="gap: 10px;"> |
|
| 10 |
+ <button class="selected-btn">1</button> |
|
| 11 |
+ <button>2</button> |
|
| 12 |
+ <button>3</button> |
|
| 13 |
+ </div> |
|
| 8 | 14 |
<div class="search-wrap flex justify-end mb20"> |
| 9 | 15 |
<select name="" id="" class="mr10 data-wrap"> |
| 10 | 16 |
<option value="">전체</option> |
--- client/views/pages/teacher/TextBookDetail.vue
+++ client/views/pages/teacher/TextBookDetail.vue
... | ... | @@ -1,11 +1,20 @@ |
| 1 | 1 |
<template> |
| 2 | 2 |
<div class="title-box flex justify-between mb40"> |
| 3 | 3 |
<p class="title">A교재</p> |
| 4 |
- <select name="" id=""> |
|
| 4 |
+ <!-- <select name="" id=""> |
|
| 5 | 5 |
<option value="">1단원</option> |
| 6 |
- </select> |
|
| 6 |
+ </select> --> |
|
| 7 | 7 |
</div> |
| 8 |
- <div class="board-wrap"> |
|
| 8 |
+ <label for="" class="title1">단원</label> |
|
| 9 |
+ <div class="unit-pagination flex mt10" style="gap: 10px;"> |
|
| 10 |
+ <button class="selected-btn">1</button> |
|
| 11 |
+ <button>2</button> |
|
| 12 |
+ <button>3</button> |
|
| 13 |
+ <button ><svg-icon type="mdi" :path="mdiPlus" style=" padding-top: 6px; |
|
| 14 |
+ width: 30px; |
|
| 15 |
+ height: 30px;"></svg-icon></button> |
|
| 16 |
+ </div> |
|
| 17 |
+ <div class="board-wrap mt30"> |
|
| 9 | 18 |
<div class="mb20 "> |
| 10 | 19 |
<div class="flex justify-between mb30 align-center"> |
| 11 | 20 |
<label for="" class="title1">지문</label> |
... | ... | @@ -168,7 +177,7 @@ |
| 168 | 177 |
|
| 169 | 178 |
<script> |
| 170 | 179 |
import SvgIcon from '@jamescoyle/vue-icon'; |
| 171 |
-import { mdiMagnify, } from '@mdi/js';
|
|
| 180 |
+import { mdiMagnify,mdiPlus } from '@mdi/js';
|
|
| 172 | 181 |
import { mdilArrowRight } from '@mdi/light-js';
|
| 173 | 182 |
import ProgressBar from '../../component/ProgressBar.vue'; |
| 174 | 183 |
|
... | ... | @@ -176,6 +185,7 @@ |
| 176 | 185 |
export default {
|
| 177 | 186 |
data() {
|
| 178 | 187 |
return {
|
| 188 |
+ mdiPlus :mdiPlus , |
|
| 179 | 189 |
mdiMagnify: mdiMagnify, |
| 180 | 190 |
mdilArrowRight: mdilArrowRight, |
| 181 | 191 |
timer: "00:00", |
--- client/views/pages/teacher/TextList.vue
+++ client/views/pages/teacher/TextList.vue
... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 |
</select> |
| 7 | 7 |
</div> |
| 8 | 8 |
<label for="" class="title2">단원</label> |
| 9 |
- <div class="unit-pagination flex mt10" style="gap: 10px;"> |
|
| 9 |
+ <div class="unit-pagination flex mt10 mb20" style="gap: 10px;"> |
|
| 10 | 10 |
<button class="selected-btn">1</button> |
| 11 | 11 |
<button>2</button> |
| 12 | 12 |
<button>3</button> |
--- client/views/pages/teacher/VocaList.vue
+++ client/views/pages/teacher/VocaList.vue
... | ... | @@ -2,9 +2,15 @@ |
| 2 | 2 |
<div class="title-box flex justify-between mb40"> |
| 3 | 3 |
<p class="title">단어장</p> |
| 4 | 4 |
<select name="" id=""> |
| 5 |
- <option value="UNIT_000000000000001">1단원</option> |
|
| 5 |
+ <option value="UNIT_000000000000001">A교재</option> |
|
| 6 | 6 |
</select> |
| 7 | 7 |
</div> |
| 8 |
+ <label for="" class="title2">단원</label> |
|
| 9 |
+ <div class="unit-pagination flex mt10 mb20" style="gap: 10px;"> |
|
| 10 |
+ <button class="selected-btn">1</button> |
|
| 11 |
+ <button>2</button> |
|
| 12 |
+ <button>3</button> |
|
| 13 |
+ </div> |
|
| 8 | 14 |
<div class="search-wrap flex justify-between mb20 align-center"> |
| 9 | 15 |
<div class="title2 gray">?단원 전체 목록</div> |
| 10 | 16 |
<div> |
--- client/views/pages/teacher/textbook.vue
+++ client/views/pages/teacher/textbook.vue
... | ... | @@ -74,8 +74,8 @@ |
| 74 | 74 |
} |
| 75 | 75 |
}, |
| 76 | 76 |
methods: {
|
| 77 |
- goToPage(page, book_Id) {
|
|
| 78 |
- this.$router.push({ name: page, query: { book_Id }});
|
|
| 77 |
+ goToPage(page, book_id) {
|
|
| 78 |
+ this.$router.push({ name: page, query: { book_id }});
|
|
| 79 | 79 |
}, |
| 80 | 80 |
buttonSearch() {
|
| 81 | 81 |
this.searchOpen = true; |
... | ... | @@ -141,7 +141,7 @@ |
| 141 | 141 |
console.error('Error updating book:', error);
|
| 142 | 142 |
}); |
| 143 | 143 |
}, |
| 144 |
- deleteBook(book_Id) {
|
|
| 144 |
+ deleteBook(book_id) {
|
|
| 145 | 145 |
if (confirm('삭제하시겠습니까?')) {
|
| 146 | 146 |
axios({
|
| 147 | 147 |
url: "/book/delete.json", |
... | ... | @@ -150,7 +150,7 @@ |
| 150 | 150 |
"Content-Type": "application/json; charset=UTF-8", |
| 151 | 151 |
}, |
| 152 | 152 |
data: {
|
| 153 |
- book_id: book_Id |
|
| 153 |
+ book_id: book_id |
|
| 154 | 154 |
}, |
| 155 | 155 |
}) |
| 156 | 156 |
.then(response => {
|
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?