diff --git a/新疆后台.zip b/dist.zip similarity index 79% rename from 新疆后台.zip rename to dist.zip index 7b55b3c..c372934 100644 Binary files a/新疆后台.zip and b/dist.zip differ diff --git a/src/api/business/vote.js b/src/api/business/vote.js index 1965296..35251e7 100644 --- a/src/api/business/vote.js +++ b/src/api/business/vote.js @@ -43,6 +43,24 @@ export function updateVoteStatus(data) { }) } +// 投票记录 +export function vote_log(data) { + return request({ + url: '/business/vote-item/vote_log', + method: 'post', + data: data + }) +} + +// 个人投票记录 +export function getMineVoteDetail(data) { + return request({ + url: '/business/vote-item/getMineVoteDetail', + method: 'get', + params: data + }) +} + @@ -76,3 +94,15 @@ export function exportVoteResults(query) { +export function exportMineVoteInfo(query) { + return request({ + url: '/business/vote-item/exportMineVoteInfo', + method: 'get', + params: query, + responseType: 'blob' + }) +} + + + + diff --git a/src/views/business/apartment/index.vue b/src/views/business/apartment/index.vue index 6983e9f..0b898fd 100644 --- a/src/views/business/apartment/index.vue +++ b/src/views/business/apartment/index.vue @@ -72,6 +72,9 @@ + + + @@ -84,7 +87,14 @@ + + + 查看投票记录 + + + @@ -248,7 +258,9 @@ handleExport() { }, - + votingRecordsFn(userId) { + this.$router.push('/apartment/votingRecords?userId='+ userId) + }, // 筛选节点 filterNode(value, data) { diff --git a/src/views/business/apartment/votingRecords/votingRecords copy.vue b/src/views/business/apartment/votingRecords/votingRecords copy.vue new file mode 100644 index 0000000..91162e6 --- /dev/null +++ b/src/views/business/apartment/votingRecords/votingRecords copy.vue @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + {{ parseTime(scope.row.startTime) }} + + + + + 详情 + 导出 + + + + + + + + + + + 导出 + + 投票说明 + + + + {{ form.voteName }} + + + + + 发起人:{{ form.makerName }} + 创建时间:{{ form.startTime }} + 截止时间:{{ form.endTime }} + + + + + + + + + 投票结果 + + + + + + {{ + item.voteName }} + + + {{ item2.itemName }} + + + {{ item2.itemCount }}人 + + + + + + + + + {{ item.itemName }} (已投) + + + + + {{ item.itemCount }}人 + + + + 投票详情 + + + + + + + + + + + + + + {{item.itemName }} + + + + + {{item.voteCount }} + + + + + + + + + + + + + + + + {{ item2.userName + ' | '+parseTime(item2.createTime)}} + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/business/apartment/votingRecords/votingRecords.vue b/src/views/business/apartment/votingRecords/votingRecords.vue new file mode 100644 index 0000000..7617b1b --- /dev/null +++ b/src/views/business/apartment/votingRecords/votingRecords.vue @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.voteTimeStr }} + + + + + 详情 + 导出 + + + + + + + + + + + 导出 + + 投票说明 + + + + {{ form.voteName }} + + + + + 发起人:{{ form.makerName }} + 创建时间:{{ form.startTime }} + 截止时间:{{ form.endTime }} + + + + + + + + + + + + 投票详情 + + + + + + + + + + + + + + 投票名称: {{ form.mineMultipleVoteTable?.voteName }} + 投票选择: {{ form.mineMultipleVoteTable?.optionName }} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/business/vote/index.vue b/src/views/business/vote/index.vue index 173be8d..65f8a9d 100644 --- a/src/views/business/vote/index.vue +++ b/src/views/business/vote/index.vue @@ -81,7 +81,7 @@ - + @@ -208,7 +208,7 @@ - + 导出 投票说明 @@ -244,8 +244,8 @@ item.voteName }} - {{ item2.itemName }} - {{ item2.itemName }} + {{ item2.itemCount }}人 @@ -267,8 +267,7 @@ - - 投票详情 + 投票详情 @@ -276,7 +275,7 @@ - {{ scope.row.voteName }} + {{ scope.row.voteName }} @@ -287,7 +286,6 @@ -