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] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AF=A6=E6=83=85-=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E9=9C=80=E6=B1=82=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= =?UTF-8?q?2?= 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 00000000..31ed33e1 --- /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 00000000..31ed33e1 --- /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 e62bd04b..4335105f 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); }