From c62c0278244e251df3f388d18acfcc4e995201b4 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Wed, 22 Sep 2021 18:10:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E4=B8=8A=E5=AE=B6=E5=9B=AD=E4=B8=89?= =?UTF-8?q?=E5=8A=A1=E5=85=AC=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 9 +- src/api/onlineHome/done.js | 19 ++ src/api/onlineHome/threeAffairs.js | 8 + src/router/index.js | 18 + src/views/onlineHome/done.vue | 308 ++++-------------- src/views/onlineHome/doneDetail.vue | 119 +++++++ src/views/onlineHome/gzdt.vue | 2 +- src/views/onlineHome/hnzc.vue | 2 +- src/views/onlineHome/threeAffairs.vue | 6 +- src/views/onlineHome/threeAffairsDetail.vue | 95 ++++++ src/views/onlineHome/villageAffairsDetail.vue | 97 ++++++ src/views/onlineHome/workbench.vue | 3 +- src/views/onlineHome/zcfg.vue | 2 +- src/views/onlineHome/zdjs.vue | 2 +- static/images/onlineHome/threeAffair1.png | Bin 0 -> 1290 bytes static/images/onlineHome/threeAffair2.png | Bin 0 -> 2355 bytes static/images/onlineHome/threeAffair3.png | Bin 0 -> 1633 bytes 17 files changed, 439 insertions(+), 251 deletions(-) create mode 100644 src/api/onlineHome/done.js create mode 100644 src/views/onlineHome/doneDetail.vue create mode 100644 src/views/onlineHome/threeAffairsDetail.vue create mode 100644 src/views/onlineHome/villageAffairsDetail.vue create mode 100644 static/images/onlineHome/threeAffair1.png create mode 100644 static/images/onlineHome/threeAffair2.png create mode 100644 static/images/onlineHome/threeAffair3.png diff --git a/config/index.js b/config/index.js index 06eb9f32..bd0906ef 100644 --- a/config/index.js +++ b/config/index.js @@ -12,9 +12,10 @@ module.exports = { proxyTable: { "/api": { // 请求的目标主机 - target: 'http://116.255.135.38:8081/nsgk_test/', + //target: 'http://116.255.135.38:8081/nsgk_test/', //target: 'http://localhost:8080/', - //target:'http://192.168.31.26:8080', + //target:'192.168.31.228:8080', + target:'http://localhost:8080', changeOrigin: true, pathRewrite: { '^/api': '' @@ -23,8 +24,8 @@ module.exports = { }, // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined + host: '192.168.31.228', // can be overwritten by process.env.HOST + port: 85, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, notifyOnErrors: true, diff --git a/src/api/onlineHome/done.js b/src/api/onlineHome/done.js new file mode 100644 index 00000000..86022960 --- /dev/null +++ b/src/api/onlineHome/done.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 查询待办列表 +export function ListTodo(query) { + return request({ + url: "/activiti/process/taskList", + method: "get", + params: query, + }) +} + +// 查询待办列表 +export function ListDone(query) { + return request({ + url: "/activiti/process/taskDoneList", + method: "get", + params: query, + }) +} diff --git a/src/api/onlineHome/threeAffairs.js b/src/api/onlineHome/threeAffairs.js index 11803c8e..93a8e64c 100644 --- a/src/api/onlineHome/threeAffairs.js +++ b/src/api/onlineHome/threeAffairs.js @@ -51,3 +51,11 @@ export function exportAffairs(query) { params: query }) } + +// 查询村务公开详细 +export function getVillageAffairs(id) { + return request({ + url: '/service/villageAffairs/get/' + id, + method: 'get' + }) +} diff --git a/src/router/index.js b/src/router/index.js index d858447a..66ad60a4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -445,6 +445,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/threeAffairs'], resolve) }, + { + path: '/onlineHome/threeAffairsDetail', + name: 'threeAffairsDetail', + meta: { + title: '三务公开详情', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/threeAffairsDetail'], resolve) + }, + { + path: '/onlineHome/villageAffairsDetail', + name: 'villageAffairsDetail', + meta: { + title: '村规民约详情', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/villageAffairsDetail'], resolve) + }, { path: '/onlineHome/homePoll', name: 'onlineHomeHomePoll', diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue index 469b03cd..925f0ce0 100644 --- a/src/views/onlineHome/done.vue +++ b/src/views/onlineHome/done.vue @@ -5,254 +5,34 @@ left-arrow @click-left="$router.back(-1)" /> - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -261,10 +41,10 @@ @@ -275,12 +55,62 @@ diff --git a/src/views/onlineHome/doneDetail.vue b/src/views/onlineHome/doneDetail.vue new file mode 100644 index 00000000..9dbbb625 --- /dev/null +++ b/src/views/onlineHome/doneDetail.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/onlineHome/gzdt.vue b/src/views/onlineHome/gzdt.vue index 9bb47f65..b615acf2 100644 --- a/src/views/onlineHome/gzdt.vue +++ b/src/views/onlineHome/gzdt.vue @@ -6,7 +6,7 @@ @click-left="$router.back(-1)" /> - + diff --git a/src/views/onlineHome/hnzc.vue b/src/views/onlineHome/hnzc.vue index 68e195cd..8cc525e0 100644 --- a/src/views/onlineHome/hnzc.vue +++ b/src/views/onlineHome/hnzc.vue @@ -6,7 +6,7 @@ @click-left="$router.back(-1)" /> - + diff --git a/src/views/onlineHome/threeAffairs.vue b/src/views/onlineHome/threeAffairs.vue index d524d9cf..f7269d78 100644 --- a/src/views/onlineHome/threeAffairs.vue +++ b/src/views/onlineHome/threeAffairs.vue @@ -9,7 +9,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/src/views/onlineHome/threeAffairsDetail.vue b/src/views/onlineHome/threeAffairsDetail.vue new file mode 100644 index 00000000..1c3804e9 --- /dev/null +++ b/src/views/onlineHome/threeAffairsDetail.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/views/onlineHome/villageAffairsDetail.vue b/src/views/onlineHome/villageAffairsDetail.vue new file mode 100644 index 00000000..01e142e2 --- /dev/null +++ b/src/views/onlineHome/villageAffairsDetail.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue index 3aa0583a..76dc7de7 100644 --- a/src/views/onlineHome/workbench.vue +++ b/src/views/onlineHome/workbench.vue @@ -424,7 +424,8 @@ }, created() { getInfo().then(response => { - this.deptName = response.user.dept.deptName + console.log(response) + this.deptName = response.user.deptName }); }, diff --git a/src/views/onlineHome/zcfg.vue b/src/views/onlineHome/zcfg.vue index 3e2a0260..e0b31c47 100644 --- a/src/views/onlineHome/zcfg.vue +++ b/src/views/onlineHome/zcfg.vue @@ -7,7 +7,7 @@ /> - + diff --git a/src/views/onlineHome/zdjs.vue b/src/views/onlineHome/zdjs.vue index 7382b383..f319da1f 100644 --- a/src/views/onlineHome/zdjs.vue +++ b/src/views/onlineHome/zdjs.vue @@ -6,7 +6,7 @@ @click-left="$router.back(-1)" /> - + diff --git a/static/images/onlineHome/threeAffair1.png b/static/images/onlineHome/threeAffair1.png new file mode 100644 index 0000000000000000000000000000000000000000..c3e8015675d57e3025453f2c06f78b1b15cd5af7 GIT binary patch literal 1290 zcmV+l1@-!gP)LULyBFzyh7yw%L2tc0b%y> zDwOSGk8I%cmW0t))(gh*elN$;U4HNw$xu>&a}2cNGYjo^FBr`gi*)W7(>g{HR7apv zPE5S*+hcI|+&}wmU;w^>^Vn{49-X05fFR@?8~(LVvoiZ&Fm5$NdPR)0X}bGPP(uJI zU}%f*?`;bJfD>q(`DE3ip@sxfQr<38r&R}7&6J~{#sDG+pbj7?!-B09FvD&2V=&ZM zKor!sw@k+q1T`j*wzsUFQ1+>`<%LQF63DbSLvuElH)J-C-#@teJQCvNhBz0bGGH1`OI_mfm(eDTl#4mw;m2YPOs}Il+)R z%^>(2*Fqp>y=aB<#f6yFHB2bU6d@N)>z!+Ure7{ixw7Q0Tr`o+V7}}^n&6RdPc2-L zyenB(uz<{+iSmil`vn}>$Tf%Co_Wqc4gM}*AyAm;!W*YNU{$sqaIi}T%LXOwlr_4- zaHoyqL*HOop<2MK=b=8qLcAYjJ@cBM8P!=2XVi8%iN3%v_X6|QD!Qf|%qpUwV!T}+ zV9?Y@2)yBvqgN2??L6ly3FsPJ0hX3;5=X4MpUmZwWp?Jz_)NUa^D+?=SEjs5Wh&zhrlB&JrGc9H z;lgPZB!t*!^^{5{m8|U(%*y?rq2BXw0v`Cb9eI-jOr~nogi4pDX86U5o?P z8umQ`EmI{zL2LG=T&6V9S%}Ne2+0~AOU*X{b;WT3 z3dbw~<1@%tshKB0*Pf~1o^stJw3fmMCv!#K#jbW0zU6;&#yne|X#s0IBr>s8V7XfI zXza}O=x87apV{Mk)V^bO&A3Jo1aH>uy?Lbp*80>-Wm>YZLBY7m3O(x$)r4FiK7OMP zYjiMtm5t-_9g|+;Dzo5KX6V>@KY}rk+ny-91HLup+&CIn&j0`b07*qoM6N<$g8#c& A!~g&Q literal 0 HcmV?d00001 diff --git a/static/images/onlineHome/threeAffair2.png b/static/images/onlineHome/threeAffair2.png new file mode 100644 index 0000000000000000000000000000000000000000..645d804c17700bffbc437c5b60b6c7a79c0f74dd GIT binary patch literal 2355 zcmV-33C#A1P) z*JY?L8_z3+<+1z)*naLj)|}p^t_)mP2=&DSm`}iy5XL*J=BtB)kuBvw^2%gb_6Y1C zhy`|n5X>Gfy5dl+x@?WV@Rm&S8F-1`3;N~={*;x2`d z$rcyEpTpg_x8rx}(vL+vfde=Qg!RcxifdVS(sq|bAots`?$n`j;Z7q6PD z_B!$X%s^(YlTkxF*iE099q+&pzBl;Zmq?JYBXPd`J`DH!6VQ0DkuNMdGT4Q7ZR9!--LAcYk&Uit6_K}@%C>>j@R8bQ2hjm@f-n}+~z z@OwBE!Gex@b$ZrXxgpDkUDV7iNx&EcqcoV50|`{hM4uuEg{d|IbW;;$1hK;!3$BwX z%7eWO$rJTEj-NEVC~DuVI!*uTHM6)#XU%5-h!6~XK9r`+*}3o}E}(bzW*ZQfjR;n@ z)n5yd`BgHF9=n%r4XrO0*Bhehvzt^Kse7IKqGZ9TfAO$rt)gv?yV1kWfUkEGQ(^0DqSYx-A%dP$_ zGp~$wG6Qp5a3m6@nQc`c@{0;q;a4=pZzY^7I4uz@Y-vy@?PzR)=rHM{CgN@;yGh&hMjLfrt`ur{BKFojy^k{-a+NR>?*R^i!^DD;Md{gbfsTG^*nR z*NL0JES$$Itdre18%=yD1{Tv<+pVzx6P;g}8x%$j282aRpJ~6`jgo&nqdqdhRLjE@ z>M8!2dBo;9OU)EB;U0?}>jxyTPG(UPI@#Ho$Js~-B{YSjeVV9|+mx_i1V(-u5HVm{ zuNqi%q(ObG-xaKr)m|@}_|b32m*CG)GbJ4j>aaE52SgWuL$jd=;xz$uGBFjm*QpaR znwUe!-bDu2Cj}vBqqeS{{1On;Yz}dw7PU303nrLKS?2X%8$aeG(oDC3nHKmyAi+wh zW&+z{V@~hUW{Y_=?TZ)%RWi@3@G5B&7J(L@NCc}n|1tgroV3QBK1hKUbFKeIH8Y>h z3w>-JVXGO1ik2;Es~(F5vYtSm8ZhCM(Zd+tbS;MGSIAw=w)!|b+)*$=PuFFP$-NF6 z$op|8dOc1s2f8j{$;oF`mkFj^3V3MSX&2JDN#AU(S5Nl?lE>`L1A}&;UR5#+hlF;> z`p6Q1QDp&lX9v*_b0w7ERhBKwbj_6|cqdUbin9V>|D`aN9&c2i=&@+IvzuUUvS?|F zm%@S>mVEu3oqebhCcr1?z&=jWD*m@Mk)~J7cg+-Ls2dQPhJIDeURIqcOr;#8R&H}U zmzvqv%{uGoCUsHI$$wBLc(d_a3S6Wk9V?3O#8woJC5oxuN?A2*Rui*8WIMzz5TJ&@ik7!`hE=R;`& z5*6b8s}U^cnWE#ffG`hNe$*4h1Bv*g8;D-Fi`w}rqtmWW14g%%bQhi=<|dn;2_SlX zCRl7>go>-vk_l%X#Qb=fAZ~QpgiHa^KErz&{IazkkFtCtuH+9BY!QpjW=229dQEf6 z7!XVBsAhiS1SD7^_YkhGo?She2NFR(Pj1f6UnIWZG<3Q>-)9yGn+b>NRD3Tu!JY@J zJT;1|!42X92kbx<0H>y+C z4i{AO+zmXz@8ehw5DR|J;`2vLqPny(AJ$%{V$T?#XCCQYTkv<9)g1kiTA0c%%qE)6 zqJe_xih#6htPThZ(#Pp1-*+;v%xNToN4h%k^z{?*UGDJrC|I(R{|b+&k1fI9NJRhs+*!y)G2AR@`zU=IGUFH@H&Fo_aiK8^b zr1$cvDdVd|*Fvr??Og*HJmFjhiM~Fw-E_x;70(Ep*jsvd@N1`T27e_nvHcm2@dnjzBa6W?_Bjx5SBA8pcDs;abFt)Hj`Yy8>eV&LjuV z>QkW;!&Hq^6XzMG*YZkF|7ytbaRtQUqI)|95ED*F$`|AdcbaY Z{SSILhhS>o!FK=v002ovPDHLkV1hGkTR#8* literal 0 HcmV?d00001 diff --git a/static/images/onlineHome/threeAffair3.png b/static/images/onlineHome/threeAffair3.png new file mode 100644 index 0000000000000000000000000000000000000000..c7e5488cd99609c6cee07dcf7ea5b40b4d4959d5 GIT binary patch literal 1633 zcmV-n2A=teP)6!V*pLJfjjs3-P_(} zx_h^K_wFqe(wj7C?#w-NzL|5r^Ucf(n#E^xo>nWNb}-RuZy4q=vM85L=p!=?+j*JV z7nRg;LDU)8kNGMI>dPeciJ*3T7ysir)moB+M4~&`DH^fK?mLsBk)ZZ;QFRKYvvoW> zmr2@zpkoJ>F49ursNWElc4j-oTn(SVarjchmrt<8e$$spx5MNxo-`?}nV^nhAOx7gnhT@K} z$nj zUJh0g0+F*jlXS`;w_KnO>8LDRS{cSIZZ(Ln|2FqaS@MS4x` z)s?5U7RfBaaw>nqz(STm5aMqS3h<}5R*aUCqfSgCkZN<$KuszHh5VV$aGG_eNeIZZ zSK-}J0BQ*bC8!r4%_LBO1vx%}w3d`BSU1$L**K^m$x}%P?qETMH!3i!*;&z|yE7~3 zdU@3f@^B4iYz$OT!XiYDOtk9$&OAOAa#Hl zN$}om!ui;5uO+S65>s3SICVm9OuZ!$LfMY=siw1)$cKnKP%=~IB%nd?VkrVE7KdJ z(R*^GaE|j%CgpryH~hS_a8{RNnNX-`6hj=N@p%-;>nIUxpbXYSYHf_ge#LQuZ?lU1 zo*SiQEw=ij*+I477f&bjH$irwVtOzzu5(0NGvkB~Kb$ozw}iSBbue$sz+xLJ`*$oE415v!iA3U8`BUQ&-9x%PeUol9s z{m8G~kyh(=fI>bELAJc)31Y^J?OMLz7VGDhl%3eTq$<;W>d~bb&2Ax3ct{x3bX{5>thYGg!=*W zU?!#CYD6YAMd@L8zOF+MqCZ23u5A<;*zYU+#%O0Fpt_23yT#(`2xI-@D826VD!NcN f{2Dbr7yJJY3Si6)f$=Ph00000NkvXXu0mjfLT3#q literal 0 HcmV?d00001