Commit @b9cd63e60f5319e36b6a0904966a10eef8f55918

홍아랑 2024-08-12

240812 홍아랑 웹캠 관련 코드 수정+충돌 해결

@b9cd63e60f5319e36b6a0904966a10eef8f55918

65ab45c

b9cd63e

client/views/pages/main/Dashboard.vue

--- client/views/pages/main/Dashboard.vue

+++ client/views/pages/main/Dashboard.vue


                         </button>
                         <p>단어장</p>
                     </div>
-                    <div class="rcon flex">
-                        <div class="race-btn">
-                            <button class="popTxt" v-for="(item, index) in items" :key="index"
-                                @click="toggleImageAndShowPopup(index, '11')">
-                                <img :src="item.imgSrc3">
-                                <img :src="item.imgSrc4" :style="{ display: item.isSecondImageVisible ? 'block' : 'none' }">
-                            </button>
-                            <p class="long">최종 평가</p>
-                        </div>
+
+                    <div class="race-btn">
+                        <button class="popTxt" v-for="(item, index) in items" :key="index"
+                            @click="toggleImageAndShowPopup(index, '11')">
+                            <img :src="item.imgSrc3">
+                            <img :src="item.imgSrc4" :style="{ display: item.isSecondImageVisible ? 'block' : 'none' }">
+                        </button>
+                        <p class="long">최종 평가</p>
                     </div>
+
                 </div>
             </div>
             <!-- 팝업 -->

             <h2 class="mb40">이 단원을 끝낸 친구들</h2>
             <article class=" flex-column" style="gap: 5px;">
                 <div class="flex" style="gap: 5px;">
-                    <div @click="buttonSearch2" class="photo" ><img   src="../../../resources/img/img143_75s.png" alt=""></div>
+                    <div @click="buttonSearch2" class="photo"><img src="../../../resources/img/img143_75s.png" alt=""></div>
                     <div @click="buttonSearch" class="photo"><img src="../../../resources/img/img143_75s.png" alt=""></div>
                 </div>
             </article>

65ab45c

b9cd63e

client/views/pages/teacher/QuestionDetail.vue

--- client/views/pages/teacher/QuestionDetail.vue

+++ client/views/pages/teacher/QuestionDetail.vue


 <template>
     <div class="title-box flex justify-between mb40">
-<<<<<<< HEAD
         <p class="title">문제 조회</p>
     </div>
     <div class="board-wrap">

                 </table>
             </div>
         </div>
-=======
-        <p class="title">문제 등록</p>
-    </div>
-    <div class="board-wrap">
-        <div class="tab-box" >
-            <label class="mr20 title1">
-               <input type="radio" v-model="selectedTab" value="tab1" />
-               문제 유형 (일반형)
-            </label>
-            <label class="mr20 title1">
-               <input type="radio" v-model="selectedTab" value="tab2" />
-               문제 유형 (O,X형)
-            </label>
-            <label class="mr20 title1">
-               <input type="radio" v-model="selectedTab" value="tab3" />
-               문제 유형 (연결형)
-            </label>
-            <label class="mr20 title1">
-               <input type="radio" v-model="selectedTab" value="tab4" />
-               문제 유형 (다중 정답형)
-            </label>
-        </div>
-        <hr>
-       <div class="gd-col2 " >
-            <div class="flex align-center mb20">
-                <label for="" class="title2">카테고리</label>
-                <select v-model="selectedSearchOption" class="mr10 data-wrap">
-                    <option value="bbsTtl">제목</option>
-                    <option value="bbsCnt">내용</option>
-                    <option value="userNm">작성자</option>
-                    <option value="bbsCls">카테고리</option>
-                </select>
-            </div>
-            <div class="flex align-center mb20">
-                <label for="" class="title2">문제 유형</label>
-                <select v-model="selectedSearchOption" class="mr10 data-wrap">
-                    <option value="bbsTtl">제목</option>
-                    <option value="bbsCnt">내용</option>
-                    <option value="userNm">작성자</option>
-                    <option value="bbsCls">카테고리</option>
-                </select>
-            </div>
-            <div class="flex align-center">
-                <label for="" class="title2">지문</label>
-                <select v-model="selectedSearchOption" class="mr10 data-wrap">
-                    <option value="bbsTtl">제목</option>
-                    <option value="bbsCnt">내용</option>
-                    <option value="userNm">작성자</option>
-                    <option value="bbsCls">카테고리</option>
-                </select>
-            </div>
-            <div class="flex align-center">
-                <label for="" class="title2">문제 지표</label>
-                <select v-model="selectedSearchOption" class="mr10 data-wrap">
-                    <option value="bbsTtl">제목</option>
-                    <option value="bbsCnt">내용</option>
-                    <option value="userNm">작성자</option>
-                    <option value="bbsCls">카테고리</option>
-                </select>
-            </div>
-       </div>
-        <div class="flex align-center mb20 mt40">
-            <label for="" class="title2">문제 배점</label>
-            <input type="text" class="data-wrap">
-        </div>
-
-        <div class="flex align-center mb20">
-            <label for="" class="title2">내용</label>
-            <textarea name="" id="" class="data-wrap"></textarea>
-        </div>
-        <div class="flex align-center mb20">
-            <label for="" class="title2">힌트</label>
-            <input type="text" class="data-wrap">
-        </div>
-        <div class="flex align-center mb20">
-            <label for="" class="title2">첨부파일</label>
-            <input type="file" ref="fileInput" @change="handleFileUpload" />
-        </div>
-        <hr>
-        <div v-if="selectedTab === 'tab1'">
-            <div class="flex align-center mb20">
-                <label for="" class="title2">답1</label>
-                <input type="text" class="data-wrap">
-            </div>
-            <div class="flex align-center mb20">
-                <label for="" class="title2">답2</label>
-                <input type="text" class="data-wrap">
-            </div>
-            <div class="flex align-center mb20">
-                <label for="" class="title2">답3</label>
-                <input type="text" class="data-wrap">
-            </div>
-            <div class="flex align-center mb20">
-                <label for="" class="title2">답4</label>
-                <input type="text" class="data-wrap">
-            </div>
-            <div class="flex align-center mb20">
-                <label for="" class="title2">해설</label>
-                <textarea name="" id="" class="data-wrap"></textarea>
-            </div>
-        </div>
-       <div v-else-if="selectedTab === 'tab2'">
-            <div class="flex align-center mb20">
-                <label for="" class="title2">답</label>
-                    <select v-model="selectedSearchOption" class="mr10 data-wrap">
-                            <option value="bbsTtl">O</option>
-                            <option value="bbsCnt">X</option>
-                        </select>
-            </div>
-            <div class="flex align-center mb20">
-                <label for="" class="title2">해설</label>
-                <textarea name="" id="" class="data-wrap"></textarea>
-            </div>
-       </div>
-       <div v-else-if="selectedTab === 'tab3'">
-            <div class="gd-col2 " >
-                <div class="flex align-center mb20 mr40" >
-                    <label for="" class="title2">문제1</label>
-                    <input type="text" class="data-wrap">
-                </div>
-                <div class="flex align-center mb20">
-                    <label for="" class="title2">답1</label>
-                    <input type="text" class="data-wrap">
-                </div>
-                <div class="flex align-center mb20 mr40">
-                    <label for="" class="title2">문제2</label>
-                    <input type="text" class="data-wrap">
-                </div>
-                <div class="flex align-center mb20">
-                    <label for="" class="title2">답2</label>
-                    <input type="text" class="data-wrap">
-                </div>
-                <div class="flex align-center mb20 mr40">
-                    <label for="" class="title2">문제3</label>
-                    <input type="text" class="data-wrap">
-                </div>
-                <div class="flex align-center mb20 ">
-                    <label for="" class="title2">답3</label>
-                    <input type="text" class="data-wrap">
-                </div>
-                <div class="flex align-center mb20 mr40">
-                    <label for="" class="title2">문제4</label>
-                    <input type="text" class="data-wrap">
-                </div>
-                <div class="flex align-center mb20">
-                    <label for="" class="title2">답4</label>
-                    <input type="text" class="data-wrap">
-                </div>
-            </div>
-            <div class="flex align-center mb20">
-                <label for="" class="title2">해설</label>
-                <textarea name="" id="" class="data-wrap"></textarea>
-            </div>
-       </div>
-       <div v-else-if="selectedTab === 'tab4'">
-                <div class="flex align-center mb20 mr40" >
-                    <label for="" class="title2">문제1</label>
-                    <input type="text" class="data-wrap">
-                    <input type="checkbox" class="ui-checkbox ml30">
-                </div>
-                <div class="flex align-center mb20 mr40">
-                    <label for="" class="title2">문제2</label>
-                    <input type="text" class="data-wrap">
-                    <input type="checkbox" class="ui-checkbox ml30">
-                </div>
-                <div class="flex align-center mb20 mr40">
-                    <label for="" class="title2">문제3</label>
-                    <input type="text" class="data-wrap">
-                    <input type="checkbox" class="ui-checkbox ml30">
-                </div>
-                <div class="flex align-center mb20 mr40">
-                    <label for="" class="title2">문제4</label>
-                    <input type="text" class="data-wrap">
-                    <input type="checkbox" class="ui-checkbox ml30">
-                </div>
-            <div class="flex align-center mb20">
-                <label for="" class="title2">해설</label>
-                <textarea name="" id="" class="data-wrap"></textarea>
-            </div>
-       </div>
-       
->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
     </div>
     <div class="flex justify-between mt50">
         <button type="button" title="글쓰기" class="new-btn" @click="goToPage('QuestionList')">
             목록
         </button>
         <div class="flex">
-<<<<<<< HEAD
             <button type="button" title="글쓰기" class="new-btn mr10" @click="editQuestion">
                 수정
             </button>

             <p>삭제하시겠습니까?</p>
             <button @click="deleteQuestion">예, 삭제</button>
             <button @click="cancelDelete">취소</button>
-=======
-            <button type="button" title="글쓰기" class="new-btn mr10">
-                삭제
-            </button>
-            <button type="button" title="글쓰기" class="new-btn">
-                수정
-            </button>
->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
         </div>
     </div>
 </template>

 <script>
 import SvgIcon from '@jamescoyle/vue-icon';
 import { mdiMagnify } from '@mdi/js';
-<<<<<<< HEAD
 import axios from 'axios';
-=======
-
->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
 
 export default {
     data() {
         return {
             mdiMagnify: mdiMagnify,
-<<<<<<< HEAD
             questionTitle: '샘플 제목',
             questionExpln: '샘플 내용',
             questionFile: null, // 파일 URL을 여기에 저장

             questionScore: '',
             questionHint: '',
             questionExplanation: ''
-=======
-            selectedTab: 'tab1',
->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
         }
     },
     methods: {
         goToPage(page) {
             this.$router.push({ name: page });
         },
-<<<<<<< HEAD
         editQuestion() {
             // 수정 로직 추가
             console.log('수정 버튼 클릭');

             // 문제 ID를 얻는 로직을 추가하세요
             return 'sampleProblemId';
         }
-=======
-    },
-    watch: {
-
-    },
-    computed: {
-
->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
     },
     components: {
         SvgIcon
     },
     mounted() {
-<<<<<<< HEAD
         this.loadFromLocalStorage();
     }
 }

         cursor: pointer;
     }
 </style>
-=======
-        console.log('Main2 mounted');
-    }
-}
-</script>
-<style scoped>
-.ui-checkbox{width: 30px; height: 30px;}
-</style>
->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941

65ab45c

b9cd63e

client/views/pages/teacher/QuestionList.vue

--- client/views/pages/teacher/QuestionList.vue

+++ client/views/pages/teacher/QuestionList.vue


                     <td>유형</td>
                     <td>지문</td>
                     <td>등록일</td>
-<<<<<<< HEAD
                 </tr>
             </thead>
             <tbody>

             <button type="button" title="등록" class="new-btn" @click="goToPage('QuestionInsert')">
                 등록
             </button>
-=======
-                </thead>
-                <tbody>
-                    <tr @click="goToPage('QuestionDetail')">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                </tbody>
-            </table>
-            <article class="table-pagination flex justify-center align-center mb20 mt30" style="gap: 10px;">
-                    <button><img src="../../../resources/img/btn27_90t_normal.png" alt=""></button>
-                    <button class="selected-btn">1</button>
-                    <button>2</button>
-                    <button>3</button>
-                    <button><img src="../../../resources/img/btn28_90t_normal.png" alt=""></button>
-                </article>
-                <div class="flex justify-end ">
-                <button type="button" title="등록" class="new-btn" @click="goToPage('QuestionInsert')">
-                    등록
-                </button>
-        </div>
->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
         </div>
     </div>
 </template>

Add a comment

Open 0
Closed 0

List

...	...	@@ -92,16 +92,16 @@
92	92	</button>
93	93	<p>단어장</p>
94	94	</div>
95		- <div class="rcon flex">
96		- <div class="race-btn">
97		- <button class="popTxt" v-for="(item, index) in items" :key="index"
98		- @click="toggleImageAndShowPopup(index, '11')">
99		- <img :src="item.imgSrc3">
100		- <img :src="item.imgSrc4" :style="{ display: item.isSecondImageVisible ? 'block' : 'none' }">
101		- </button>
102		- <p class="long">최종 평가</p>
103		- </div>
	95	+
	96	+ <div class="race-btn">
	97	+ <button class="popTxt" v-for="(item, index) in items" :key="index"
	98	+ @click="toggleImageAndShowPopup(index, '11')">
	99	+ <img :src="item.imgSrc3">
	100	+ <img :src="item.imgSrc4" :style="{ display: item.isSecondImageVisible ? 'block' : 'none' }">
	101	+ </button>
	102	+ <p class="long">최종 평가</p>
104	103	</div>
	104	+
105	105	</div>
106	106	</div>
107	107	<!-- 팝업 -->
...	...	@@ -262,7 +262,7 @@
262	262	<h2 class="mb40">이 단원을 끝낸 친구들</h2>
263	263	<article class=" flex-column" style="gap: 5px;">
264	264	<div class="flex" style="gap: 5px;">
265		- <div @click="buttonSearch2" class="photo" ><img src="../../../resources/img/img143_75s.png" alt=""></div>
	265	+ <div @click="buttonSearch2" class="photo"><img src="../../../resources/img/img143_75s.png" alt=""></div>
266	266	<div @click="buttonSearch" class="photo"><img src="../../../resources/img/img143_75s.png" alt=""></div>
267	267	</div>
268	268	</article>

...	...	@@ -1,6 +1,5 @@
1	1	<template>
2	2	<div class="title-box flex justify-between mb40">
3		-<<<<<<< HEAD
4	3	<p class="title">문제 조회</p>
5	4	</div>
6	5	<div class="board-wrap">
...	...	@@ -76,195 +75,12 @@
76	75	</table>
77	76	</div>
78	77	</div>
79		-=======
80		- <p class="title">문제 등록</p>
81		- </div>
82		- <div class="board-wrap">
83		- <div class="tab-box" >
84		- <label class="mr20 title1">
85		- <input type="radio" v-model="selectedTab" value="tab1" />
86		- 문제 유형 (일반형)
87		- </label>
88		- <label class="mr20 title1">
89		- <input type="radio" v-model="selectedTab" value="tab2" />
90		- 문제 유형 (O,X형)
91		- </label>
92		- <label class="mr20 title1">
93		- <input type="radio" v-model="selectedTab" value="tab3" />
94		- 문제 유형 (연결형)
95		- </label>
96		- <label class="mr20 title1">
97		- <input type="radio" v-model="selectedTab" value="tab4" />
98		- 문제 유형 (다중 정답형)
99		- </label>
100		- </div>
101		- <hr>
102		- <div class="gd-col2 " >
103		- <div class="flex align-center mb20">
104		- <label for="" class="title2">카테고리</label>
105		- <select v-model="selectedSearchOption" class="mr10 data-wrap">
106		- <option value="bbsTtl">제목</option>
107		- <option value="bbsCnt">내용</option>
108		- <option value="userNm">작성자</option>
109		- <option value="bbsCls">카테고리</option>
110		- </select>
111		- </div>
112		- <div class="flex align-center mb20">
113		- <label for="" class="title2">문제 유형</label>
114		- <select v-model="selectedSearchOption" class="mr10 data-wrap">
115		- <option value="bbsTtl">제목</option>
116		- <option value="bbsCnt">내용</option>
117		- <option value="userNm">작성자</option>
118		- <option value="bbsCls">카테고리</option>
119		- </select>
120		- </div>
121		- <div class="flex align-center">
122		- <label for="" class="title2">지문</label>
123		- <select v-model="selectedSearchOption" class="mr10 data-wrap">
124		- <option value="bbsTtl">제목</option>
125		- <option value="bbsCnt">내용</option>
126		- <option value="userNm">작성자</option>
127		- <option value="bbsCls">카테고리</option>
128		- </select>
129		- </div>
130		- <div class="flex align-center">
131		- <label for="" class="title2">문제 지표</label>
132		- <select v-model="selectedSearchOption" class="mr10 data-wrap">
133		- <option value="bbsTtl">제목</option>
134		- <option value="bbsCnt">내용</option>
135		- <option value="userNm">작성자</option>
136		- <option value="bbsCls">카테고리</option>
137		- </select>
138		- </div>
139		- </div>
140		- <div class="flex align-center mb20 mt40">
141		- <label for="" class="title2">문제 배점</label>
142		- <input type="text" class="data-wrap">
143		- </div>
144		-
145		- <div class="flex align-center mb20">
146		- <label for="" class="title2">내용</label>
147		- <textarea name="" id="" class="data-wrap"></textarea>
148		- </div>
149		- <div class="flex align-center mb20">
150		- <label for="" class="title2">힌트</label>
151		- <input type="text" class="data-wrap">
152		- </div>
153		- <div class="flex align-center mb20">
154		- <label for="" class="title2">첨부파일</label>
155		- <input type="file" ref="fileInput" @change="handleFileUpload" />
156		- </div>
157		- <hr>
158		- <div v-if="selectedTab === 'tab1'">
159		- <div class="flex align-center mb20">
160		- <label for="" class="title2">답1</label>
161		- <input type="text" class="data-wrap">
162		- </div>
163		- <div class="flex align-center mb20">
164		- <label for="" class="title2">답2</label>
165		- <input type="text" class="data-wrap">
166		- </div>
167		- <div class="flex align-center mb20">
168		- <label for="" class="title2">답3</label>
169		- <input type="text" class="data-wrap">
170		- </div>
171		- <div class="flex align-center mb20">
172		- <label for="" class="title2">답4</label>
173		- <input type="text" class="data-wrap">
174		- </div>
175		- <div class="flex align-center mb20">
176		- <label for="" class="title2">해설</label>
177		- <textarea name="" id="" class="data-wrap"></textarea>
178		- </div>
179		- </div>
180		- <div v-else-if="selectedTab === 'tab2'">
181		- <div class="flex align-center mb20">
182		- <label for="" class="title2">답</label>
183		- <select v-model="selectedSearchOption" class="mr10 data-wrap">
184		- <option value="bbsTtl">O</option>
185		- <option value="bbsCnt">X</option>
186		- </select>
187		- </div>
188		- <div class="flex align-center mb20">
189		- <label for="" class="title2">해설</label>
190		- <textarea name="" id="" class="data-wrap"></textarea>
191		- </div>
192		- </div>
193		- <div v-else-if="selectedTab === 'tab3'">
194		- <div class="gd-col2 " >
195		- <div class="flex align-center mb20 mr40" >
196		- <label for="" class="title2">문제1</label>
197		- <input type="text" class="data-wrap">
198		- </div>
199		- <div class="flex align-center mb20">
200		- <label for="" class="title2">답1</label>
201		- <input type="text" class="data-wrap">
202		- </div>
203		- <div class="flex align-center mb20 mr40">
204		- <label for="" class="title2">문제2</label>
205		- <input type="text" class="data-wrap">
206		- </div>
207		- <div class="flex align-center mb20">
208		- <label for="" class="title2">답2</label>
209		- <input type="text" class="data-wrap">
210		- </div>
211		- <div class="flex align-center mb20 mr40">
212		- <label for="" class="title2">문제3</label>
213		- <input type="text" class="data-wrap">
214		- </div>
215		- <div class="flex align-center mb20 ">
216		- <label for="" class="title2">답3</label>
217		- <input type="text" class="data-wrap">
218		- </div>
219		- <div class="flex align-center mb20 mr40">
220		- <label for="" class="title2">문제4</label>
221		- <input type="text" class="data-wrap">
222		- </div>
223		- <div class="flex align-center mb20">
224		- <label for="" class="title2">답4</label>
225		- <input type="text" class="data-wrap">
226		- </div>
227		- </div>
228		- <div class="flex align-center mb20">
229		- <label for="" class="title2">해설</label>
230		- <textarea name="" id="" class="data-wrap"></textarea>
231		- </div>
232		- </div>
233		- <div v-else-if="selectedTab === 'tab4'">
234		- <div class="flex align-center mb20 mr40" >
235		- <label for="" class="title2">문제1</label>
236		- <input type="text" class="data-wrap">
237		- <input type="checkbox" class="ui-checkbox ml30">
238		- </div>
239		- <div class="flex align-center mb20 mr40">
240		- <label for="" class="title2">문제2</label>
241		- <input type="text" class="data-wrap">
242		- <input type="checkbox" class="ui-checkbox ml30">
243		- </div>
244		- <div class="flex align-center mb20 mr40">
245		- <label for="" class="title2">문제3</label>
246		- <input type="text" class="data-wrap">
247		- <input type="checkbox" class="ui-checkbox ml30">
248		- </div>
249		- <div class="flex align-center mb20 mr40">
250		- <label for="" class="title2">문제4</label>
251		- <input type="text" class="data-wrap">
252		- <input type="checkbox" class="ui-checkbox ml30">
253		- </div>
254		- <div class="flex align-center mb20">
255		- <label for="" class="title2">해설</label>
256		- <textarea name="" id="" class="data-wrap"></textarea>
257		- </div>
258		- </div>
259		-
260		->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
261	78	</div>
262	79	<div class="flex justify-between mt50">
263	80	<button type="button" title="글쓰기" class="new-btn" @click="goToPage('QuestionList')">
264	81	목록
265	82	</button>
266	83	<div class="flex">
267		-<<<<<<< HEAD
268	84	<button type="button" title="글쓰기" class="new-btn mr10" @click="editQuestion">
269	85	수정
270	86	</button>
...	...	@@ -280,14 +96,6 @@
280	96	<p>삭제하시겠습니까?</p>
281	97	<button @click="deleteQuestion">예, 삭제</button>
282	98	<button @click="cancelDelete">취소</button>
283		-=======
284		- <button type="button" title="글쓰기" class="new-btn mr10">
285		- 삭제
286		- </button>
287		- <button type="button" title="글쓰기" class="new-btn">
288		- 수정
289		- </button>
290		->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
291	99	</div>
292	100	</div>
293	101	</template>
...	...	@@ -295,17 +103,12 @@
295	103	<script>
296	104	import SvgIcon from '@jamescoyle/vue-icon';
297	105	import { mdiMagnify } from '@mdi/js';
298		-<<<<<<< HEAD
299	106	import axios from 'axios';
300		-=======
301		-
302		->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
303	107
304	108	export default {
305	109	data() {
306	110	return {
307	111	mdiMagnify: mdiMagnify,
308		-<<<<<<< HEAD
309	112	questionTitle: '샘플 제목',
310	113	questionExpln: '샘플 내용',
311	114	questionFile: null, // 파일 URL을 여기에 저장
...	...	@@ -321,16 +124,12 @@
321	124	questionScore: '',
322	125	questionHint: '',
323	126	questionExplanation: ''
324		-=======
325		- selectedTab: 'tab1',
326		->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
327	127	}
328	128	},
329	129	methods: {
330	130	goToPage(page) {
331	131	this.$router.push({ name: page });
332	132	},
333		-<<<<<<< HEAD
334	133	editQuestion() {
335	134	// 수정 로직 추가
336	135	console.log('수정 버튼 클릭');
...	...	@@ -381,20 +180,11 @@
381	180	// 문제 ID를 얻는 로직을 추가하세요
382	181	return 'sampleProblemId';
383	182	}
384		-=======
385		- },
386		- watch: {
387		-
388		- },
389		- computed: {
390		-
391		->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
392	183	},
393	184	components: {
394	185	SvgIcon
395	186	},
396	187	mounted() {
397		-<<<<<<< HEAD
398	188	this.loadFromLocalStorage();
399	189	}
400	190	}
...	...	@@ -440,12 +230,3 @@
440	230	cursor: pointer;
441	231	}
442	232	</style>
443		-=======
444		- console.log('Main2 mounted');
445		- }
446		-}
447		-</script>
448		-<style scoped>
449		-.ui-checkbox{width: 30px; height: 30px;}
450		-</style>
451		->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941

...	...	@@ -34,7 +34,6 @@
34	34	<td>유형</td>
35	35	<td>지문</td>
36	36	<td>등록일</td>
37		-<<<<<<< HEAD
38	37	</tr>
39	38	</thead>
40	39	<tbody>
...	...	@@ -63,32 +62,6 @@
63	62	<button type="button" title="등록" class="new-btn" @click="goToPage('QuestionInsert')">
64	63	등록
65	64	</button>
66		-=======
67		- </thead>
68		- <tbody>
69		- <tr @click="goToPage('QuestionDetail')">
70		- <td></td>
71		- <td></td>
72		- <td></td>
73		- <td></td>
74		- <td></td>
75		- <td></td>
76		- </tr>
77		- </tbody>
78		- </table>
79		- <article class="table-pagination flex justify-center align-center mb20 mt30" style="gap: 10px;">
80		- <button><img src="../../../resources/img/btn27_90t_normal.png" alt=""></button>
81		- <button class="selected-btn">1</button>
82		- <button>2</button>
83		- <button>3</button>
84		- <button><img src="../../../resources/img/btn28_90t_normal.png" alt=""></button>
85		- </article>
86		- <div class="flex justify-end ">
87		- <button type="button" title="등록" class="new-btn" @click="goToPage('QuestionInsert')">
88		- 등록
89		- </button>
90		- </div>
91		->>>>>>> e47769b90c7ad4f0b34f38bb2a56a8a69a894941
92	65	</div>
93	66	</div>
94	67	</template>

Delete comment