diff --git a/src/components/main/MainVote.vue b/src/components/main/MainVote.vue
index 0ec3734..d0c5caa 100644
--- a/src/components/main/MainVote.vue
+++ b/src/components/main/MainVote.vue
@@ -11,7 +11,7 @@
-
{{ item.localVote.formatted_LOCVOTEDT }}
+
{{ item.localVote.formatted_LOCVOTRDT }}
{{ truncateTitle(item.localVote.LOCVOTTTL) }}
- {{ getDaysAgo(item.localVote.formatted_LOCVOTEDT) }}
+ {{ getDaysAgo(item.localVote.formatted_LOCVOTEDT) }} ({{item.localVote.total_voted}}/{{ item.localVote.total_votable }})
@@ -79,7 +79,7 @@ const getvoteList = () => {
{
page: 1
,voteset:'2' //투표중
- ,myVote:'2' //내가한 투표표
+ ,myVote:'2' //내가 안한 투표
}
}).then(res => {
voteList.value = res.data.data.list;
@@ -97,7 +97,8 @@ const goVoteList = () =>{
router.push({
path: '/voteboard',
query: {
- voteset: '2',
+ voteset: '2' //투표중
+ ,myVote:'2' //내가 안한 투표
}
});
}
diff --git a/src/views/voteboard/voteBoardList.vue b/src/views/voteboard/voteBoardList.vue
index b47b0d0..4395ca7 100644
--- a/src/views/voteboard/voteBoardList.vue
+++ b/src/views/voteboard/voteBoardList.vue
@@ -72,11 +72,13 @@ const ischeked = ref(false);
const selectedVote = ref({}); // 선택된 투표 데이터
const router = useRouter();
const route = useRoute();
-
+const myVote = ref('2');
onMounted(() => {
const maincvoteset = route.query.voteset || '0';
+ const maincmyVote = route.query.myVote || '0';
voteset.value =maincvoteset;
category.value = maincvoteset;
+ myVote.value = maincmyVote;
getvoteList();
});
//글작성
@@ -91,16 +93,16 @@ const changeCheck = () =>{
//투표목록
const getvoteList = () => {
$api.get('vote/getVoteList',{
- //목록조회시 파라미터 전달
params:
{
page: currentPage.value
,voteset:voteset.value
- ,myVote:ischeked.value ? '1':'0'
+ ,myVote:myVote.value == '2' ? myVote.value : ischeked.value ? '1':'0'
}
}).then(res => {
PageData.value = res.data.data;
voteListCardData.value = res.data.data.list;
+ myVote.value = '';
})
};