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

Merge branch 'khj'

Browse Source
This commit is contained in:
khj0414 2025-04-03 10:44:14 +09:00
commit 55c0c33894
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/main/MainVote.vue
View File

@ -11,7 +11,7 @@
<li class="d-flex mb-1" v-for="item in voteList" :key="item.LOCVOTSEQ"> <li class="d-flex mb-1" v-for="item in voteList" :key="item.LOCVOTSEQ">
<div class="d-flex w-100 flex-wrap align-items-center justify-content-between gap-2"> <div class="d-flex w-100 flex-wrap align-items-center justify-content-between gap-2">
<div class="me-2 mb-3"> <div class="me-2 mb-3">
<small class="card-subtitle">{{ item.localVote.formatted_LOCVOTEDT }}</small> <small class="card-subtitle">{{ item.localVote.formatted_LOCVOTRDT }}</small>
<div class="d-flex flex-wrap align-items-center"> <div class="d-flex flex-wrap align-items-center">
<div class="avatar flex-shrink-0 me-1"> <div class="avatar flex-shrink-0 me-1">
<img <img
@ -28,7 +28,7 @@
<small ><strong>{{ truncateTitle(item.localVote.LOCVOTTTL) }}</strong></small> <small ><strong>{{ truncateTitle(item.localVote.LOCVOTTTL) }}</strong></small>
</div> </div>
<small class="d-flex align-items-center lh-1 me-4 mb-4 mb-sm-0"><span class="badge badge-dot text-bg-warning me-1"> <small class="d-flex align-items-center lh-1 me-4 mb-4 mb-sm-0"><span class="badge badge-dot text-bg-warning me-1">
</span> {{ getDaysAgo(item.localVote.formatted_LOCVOTEDT) }}</small> </span> {{ getDaysAgo(item.localVote.formatted_LOCVOTEDT) }} ({{item.localVote.total_voted}}/{{ item.localVote.total_votable }})</small>
</div> </div>
</div> </div>
</div> </div>
@ -79,7 +79,7 @@ const getvoteList = () => {
{ {
page: 1 page: 1
,voteset:'2' //투표중 ,voteset:'2' //투표중
,myVote:'2' //내가한 투표표 ,myVote:'2' //내가 안한 투표
} }
}).then(res => { }).then(res => {
voteList.value = res.data.data.list; voteList.value = res.data.data.list;
@ -97,7 +97,8 @@ const goVoteList = () =>{
router.push({ router.push({
path: '/voteboard', path: '/voteboard',
query: { query: {
voteset: '2', voteset: '2' //투표중
,myVote:'2' //내가 안한 투표
} }
}); });
} }

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

@ -72,11 +72,13 @@ const ischeked = ref(false);
const selectedVote = ref({}); // 선택된 투표 데이터 const selectedVote = ref({}); // 선택된 투표 데이터
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
const myVote = ref('2');
onMounted(() => { onMounted(() => {
const maincvoteset = route.query.voteset || '0'; const maincvoteset = route.query.voteset || '0';
const maincmyVote = route.query.myVote || '0';
voteset.value =maincvoteset; voteset.value =maincvoteset;
category.value = maincvoteset; category.value = maincvoteset;
myVote.value = maincmyVote;
getvoteList(); getvoteList();
}); });
//글작성 //글작성
@ -91,16 +93,16 @@ const changeCheck = () =>{
//투표목록 //투표목록
const getvoteList = () => { const getvoteList = () => {
$api.get('vote/getVoteList',{ $api.get('vote/getVoteList',{
//목록조회시 파라미터 전달
params: params:
{ {
page: currentPage.value page: currentPage.value
,voteset:voteset.value ,voteset:voteset.value
,myVote:ischeked.value ? '1':'0' ,myVote:myVote.value == '2' ? myVote.value : ischeked.value ? '1':'0'
} }
}).then(res => { }).then(res => {
PageData.value = res.data.data; PageData.value = res.data.data;
voteListCardData.value = res.data.data.list; voteListCardData.value = res.data.data.list;
myVote.value = '';
}) })
}; };