diff --git a/project/pingchang/apps/AppGeneralElection/AppGeneralElection.vue b/project/pingchang/apps/AppGeneralElection/AppGeneralElection.vue index 9a5d71b2..1ec02caa 100644 --- a/project/pingchang/apps/AppGeneralElection/AppGeneralElection.vue +++ b/project/pingchang/apps/AppGeneralElection/AppGeneralElection.vue @@ -9,6 +9,7 @@ diff --git a/project/pingchang/apps/AppGeneralElection/components/Statistics.vue b/project/pingchang/apps/AppGeneralElection/components/Statistics.vue new file mode 100644 index 00000000..a2e2a6ae --- /dev/null +++ b/project/pingchang/apps/AppGeneralElection/components/Statistics.vue @@ -0,0 +1,152 @@ + + + + + + + + + + 已投人数:{{ data.alreadyCount || 0 }} + 未投人数:{{ data.notYetCount || 0 }} + 日期:{{ data.dateTime || '' }} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue b/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue index b6109b6b..a8053e4f 100644 --- a/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue +++ b/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue @@ -1,6 +1,6 @@ - + diff --git a/project/pingchang/apps/AppGeneralElection/components/electionList.vue b/project/pingchang/apps/AppGeneralElection/components/electionList.vue index c14fa5df..faf2b651 100644 --- a/project/pingchang/apps/AppGeneralElection/components/electionList.vue +++ b/project/pingchang/apps/AppGeneralElection/components/electionList.vue @@ -5,7 +5,7 @@ - 添加 + 添加 @@ -18,9 +18,9 @@ - 详情 + 详情 结束 - 统计 + 统计 删除 @@ -87,7 +87,6 @@ export default { type: 'electionAdd', params: { id: id || '', - isEdit: flag } }) }, @@ -108,7 +107,7 @@ export default { } this.getList() }, - // 开始结束 + // 结束 startEnd(id, status) { this.$confirm('投票正在进行中,确定要提前结束吗?').then(() => { this.instance.post(`/app/appgeneralelectioninfo/start-end?id=${id}&start=${status}`).then(res=>{ @@ -120,7 +119,14 @@ export default { }) }, // 统计 - toStatistics() {}, + toStatistics(id) { + this.$emit('change', { + type: 'Statistics', + params: { + id: id || '', + } + }) + }, } }