수정사항 수정정
This commit is contained in:
parent
44de501340
commit
1dceec000c
@ -132,7 +132,6 @@ const checkedNames = (numList) => {
|
|||||||
}
|
}
|
||||||
//투표종료
|
//투표종료
|
||||||
const endVoteId = (endVoteId) => {
|
const endVoteId = (endVoteId) => {
|
||||||
console.log('endVoteId',endVoteId)
|
|
||||||
$api.patch('vote/updateEndData',{
|
$api.patch('vote/updateEndData',{
|
||||||
endVoteId :endVoteId
|
endVoteId :endVoteId
|
||||||
}).then((res)=>{
|
}).then((res)=>{
|
||||||
@ -143,7 +142,6 @@ const endVoteId = (endVoteId) => {
|
|||||||
}
|
}
|
||||||
//기한 지난 투표 종료
|
//기한 지난 투표 종료
|
||||||
const voteEnded = async (id) =>{
|
const voteEnded = async (id) =>{
|
||||||
console.log('voteEnded',id)
|
|
||||||
await endVoteId(id.id);
|
await endVoteId(id.id);
|
||||||
}
|
}
|
||||||
//투표 삭제
|
//투표 삭제
|
||||||
|
|||||||
@ -34,7 +34,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 숨겨진 input 태그를 사용하여 강제로 포커스 -->
|
<!-- 숨겨진 input 태그를 사용하여 강제로 포커스 -->
|
||||||
<input ref="dateInput" type="datetime-local" v-model="endDate" class="hidden-date-input">
|
<input ref="dateInput" :min="minDate" type="datetime-local" v-model="endDate" class="hidden-date-input">
|
||||||
|
|
||||||
<!-- 항목 입력 반복 -->
|
<!-- 항목 입력 반복 -->
|
||||||
<div v-for="(item, index) in itemList" :key="index">
|
<div v-for="(item, index) in itemList" :key="index">
|
||||||
@ -115,10 +115,7 @@ import { useUserStore } from '@s/userList';
|
|||||||
import { useRoute } from "vue-router";
|
import { useRoute } from "vue-router";
|
||||||
|
|
||||||
const userStore = useUserStore();
|
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 toastStore = useToastStore();
|
||||||
const activeUserList = ref([]);
|
const activeUserList = ref([]);
|
||||||
const disabledUsers = ref([]);
|
const disabledUsers = ref([]);
|
||||||
@ -144,12 +141,11 @@ const focusDateInput = () => {
|
|||||||
|
|
||||||
const minDate = ref('');
|
const minDate = ref('');
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
nextTick(() => {
|
|
||||||
const offset = new Date().getTimezoneOffset() * 60000;
|
const offset = new Date().getTimezoneOffset() * 60000;
|
||||||
const today = new Date(Date.now() - offset);
|
const today = new Date(Date.now() - offset);
|
||||||
today.setDate(today.getDate() + 1);
|
today.setDate(today.getDate() + 1);
|
||||||
minDate.value = today.toISOString().substring(0, 16);
|
minDate.value = today.toISOString().substring(0, 16);
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const userSet = ({ userList, userTotal }) => {
|
const userSet = ({ userList, userTotal }) => {
|
||||||
|
|||||||
@ -159,6 +159,9 @@
|
|||||||
if (newAlphabet !== null) {
|
if (newAlphabet !== null) {
|
||||||
getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
|
getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
|
||||||
} else {
|
} else {
|
||||||
|
if( selectedCategory.value !== '' && selectedCategory.value !== null){
|
||||||
|
getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
|
||||||
|
}
|
||||||
wordList.value = [];
|
wordList.value = [];
|
||||||
total.value = 0;
|
total.value = 0;
|
||||||
}
|
}
|
||||||
@ -173,6 +176,9 @@
|
|||||||
getwordList(searchText.value, selectedAlphabet.value, '');
|
getwordList(searchText.value, selectedAlphabet.value, '');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if( selectedAlphabet.value !== '' && selectedAlphabet.value !== null){
|
||||||
|
getwordList(searchText.value, selectedAlphabet.value, selectedCategory.value);
|
||||||
|
}
|
||||||
wordList.value = [];
|
wordList.value = [];
|
||||||
total.value = 0;
|
total.value = 0;
|
||||||
}
|
}
|
||||||
@ -194,7 +200,6 @@
|
|||||||
sendWordRequest(category, wordData, newCodName);
|
sendWordRequest(category, wordData, newCodName);
|
||||||
};
|
};
|
||||||
const sendWordRequest = (category, wordData, data) => {
|
const sendWordRequest = (category, wordData, data) => {
|
||||||
console.log(category,'category')
|
|
||||||
const payload = {
|
const payload = {
|
||||||
WRDDICCAT: category,
|
WRDDICCAT: category,
|
||||||
WRDDICTTL: wordData.title,
|
WRDDICTTL: wordData.title,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user