localnet/localhost-front
10
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into board-ji

Browse Source
This commit is contained in:
dyhj625 2025-03-25 11:20:18 +09:00
commit ca1a466ce2
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/voteboard/voteBoardList.vue
View File

@ -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);
}
//투표 삭제

10
src/views/voteboard/voteboardWrite.vue
View File

@ -34,7 +34,7 @@
</div>
<!-- 숨겨진 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">
@ -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 }) => {

7
src/views/wordDict/wordDict.vue
View File

@ -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,