diff --git a/src/views/voteboard/voteBoardList.vue b/src/views/voteboard/voteBoardList.vue
index e1f885b..4079dad 100644
--- a/src/views/voteboard/voteBoardList.vue
+++ b/src/views/voteboard/voteBoardList.vue
@@ -132,7 +132,6 @@ const checkedNames = (numList) => {
}
//투표종료
const endVoteId = (endVoteId) => {
- console.log('endVoteId',endVoteId)
$api.patch('vote/updateEndData',{
endVoteId :endVoteId
}).then((res)=>{
@@ -143,7 +142,6 @@ const endVoteId = (endVoteId) => {
}
//기한 지난 투표 종료
const voteEnded = async (id) =>{
- console.log('voteEnded',id)
await endVoteId(id.id);
}
//투표 삭제
diff --git a/src/views/voteboard/voteboardWrite.vue b/src/views/voteboard/voteboardWrite.vue
index b94450e..9b2d66f 100644
--- a/src/views/voteboard/voteboardWrite.vue
+++ b/src/views/voteboard/voteboardWrite.vue
@@ -34,7 +34,7 @@
-
+
@@ -115,10 +115,7 @@ import { useUserStore } from '@s/userList';
import { useRoute } from "vue-router";
const userStore = useUserStore();
-// const offset = new Date().getTimezoneOffset() * 60000
-// const today = new Date(Date.now() - offset);
-// today.setDate(today.getDate() + 1);
-// const minDate = today.toISOString().substring(0, 16);
+
const toastStore = useToastStore();
const activeUserList = ref([]);
const disabledUsers = ref([]);
@@ -144,12 +141,11 @@ const focusDateInput = () => {
const minDate = ref('');
onMounted(() => {
- nextTick(() => {
const offset = new Date().getTimezoneOffset() * 60000;
const today = new Date(Date.now() - offset);
today.setDate(today.getDate() + 1);
minDate.value = today.toISOString().substring(0, 16);
- });
+
});
const userSet = ({ userList, userTotal }) => {
diff --git a/src/views/wordDict/wordDict.vue b/src/views/wordDict/wordDict.vue
index a75ff61..292cf0b 100644
--- a/src/views/wordDict/wordDict.vue
+++ b/src/views/wordDict/wordDict.vue
@@ -159,6 +159,9 @@
if (newAlphabet !== null) {
getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
} else {
+ if( selectedCategory.value !== '' && selectedCategory.value !== null){
+ getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
+ }
wordList.value = [];
total.value = 0;
}
@@ -173,6 +176,9 @@
getwordList(searchText.value, selectedAlphabet.value, '');
}
} else {
+ if( selectedAlphabet.value !== '' && selectedAlphabet.value !== null){
+ getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
+ }
wordList.value = [];
total.value = 0;
}
@@ -194,7 +200,6 @@
sendWordRequest(category, wordData, newCodName);
};
const sendWordRequest = (category, wordData, data) => {
- console.log(category,'category')
const payload = {
WRDDICCAT: category,
WRDDICTTL: wordData.title,