From 8f15cb2afce27cdbf1348c4086d082db4efb1744 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Fri, 3 Sep 2021 11:52:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=B6=E5=9B=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/onlineHome/poll.js | 33 ++++ src/router/index.js | 9 + src/views/onlineHome/homePoll.vue | 138 ++++++++------- src/views/onlineHome/homePollDetail.vue | 220 ++++++++++++++++++++++++ static/images/onlineHome/voteMenu.png | Bin 0 -> 800 bytes 5 files changed, 330 insertions(+), 70 deletions(-) create mode 100644 src/api/onlineHome/poll.js create mode 100644 src/views/onlineHome/homePollDetail.vue create mode 100644 static/images/onlineHome/voteMenu.png diff --git a/src/api/onlineHome/poll.js b/src/api/onlineHome/poll.js new file mode 100644 index 00000000..5f4955b5 --- /dev/null +++ b/src/api/onlineHome/poll.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' + +// 查询投票主题列表 +export function listPoll(query) { + return request({ + url: '/poll/poll/list', + method: 'get', + params: query + }) +} +// 查询投票主题详细 +export function getPoll(id) { + return request({ + url: '/poll/poll/get/' + id, + method: 'get' + }) +} +// 新增投票主题 +export function votePoll(id,list) { + return request({ + url: '/poll/poll/votePoll/'+ id +'/'+ list, + method: 'get' + }) +} + +// 查询投票详情列表 +export function listPollVote(query) { + return request({ + url: '/poll/pollVote/list', + method: 'get', + params: query + }) +} diff --git a/src/router/index.js b/src/router/index.js index 38006378..1600f163 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -645,6 +645,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/zdjs'], resolve) }, + { + path: '/onlineHome/homePollDetail', + name: 'homePollDetail', + meta: { + title: '投票详情', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/homePollDetail'], resolve) + }, { path: '/flowChart', name: 'flowChart', diff --git a/src/views/onlineHome/homePoll.vue b/src/views/onlineHome/homePoll.vue index 9e1cd13e..be54bc6a 100644 --- a/src/views/onlineHome/homePoll.vue +++ b/src/views/onlineHome/homePoll.vue @@ -6,83 +6,54 @@ @click-left="$router.back(-1)" > - - -

活动主题活动主题活动主题活动主题

-
-
- - -

活动描述活动描述活动描述

-
-
+ + + + + + + +

{{item.subjectName}}

+
+ +

+ 开始时间:{{item.startTime}} +

+

+ 截止时间:{{item.endTime}} +

+

+ 发起人:{{item.promoters}} +

+
+
+ +

未开始

+

查看

+

投票

+
+
+
- - - -

实名

- -

单选

- -

多选

-
- - -

3人已参与

-
-
- - - - - - - - - - - - 57票 87% - - - - diff --git a/src/views/onlineHome/homePollDetail.vue b/src/views/onlineHome/homePollDetail.vue new file mode 100644 index 00000000..29c91097 --- /dev/null +++ b/src/views/onlineHome/homePollDetail.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/static/images/onlineHome/voteMenu.png b/static/images/onlineHome/voteMenu.png new file mode 100644 index 0000000000000000000000000000000000000000..48ec79630d35667a1211b88095ebe0dfb5cb470b GIT binary patch literal 800 zcmV+*1K<3KP)PfN^U10lODMTBch#NFj{PKk`k(Zk;-kf4(Wrh>okQ6Q;w%I?(vM%N&*wmA z3~zM(>O26ps>d?|L_w773V<(FKh6a3P8{!I7te$(je&x*E>D29?)h&NWG6qXnC-pV z{;p_0+7tx|F>fn6|E#vnNc-1%ey+N-a7IFCtrAjb%XKH<-wL=JwOu9JU)aQRG8Dj< zs@oJtO(ywc%7m^(sV}CMkM~nIq%Q1$!3J=Y4KvtAzpu=$XZ1`%^rm4+VQKU^)1bcF z;PivKjX{m|yV48#IW+^^O{(iBy{}!&F84S*$?EDUctr{td4`FE>5k{l==>MUmIqaIp@f!O)|EOI7r}$Si!+2*|GU1 zUwKEQwmyGOwwg8=gqdmcaf?Q;Jb&&A)FopK`mA*^8;gaGn^BX`7PW=cxm4|fI)E!x zKkDRk&Vc|ZF9$y?lzu!)Z3xyNhfWqdyR!DUMM}lhU6?7!B(y<2)>~L`2~fBiNRIBC z9Cw%v9$ee~Ag==mY3cVt+#CZCF17~ASlq|UA!c6b0cS}+XaL8vKJ3(Pl6XLrWV85x z4Bn$Gunfw*XRUMHWAEjgZkiB|7yAbE!5E0(obxe&V2wSKcvKDr=mVjWD}{0Z1Js(D e8@s01x@QlcHKk(xav;J00000 Date: Fri, 3 Sep 2021 15:18:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BD=91=E4=B8=8A=E5=AE=B6=E5=9B=AD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/onlineHome/advice.vue | 1 - src/views/onlineHome/done.vue | 3 --- src/views/onlineHome/expenditureDetail.vue | 1 - src/views/onlineHome/gzdt.vue | 1 - src/views/onlineHome/hnzc.vue | 1 - src/views/onlineHome/home.vue | 1 - src/views/onlineHome/homePoll.vue | 2 -- src/views/onlineHome/homePollDetail.vue | 1 - src/views/onlineHome/inAndOutDetail.vue | 1 - src/views/onlineHome/incomeDetail.vue | 1 - src/views/onlineHome/livePay.vue | 1 - src/views/onlineHome/mailList.vue | 1 - src/views/onlineHome/password.vue | 1 - src/views/onlineHome/personalPicture.vue | 1 - src/views/onlineHome/threeAffairs.vue | 1 - src/views/onlineHome/zcfg.vue | 1 - src/views/onlineHome/zdjs.vue | 1 - 17 files changed, 20 deletions(-) diff --git a/src/views/onlineHome/advice.vue b/src/views/onlineHome/advice.vue index 8f2ada1f..1db54695 100644 --- a/src/views/onlineHome/advice.vue +++ b/src/views/onlineHome/advice.vue @@ -57,7 +57,6 @@ 提交 - diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue index 4783a1ce..469b03cd 100644 --- a/src/views/onlineHome/done.vue +++ b/src/views/onlineHome/done.vue @@ -270,9 +270,6 @@ - - - diff --git a/src/views/onlineHome/expenditureDetail.vue b/src/views/onlineHome/expenditureDetail.vue index 86aa567f..85911473 100644 --- a/src/views/onlineHome/expenditureDetail.vue +++ b/src/views/onlineHome/expenditureDetail.vue @@ -87,7 +87,6 @@ title="截止时间" :formatter="formatter" />--> - diff --git a/src/views/onlineHome/gzdt.vue b/src/views/onlineHome/gzdt.vue index 2d7274b0..9bb47f65 100644 --- a/src/views/onlineHome/gzdt.vue +++ b/src/views/onlineHome/gzdt.vue @@ -29,7 +29,6 @@ - diff --git a/src/views/onlineHome/hnzc.vue b/src/views/onlineHome/hnzc.vue index cc415d15..68e195cd 100644 --- a/src/views/onlineHome/hnzc.vue +++ b/src/views/onlineHome/hnzc.vue @@ -29,7 +29,6 @@ - diff --git a/src/views/onlineHome/home.vue b/src/views/onlineHome/home.vue index cbb2e66b..4725bb6a 100644 --- a/src/views/onlineHome/home.vue +++ b/src/views/onlineHome/home.vue @@ -94,7 +94,6 @@ - diff --git a/src/views/onlineHome/homePoll.vue b/src/views/onlineHome/homePoll.vue index be54bc6a..99b11157 100644 --- a/src/views/onlineHome/homePoll.vue +++ b/src/views/onlineHome/homePoll.vue @@ -45,8 +45,6 @@ - - diff --git a/src/views/onlineHome/homePollDetail.vue b/src/views/onlineHome/homePollDetail.vue index 29c91097..13702ddf 100644 --- a/src/views/onlineHome/homePollDetail.vue +++ b/src/views/onlineHome/homePollDetail.vue @@ -114,7 +114,6 @@ 提交 - diff --git a/src/views/onlineHome/inAndOutDetail.vue b/src/views/onlineHome/inAndOutDetail.vue index f142c22b..d421c388 100644 --- a/src/views/onlineHome/inAndOutDetail.vue +++ b/src/views/onlineHome/inAndOutDetail.vue @@ -83,7 +83,6 @@ title="截止时间" :formatter="formatter" />--> - diff --git a/src/views/onlineHome/incomeDetail.vue b/src/views/onlineHome/incomeDetail.vue index a2c6a9bb..f1d518b0 100644 --- a/src/views/onlineHome/incomeDetail.vue +++ b/src/views/onlineHome/incomeDetail.vue @@ -83,7 +83,6 @@ title="截止时间" :formatter="formatter" />--> - diff --git a/src/views/onlineHome/livePay.vue b/src/views/onlineHome/livePay.vue index 1bb0e986..f76f7082 100644 --- a/src/views/onlineHome/livePay.vue +++ b/src/views/onlineHome/livePay.vue @@ -60,7 +60,6 @@ - diff --git a/src/views/onlineHome/mailList.vue b/src/views/onlineHome/mailList.vue index f6e3a4bf..5d214aa0 100644 --- a/src/views/onlineHome/mailList.vue +++ b/src/views/onlineHome/mailList.vue @@ -35,7 +35,6 @@ - diff --git a/src/views/onlineHome/password.vue b/src/views/onlineHome/password.vue index a3887855..bf9875d6 100644 --- a/src/views/onlineHome/password.vue +++ b/src/views/onlineHome/password.vue @@ -43,7 +43,6 @@ 完成 - diff --git a/src/views/onlineHome/personalPicture.vue b/src/views/onlineHome/personalPicture.vue index 161b403b..a1347bd7 100644 --- a/src/views/onlineHome/personalPicture.vue +++ b/src/views/onlineHome/personalPicture.vue @@ -95,7 +95,6 @@ 农户画像 - diff --git a/src/views/onlineHome/threeAffairs.vue b/src/views/onlineHome/threeAffairs.vue index cd08d946..d524d9cf 100644 --- a/src/views/onlineHome/threeAffairs.vue +++ b/src/views/onlineHome/threeAffairs.vue @@ -55,7 +55,6 @@ - diff --git a/src/views/onlineHome/zcfg.vue b/src/views/onlineHome/zcfg.vue index 21e0551d..3e2a0260 100644 --- a/src/views/onlineHome/zcfg.vue +++ b/src/views/onlineHome/zcfg.vue @@ -30,7 +30,6 @@ - diff --git a/src/views/onlineHome/zdjs.vue b/src/views/onlineHome/zdjs.vue index 34a746c5..7382b383 100644 --- a/src/views/onlineHome/zdjs.vue +++ b/src/views/onlineHome/zdjs.vue @@ -29,7 +29,6 @@ -