From b850e41c9fc8bccc152a52d7b9730af1c7163542 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 8 Dec 2021 15:14:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE-=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/measure/jgzs@2x.png | Bin 0 -> 1603 bytes src/assets/img/shuju/measure/lxdj@2x.png | Bin 0 -> 1426 bytes src/assets/img/shuju/measure/ly@2x.png | Bin 0 -> 1590 bytes src/assets/img/shuju/measure/qita.png | Bin 0 -> 1414 bytes src/assets/img/shuju/measure/xq@2x.png | Bin 0 -> 1913 bytes .../visual/communityParty/community.vue | 401 ++++++++++++++++++ src/views/modules/visual/measure/service.vue | 271 +++++------- 7 files changed, 496 insertions(+), 176 deletions(-) create mode 100644 src/assets/img/shuju/measure/jgzs@2x.png create mode 100644 src/assets/img/shuju/measure/lxdj@2x.png create mode 100644 src/assets/img/shuju/measure/ly@2x.png create mode 100644 src/assets/img/shuju/measure/qita.png create mode 100644 src/assets/img/shuju/measure/xq@2x.png diff --git a/src/assets/img/shuju/measure/jgzs@2x.png b/src/assets/img/shuju/measure/jgzs@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fd3e53c80d1795c1d67a90455181a3a537fd9f42 GIT binary patch literal 1603 zcmV-J2E6%+P)Px){YgYYR9M5cS6yrrRTSny(I^ilYGRE4e~Iyd7~inFGt=#EyIY|xbX%dcTS{rm z&dl}~idH0m8io1?#DJAn5iM+K*_ok*c4-TOw)_Z4@C5^j@r4Ip^nv&Txqj!|S=gk7 z!WNr+nd!afeCM3+o^z+2G2=FWyuHodtezF^o}QJbJnjTNbHZ zYwn%#fBdL>8=gXtc-HP#fdqtSPmA#GZ4ll>y+Bd|dxH1kE6;d(Tk`K{@T|V37ZBhA z1=R-Xg#WumBJWtC2%elLaiTy3zAq8J!KK36*C?QjQ2Lsd-I3s)xcM*wUsP-ZK}tpb znUKi;DJY+W)9&+3kk|8$6^ZNvHLQ@Qud!hI3G_C1s{K(BJYFb52on5p?)AziLFjZo z!8X~(D4G1H?}}Py%BYE&0QHK zpzW{SnLAbt!UZ5JCR_z+IZ z<&KqfUb7zyivT9Zmt68p1_^{`LH@IWqpyp=5s93UibYfT1x71MQ}z-IMc{Dx)3=>K z_*{4<5*Vi*NWqs}x@#&w-%wR|x=#QI4wpWgQ4jbJmG}Bb%S8&lgOwsDS!LeHp7zKl z-3J_h2S>{u%P0Xf&?-P&M}&?+_=Y20IiuxSbDf&|2!Y{*6Re*H<+*4wrIU$yj|AlRbV`nw=or8#B{356BM zoa?n>CzZYRf{}2aj0SpMQWIt^lq*mzqn;9H4#(KcoZzMylLn`GhT$5St^O$)O9I1G z9kUElE<`o!kkHqV^b-B$Wkhz&GOH$MEzyW(L34KF_N&`#y;?64oV7~v`;Z8 z)+FD4y;ZY}&t(GWdfR*x4W*-!V%h^nNJi=j&5G4%PP77@egQUD)c)G_nq^jLj`5z9 z8n$$Fwy}UXn9DXcvI>YndlS1J4MWv&melnyLZ-_>Jl~am6y3d@s;8cybH?9()!E4< zZ6KWon<($0>ByFR$d@>nixQW`ZKYTfj{xJ6N`MUL?1)rWVbnpoK@jb6lWT!Z4L4>Y zR)pqU=B{mE8`yI4@FfoBk`u8>9;LZ<;t`-}QVj^hk3hbfIvHnINfq*F+2(!@V3{An z{w)g1z&o#D&$VfjKJb+jw3_xMH#MSJHt7h$_%k?vL54IwAXzD;H5Nn8e5#s9$~Jc4 z*$sT@q8nB1cGW|F=pk7U6aHT&KSpn3x(x$%nHc&8UqP& zgJO@t?^tv9$(GNaeEB9Mb<7UpMnbRN^fIC(C`)%{H_K*%64ZF40I4DSqL3PqFCBiz z8Y@K#m@%FzYF_3rcMvCW-`f8JiRj~070)xqO3p7eDcy>Clbiw^4Vsg{QqvmtxZ|m6 zy3EKIV@DTKjvad&zM{{wPc>4DJ)_H+OM002ovPDHLkV1gf5 B6z%{3 literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/measure/lxdj@2x.png b/src/assets/img/shuju/measure/lxdj@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..2db1aea005d7a6871faeaf8652bf6c47984033e5 GIT binary patch literal 1426 zcmX|A2~bl<7=9!`l9xat@CZ2|kpZtd6qPFUm_`JVDKb_lGYqxTQUbJ!!$?uA3&R5i{KR7KE7Jrb~y2ChMV-5HZRoTIdT+c0?0QOb7@WJX6dfx|pMp>uJe< z^R5xWo*}rFi$Ax;2kh`ZTU=wOS8(wG1Rq4O0rob`VJ-%i|HqI$HfV>9b1;oP z2IgSHdW>^T;~dkNgK3;MB!)~Aj>E@E6A}tO zKBVId&iET=z!2|Ti6z(31aso8%Zl0w*Es@m?uNBiLeW38BbGK{3MRNu(+C&j!RI#; z`pv}3W>94~mIO|Xoicx!PMJ(KpUttH&4=f*$gl5ME#8FR{z+acChJQr^-BJVjJ2ZV zf#j=Yq}2hzT9w6Gzte{b(g!KsP(?D_qZ$Tyh7p0Wnq+*;G%69a-U4l;0+H*bu}Pt+ z4>9$#O)uCcjRQ~u%$g>hOfy1!!Vw4tX4kdhuYoBS;=L=O-$X2LwoLl`9C&=i@rMJ0 zAQIWaf;zB}^6(a1>gvEwJ=emiyM z_oU=x$+@)i=^0ts*_SToGkEDG6Ps4bOj z?G1VmJ{`M7Qx~0QbAj}>J#0LW%%Ec|!4AF!wyww%f@HF!4> z{eNHO4c0C$gvk>oyMihLV{WIH>0dps$T@M8X+DxeF8u7+9NffHL60)Yl)#iZ&c(T< zfWB+HdYwht9<~=fN{b7N!n(aYquB2HaQ=w0VX9qh|FK3C|?`-cwoPSclAtel*w1Yh}6MsbJQSH&_KJMsT&Ik!- z=*-!(QBf|ZdfmD@Ri9d4$lyp2PjAoLzJ}14I9g&{OsK(E$J*gnN1{_Z1eL;FTix8Y z+E%s-oW*7#CDyv8G(;Q~S$-!{9Lc^Q6+P*H1gDiGXbkP*D6_o@cW*iNTW-ww8W}Cw zc6Tv}Oio&?xxEw%*X8EjKR;i0zrLZN{`~dmPqL`Lnk7{_?P0SWzBvlH%3M4g$8u9j t%gy(XPv!=zch|?AythLga%C!oPKMIdwDx<_P(FClkiT!BPpx-&>c8Ir-U9#t literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/measure/ly@2x.png b/src/assets/img/shuju/measure/ly@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..76303b9c1428b8e885297aa1d720dc8cce4951d0 GIT binary patch literal 1590 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 LS41!#7@PYaC-IVr literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/measure/xq@2x.png b/src/assets/img/shuju/measure/xq@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..bb4674f9d32846c6a46bbc6479f40536a7103bf9 GIT binary patch literal 1913 zcmV-<2Zs2GP)Px+Gf6~2R9M5cRts=c4 zo?9h9$!BBJ1CoNqa><5zz;C!|Qy6aD(hSp!Ti}+$2uN&=Ao`kb-rSV^qvoDg6na=< z3w23s^>9x~J3Lw51AnPF3oqG+;AO;%N6*3BgMIM8&Q6$86b8x0I+(IKyy!S_+OH9V-j9H^=@Ae#n%>(Ks!eE@#(X*)n?5xVg|* zI2RKR_^YIkcw3D7m11yx-F)S<)`b?95` zwfN*Cj>rX5(>ZwZP?VebFVD}$pB<}yx}w!*jt+pj@eG3|lKAX;VY+albd;}e>W9C2 zWAOWm=&W()f6mi3<3(RAYG}p8%{>hBTv5~Y;^tMh>PPungfe^zWT8_Jj=KPDTiaAs z^T|40TQ}(2P9wVEp}m#+t`|4^%gVhO{%O#*c7qO~Z$1613C)1v#K{Bt<8d&2bCTgV z|E_`uKd*T0T72>mXOvH|h!Jxv_R9$sV2s698DcRYSmJT`v%d~zeQ^+ey{}^Dqvikk z<5PzZPbWNb;Olv0BOh^yI~r%~?DSDLCscr`t82FDdg51Go5{CI_qp)zO9rDf} zXP`CNatB%vQLvtmfUzs)m3xv8y?hj=O(?m{$^S`a=l>x+mMY6SlD26(;*|?i^{2ErRlmC#BNx+qSP3lORv6V(m)rEBifBFk+ ze{&-LN)6k%QyzZ}FOLKn?VXOC*!BWt7%Ue97MRxF}G=HR!IHp_vzuHL=l{0m6h z!-x*Pm=UpU*$&Q1f_gt+Vya8K^`46*IxoLIH_;H!2QMrF+_~UQ>%+aJdiSNR=32pJ z2=F^7hGI!0qs14C+IuM17(>Uc#A-h#5)Bakeg|8(423lKy0tR5E?s5xr*`XoDVw(H z(qd)R@O*Qky2~n5T-Mab*Q;HZ@^m%A2I3G`?Mbc5vh!-vAT61L+f3S&gC6VE9mot! ziCBP*Nch}d&35rBeAioNu1$Lkfz)R@AHQB*%`exuMieSfPrfqHv07DiQLd>LmXZ$( zEF~_*P%LSX7HNu)p@edc(ShXJ(E^CTo}GhVibqkcbn{EhLBV143t#DLQZ}78^%lO2 zF4nlyT9tc5sje0lkqv#Dh(p{QH~%Wdk_Kt94T=R&uB!^j44OEAE^dq5$-hUFjJ5@G zCnwi>h1KTZg=5A5E22o_72c(!1X`1ge8eFx#ZWArpo|t*Bo22O@wjtW3mmH^q+*xI&;p&R+q6qBaD^WQ%_9#eL&{n z?v}fR-(g1-Y{z1I*%gZr*DIM1IgE=jH=_MN+)7Ew>uCMa00000NkvXXu0mjfb(*OX literal 0 HcmV?d00001 diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index e69de29bb..30fdb4981 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -0,0 +1,401 @@ + + + + + + diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue index eff367fef..96cc33bac 100644 --- a/src/views/modules/visual/measure/service.vue +++ b/src/views/modules/visual/measure/service.vue @@ -29,7 +29,7 @@ -
+ + +
+
@@ -173,218 +177,125 @@ export default { async mounted() { await nextTick(100); this.initCharts() - this.initChartType() + // this.initChartType() this.getBuildingwarnlist(); }, methods: { initCharts() { - const eId = document.getElementById('echartOrg') + const eId = document.getElementById('echartsBox') let _charts = echarts.init(eId) + let option = { tooltip: { - show: false, - trigger: 'item' + trigger: 'axis', + axisPointer: { + // Use axis to trigger tooltip + type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow' + } }, legend: { - show: false, - orient: 'vertical', - top: '40%', - left: 'right', + top: 'bottom', + bottom: 'bottom', textStyle: { color: '#fff' } }, - title: { - text: '12000', //图形标题，配置在中间对应效果图的80% - subtext: '总数', - left: "center", - top: "center", - textStyle: { - color: "#fff", - fontSize: 28, - align: "center" + grid: { + left: '3%', + right: '4%', + bottom: '10%', + containLabel: true + }, + xAxis: { + type: 'category', + axisLabel: { + color: '#fff' + }, + data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + }, + yAxis: { + type: 'value', + splitLine: { + show: false }, - subtextStyle: { - fontSize: 16, + axisLabel: { color: '#fff' - } + }, + // axisLine: false }, series: [ { - // name: 'Access From', - type: 'pie', - // center: ['10%', '50%'], - radius: ['40%', '60%'], - avoidLabelOverlap: false, - // top: top + '%', - // height: '80%', - left: 'center', - width: 400, + name: '区域化党建单位', + type: 'bar', + stack: 'total', + // barWidth: 20, label: { - show: true, - position: 'outer', - alignTo: 'edge', - formatter: '{a|{c}}\n{r|}\n{name|{b}}', - minMargin: 5, - edgeDistance: 20, - lineHeight: 15, - color: '#fff', - fontSize: 12, - // padding: [5], - distanceToLabelLine: 10, - rich: { - name: { - padding: [0, 6, 0, 6] - }, - a: { - fontSize: 15, - color: '#fff', - padding: [0, 6, 0, 6] - }, - r: { - backgroundColor: 'auto', - borderRadius: 6, - width: 6, - height: 6, - // padding: [3, 3, 0, -12] - } - } + show: true }, emphasis: { - label: { - show: true, - fontSize: '14', - fontWeight: 'bold' - } + focus: 'series' }, - labelLine: { - show: true, - length: 20, - length2: 0, - maxSurfaceAngle: 80, - lineStyle: { - cap: 'round' - } + data: [320, 302, 301, 334, 390, 330, 320] + }, + { + name: '社会组织', + type: 'bar', + stack: 'total', + // barWidth: 20, + label: { + show: true }, - labelLayout: function (params) { - const isLeft = params.labelRect.x < _charts.getWidth() / 2; - const points = params.labelLinePoints; - // Update the end point. - points[2][0] = isLeft - ? params.labelRect.x - : params.labelRect.x + params.labelRect.width; - return { - labelLinePoints: points - }; + emphasis: { + focus: 'series' }, - data: [ - { value: 1048, name: 'Search Engine' }, - { value: 735, name: 'Direct' }, - { value: 580, name: 'Email' }, - { value: 484, name: 'Union Ads' }, - { value: 300, name: 'Video Ads' } - ] - } - ] - } - option && _charts.setOption(option); - - }, - initChartType() { - const eId = document.getElementById('echartType') - let _charts = echarts.init(eId) - let option = { - tooltip: { - trigger: 'item' - }, - legend: { - show: false, - orient: 'vertical', - top: '40%', - left: 'right', - textStyle: { - color: '#fff' - } - }, - title: { - text: '12000', //图形标题，配置在中间对应效果图的80% - subtext: '总数', - left: "center", - top: "center", - textStyle: { - color: "#fff", - fontSize: 28, - align: "center" + data: [120, 132, 101, 134, 90, 230, 210] }, - subtextStyle: { - fontSize: 16, - color: '#fff' - } - }, - series: [ { - // name: 'Access From', - type: 'pie', - // center: ['10%', '50%'], - radius: ['40%', '60%'], - avoidLabelOverlap: false, - // top: top + '%', - // height: '80%', - left: 'center', - width: 400, + name: '社区自组织', + type: 'bar', + stack: 'total', + // barWidth: 20, label: { - position: 'outer', - alignTo: 'labelLine', - formatter: '{name|{b}}\n{time|{c} 小时}', - minMargin: 5, - edgeDistance: 20, - lineHeight: 15, - color: '#fff', - fontSize: 15, - rich: { - time: { - fontSize: 10, - color: '#fff' - } - } + show: true }, emphasis: { - label: { - show: true, - fontSize: '14', - fontWeight: 'bold' - } + focus: 'series' }, - labelLine: { - show: true, - length: 20, - length2: 0, - maxSurfaceAngle: 80 + data: [220, 182, 191, 234, 290, 330, 310] + }, + { + name: '志愿者', + type: 'bar', + stack: 'total', + // barWidth: 20, + label: { + show: true }, - labelLayout: function (params) { - const isLeft = params.labelRect.x < _charts.getWidth() / 2; - const points = params.labelLinePoints; - // Update the end point. - points[2][0] = isLeft - ? params.labelRect.x - : params.labelRect.x + params.labelRect.width; - return { - labelLinePoints: points - }; + emphasis: { + focus: 'series' }, - data: [ - { value: 1048, name: 'Search Engine' }, - { value: 735, name: 'Direct' }, - { value: 580, name: 'Email' }, - { value: 484, name: 'Union Ads' }, - { value: 300, name: 'Video Ads' } - ] + data: [150, 212, 201, 154, 190, 330, 410] + }, + { + name: '未完成', + type: 'bar', + stack: 'total', + // barWidth: 20, + label: { + show: true + }, + emphasis: { + focus: 'series' + }, + data: [820, 832, 901, 934, 1290, 1330, 1320] } ] - } + }; + option && _charts.setOption(option); }, + onClickList(index, level) { this.activeIndex = index; this.activeLevel = level; @@ -597,4 +508,12 @@ export default { } } } + + +.echarts-boxs { + width: 100%; + height: 400px; +} + + From b4dfd8d553b8a0043da91ff030fa4acba23bfcb8 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 8 Dec 2021 15:17:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82=E6=A8=A1=E5=9D=97=E5=BC=80?= =?UTF-8?q?=E5=8F=912?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/top/1.png | Bin 0 -> 1191 bytes src/assets/img/shuju/top/2.png | Bin 0 -> 1373 bytes src/assets/img/shuju/top/3.png | Bin 0 -> 1329 bytes src/assets/scss/modules/visual/people.scss | 127 ++++- .../visual/basicinfo/cpts/demand-info.vue | 503 ++++++++++++++++++ .../visual/basicinfo/cpts/incident-info.vue | 503 ++++++++++++++++++ .../visual/basicinfo/cpts/topic-info.vue | 503 ++++++++++++++++++ src/views/modules/visual/basicinfo/people.vue | 290 +++++++++- 8 files changed, 1909 insertions(+), 17 deletions(-) create mode 100644 src/assets/img/shuju/top/1.png create mode 100644 src/assets/img/shuju/top/2.png create mode 100644 src/assets/img/shuju/top/3.png create mode 100644 src/views/modules/visual/basicinfo/cpts/demand-info.vue create mode 100644 src/views/modules/visual/basicinfo/cpts/incident-info.vue create mode 100644 src/views/modules/visual/basicinfo/cpts/topic-info.vue diff --git a/src/assets/img/shuju/top/1.png b/src/assets/img/shuju/top/1.png new file mode 100644 index 0000000000000000000000000000000000000000..1f4ddc87ff47aa84a12f45c8f427092aa127ef2e GIT binary patch literal 1191 zcmWks2~ZPf6izrQAW(5&N>Pwj(GJCGP11mJ3xOb}fQcY6$tIg@u8jr~u7dR#duWyE zFjbCH9V0rm9S}PmDYjVZ2!f);YC8yskz_Z??q&&!juJ5a+4=TA-h2P|zW3%GD-z^| zg~Ws~7>qD}eohJ4&XJe3|C5XBz6;up<3Vt!8BU}0sy~jw+dHlX|5DA=z)bwm4P#O4%nPhHLlg! zt56U?e5xe#6s}SP*Xu~00=TGbIkr!4uS5Z@-Hd`TK#QR|zys_cFJ{zZ6?&`^#StxF zz%^RHhU;{I0hHsAfo^CVa*acwaljg&+@aDs_aIAo#fWpS+9^?kEKZr)Ria!fR;Y4` zR6wn(6aaCRAw(fe?1Tvc473qNN}^avlqiYMkB~e$PzcnL`3jP+0OgYfFu4P!G9W4w zqOu^MoZ2p@a^zI5oDv(|DN^@V8R#3R+MOnIr$eAQG)GE*A_c9Wlcn@`t#otS%()Iv zo5l0J#nXP?^TYYs=5w%Z}G=#F<9^V$G#uO0Vd_ySEY&@(=tZ%^0M zYA{c*xkRvw!SwTgYguq`NLYCIij^xPquz~K9k*spLPBEF7B+{&P1&}MmnSF|mP1NJ zQ&nA4-*DjA@e_?57cTwOdAX;j_u3zQH;0EuMo0e{8=IJVI_+>0#PhiqFJ8U^-)rx} z;^LbO_QiEzq}%v8S;FKyoe$uefRCdCt(}I6t4lEHYxEOWuROl`8aC9dZ$)Q2U(ZjO z&a_T)+2aS}cCI@6X zok&=o2$g$cTc8t39f>!3GueUded$*Y-yi7JZiwE@>wmbGk>uBM_R&z&2LGuQ$;+%^ z-9b>b>A*mHWK+Cx_KnfMY+d*DYZN~~=*f5$`fdOC?X1v<(OW)iOn1DoyJziCc=U9s zIZztk{par+?}bNOOU=RH(ql>-3D-OYmzJR9lL^Ab1!@&El53%ze0 zI~`i4h@JFXA0TLaIDAOBMf7ZA?U(&mGIS5ZKdf8M{A%k5@sYe!h0Mk=-lc@m;^7rR zD+g-?+_+PPe(!B*7yle{FSs_p;YodjH!|dF_S1O`%NKi*24)4#TR51Oo~|;41;&m0 a&b-|`xk+?1S#uu@1%sa}$mz<4j{FZz2w5-y literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/top/2.png b/src/assets/img/shuju/top/2.png new file mode 100644 index 0000000000000000000000000000000000000000..fc2e96ca409708d24d39714760a3a2e018d46b10 GIT binary patch literal 1373 zcmWkt3piA17#>>N#Ur+swH0YMs+~kgQ7L1P$~4Rj8TZ?`Gng=}GDDdZB9~%v->p?? z(o!q+uwB;1lP`+whm`@a8s-{<>J(`lXtE7q(akw^w! z2dKWlTP%)cOMs=e6g>t`C*9YRLTY=u4k3|rpU@98-NEJpzyfK3MOw()Kb*%JD^HqW zImvm!@-x8%%bpOi2oYzZHBZeVe@t+b)g{U5_)|XH&^*>Oi>#n+!ZUoK#!Qv>CM3yg zvXPG^dQ8@E(KH%d%E5!2plU8$&xe1@ku~v=iUe6j0xV9)ID6sdoXPrQu$U(+kC&Bj zRQ@*VBU{uyWV9ei=|e_xnOK|~)WnyGdCFi%s5x83+^V8)LHIsUeWuFi7bSg*D!`72 zqsT>JSj;{ZgDk5`#8MA}r6P;24BSCP?naOM5kU?}ejwD4g-7jyYtpbJPeuCS#k8dy zB4nqEu@xK<;m$~&KbR}oc5qcPNDeh-L5+O4k+1Z#k)MfN+_`j2kwF6%s>^`t0Wv`# zxCU1yfe^Sl1-`(AFQ$Sg;M(*>QY9Q&X^iY#tgI|GhiJW*De2+EV64wn~2fVA?n zQS#zwc`*mcJBkPb5Fs0siWCGPCxekwAxL2;Qq4my@KC-Fn(d3`FwkF_Xf6woLQnXk z<;iG8sv_+Wprhbjfmj zjt66cP%J+jXo5%Y#iLzt&OSV5KOXCf$5C+pQ9OrD1nnS#0UUu!MCdLe%n7JOMC=Bt z5@~dT#~?CT#F=EGgiDA8O4c?Yl+xc;d33unz)s1wR|YyLubv0GseH*mSQXP+ef^@k zt!ApDWxBg!;a;g@wP=gRen1NAY}V43dt{ zl5f6Ux?Er1(9m$zs@2BECZ?uq)|qek*=n=xc01?YdtLUqAEeV6EOtm}OhQ6pT1K`& zR8m=4RdeZ5^W_`uw>t0Kf7Cbdbny9$;gQiX=_DkRA((P%W>zydH$Sh{e)$sX{bLOH zQO~`ouFPHikzoznjOcV$*~CLjax_|9%L;jMP8#1+?9P7X{D+0j-KIaUv~}IHd?V5e z4smkmu(i3|e(lcv-c=9e-!XaQZp_XhVeIldx>kjb)QxVr-1!!B-=cB#sg|EM zt{1mcz0Ut#caB-05*XOWw?dMG9-S7H_4bi{T|L&K+eW=L9WBLXxetW*Fy6^4HT62> WUM&6c2Zt;{Gm*U9Y1B4KnDBp$*WaiB literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/top/3.png b/src/assets/img/shuju/top/3.png new file mode 100644 index 0000000000000000000000000000000000000000..7e89e21541c733cc32f0e98f507c08e8a3e916da GIT binary patch literal 1329 zcmV-11Px(>q$gGR9M69S6yrrWfVQ%%yiwtmeSTzOQDu7T4)oZf(b|@Rt!;63W|y^CI)#y zeF5VO5W<6j=mVN)NZBiAWlMMVJJ*N(nVFqg zECio)l1aY(neUu??z#871N_%7btexUJGy?V;%L-TtcK7QZ4W53uSYT8$4_aRQG3B?~NhQjRLw|A3Du+xVe>&(h}GBGA>fu@%I}5V4eq z157Uo2%%gzM4az(M5rg5kVEG?+H1x{pr>bZwV}|VgdsOb2H1((1Dpl(Dd5~wY}?*B zCIV@Dbh8qcP@Iq5YKXd=nTq#Jf0yI}a#LDNA;@yPA zJ>eQO&R&g3Wg~73oX5!{IVig0-y>K=U+6Y8G|@IltJ!j`k!7d&260YhRa|e7r$SMF!upGd*J_WkE*404R zl#4VcccHl=l~Dk|&~Jx4=Ccz6nGH)y{lMa+52Aw=Flf$DqT!g2aC;%Q>FICQ1ERsv zxTg|A<0b(B>_jZEKjajFNRtRu&Ie8kl&;A|?rAjQQbP!xisv_-IHeWg@&=eCr6{X= z2&3^oFwnWRKmjLx+5N_y-!XdvaAMf2fFNr=@k&R3o#%*!CpMsJ`jhz>uKj)-92sm-& znDq4Xg6>u}X%1#A{t%4|-^~-vk>g0__%}kOFhdots3oshcAwtBR@~CEDFx~yeqiSy zO8nIYJ2`}Kc^x7(b3Nq7*UbX}j1FA_N3OzM&W^VPigLJUBLZbNgo}|ik;i~pp!kLF zQQf=*ljp5Q;?i6&m4Hz)9_7*b0D$YKzw$WWdyYuTrrukWz_3~QS%rONixM^j9=9Z7 zr*;D*s+ty|yz#O8vvy(-@l*S8{ij_Xk9hO1cTa!o$1As-ho`VOqxtEgAFXFWv?Xz%=2IEsPVRYk6~ z5QcDN{o1~d#xxPxG**Jr?e~EMR)@#1bhq&Qy)6j5D1kXkb|hh@o>9WiTMQUZx1%6% zZWIELt@p1v`NnMzrL)>Pu7$!wtxEVF$h7}>4IWsWwZs(ga>JV5H{Aos9le +
+
+ +
+ + 更多信息 +
+ +
+ +
+ +
+
+
+ 所属网格： + {{ gridName }} +
+
+ 所属小区： + {{ xiaoquName }} +
+
+ 所属楼宇： + {{ louName }}-{{ danyuanName }} +
+
+ 所属家庭： + {{ homeName }} +
+
+ {{ field.label }}： + + {{ + info[field.columnName] == null + ? "--" + : getOptionLabel( + field.options, + info[field.columnName], + field.itemType + ) + }} + + {{ + info[field.columnName] == null ? "--" : info[field.columnName] + }} +
+
+ +
+
+ +
+
+ +
+
+ {{ item.label }} +
+
+ +
+
+ +
+
+
+
+ {{ field.label }}： + {{ + infoItem[field.columnName] == null + ? "--" + : getOptionLabel( + field.options, + infoItem[field.columnName], + field.itemType + ) + }} + + {{ + infoItem[field.columnName] == null + ? "--" + : infoItem[field.columnName] + }} +
+
+
+
+
+ {{ field.label }}： + {{ + !allInfo[group.tableName] || + allInfo[group.tableName][0][field.columnName] == null + ? "--" + : getOptionLabel( + field.options, + allInfo[group.tableName][0][field.columnName], + field.itemType + ) + }} + + {{ + !allInfo[group.tableName] || + allInfo[group.tableName][0][field.columnName] == null + ? "--" + : allInfo[group.tableName][0][field.columnName] + }} +
+
+
+ +
+
+ + + + + diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue new file mode 100644 index 000000000..31ed33e1e --- /dev/null +++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue @@ -0,0 +1,503 @@ + + + + + diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue new file mode 100644 index 000000000..31ed33e1e --- /dev/null +++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue @@ -0,0 +1,503 @@ + + + + + diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index e62bd04bf..4335105fd 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -304,16 +304,17 @@ :loading="demand.loading" :header="demand.header" :list="demand.list" + @operate="handleOperateDemandList" > -
+
@@ -326,9 +327,71 @@
- 上报事件 + 上报事件 + 发布话题 +
+
+
+
+
{{ item.eventContent }}
+
{{ item.reportTime }}
+
+
+ +
+ + +
+
+ +
+
+
+
{{ item.eventContent }}
+
{{ item.reportTime }}
+
+
+ +
+ + +
-
@@ -338,11 +401,67 @@ 积分记录
-
+ +
+
+
+
+
+
{{ item.point }}
+
+
+
{{ item.title }}
+
{{ item.dateTime }}
+
+
+
+
+ +
+ + +
+
+ + + + + + @@ -351,6 +470,9 @@ import { Loading } from "element-ui"; //引入Loading服务 import { requestPost } from "@/js/dai/request"; import cptCard from "@/views/modules/visual/cpts/card"; import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more"; +import demandInfo from "@/views/modules/visual/basicinfo/cpts/demand-info"; +import incidentInfo from "@/views/modules/visual/basicinfo/cpts/incident-info"; +import topicInfo from "@/views/modules/visual/basicinfo/cpts/topic-info"; import cptTb from "@/views/modules/visual/cpts/tb"; export default { @@ -358,10 +480,12 @@ export default { data() { return { showedMoreInfo: false, + showedDemandInfo: false, userId: "", info: { + epmetUserId: "", financialSituation: { monthlyIncome: "", retirementAmount: "" }, gridName: "", houseInfo: [], @@ -413,10 +537,44 @@ export default { ], header: ["序号", "服务时间", "需求类型", "需求内容", "状态", "操作"], list: [], + srcList: [], + currentIndex: 0, pageSize: 5, pageNo: 1, total: 0, }, + + showedIncidentOrTopic: "incident", + + incident: { + loading: false, + list: [], + pageSize: 10, + pageNo: 1, + total: 0, + showedInfo: false, + currentIndex: 0, + }, + + topic: { + loading: false, + list: [], + pageSize: 10, + pageNo: 1, + total: 0, + showedInfo: false, + currentIndex: 0, + }, + + point: { + loading: false, + list: [], + pageSize: 10, + pageNo: 1, + total: 0, + showedInfo: false, + currentIndex: 0, + }, }; }, @@ -434,6 +592,9 @@ export default { cptCard, peopleMore, cptTb, + demandInfo, + incidentInfo, + topicInfo }, watch: { @@ -454,10 +615,13 @@ export default { methods: { handleSearch() {}, - getApiData() { - this.getInfo(); + async getApiData() { + await this.getInfo(); this.getHouseInfo(); this.getDemandData(); + this.getIncidentData(); + this.getTopicData(); + this.getPointData(); }, toUserInfo(uid) { @@ -496,16 +660,23 @@ export default { } }, - handlePageNoChange_demand(val) { + handlePageNoChangeDemand(val) { this.demand.pageNo = val; this.getDemandData(); }, + handleOperateDemandList(index, type) { + if (type == "查看") { + this.showedDemandInfo = true; + this.demand.currentIndex = index; + } + }, + //加载组织数据 async getDemandData() { - const url = - "http://yapi.elinkservice.cn/mock/245/heart/userdemand/mydemand"; + const url = "/heart/userdemand/mydemand"; let params = { + epmetUserId: this.info.epmetUserId, userId: this.userId, pageNo: this.demand.pageNo, pageSize: this.demand.pageSize, @@ -520,12 +691,109 @@ export default { return [ { type: "index" }, item.wantServiceTime, - item.content, item.categoryName, + item.content, item.statusName, { type: "operate", list: ["查看"] }, ]; }); + this.demand.srcList = data.list; + } else { + this.$message.error(msg); + } + }, + + handlePageNoChangeIncident(val) { + this.incident.pageNo = val; + this.getIncidentData(); + }, + + handleClickIncident(index) { + this.incident.showedInfo = true; + this.incident.currentIndex = index; + }, + + //加载组织数据 + async getIncidentData() { + const url = + "http://yapi.elinkservice.cn/mock/245/gov/project/resievent/pageuserreported"; + let params = { + epmetUserId: this.info.epmetUserId, + userId: this.userId, + pageNo: this.incident.pageNo, + pageSize: this.incident.pageSize, + }; + + const { data, code, msg } = await requestPost(url, params); + this.incident.loading = false; + + if (code === 0) { + this.incident.total = data.total; + this.incident.list = data.list; + } else { + this.$message.error(msg); + } + }, + + handlePageNoChangeTopic(val) { + this.topic.pageNo = val; + this.getTopicData(); + }, + + handleClickTopic(index) { + this.topic.showedInfo = true; + this.topic.currentIndex = index; + }, + + //加载组织数据 + async getTopicData() { + const url = + "http://yapi.elinkservice.cn/mock/245/gov/project/resievent/pageuserreported"; + let params = { + epmetUserId: this.info.epmetUserId, + userId: this.userId, + pageNo: this.topic.pageNo, + pageSize: this.topic.pageSize, + }; + + const { data, code, msg } = await requestPost(url, params); + this.topic.loading = false; + + if (code === 0) { + this.topic.total = data.total; + this.topic.list = data.list; + } else { + this.$message.error(msg); + } + }, + + handlePageNoChangePoint(val) { + this.point.pageNo = val; + this.getPointData(); + }, + + handleClickPoint(index) { + this.point.showedInfo = true; + this.point.currentIndex = index; + }, + + //加载组织数据 + async getPointData() { + const url = + "http://yapi.elinkservice.cn/mock/245/point/resi/point/pageuserpoint"; + let params = { + epmetUserId: this.info.epmetUserId, + userId: this.userId, + pageNo: this.point.pageNo, + pageSize: this.point.pageSize, + }; + + const { data, code, msg } = await requestPost(url, params); + this.point.loading = false; + + if (code === 0) { + this.point.total = data.total; + this.point.list = data.list; } else { this.$message.error(msg); } From 16e446e318b15406368c484724f2a4c51f071dff Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 8 Dec 2021 16:40:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/communityGovern/resiPieOption.js | 76 +++++++++++-------- .../visual/communityGovern/resibuzz.vue | 26 +++++-- 2 files changed, 67 insertions(+), 35 deletions(-) diff --git a/src/views/modules/visual/communityGovern/resiPieOption.js b/src/views/modules/visual/communityGovern/resiPieOption.js index 58d04e13b..6562f8882 100644 --- a/src/views/modules/visual/communityGovern/resiPieOption.js +++ b/src/views/modules/visual/communityGovern/resiPieOption.js @@ -1,5 +1,5 @@ -export function pieOption () { +export function pieOption (_charts) { const center= ['50%', '250px'] return { title: { @@ -47,25 +47,19 @@ const center= ['50%', '250px'] center: center, radius: ['55%', '55.3%'], label: { - normal: { - show: false - } + show: false }, labelLine: { - normal: { - show: false - } + show: false }, data: [{ value: 360, itemStyle: { - normal: { - color: 'rgba(40, 101, 250, 0)', - width:0, - borderColor: 'rgba(40, 101, 250, 0.5)', - borderWidth: 1, - borderType: 'dotted' - } + color: 'rgba(40, 101, 250, 0)', + width:0, + borderColor: 'rgba(40, 101, 250, 0.5)', + borderWidth: 1, + borderType: 'dotted' } } ] @@ -85,33 +79,55 @@ const center= ['50%', '250px'] left: 'center', width: 400, label: { - position: 'outer', - // alignTo: 'edge', - formatter: '{a|{c}}\n\n{name|{b}}', - // minMargin: 100, - // edgeDistance: 0, - // lineHeight: 20, + // show: false, + position: 'outside', + alignTo: 'edge', + // formatter: '{a|{c}}\n\n{name|{b}}', + formatter: '{a|{c}}\n{r|}\n{name|{b}}', + minMargin: 5, + edgeDistance: 1, + lineHeight: 15, color: '#fff', fontSize: 12, - distanceToLabelLine: -60, + // distanceToLabelLine: -60, rich: { + name: { + padding: [0, 6, 0, 6] + }, a: { - fontSize: '30px', - color: ' #00F5FE', - + fontSize: 30, + color: '#fff', + padding: [0, 6, 6, 6] }, - b: { - lineHeight: 0, - fontSize: '20px', - color: ' #FFFFFF' - + r: { + backgroundColor: 'auto', + borderRadius: 6, + width: 6, + height: 6, + // padding: [3, 3, 0, -12] } } }, labelLine: { + show: false, smooth: 0.2, length: 30, - length2: 90 + length2: 0, + maxSurfaceAngle: 80 + }, + labelLayout: function (params) { + const isLeft = params.labelRect.x < _charts.getWidth() / 2; + const points = params.labelLinePoints; + // Update the end point. + if (points) { + points[2][0] = isLeft + ? params.labelRect.x + : params.labelRect.x + params.labelRect.width; + } + + return { + labelLinePoints: points + }; }, // itemStyle: { // normal:{ diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue index c286a3969..efe639c0d 100644 --- a/src/views/modules/visual/communityGovern/resibuzz.vue +++ b/src/views/modules/visual/communityGovern/resibuzz.vue @@ -116,6 +116,7 @@ export default { pageSize: 10, pageNo: 1, total: 0, + pieChartS: null }, }; }, @@ -159,8 +160,9 @@ export default { }, methods: { - pieInitOk () { - console.log('pie准备好了') + pieInitOk (dom) { + console.log('pie准备好了', dom) + this.pieChartS = dom this.pieInitState = true }, @@ -180,12 +182,13 @@ export default { // const res = await getMonthPieChart(this.shibeiAId) // 获取pieChart配置 - this.pieOption = pieOption() + this.pieOption = pieOption(this.pieChartS) + this.pieOption.title.text = this.pieTotal + this.pieOption.series[1].data = this.pieData this.clickPie(0) - this.pieOption.title.text = this.pieTotal - this.pieOption.series[1].data = this.pieData + this.$refs.pieChart.setOption(this.pieOption) @@ -212,6 +215,19 @@ export default { } }; + console.log('zhilma') + // element.labelLayout = (params) => { + // const isLeft = params.labelRect.x < this.pieChartS.getWidth() / 2; + // const points = params.labelLinePoints; + // console.log('isLeft', isLeft, points) + // // Update the end point. + // points[2][0] = isLeft + // ? params.labelRect.x + // : params.labelRect.x + params.labelRect.width; + // return { + // labelLinePoints: points + // }; + // } } else { element.label = {