From 3105b5a91fdbde26629b094dc10a66d48c70187c Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 13 Dec 2021 17:30:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=AF=9D?= =?UTF-8?q?=E9=A2=98=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 + .../scss/modules/visual/incident-info.scss | 51 +- .../visual/basicinfo/cpts/incident-info.vue | 261 ++++-- .../visual/basicinfo/cpts/topic-info.vue | 804 +++++++++++------- src/views/modules/visual/basicinfo/people.vue | 13 +- src/views/modules/visual/cpts/line-chart.vue | 214 +++++ 6 files changed, 947 insertions(+), 398 deletions(-) create mode 100644 src/views/modules/visual/cpts/line-chart.vue diff --git a/public/index.html b/public/index.html index dfbf8452..397b7f46 100644 --- a/public/index.html +++ b/public/index.html @@ -6,6 +6,8 @@ + + diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue index 31ed33e1..3bb9f932 100644 --- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue @@ -4,62 +4,31 @@
- 更多信息 + 话题详情
-
-
-
- 所属网格： - {{ 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] - }} -
+
+
话题内容
+
{{ info.topicContent }}
+
+ +
+
+ 发布时间： + {{ info.releaseTime }} +
+
+ 话题地址： + {{ info.releaseAddress }} +
+
+ 所属网格： + {{ info.gridName }}
- -
@@ -89,81 +58,197 @@
-
-
-
-
- {{ field.label }}： - {{ - infoItem[field.columnName] == null - ? "--" - : getOptionLabel( - field.options, - infoItem[field.columnName], - field.itemType - ) - }} - - {{ - infoItem[field.columnName] == null - ? "--" - : infoItem[field.columnName] - }} +
+
+
+ + 加载中 +
+
+ +
+
+
+ +
+ +
+
+
+
+ 议题标题： + {{ issueInfo.issueTitle }} +
+
+ 议题建议： + {{ issueInfo.issueSuggestion }} +
+
+ 所属网格： + {{ issueInfo.belongsGridName || "--" }} +
+
+ 议题发起人： + {{ issueInfo.issueInitiator }} +
+
+ 议题来源： + {{ issueInfo.topicInfo.groupName }} +
+
+ 转议题时间： + {{ issueInfo.shiftIssueTime }} +
+ +
+
+
+
+ {{ issueTrend.realityVoteCount }}/{{ + issueTrend.shouldVoteCount + }} +
+
已表决/应表决
+
+
+
{{ issueTrend.supportAmount }}
+
支持
+
+
+
{{ issueTrend.oppositionAmount }}
+
反对
+
+
+ + +
+
+
+
-
-
- {{ 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] - }} + +
+
+
+
+ 项目标题： + {{ projectInfo.projectTitle }} +
+
+ 项目方案： + {{ projectInfo.projectTitle }} +
+
+ 内部备注： + {{ projectInfo.internalRemark || "--" }} +
+
+ 当前处理部门： + {{ projectInfo.departmentNameList.join("、") }} +
+
+ 分类： +
+
+ {{ item.name }} +
+
+
+
+ 标签： +
+
+ {{ item.name }} +
+
+
+
+ +
+
处理进展
+
+
+
+
{{ item.processName }}
+
+ {{ item.processTime }} +
+
+ +
+
处理部门：
+
{{ item.departmentName }}
+
+ +
+
说 明：
+
+ {{ item.publicReply }} +
+
+ +
+
内部备注：
+
+ {{ + item.internalRemark + }} +
+
+
+
+ + + {{ att.name }} + +
+
+
+
+
+
+
+
@@ -174,16 +259,25 @@ - + diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index 42241b4c..03656ab7 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -448,17 +448,18 @@ />
diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue new file mode 100644 index 00000000..99795ad5 --- /dev/null +++ b/src/views/modules/visual/cpts/line-chart.vue @@ -0,0 +1,214 @@ + + + + + From f25ebb1a6f6175044d22f4e26ba83cd85fe35a13 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 13 Dec 2021 17:32:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B2=BB=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production.sit | 4 +- public/index.html | 4 +- src/assets/img/shuju/volunteer1.png | Bin 0 -> 2333 bytes src/assets/img/shuju/volunteer2.png | Bin 0 -> 2164 bytes src/assets/img/shuju/volunteer3.png | Bin 0 -> 2211 bytes src/assets/img/shuju/volunteer4.png | Bin 0 -> 2440 bytes src/assets/img/shuju/volunteer5.png | Bin 0 -> 2147 bytes src/assets/img/shuju/volunteer6.png | Bin 0 -> 2152 bytes src/assets/img/shuju/volunteer7.png | Bin 0 -> 2508 bytes src/assets/img/shuju/volunteer8.png | Bin 0 -> 2330 bytes src/assets/img/shuju/volunteer9.png | Bin 0 -> 2360 bytes .../modules/visual/distributionAnalyze.scss | 18 ++ src/assets/scss/modules/visual/resibuzz.scss | 27 +- .../scss/modules/visual/typeAnalyze.scss | 24 +- .../communityGovern/distributionAnalyze.vue | 239 ++++++++++-------- .../visual/communityGovern/processAnalyze.vue | 119 +++++---- .../visual/communityGovern/resibuzz.vue | 135 ++++++---- .../visual/communityGovern/typeAnalyze.vue | 136 +++++----- .../visual/components/screen-map/index.vue | 35 ++- .../modules/visual/measure/volunteer.vue | 147 +++++------ 21 files changed, 500 insertions(+), 392 deletions(-) create mode 100644 src/assets/img/shuju/volunteer1.png create mode 100644 src/assets/img/shuju/volunteer2.png create mode 100644 src/assets/img/shuju/volunteer3.png create mode 100644 src/assets/img/shuju/volunteer4.png create mode 100644 src/assets/img/shuju/volunteer5.png create mode 100644 src/assets/img/shuju/volunteer6.png create mode 100644 src/assets/img/shuju/volunteer7.png create mode 100644 src/assets/img/shuju/volunteer8.png create mode 100644 src/assets/img/shuju/volunteer9.png diff --git a/.env.development b/.env.development index 2ad1156b..b3e49ab5 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ NODE_ENV=development -VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api -# VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api +VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = http://192.168.51.36:8080/api # VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api VUE_APP_NODE_ENV=dev diff --git a/.env.production.sit b/.env.production.sit index de86de77..b0c600ea 100644 --- a/.env.production.sit +++ b/.env.production.sit @@ -1,5 +1,5 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api -# VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api +VUE_APP_API_SERVER = http://192.168.1.140/api VUE_APP_NODE_ENV=prod:sit VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index ef957a4c..3d3861c7 100644 --- a/public/index.html +++ b/public/index.html @@ -36,8 +36,8 @@ <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %> diff --git a/src/assets/img/shuju/volunteer1.png b/src/assets/img/shuju/volunteer1.png new file mode 100644 index 0000000000000000000000000000000000000000..2937ab236572a64d02fc0533b6bef8c9df4c1016 GIT binary patch literal 2333 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 literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/volunteer4.png b/src/assets/img/shuju/volunteer4.png new file mode 100644 index 0000000000000000000000000000000000000000..e2fe9f32b4ec327dc21da1c6796148d243926533 GIT binary patch literal 2440 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 Z{te3orT_!`@9+Qs002ovPDHLkV1hCEA7TIi literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/volunteer6.png b/src/assets/img/shuju/volunteer6.png new file mode 100644 index 0000000000000000000000000000000000000000..361d6f510a873b117944eb2193bf42268e8c7589 GIT binary patch literal 2152 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 ABme*a literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/volunteer9.png b/src/assets/img/shuju/volunteer9.png new file mode 100644 index 0000000000000000000000000000000000000000..6e2f64027c1d82567a69cf65ab84882bf6d9eb3c GIT binary patch literal 2360 zcmV-83CH${P)Px-@<~KNR9Hu~muskIS9!;O&suBm{a(+RbD1-jjLFHEMx9JeY=n>xrKTeIC5kbT z*pwoIA6msC#YR)n8KP8)6bpW+LIqKZ7!)s9!ImmYLaW7uNaH1v$w_AB%(=`t?|ILA z*_XA}Q}%vmoMfU{XPXnZrED)xK9q^F;K zkG@%da@X1;@BI0-taWWb_kG>29yebMruE)3>7od!pWs6NgWRl_H`!50`gz)ayBbG-^!!u%58Zm}D+aWD`mvu4`m1k@VlnEe&03$M z(91WeT!$j*PUj})AC8E(p}OczyXTYa{vw^b(}nW4bE7kF*gAFB=;ffU$z|P7|LTb{ z>D^{yiH+3@(U>2pns*_RMdRx59lA1qw=rR4eEue@v7^TQrnK1~2itm&CH!(SE^g!0 zE#)f$)cgDY`FXJE8$=_ma3fo_{MK%|M0?1X}))t!5fM3 zq!K^iZ3hwg&(TL-cjwE&)W84V7E%>Nw4OBgsVARMF}KyzMFU2|cLyK4{cSvQq1$rB zq5MNPJj)j}VSLsRZMRmKLx!zH}$Vl?u>rL);**Z#VlU;JD> z(Zq^iTK~NFcdvgRr%AZsIm6m&tV6KrHQZHTSAc5z6G#J6)P2L@vIKizn)=L zvwpxM?6gPc9N6s6|Aj#K0%lPfup^hk;M*C`dFDq%`)gAM3zxq z0al1|ge;v;;{NfKjVBLDj11996pt~5eUuQEr zRJF?-2e(>4k4ok-b_I>gSaS!<$)AB$MKO^EG}$8auG2@x);ZES1V~0)^BAEP-zyLxCyq+ zvik^g<|Nzx3rzhvqKObqE!NF3(|LicK%yo31W~0v>NY#m#%gtOR9kJ%+)mHk&xPV2 zDfQn#hZwhwF$2oI3BzN>OM#*}fZ9WNKSw`#Hw*5qO!WJVsweSM5JG4c(D)*ttHl2@ z(B<1Tw6&Jh9H4Lh6e~BgnSY)j|BcaIg4-rBdkxUBW97_c-HnVMT}m@gw98mMLf|_3 z?r!?-1gg(4)n8MEt;TJtB}zmIM7`|5nZ=CE1XjdhBqNa?slASt{2^W!7*yY87cc-kamb0Kfdp0GV??C7gStQ1l#&waSWabXK_9Th4uregFMbrVR6Qbsb zsfZe84it-MhS0)D4TzE|>;zcI$r}+33RyI*{0TZ{8I3TrS))%H%vaD9=Y_~-j zx{V;l`bByWF-M7Ui72lkk()6bCY5=dsWT`bQX5!lUDm_c! zR}Bbp18q`%8%YMW(h|)Ccd)3{`id}iHxi`NrWLvb?ISES*@i43vV<~E&}D>L7UqF2 zP-kboHC)cCh)M-of9*a{Te23z-R4}h4&ZGxUL@)sQAV`fgnU0|c&wTUV_kBb#&W}R zj{Uimq-v38v+W~lAJZ&8*L0 + :show-all-levels="false" + @change="handleChangeAgency">
+
@@ -73,7 +84,8 @@ import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts import screenMap from "@/views/modules/visual/components/screen-map"; import { lineOption } from './distributionLineOption.js' import * as echarts from 'echarts' - +import nextTick from 'dai-js/tools/nextTick' +import ScreenLoading from "@/views/modules/visual/components/screen-loading"; export default { name: "HomeMap", @@ -104,57 +116,57 @@ export default { legend: [], lineData: [820, 932, 901, 934, 1290, 1330, 1320], lineList: [ - { - time: '4:00', - categoryList: [ - { - categoryCode: '001', - count: 100, - color: '#1B51FF', - name: '分类1' - }, - { - categoryCode: '002', - count: 200, - color: '#00E5ED', - name: '分类2' - } - ] - }, - { - time: '5:00', - categoryList: [ - { - categoryCode: '001', - count: 20, - color: '#1B51FF', - name: '分类1' - }, - { - categoryCode: '002', - count: 400, - color: '#00E5ED', - name: '分类2' - } - ] - }, - { - time: '6:00', - categoryList: [ - { - categoryCode: '001', - count: 50, - color: '#1B51FF', - name: '分类1' - }, - { - categoryCode: '002', - count: 10, - color: '#00E5ED', - name: '分类2' - } - ] - } + // { + // time: '4:00', + // categoryList: [ + // { + // categoryCode: '001', + // count: 100, + // color: '#1B51FF', + // name: '分类1' + // }, + // { + // categoryCode: '002', + // count: 200, + // color: '#00E5ED', + // name: '分类2' + // } + // ] + // }, + // { + // time: '5:00', + // categoryList: [ + // { + // categoryCode: '001', + // count: 20, + // color: '#1B51FF', + // name: '分类1' + // }, + // { + // categoryCode: '002', + // count: 400, + // color: '#00E5ED', + // name: '分类2' + // } + // ] + // }, + // { + // time: '6:00', + // categoryList: [ + // { + // categoryCode: '001', + // count: 50, + // color: '#1B51FF', + // name: '分类1' + // }, + // { + // categoryCode: '002', + // count: 10, + // color: '#00E5ED', + // name: '分类2' + // } + // ] + // } ], timeRange: [], @@ -194,8 +206,10 @@ export default { this.userId = this.uid; this.initData() await this.getAgencylist()//获取组织级别 + await nextTick(500) await this.loadOrgData() - this.getApiData(); + await this.getApiData(); + }, methods: { @@ -241,31 +255,46 @@ export default { await this.loadMapData(); }, - async getAgencylist () { - const url = '/gov/org/customeragency/agencylist' - // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist' + // 获取当前登录人员信息及组织信息 + getAgencylist () { + const url = '/gov/org/customeragency/staffinagencylist' + let params = {} + window.app.ajax.post( + url, + params, + (data, rspMsg) => { + this.agencyInfo = data.agencyList + this.orgId = this.agencyInfo.agencyId + if (!this.agencyInfo.latitude) { + this.agencyInfo.latitude = 36.072227 + } + if (!this.agencyInfo.longitude) { + this.agencyInfo.longitude = 120.389455 + } + if (!this.agencyInfo.level) { + this.agencyInfo.level = 'street' + } - const params = { - // customerId: '613cc61a6b8ce4c70d21bd413dac72cc' - customerId: '0c41b272ee9ee95ac6f184ad548a30eb' - } - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - ++this.iscascaderShow - this.casOptions = [] - this.agencyIdArray.length = [] + //组织级联数据 + ++this.iscascaderShow + this.casOptions = [] + this.agencyIdArray.length = [] - if (data) { - this.casOptions.push(data) + if (data.subAgencyList) { + data.agencyList.subAgencyList = data.subAgencyList + this.casOptions.push(data.agencyList) + this.agencyIdArray.push(this.orgId) + } + + }, + (rspMsg, data) => { + this.$message.error(rspMsg) } + ) - } else { - this.$message.error(msg) - } }, handleChangeDate (value) { - this.dateId = value this.getApiData() }, @@ -283,16 +312,16 @@ export default { if (code === 0) { - this.agencyInfo = data - if (!data.latitude) { - this.agencyInfo.latitude = 36.072227 - } - if (!data.longitude) { - this.agencyInfo.longitude = 120.389455 - } - if (!data.level) { - this.agencyInfo.level = 'street' - } + // this.agencyInfo = data + // if (!data.latitude) { + // this.agencyInfo.latitude = 36.072227 + // } + // if (!data.longitude) { + // this.agencyInfo.longitude = 120.389455 + // } + // if (!data.level) { + // this.agencyInfo.level = 'street' + // } this.subAgencyArray = [] if (data.children && data.children.length > 0) { this.subAgencyArray = data.children @@ -307,12 +336,10 @@ export default { }, async loadMapData () { - this.$refs.lineChart.clear() - const _that = this // this.$refs.lineChart.showLoading() - // const url ="/gov/project/project/projectdistributionanalysisright"; - const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisright"; + const url = "/gov/project/project/projectdistributionanalysisright"; + // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisright"; let params = { orgId: this.orgId, startDate: this.timeRange.length > 0 && this.timeRange[0] || '', @@ -349,7 +376,7 @@ export default { ) } if (data.list && data.list.length > 0) { - // this.mapList = data.list + this.mapList = data.list } else { @@ -357,7 +384,7 @@ export default { } this.mapList.forEach(item => { - // debugger + for (let i = 0; i < this.subAgencyArray.length; i++) { let agencyItem = this.subAgencyArray[i] if (item.orgId === agencyItem.id) { @@ -409,10 +436,7 @@ export default { } }, - lineInitOk (dom) { - - this.lineInitState = true }, @@ -428,11 +452,10 @@ export default { // 获取折线图 async getLineChart () { this.$refs.lineChart.clear() - const _that = this - // this.$refs.lineChart.showLoading() - // const url ="/gov/project/project/projectdistributionanalysisleft"; - const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft"; + this.$refs.lineChart.showLoading() + const url = "/gov/project/project/projectdistributionanalysisleft"; + // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft"; let params = { orgId: this.orgId, startDate: this.timeRange.length > 0 && this.timeRange[0] || '', @@ -440,24 +463,27 @@ export default { }; const { data, code, msg } = await requestPost(url, params); - + this.$refs.lineChart.hideLoading() if (code === 0) { // 获取pieChart配置 this.lineOption = lineOption() if (data && data.length > 0) { - + this.lineList = data this.loadCategoryData() - } else { + + this.$refs.lineChart.setOption(this.lineOption, true) + this.$refs.lineChart.setOption({ + xAxis: { data: this.xaxis }, + legend: { data: this.legend }, + series: this.series + }, true) + } else { + this.lineList = [] } - this.$refs.lineChart.setOption(this.lineOption, true) - this.$refs.lineChart.setOption({ - xAxis: { data: this.xaxis }, - legend: { data: this.legend }, - series: this.series - }, true) + } else { @@ -548,7 +574,8 @@ export default { cptCard, cptTb, screenEchartsFrame, - screenMap + screenMap, + ScreenLoading }, watch: { diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue index a151cf58..4e2e852d 100644 --- a/src/views/modules/visual/communityGovern/processAnalyze.vue +++ b/src/views/modules/visual/communityGovern/processAnalyze.vue @@ -12,17 +12,17 @@ :key="iscascaderShow" :options="casOptions" :props="optionProps" - @change="handleChangeAgency" - clearable> + :show-all-levels="false" + @change="handleChangeAgency">
- + value-format="yyyy-MM-dd">
@@ -108,6 +108,7 @@ import screenMap from "@/views/modules/visual/components/screen-map"; import { pieOption } from './processPieOption.js' import { lineOption } from './processLineOption.js' +import nextTick from 'dai-js/tools/nextTick' export default { @@ -156,6 +157,7 @@ export default { ], dateId: '', + dateIdShow: '', agencyId: '', status: 'pending',//状态:待处理 pending，结案closed agencyInfo: {}, @@ -225,16 +227,26 @@ export default { async mounted () { this.userId = this.uid; + this.initData() - await this.getWorkUserInfo() + + // this.agencyInfo = this.$store.state.user + // this.agencyId = this.agencyInfo.agencyId + + // await this.getWorkUserInfo() await this.getAgencylist()//获取组织级别 - this.getApiData(); + await nextTick(500) + await this.getApiData(); }, methods: { initData () { var time = (new Date).getTime() - 24 * 60 * 60 * 1000; - this.dateId = new Date(time); // 获取的是前一天日期 + var nowdate = new Date(time); // 获取的是前一天日期 + var y = nowdate.getFullYear(); + var m = nowdate.getMonth() + 1 < 10 ? "0" + (nowdate.getMonth() + 1) : nowdate.getMonth() + 1; + var d = nowdate.getDate() < 10 ? "0" + nowdate.getDate() : nowdate.getDate(); + this.dateIdShow = y + '-' + m + '-' + d; }, async getApiData () { @@ -245,29 +257,41 @@ export default { }, handleChangeDate (value) { - this.dateId = value + this.dateIdShow = value + this.getApiData() }, - // 获取当前管理员信息 - getWorkUserInfo () { - const url = '/epmetuser/customerstaff/staffbasicinfo' + // 获取当前登录人员信息及组织信息 + getAgencylist () { + const url = '/gov/org/customeragency/agencygridtree' let params = {} window.app.ajax.post( url, params, (data, rspMsg) => { this.agencyInfo = data - if (!data.latitude) { + this.agencyId = this.agencyInfo.agencyId + if (!this.agencyInfo.latitude) { this.agencyInfo.latitude = 36.072227 } - if (!data.longitude) { + if (!this.agencyInfo.longitude) { this.agencyInfo.longitude = 120.389455 } - if (!data.level) { + if (!this.agencyInfo.level) { this.agencyInfo.level = 'street' } + //组织级联数据 + ++this.iscascaderShow + this.casOptions = [] + this.agencyIdArray.length = [] + + if (data) { + this.casOptions.push(data) + this.agencyIdArray.push(this.agencyId) + } + }, (rspMsg, data) => { this.$message.error(rspMsg) @@ -276,41 +300,19 @@ export default { }, - async getAgencylist () { - const url = '/gov/org/customeragency/agencylist' - // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist' - - const params = { - // customerId: '613cc61a6b8ce4c70d21bd413dac72cc' - customerId: '0c41b272ee9ee95ac6f184ad548a30eb' - } - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - ++this.iscascaderShow - this.casOptions = [] - this.agencyIdArray.length = [] - - if (data) { - this.casOptions.push(data) - } - - } else { - this.$message.error(msg) - } - }, - //加载项目 async getProjectTotal () { - // const url = "/data/aggregator/project/projecttotal"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projecttotal"; + this.$refs.pieChart.showLoading() + const url = "/data/aggregator/project/projecttotal"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projecttotal"; let params = { - agencyId: '', + agencyId: this.agencyId, dateId: this.dateId, }; const { data, code, msg } = await requestPost(url, params); - + this.$refs.pieChart.hideLoading() if (code === 0) { this.projectTotal = data.projectTotal this.dateIncr = data.dateIncr @@ -339,10 +341,10 @@ export default { //加载项目 async loadProjectlist () { - // const url = "/data/aggregator/project/projectstatuslist"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectstatuslist"; + const url = "/data/aggregator/project/projectstatuslist"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectstatuslist"; let params = { - agencyId: '', + agencyId: this.agencyId, dateId: this.dateId, status: this.status }; @@ -352,13 +354,13 @@ export default { if (code === 0) { - // this.projectList = [...data] - if (this.status === 'closed') { - this.projectList = this.projectList1 - } else { - this.projectList = this.projectList2 + this.projectList = [...data] + // if (this.status === 'closed') { + // this.projectList = this.projectList1 + // } else { + // this.projectList = this.projectList2 - } + // } this.projectList.forEach(item => { item.values_ = { name: item.title @@ -410,7 +412,7 @@ export default { if (this.isfirstInit) { //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray - this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle) + this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000) } else { this.$refs.map.refreshMap(null, this.projectList) @@ -446,18 +448,18 @@ export default { // 获取折线图 async getLineChart () { this.$refs.lineChart.clear() - + this.$refs.lineChart.showLoading() const _that = this // this.$refs.pieChart.showLoading() - // const url ="/data/aggregator/project/projectmonthincr"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectmonthincr"; + const url = "/data/aggregator/project/projectmonthincr"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectmonthincr"; let params = { agencyId: this.agencyId, dateId: this.dateId, }; const { data, code, msg } = await requestPost(url, params); - + this.$refs.lineChart.hideLoading() if (code === 0) { // 获取pieChart配置 this.lineOption = lineOption() @@ -504,7 +506,7 @@ export default { this.$refs.pieChart.clear() this.pieTotal = 0 const _that = this - // this.$refs.pieChart.showLoading() + // 获取pieChart配置 this.pieOption = pieOption(this.pieChartS) @@ -597,6 +599,11 @@ export default { }, watch: { + dateIdShow () { + + let dataArray = this.dateIdShow.split('-') + this.dateId = dataArray.join('') + }, uid (id) { this.userId = id; }, diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue index f042af0b..8d79875b 100644 --- a/src/views/modules/visual/communityGovern/resibuzz.vue +++ b/src/views/modules/visual/communityGovern/resibuzz.vue @@ -12,8 +12,8 @@ :key="iscascaderShow" :options="casOptions" :props="optionProps" - @change="handleChangeAgency" - clearable> + :show-all-levels="false" + @change="handleChangeAgency">
-
- - -
- +
+ + +
@@ -71,6 +70,7 @@ import cptTb from "@/views/modules/visual/cpts/tb"; import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame"; import { pieOption } from './resiPieOption.js' +import nextTick from 'dai-js/tools/nextTick' export default { @@ -121,6 +121,7 @@ export default { status: 'all', orgId: '', + orgTypeSel: '', demand: { loading: true, colList: [ @@ -184,7 +185,7 @@ export default { optionProps: { multiple: false, - value: 'agencyId', + value: 'orgLevel', label: 'agencyName', children: 'subAgencyList', checkStrictly: true @@ -199,41 +200,60 @@ export default { async mounted () { this.userId = this.uid; + await this.getAgencylist()//获取组织级别 + await nextTick(500) this.getApiData(); }, methods: { async getApiData () { - await this.getAgencylist()//获取组织级别 + await this.getPie() await this.getTable(); }, - async getAgencylist () { - const url = '/gov/org/customeragency/agencylist' - // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist' + // 获取当前登录人员信息及组织信息 + getAgencylist () { + const url = '/gov/org/customeragency/agencygridtree' + let params = {} + window.app.ajax.post( + url, + params, + (data, rspMsg) => { + this.agencyInfo = data + this.orgId = this.agencyInfo.agencyId + this.orgType = this.agencyInfo.level === 'grid' ? 'grid' : 'agency' + + + if (!this.agencyInfo.latitude) { + this.agencyInfo.latitude = 36.072227 + } + if (!this.agencyInfo.longitude) { + this.agencyInfo.longitude = 120.389455 + } + if (!this.agencyInfo.level) { + this.agencyInfo.level = 'street' + } - const params = { - // customerId: '613cc61a6b8ce4c70d21bd413dac72cc' - customerId: '0c41b272ee9ee95ac6f184ad548a30eb' - } - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - ++this.iscascaderShow - this.casOptions = [] - this.agencyIdArray.length = [] + //组织级联数据 + ++this.iscascaderShow + this.casOptions = [] + this.agencyIdArray.length = [] - if (data) { - this.casOptions.push(data) + if (data) { + this.casOptions.push(data) + this.agencyIdArray.push(this.agencyInfo.orgLevel) + } + + }, + (rspMsg, data) => { + this.$message.error(rspMsg) } + ) - } else { - this.$message.error(msg) - } }, - pieInitOk (dom) { console.log('pie准备好了', dom) this.pieChartS = dom @@ -255,22 +275,21 @@ export default { this.pieTotal = 0 const _that = this // this.$refs.pieChart.showLoading() - // const url ="/gov/issue/issue/resibuzz-leftpiechart"; - const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz-leftpiechart"; + const url = "/gov/issue/issue/resibuzz-leftpiechart"; + // const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz-leftpiechart"; let params = { orgId: this.orgId, + orgType: this.orgType, + }; const { data, code, msg } = await requestPost(url, params); - // 获取pieChart配置 - - if (code === 0) { // 获取pieChart配置 this.pieOption = pieOption(this.pieChartS) if (data && data.length > 0) { - // this.pieData = data + this.pieData = data } else { this.pieData = [{ count: 0, categoryName: '无分类', color: '#00E5ED' }] @@ -359,19 +378,29 @@ export default { }, handleChangeAgency (value) { - console.log(value) - this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label - this.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '' - console.log(this.agencyIdArray) + let orgArray = [] + let key = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '' + if (key) { + orgArray = key.split('-') + this.orgId = orgArray[0] + this.orgType = orgArray[1] + } else { + this.orgId = '' + this.orgType = '' + } + + this.getApiData() + }, //加载组织数据 async getTable () { - // const url = "/gov/issue/issue/resibuzz"; - const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz"; + const url = "/gov/issue/issue/resibuzz"; + // const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz"; let params = { status: this.status, orgId: this.orgId, + orgType: this.orgType, pageNo: this.demand.pageNo, pageSize: this.demand.pageSize, }; @@ -384,15 +413,15 @@ export default { this.demand.list = data.list.map((item) => { return [ { type: "index" }, - item.issueTitle, - item.suggestion, - item.categoryName, - item.status, - item.createdTime, - item.issueOriginator, - item.voteAccount, - item.supportCount, - item.oppositionCount, + item.issueTitle ? item.issueTitle : '', + item.suggestion ? item.suggestion : '', + item.categoryName.join(','), + item.status ? item.status : '', + item.createdTime ? item.createdTime : '', + item.issueOriginator ? item.issueOriginator : '', + item.voteAccount ? item.voteAccount : '', + item.supportCount ? item.supportCount : '', + item.oppositionCount ? item.oppositionCount : '', { type: "operate", list: ["查看"] }, ]; }); diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue index 8e77ebdb..61e1bfd6 100644 --- a/src/views/modules/visual/communityGovern/typeAnalyze.vue +++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue @@ -12,18 +12,18 @@ :key="iscascaderShow" :options="casOptions" :props="optionProps" - @change="handleChangeAgency" - clearable> + :show-all-levels="false" + @change="handleChangeAgency">
- + value-format="yyyy-MM-dd">
@@ -45,15 +45,16 @@ :header="demand.header" :list="demand.list"> -
- - -
+ + +
+ +
@@ -71,7 +72,7 @@ import cptTb from "@/views/modules/visual/cpts/tb"; import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame"; import { pieOption } from './typePieOption.js' - +import nextTick from 'dai-js/tools/nextTick' export default { name: "HomeMap", @@ -100,6 +101,7 @@ export default { { total: 300, categoryName: '街道安全', color: '#FAC126' } ], + dateIdShow: '', agencyId: '', dateId: '', categoryCode: '', @@ -160,6 +162,7 @@ export default { multiple: false, value: 'agencyId', label: 'agencyName', + orgType: 'orgType', children: 'subAgencyList', checkStrictly: true }, @@ -175,48 +178,62 @@ export default { this.userId = this.uid; this.initData() await this.getAgencylist()//获取组织级别 - this.getApiData(); + await nextTick(500) + await this.getPie() }, methods: { initData () { var time = (new Date).getTime() - 24 * 60 * 60 * 1000; - this.dateId = new Date(time); // 获取的是前一天日期 + var nowdate = new Date(time); // 获取的是前一天日期 + var y = nowdate.getFullYear(); + var m = nowdate.getMonth() + 1 < 10 ? "0" + (nowdate.getMonth() + 1) : nowdate.getMonth() + 1; + var d = nowdate.getDate() < 10 ? "0" + nowdate.getDate() : nowdate.getDate(); + this.dateIdShow = y + '-' + m + '-' + d; }, - async getApiData () { - await this.getPie() - await this.getTable(); - }, + // 获取当前登录人员信息及组织信息 + getAgencylist () { + const url = '/gov/org/customeragency/agencygridtree' + let params = {} + window.app.ajax.post( + url, + params, + (data, rspMsg) => { + this.agencyInfo = data + this.agencyId = this.agencyInfo.agencyId + if (!this.agencyInfo.latitude) { + this.agencyInfo.latitude = 36.072227 + } + if (!this.agencyInfo.longitude) { + this.agencyInfo.longitude = 120.389455 + } + if (!this.agencyInfo.level) { + this.agencyInfo.level = 'street' + } - async getAgencylist () { - const url = '/gov/org/customeragency/agencylist' - // const url = 'http://yapi.elinkservice.cn/mock/102/gov/org/agency/agencylist' + //组织级联数据 + ++this.iscascaderShow + this.casOptions = [] + this.agencyIdArray.length = [] - const params = { - // customerId: '613cc61a6b8ce4c70d21bd413dac72cc' - customerId: '0c41b272ee9ee95ac6f184ad548a30eb' - } - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - ++this.iscascaderShow - this.casOptions = [] - this.agencyIdArray.length = [] + if (data) { + this.casOptions.push(data) + this.agencyIdArray.push(this.agencyId) + } - if (data) { - this.casOptions.push(data) + }, + (rspMsg, data) => { + this.$message.error(rspMsg) } + ) - } else { - this.$message.error(msg) - } }, handleChangeDate (value) { - - this.dateId = value - this.getApiData() + this.dateIdShow = value + this.getPie() }, @@ -241,8 +258,8 @@ export default { this.pieTotal = 0 const _that = this // this.$refs.pieChart.showLoading() - // const url ="/data/aggregator/project/projectcategorylist"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectcategorylist"; + const url = "/data/aggregator/project/projectcategorylist"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectcategorylist"; let params = { agencyId: this.agencyId, dateId: this.dateId, @@ -255,7 +272,7 @@ export default { // 获取pieChart配置 this.pieOption = pieOption(this.pieChartS) if (data && data.length > 0) { - // this.pieData = data + this.pieData = data } else { this.pieData = [{ total: 0, categoryName: '无分类', color: '#00E5ED' }] @@ -274,14 +291,13 @@ export default { maxValue = item.value maxIndex = index item.selected = true + this.categoryCode = item.categoryCode } else if (index !== 0) { item.selected = false } }); - - this.pieOption.title.text = this.pieTotal this.pieOption.series[1].itemStyle = { color: function (params) { @@ -293,8 +309,6 @@ export default { let fun = function (params) { _that.clickPie(params.dataIndex) - _that.categoryCode = _that.pieData[params.dataIndex].categoryCode - _that.getTable() } this.$refs.pieChart.handleClick(fun) this.clickPie(maxIndex) @@ -304,7 +318,7 @@ export default { }, - clickPie (seriesIndex) { + async clickPie (seriesIndex) { this.pieData.forEach((element, index) => { if (index === seriesIndex) { element.label = { @@ -340,20 +354,22 @@ export default { // this.$refs.pieChart.hideLoading() this.$refs.pieChart.setOption(this.pieOption) + this.categoryCode = this.pieData[seriesIndex].categoryCode + this.getTable() }, handleChangeAgency (value) { this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '' - this.getApiData() + this.getPie() console.log(this.agencyIdArray) }, //加载组织数据 async getTable () { - // const url = "/data/aggregator/project/categoryprojectlist"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/categoryprojectlist"; + const url = "/data/aggregator/project/categoryprojectlist"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/categoryprojectlist"; let params = { dateId: this.dateId, agencyId: this.agencyId, @@ -375,13 +391,13 @@ export default { item.statusShow = item.status === 'pending' ? '待处理' : '已结案' return [ { type: "index" }, - item.projectCode, + item.projectCode ? item.projectCode : '', item.categoryNames.join(','), - item.originShow, - item.gridName, - item.statusShow, - item.title, - item.time, + item.originShow ? item.originShow : '', + item.gridName ? item.gridName : '', + item.statusShow ? item.statusShow : '', + item.title ? item.title : '', + item.time ? item.time : '', { type: "operate", list: ["查看"] }, ]; }); @@ -415,11 +431,15 @@ export default { }, watch: { + dateIdShow () { + let dataArray = this.dateIdShow.split('-') + this.dateId = dataArray.join('') + }, uid (id) { this.userId = id; }, userId () { - this.getApiData(); + this.getPie() window.scrollTo(0, 0); }, }, diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index c2648b0a..107a6622 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -24,6 +24,7 @@ import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/int import { getCenter, boundingExtent } from 'ol/extent.js'; import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js'; import { altKeyOnly, click, pointerMove } from 'ol/events/condition'; +import { getDistance } from 'ol/sphere'; import { mapGetters } from "vuex"; import { Loading } from 'element-ui'; //引入Loading服务 @@ -134,6 +135,7 @@ const vueGis = { //icon图标样式 iconUrlArray: [], iconTextColor: '#ffffff', + distanceMax: null,//显示的坐标距离中心点的范围 } }, @@ -143,13 +145,14 @@ const vueGis = { }, methods: { //加载地图:地图基本信息，多边形区域信息，多边形icon - loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle) { + loadMap (mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray, iconTextStyle, distanceMax) { this.mapInfo = mapInfo this.polygonArray = polygonArray this.polIconUrlArray = polIconUrlArray this.iconArrays = iconArrays this.iconUrlArray = iconUrlArray this.iconTextStyle = iconTextStyle + this.distanceMax = distanceMax //初始化地图 this.initMap() @@ -302,11 +305,12 @@ const vueGis = { //加载icon图标 loadIcon () { iconSource.clear()//清空多边形标注 + if (this.iconArrays && this.iconArrays.length > 0) { let iconFeatures = []; + let iconArraysNew = [] this.iconArrays.forEach((oneIcon, index) => { - let urlNum = this.getRndBetween(1, 3) //添加标注 let iconItem = new Feature({ geometry: new Point([oneIcon.longitude, oneIcon.latitude]), @@ -328,7 +332,16 @@ const vueGis = { }); iconItem.setStyle(iconStyle); - iconFeatures.push(iconItem); + if (this.distanceMax) { + if (this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)) { + iconFeatures.push(iconItem); + } + } else { + iconFeatures.push(iconItem); + } + + + }); @@ -349,6 +362,22 @@ const vueGis = { }, + //计算和中心点距离 + computedDistance (lon, lat, max) { + let c1 = [2]; c1[0] = lon; c1[1] = lat; + let distance = getDistance(this.centerPoint, c1); + console.log(distance) + return (distance < max || distance === max) + + + + + // debugger + // return + // var wgs84Sphere = new ol.Sphere(6378137); + // wgs84Sphere.haversineDistance([120.21592590991689, 30.210793016606],[120.21670777384473, 30.211168525868086]); + }, + //初始化地图 initMap () { this.setMapLocation() diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue index 8850c540..a39f7e78 100644 --- a/src/views/modules/visual/measure/volunteer.vue +++ b/src/views/modules/visual/measure/volunteer.vue @@ -72,26 +72,16 @@
-
-
-
调解员
-
-
-
-
调解员
-
-
-
-
能人达人
-
-
-
-
治安巡逻
-
-
-
-
代办员
+ +
+ + +
{{item.optionLabel}}
+
@@ -148,44 +138,20 @@ export default { //地图相关数据 isfirstInit: true,//记录是否是首次加载地图 agencyInfo: {},//登陆者的组织信息：主要为了获取地图中心点和level - unitMapList: [], - unitMapList1: [ - { - type: '党建楼宇', - name: '建联单位1', - latitude: 36.062227, - longitude: 120.389455, - }, - { - type: '党建楼宇', - name: '建联单位2', - latitude: 36.082227, - longitude: 120.389455, - }, - { - type: '机关直属部门', - name: '建联单位3', - latitude: 36.062227, - longitude: 120.379455, - }, - { - type: '两新党建', - name: '建联单位4', - latitude: 36.082227, - longitude: 120.379455, - }, - { - type: '辖区单位', - name: '建联单位5', - latitude: 36.092227, - longitude: 120.379455, - }, - { - type: '其他', - name: '建联单位6', - latitude: 36.102227, - longitude: 120.379455, - } + distributionsList: [], + + legendArray: [], + + iconUrlArray: [ + require('../../../../assets/img/shuju/volunteer1.png'),//文化队伍 + require('../../../../assets/img/shuju/volunteer2.png'),//楼委会 + require('../../../../assets/img/shuju/volunteer3.png'),//能人达人 + require('../../../../assets/img/shuju/volunteer4.png'),//老友俱乐部 + require('../../../../assets/img/shuju/volunteer5.png'),//代办员 + require('../../../../assets/img/shuju/volunteer6.png'),//调解员 + require('../../../../assets/img/shuju/volunteer7.png'),//采集员 + require('../../../../assets/img/shuju/volunteer8.png'),//治安巡逻 + require('../../../../assets/img/shuju/volunteer9.png'),//其他 ], }; }, @@ -427,49 +393,58 @@ export default { }, + + //获取联建单位分布图 async getMapUnitList () { - // const url = "/heart/icpartyunit/distribution" - const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" + const url = "/epmetuser/volunteer/distribution" + // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" let params = { - agencyId: this.$store.state.user.agencyId + customerId: this.$store.state.user.customerId } const { data, code, msg } = await requestPost(url, params) if (code === 0) { - // this.unitMapList = data - this.unitMapList = this.unitMapList1 - - this.unitMapList.forEach(item => { - - if (item.type === '党建楼宇') { - item.urlIndex = 0 - } else if (item.type === '两新党建') { - item.urlIndex = 1 - } else if (item.type === '辖区单位') { - item.urlIndex = 2 - } else if (item.type === '机关直属部门') { - item.urlIndex = 3 - } else if (item.type === '其他') { - item.urlIndex = 4 - } - }); + this.legendArray = data.legends + this.legendArray.forEach((legendTtem, index) => { + if (index < this.iconUrlArray.length) { + legendTtem.url = this.iconUrlArray[index] + } else {//超过原型数量的都默认为第一个图标 + legendTtem.url = this.iconUrlArray[0] + } - this.iconUrlArray = [ - require('../../../../assets/img/shuju/measure/ly@2x.png'),//未处理 - require('../../../../assets/img/shuju/measure/jgzs@2x.png'),//已处理 - require('../../../../assets/img/shuju/measure/lxdj@2x.png'),//已处理 - require('../../../../assets/img/shuju/measure/xq@2x.png'),//已处理 - require('../../../../assets/img/shuju/measure/qita.png')//已处理 - ] + }); + this.legendArray.push({ + optionValue: 'other', + optionLabel: '其他', + url: this.iconUrlArray[8] + }) + + this.distributionsList = data.distributions + + this.distributionsList.forEach(item => { + let typeShow = '' + if (item.volunteerCategories.length > 0) { + typeShow = item.volunteerCategories[0] + } else { + typeShow = 'other' + } + item.urlIndex = 0 + for (let i = 0; i < this.legendArray.length; i++) { + if (typeShow === this.legendArray[i].optionValue) { + item.urlIndex = i + break; + } + } + }); + console.log(this.distributionsList) //第一次加载完置为false this.loadMap() - this.isfirstInit = false } else { @@ -483,7 +458,7 @@ export default { loadMap () { if (this.isfirstInit) { //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray - this.$refs.map.loadMap(this.agencyInfo, null, null, this.unitMapList, this.iconUrlArray, null) + this.$refs.map.loadMap(this.agencyInfo, null, null, this.distributionsList, this.iconUrlArray, null) } else { this.$refs.map.refreshMap(null, this.unitMapList) From 8a8fc5abadff28a96dd79d491300a65b016a5b66 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 14 Dec 2021 10:00:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=AF=9D?= =?UTF-8?q?=E9=A2=98=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/incident-info.scss | 2 + .../visual/basicinfo/cpts/incident-info.vue | 230 +++++++------- .../visual/basicinfo/cpts/topic-info.vue | 283 ++++++++++-------- src/views/modules/visual/cpts/line-chart.vue | 10 +- 4 files changed, 291 insertions(+), 234 deletions(-) diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss index b59c7a1d..989b7d56 100644 --- a/src/assets/scss/modules/visual/incident-info.scss +++ b/src/assets/scss/modules/visual/incident-info.scss @@ -176,6 +176,8 @@ } .m-line { + min-width: 400px; + .stat { margin: 20px 0 10px; display: flex; diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue index ce0975e1..19c524fb 100644 --- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue @@ -15,7 +15,12 @@
事件内容
{{ info.eventContent }}
- +
提交时间： @@ -72,6 +77,7 @@ :userName="yanPan.icUserName" :singleList="yanPan.categoryList" @user="toUserInfo" + @project="toProjectInfo" /> 加载中
@@ -110,7 +116,7 @@ 当前处理部门： {{ projectInfo.departmentNameList.join("、") }}
-
+
分类：
@@ -118,7 +124,7 @@
-
+
标签：
@@ -208,6 +214,108 @@ import cptTb from "@/views/modules/visual/cpts/tb"; import analyse from "@/views/modules/visual/cpts/analyse"; import dateFormat from "dai-js/tools/dateFormat"; +function iniData() { + return { + groupList: [ + { label: "研判分析" }, + { label: "查看回复" }, + { label: "查看项目" }, + ], + groupIndex: 0, + startGroupIndex: 0, + + info: { + eventTime: "", + eventContent: "", + eventAddress: "", + gridName: "", + isClosed: true, + isResolve: true, + isRollback: true, + eventImgs: [], + eventPerson: [], + eventOrg: [], + eventPeopleName: "", + projectInfo: { + projectId: "", + operationName: "", + operationTime: "", + projectDeclare: "", + }, + }, + + comment: { + loading: true, + colList: [ + { + align: "center", + width: "20%", + }, + { + align: "center", + width: "30%", + }, + { + align: "left", + width: "50%", + }, + ], + header: ["回复者", "回复时间", "回复内容"], + list: [], + }, + + projectProcess: [], + + projectInfo: { + backGround: "", + departmentList: [ + // { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] }, + ], + departmentNameList: [], + internalRemark: "", + isSend: false, + locateAddress: "", + locateDimension: "", + locateLongitude: "", + origin: "", + originId: "", + platformIds: [], + processable: false, + projectId: "", + projectStatus: "pending", + projectTitle: "", + publicReply: "", + returnable: false, + }, + + projectCate: [], + projectTag: [], + + yanPan: { + loading: false, + + icResiUserId: "", + houseId: "", + icUserName: "", + epmetUserIdList: [], + houseUserList: [ + // { + // icResiUserId: '', + // icUserName: '', + // } + ], + categoryList: [], + projectData: [ + // { + // firstCategoryCode: '', + // firstCategoryName: '', + // projectList: [], + // } + ], + }, + }; +} + export default { name: "demandInfo", props: { @@ -232,112 +340,16 @@ export default { screenLoading, }, - data() { - return { - groupList: [ - { label: "研判分析" }, - { label: "查看回复" }, - { label: "查看项目" }, - ], - groupIndex: 0, - startGroupIndex: 0, - - info: { - eventTime: "", - eventContent: "", - eventAddress: "", - gridName: "", - isClosed: true, - isResolve: true, - isRollback: true, - eventImgs: [], - eventPerson: [], - eventOrg: [], - eventPeopleName: "", - projectInfo: { - projectId: "", - operationName: "", - operationTime: "", - projectDeclare: "", - }, - }, - - comment: { - loading: true, - colList: [ - { - align: "center", - width: "20%", - }, - { - align: "center", - width: "30%", - }, - { - align: "left", - width: "50%", - }, - ], - header: ["回复者", "回复时间", "回复内容"], - list: [], - }, - - projectProcess: [], - - projectInfo: { - backGround: "", - departmentList: [ - // { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] }, - ], - departmentNameList: [], - internalRemark: "", - isSend: false, - locateAddress: "", - locateDimension: "", - locateLongitude: "", - origin: "", - originId: "", - platformIds: [], - processable: false, - projectId: "", - projectStatus: "pending", - projectTitle: "", - publicReply: "", - returnable: false, - }, - - projectCate: [], - projectTag: [], - - yanPan: { - loading: false, - - icResiUserId: "", - houseId: "", - icUserName: "", - epmetUserIdList: [], - houseUserList: [ - // { - // icResiUserId: '', - // icUserName: '', - // } - ], - categoryList: [], - projectData: [ - // { - // firstCategoryCode: '', - // firstCategoryName: '', - // projectList: [], - // } - ], - }, - }; - }, + data: iniData, computed: {}, watch: { resiEventId() { + let data = iniData(); + Object.keys(data).forEach((k) => { + this[k] = data[k]; + }); this.getApiData(); }, }, @@ -347,6 +359,10 @@ export default { }, methods: { + watchImg(src) { + window.open(src); + }, + addStartGroupIndex() { const { startGroupIndex, groupList } = this; if (startGroupIndex < groupList.length - 9) { @@ -496,6 +512,7 @@ export default { statusName: subItem.projectStatus == "pending" ? "待处理" : "结案", projectId: subItem.projectId, + resiEventId: subItem.resiEventId, }; }), }; @@ -512,6 +529,11 @@ export default { path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`, }); }, + + toProjectInfo(item) { + console.log(item) + this.resiEventId = item.resiEventId; + }, }, }; diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue index 3bb9f932..b024d344 100644 --- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue @@ -15,7 +15,12 @@
话题内容
{{ info.topicContent }}
- +
发布时间： @@ -68,6 +73,7 @@ :userName="yanPan.icUserName" :singleList="yanPan.categoryList" @user="toUserInfo" + @project="toProjectInfo" /> 加载中
@@ -137,7 +143,10 @@
- +
@@ -266,6 +275,133 @@ import lineChart from "@/views/modules/visual/cpts/line-chart"; import analyse from "@/views/modules/visual/cpts/analyse"; import dateFormat from "dai-js/tools/dateFormat"; +function iniData() { + return { + groupList: [ + { label: "研判分析" }, + { label: "话题评论" }, + { label: "查看议题" }, + { label: "查看项目" }, + ], + groupIndex: 0, + startGroupIndex: 0, + + info: { + badgeList: [], + closeDetail: { + closeUserName: "", + closeDateTime: "-1", + closeReason: "", + closeUserHeadPhoto: "", + }, + dimension: "", + hiddenDetail: null, + issueId: "", + longitude: "", + releaseAddress: "", + releaseTime: "", + releaseUserHeadPhoto: "", + releaseUserName: "", + shiftIssueFlag: true, + topicContent: "", + topicId: "", + topicImgs: [], + topicStatus: "discussing", + }, + + comment: { + loading: true, + colList: [ + { + align: "center", + width: "20%", + }, + { + align: "center", + width: "20%", + }, + { + align: "left", + width: "50%", + }, + { + align: "left", + width: "10%", + }, + ], + header: ["评论者", "评论时间", "评论内容", "评论图片"], + list: [], + }, + + issueInfo: { + attitude: "", + belongsGridName: "", + issueIdea: "", + issueInitiator: "", + issueStatus: "", + issueSuggestion: "", + issueTitle: "", + joinVote: true, + projectId: "", + projectStatus: false, + publishIdeaFlag: false, + }, + + issueTrend: {}, + issueChartData: [], + + projectProcess: [], + + projectInfo: { + backGround: "", + departmentList: [ + // { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] }, + ], + departmentNameList: [], + internalRemark: "", + isSend: false, + locateAddress: "", + locateDimension: "", + locateLongitude: "", + origin: "", + originId: "", + platformIds: [], + processable: false, + projectId: "", + projectStatus: "pending", + projectTitle: "", + publicReply: "", + returnable: false, + }, + + projectCate: [], + projectTag: [], + + yanPan: { + loading: false, + + icResiUserId: "", + houseId: "", + icUserName: "", + epmetUserIdList: [], + houseUserList: [ + // { + // icResiUserId: '', + // icUserName: '', + // } + ], + categoryList: [], + projectData: [ + // { + // firstCategoryCode: '', + // firstCategoryName: '', + // projectList: [], + // } + ], + }, + }; +} + export default { name: "demandInfo", props: { @@ -291,137 +427,16 @@ export default { lineChart, }, - data() { - return { - groupList: [ - { label: "研判分析" }, - { label: "话题评论" }, - { label: "查看议题" }, - { label: "查看项目" }, - ], - groupIndex: 0, - startGroupIndex: 0, - - info: { - badgeList: [], - closeDetail: { - closeUserName: "", - closeDateTime: "-1", - closeReason: "", - closeUserHeadPhoto: "", - }, - dimension: "", - hiddenDetail: null, - issueId: "", - longitude: "", - releaseAddress: "", - releaseTime: "", - releaseUserHeadPhoto: "", - releaseUserName: "", - shiftIssueFlag: true, - topicContent: "", - topicId: "", - topicImgs: [], - topicStatus: "discussing", - }, - - comment: { - loading: true, - colList: [ - { - align: "center", - width: "20%", - }, - { - align: "center", - width: "20%", - }, - { - align: "left", - width: "50%", - }, - { - align: "left", - width: "10%", - }, - ], - header: ["评论者", "评论时间", "评论内容", "评论图片"], - list: [], - }, - - issueInfo: { - attitude: "", - belongsGridName: "", - issueIdea: "", - issueInitiator: "", - issueStatus: "", - issueSuggestion: "", - issueTitle: "", - joinVote: true, - projectId: "", - projectStatus: false, - publishIdeaFlag: false, - }, - - issueTrend: {}, - issueChartData: [], - - projectProcess: [], - - projectInfo: { - backGround: "", - departmentList: [ - // { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] }, - ], - departmentNameList: [], - internalRemark: "", - isSend: false, - locateAddress: "", - locateDimension: "", - locateLongitude: "", - origin: "", - originId: "", - platformIds: [], - processable: false, - projectId: "", - projectStatus: "pending", - projectTitle: "", - publicReply: "", - returnable: false, - }, - - projectCate: [], - projectTag: [], - - yanPan: { - loading: false, - - icResiUserId: "", - houseId: "", - icUserName: "", - epmetUserIdList: [], - houseUserList: [ - // { - // icResiUserId: '', - // icUserName: '', - // } - ], - categoryList: [], - projectData: [ - // { - // firstCategoryCode: '', - // firstCategoryName: '', - // projectList: [], - // } - ], - }, - }; - }, + data: iniData, computed: {}, watch: { topicId() { + let data = iniData(); + Object.keys(data).forEach((k) => { + this[k] = data[k]; + }); this.getApiData(); }, }, @@ -431,6 +446,10 @@ export default { }, methods: { + watchImg(src) { + window.open(src); + }, + addStartGroupIndex() { const { startGroupIndex, groupList } = this; if (startGroupIndex < groupList.length - 9) { @@ -510,7 +529,7 @@ export default { comment: { srcList }, } = this; if (srcList[index] && srcList[index].imageList) { - window.open(srcList[index].imageList[0].url); + this.watchImg(srcList[index].imageList[0].url); } }, @@ -652,6 +671,7 @@ export default { statusName: subItem.projectStatus == "pending" ? "待处理" : "结案", projectId: subItem.projectId, + topicId: subItem.topicId, }; }), }; @@ -668,6 +688,11 @@ export default { path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`, }); }, + + toProjectInfo(item) { + console.log(item); + this.topicId = item.topicId; + }, }, }; diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue index 99795ad5..84d14f2b 100644 --- a/src/views/modules/visual/cpts/line-chart.vue +++ b/src/views/modules/visual/cpts/line-chart.vue @@ -1,6 +1,6 @@ @@ -189,6 +189,14 @@ export default { return {}; }, }, + width: { + type: Number, + default: 400, + }, + height: { + type: Number, + default: 260, + }, }, data() { return { From 5397a504dd1a503b099865f97d51884edced4d36 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 14 Dec 2021 11:15:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=AF=9D?= =?UTF-8?q?=E9=A2=98=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/foldText.vue | 135 ++++++++++++++++++ .../visual/basicinfo/cpts/incident-info.vue | 12 +- .../visual/basicinfo/cpts/topic-info.vue | 10 +- 3 files changed, 148 insertions(+), 9 deletions(-) create mode 100644 src/views/components/foldText.vue diff --git a/src/views/components/foldText.vue b/src/views/components/foldText.vue new file mode 100644 index 00000000..4438e0c7 --- /dev/null +++ b/src/views/components/foldText.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue index 19c524fb..e95e2fe2 100644 --- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue @@ -118,19 +118,19 @@
分类： -
+
{{ item.name }}
-
+
标签： -
+
{{ item.name }}
-
+
@@ -212,6 +212,7 @@ import screenLoading from "@/views/modules/visual/cpts/loading"; import { requestPost } from "@/js/dai/request"; import cptTb from "@/views/modules/visual/cpts/tb"; import analyse from "@/views/modules/visual/cpts/analyse"; +import foldText from "@/views/components/foldText"; import dateFormat from "dai-js/tools/dateFormat"; function iniData() { @@ -338,6 +339,7 @@ export default { cptTb, analyse, screenLoading, + foldText, }, data: iniData, @@ -531,7 +533,7 @@ export default { }, toProjectInfo(item) { - console.log(item) + console.log(item); this.resiEventId = item.resiEventId; }, }, diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue index b024d344..ed1861d7 100644 --- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue @@ -178,19 +178,19 @@
分类： -
+
{{ item.name }}
-
+
标签： -
+
{{ item.name }}
-
+
@@ -273,6 +273,7 @@ import { requestPost } from "@/js/dai/request"; import cptTb from "@/views/modules/visual/cpts/tb"; import lineChart from "@/views/modules/visual/cpts/line-chart"; import analyse from "@/views/modules/visual/cpts/analyse"; +import foldText from "@/views/components/foldText"; import dateFormat from "dai-js/tools/dateFormat"; function iniData() { @@ -425,6 +426,7 @@ export default { analyse, screenLoading, lineChart, + foldText, }, data: iniData, From 45bfab9f8bb53625728d0e0e94c0cd48af5111c4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 14 Dec 2021 13:59:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/issue-info.scss | 135 +++++++++ .../scss/modules/visual/processAnalyze.scss | 6 + src/assets/scss/modules/visual/resibuzz.scss | 7 + .../visual/communityGovern/cpt/issue-info.vue | 229 +++++++++++++++ .../visual/communityGovern/processAnalyze.vue | 241 ++++++++-------- .../communityGovern/processLineOption.js | 11 +- .../visual/communityGovern/resibuzz.vue | 272 ++++++++++-------- .../visual/communityGovern/typeAnalyze.vue | 58 ++-- .../visual/components/screen-map/index.vue | 7 +- .../visual/components/screen-nodata/index.vue | 34 +++ .../modules/visual/measure/volunteer.vue | 31 +- 11 files changed, 753 insertions(+), 278 deletions(-) create mode 100644 src/assets/scss/modules/visual/issue-info.scss create mode 100644 src/views/modules/visual/communityGovern/cpt/issue-info.vue create mode 100644 src/views/modules/visual/components/screen-nodata/index.vue diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss new file mode 100644 index 00000000..da6031fb --- /dev/null +++ b/src/assets/scss/modules/visual/issue-info.scss @@ -0,0 +1,135 @@ +@import '../../c/config'; +@import '../../c/function'; +@import './c/common'; + +.m-pop { + @include shield; + background-color: rgba(#000, 0.9); + overflow-y: auto; + + .wrap { + position: relative; + margin: 120px auto; + width: 1020px; + + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + + .btn-close { + position: absolute; + top: -10px; + right: -10px; + cursor: pointer; + } + + .line { + margin: 20px auto; + width: 900px; + height: 1px; + border: 1px dashed #1257c9; + } + } +} + +.m-content { + display: flex; +} + +.m-info { + padding-left: 62px; + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 24px; + width: 50%; + + .info-title { + margin-top: 30px; + font-size: 20px; + font-family: PingFang SC; + font-weight: bold; + color: #ffffff; + line-height: 30px; + } + + .info-prop { + position: relative; + margin: 10px 0; + display: flex; + padding-left: 15px; + + .info-pics { + display: flex; + margin: 20px 0; + img { + display: block; + width: 32%; + height: 90px; + margin-right: 9px; + object-fit: cover; + } + } + > span, + > div { + display: block; + max-width: 300px; + } + + &::before { + content: ''; + display: block; + position: absolute; + top: 9px; + left: 0; + width: 7px; + height: 7px; + background: #0c81fe; + border-radius: 3px; + margin-right: 10px; + } + } +} + +.m-line { + width: 50%; + + .stat { + margin: 20px 0 10px; + display: flex; + .stat-item { + width: 33%; + text-align: center; + + div { + font-size: 17px; + font-family: Source Han Serif SC; + font-weight: 500; + color: rgba(#fff, 0.5); + line-height: 24px; + &.z-weak { + font-size: 12px; + font-family: Source Han Serif SC; + font-weight: 500; + color: rgba(#fff, 0.5); + line-height: 24px; + } + } + } + } +} diff --git a/src/assets/scss/modules/visual/processAnalyze.scss b/src/assets/scss/modules/visual/processAnalyze.scss index 0cd1f822..07c430f5 100644 --- a/src/assets/scss/modules/visual/processAnalyze.scss +++ b/src/assets/scss/modules/visual/processAnalyze.scss @@ -293,3 +293,9 @@ } } } + +.table-status { + position: relative; + width: 600px; + margin: auto; +} diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss index 138c09e2..91ff7705 100644 --- a/src/assets/scss/modules/visual/resibuzz.scss +++ b/src/assets/scss/modules/visual/resibuzz.scss @@ -134,3 +134,10 @@ height: 90%; } } + +.table-status { + position: relative; + width: 600px; + margin: auto; + margin-top: 200px; +} diff --git a/src/views/modules/visual/communityGovern/cpt/issue-info.vue b/src/views/modules/visual/communityGovern/cpt/issue-info.vue new file mode 100644 index 00000000..61df9568 --- /dev/null +++ b/src/views/modules/visual/communityGovern/cpt/issue-info.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue index 4e2e852d..ec2ca8c8 100644 --- a/src/views/modules/visual/communityGovern/processAnalyze.vue +++ b/src/views/modules/visual/communityGovern/processAnalyze.vue @@ -41,7 +41,8 @@ {{monthIncr}} -
+
@@ -60,12 +61,26 @@
+ +
+ 加载中 +
+
近12月新增项目数
- + +
+ 加载中 +
@@ -105,6 +120,8 @@ import cptCard from "@/views/modules/visual/cpts/card"; import cptTb from "@/views/modules/visual/cpts/tb"; import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame"; import screenMap from "@/views/modules/visual/components/screen-map"; +import ScreenLoading from "@/views/modules/visual/components/screen-loading"; +import ScreenNodata from "@/views/modules/visual/components/screen-nodata"; import { pieOption } from './processPieOption.js' import { lineOption } from './processLineOption.js' @@ -115,9 +132,10 @@ export default { name: "HomeMap", data () { return { - showNoData: false, - timer: null, - isfirstInit: true, + dataLoading: true, + pieNoData: false, + lineNoData: false, + isfirstInit: true,//记录地图是否第一次加载 projectTotal: 0, dateIncr: 0, @@ -127,7 +145,9 @@ export default { lineOption: {}, lineInitState: false, lineColorArray: [], - lineData: [820, 932, 901, 934, 1290, 1330, 1320], + lineData: [], + lineXaxis: [], + lineSeriesData: [], pieChartS: null, pieChart: '', @@ -136,9 +156,8 @@ export default { pieTotal: 0, colorArray: [], pieData: [ - { value: 1048, name: '未结案', color: '#FAC126', selected: true }, - { value: 735, name: '已结案', color: '#3DDA83' }, - + // { value: 1048, name: '未结案', color: '#FAC126', selected: true }, + // { value: 735, name: '已结案', color: '#3DDA83' }, ], legendArray: [ @@ -182,26 +201,7 @@ export default { title: "南宁第二网格", } ], - projectList2: [ - { - agencyId: '', - projectId: '', - origin: '', - status: 'pending', - title: '山东路山东路', - latitude: 36.062227, - longitude: 120.379455, - }, - { - agencyId: '', - projectId: '', - origin: '', - status: 'closed', - latitude: 36.082227, - longitude: 120.379455, - title: "山东路", - } - ], + iconUrlArray: [], iconTextStyle: {}, @@ -222,87 +222,88 @@ export default { }, // mixins: [animate] beforeDestroy () { - this.timer && clearInterval(this.timer) + }, + async created () { - async mounted () { - this.userId = this.uid; + }, + async mounted () { + this.dataLoading = true + //初始化时间、各组件 this.initData() + await this.getAgencylist()//获取组织级别 + //获取服务器数据 + await this.getProjectTotal() + await this.getLineChart() + await this.loadProjectlist() + this.dataLoading = false - // this.agencyInfo = this.$store.state.user - // this.agencyId = this.agencyInfo.agencyId + this.assignData() - // await this.getWorkUserInfo() - await this.getAgencylist()//获取组织级别 - await nextTick(500) - await this.getApiData(); }, methods: { - initData () { - var time = (new Date).getTime() - 24 * 60 * 60 * 1000; - var nowdate = new Date(time); // 获取的是前一天日期 - var y = nowdate.getFullYear(); - var m = nowdate.getMonth() + 1 < 10 ? "0" + (nowdate.getMonth() + 1) : nowdate.getMonth() + 1; - var d = nowdate.getDate() < 10 ? "0" + nowdate.getDate() : nowdate.getDate(); - this.dateIdShow = y + '-' + m + '-' + d; - - }, async getApiData () { await this.getProjectTotal() + await this.getLineChart() await this.loadProjectlist() - await this.getLine() }, + assignData () { + this.getPie() + this.getLine() + }, + handleChangeDate (value) { this.dateIdShow = value - this.getApiData() }, // 获取当前登录人员信息及组织信息 - getAgencylist () { - const url = '/gov/org/customeragency/agencygridtree' - let params = {} - window.app.ajax.post( - url, - params, - (data, rspMsg) => { - this.agencyInfo = data - this.agencyId = this.agencyInfo.agencyId - if (!this.agencyInfo.latitude) { - this.agencyInfo.latitude = 36.072227 - } - if (!this.agencyInfo.longitude) { - this.agencyInfo.longitude = 120.389455 - } - if (!this.agencyInfo.level) { - this.agencyInfo.level = 'street' - } + async getAgencylist () { + const url = "/gov/org/customeragency/agencygridtree"; - //组织级联数据 - ++this.iscascaderShow - this.casOptions = [] - this.agencyIdArray.length = [] + let params = {}; - if (data) { - this.casOptions.push(data) - this.agencyIdArray.push(this.agencyId) - } + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.agencyInfo = data + this.agencyId = this.agencyInfo.agencyId + if (!this.agencyInfo.latitude) { + this.agencyInfo.latitude = 36.072227 + } + if (!this.agencyInfo.longitude) { + this.agencyInfo.longitude = 120.389455 + } + if (!this.agencyInfo.level) { + this.agencyInfo.level = 'street' + } - }, - (rspMsg, data) => { - this.$message.error(rspMsg) + //组织级联数据 + ++this.iscascaderShow + this.casOptions = [] + this.agencyIdArray.length = [] + + if (data) { + this.casOptions.push(data) + this.agencyIdArray.push(this.agencyId) } - ) + + } else { + this.$message.error(msg); + } }, //加载项目 async getProjectTotal () { - this.$refs.pieChart.showLoading() + if (this.$refs.pieChart) { + this.$refs.pieChart.showLoading() + this.$refs.pieChart.clear() + } + const url = "/data/aggregator/project/projecttotal"; // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projecttotal"; let params = { @@ -311,8 +312,9 @@ export default { }; const { data, code, msg } = await requestPost(url, params); - - this.$refs.pieChart.hideLoading() + if (this.$refs.pieChart) { + this.$refs.pieChart.hideLoading() + } if (code === 0) { this.projectTotal = data.projectTotal this.dateIncr = data.dateIncr @@ -331,9 +333,6 @@ export default { } ] - this.getPie() - - } else { this.$message.error(msg); } @@ -409,14 +408,11 @@ export default { }, loadMap () { - if (this.isfirstInit) { //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000) } else { this.$refs.map.refreshMap(null, this.projectList) - - } }, @@ -426,10 +422,8 @@ export default { }, pieInitOk (dom) { - this.pieChartS = dom this.pieInitState = true - }, lineInitOk () { @@ -438,7 +432,7 @@ export default { }, getLine () { if (this.lineInitState) { - this.getLineChart() + this.assignLineChart() } else { setTimeout(() => { this.getLine() @@ -447,8 +441,10 @@ export default { }, // 获取折线图 async getLineChart () { - this.$refs.lineChart.clear() - this.$refs.lineChart.showLoading() + if (this.$refs.lineChart) { + this.$refs.lineChart.clear() + this.$refs.lineChart.showLoading() + } const _that = this // this.$refs.pieChart.showLoading() const url = "/data/aggregator/project/projectmonthincr"; @@ -459,31 +455,27 @@ export default { }; const { data, code, msg } = await requestPost(url, params); - this.$refs.lineChart.hideLoading() + if (code === 0) { // 获取pieChart配置 - this.lineOption = lineOption() - let xaxis = [] - let totalIndexData = [] + + this.lineXaxis = [] + this.lineSeriesData = [] if (data && data.length > 0) { + this.lineNoData = false data.forEach(item => { - xaxis.push(item.type) - totalIndexData.push(item.value) + this.lineXaxis.push(item.type) + this.lineSeriesData.push(item.value) }); - // this.lineData = data + this.lineData = data } else { - + this.lineNoData = true } - this.$refs.lineChart.setOption(this.lineOption, true) - this.$refs.lineChart.setOption({ - xAxis: { data: xaxis }, - series: [ - { data: totalIndexData }, - - ] - }, true) + if (this.$refs.lineChart) { + this.$refs.lineChart.hideLoading() + } } else { this.$message.error(msg); @@ -492,9 +484,21 @@ export default { }, + assignLineChart () { + this.lineOption = lineOption() + this.$refs.lineChart.setOption(this.lineOption, true) + this.$refs.lineChart.setOption({ + xAxis: { data: this.lineXaxis }, + series: [ + { data: this.lineSeriesData }, + + ] + }, true) + }, + getPie () { if (this.pieInitState) { - this.getPieChart() + this.assignPieChart() } else { setTimeout(() => { this.getPie() @@ -502,12 +506,11 @@ export default { } }, // 获取饼状图 - async getPieChart () { - this.$refs.pieChart.clear() + async assignPieChart () { + this.pieTotal = 0 const _that = this - // 获取pieChart配置 this.pieOption = pieOption(this.pieChartS) @@ -575,7 +578,15 @@ export default { console.log(this.agencyIdArray) }, - + //初始化时间 + initData () { + var time = (new Date).getTime() - 24 * 60 * 60 * 1000; + var nowdate = new Date(time); // 获取的是前一天日期 + var y = nowdate.getFullYear(); + var m = nowdate.getMonth() + 1 < 10 ? "0" + (nowdate.getMonth() + 1) : nowdate.getMonth() + 1; + var d = nowdate.getDate() < 10 ? "0" + nowdate.getDate() : nowdate.getDate(); + this.dateIdShow = y + '-' + m + '-' + d; + }, toUserInfo (uid) { this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); @@ -596,6 +607,8 @@ export default { cptTb, screenEchartsFrame, screenMap, + ScreenLoading, + ScreenNodata }, watch: { diff --git a/src/views/modules/visual/communityGovern/processLineOption.js b/src/views/modules/visual/communityGovern/processLineOption.js index ef7dec01..04b4f950 100644 --- a/src/views/modules/visual/communityGovern/processLineOption.js +++ b/src/views/modules/visual/communityGovern/processLineOption.js @@ -2,7 +2,15 @@ import * as echarts from 'echarts' export function lineOption () { return { - + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross', + label: { + backgroundColor: '#6a7985' + } + } + }, xAxis: { type: 'category', // boundaryGap: false, @@ -54,6 +62,7 @@ export function lineOption () { { name: '项目数', type: 'line', + smooth: true, barWidth: 15, areaStyle: {}, itemStyle: { diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue index 8d79875b..84e9e9c0 100644 --- a/src/views/modules/visual/communityGovern/resibuzz.vue +++ b/src/views/modules/visual/communityGovern/resibuzz.vue @@ -31,10 +31,16 @@
- - + +
+ 加载中 +
@@ -43,7 +49,8 @@ + :list="demand.list" + @operate="toIssueInfo">
@@ -59,6 +66,11 @@
+ + + @@ -68,17 +80,20 @@ import { requestPost } from "@/js/dai/request"; import cptCard from "@/views/modules/visual/cpts/card"; import cptTb from "@/views/modules/visual/cpts/tb"; import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame"; - +import ScreenLoading from "@/views/modules/visual/components/screen-loading"; +import ScreenNodata from "@/views/modules/visual/components/screen-nodata"; import { pieOption } from './resiPieOption.js' import nextTick from 'dai-js/tools/nextTick' +import issueInfo from "./cpt/issue-info"; export default { name: "HomeMap", data () { return { - showNoData: false, - timer: null, + dataLoading: true, + pieNoData: false, + pieChartS: null, pieChart: '', pieOption: {}, @@ -86,18 +101,18 @@ export default { pieTotal: 0, colorArray: [], pieData: [ - { count: 1048, categoryName: '城市管理', color: '#1B51FF', selected: true }, - { count: 735, categoryName: '为民服务', color: '#00E5ED' }, - { count: 580, categoryName: '安全监管', color: '#7800FF' }, - { count: 484, categoryName: '民政', color: '#16D783' }, - { count: 300, categoryName: '环境保护', color: '#FF7800' }, - { count: 1048, categoryName: '建设管理', color: '#FFBA00' }, - { count: 735, categoryName: '街道吹哨部门报到', color: '#FFD685' }, - { count: 1580, categoryName: '社会治安综合', color: '#2A00FF' }, - { count: 484, categoryName: '公安交通管理', color: '#C600FF' }, - { count: 300, categoryName: '卫生计生监管执法', color: '#FF2A00' }, - { count: 484, categoryName: '民生', color: '#3DDA83' }, - { count: 300, categoryName: '街道安全', color: '#FAC126' } + // { count: 1048, categoryName: '城市管理', color: '#1B51FF', selected: true }, + // { count: 735, categoryName: '为民服务', color: '#00E5ED' }, + // { count: 580, categoryName: '安全监管', color: '#7800FF' }, + // { count: 484, categoryName: '民政', color: '#16D783' }, + // { count: 300, categoryName: '环境保护', color: '#FF7800' }, + // { count: 1048, categoryName: '建设管理', color: '#FFBA00' }, + // { count: 735, categoryName: '街道吹哨部门报到', color: '#FFD685' }, + // { count: 1580, categoryName: '社会治安综合', color: '#2A00FF' }, + // { count: 484, categoryName: '公安交通管理', color: '#C600FF' }, + // { count: 300, categoryName: '卫生计生监管执法', color: '#FF2A00' }, + // { count: 484, categoryName: '民生', color: '#3DDA83' }, + // { count: 300, categoryName: '街道安全', color: '#FAC126' } ], //voting 已转项目：shift_project 已关闭：closed，全部：all stateArray: [ @@ -122,6 +137,7 @@ export default { status: 'all', orgId: '', orgTypeSel: '', + tableList: [], demand: { loading: true, colList: [ @@ -175,8 +191,9 @@ export default { pageSize: 10, pageNo: 1, total: 0, - }, + showIssue: true, + issueId: 'cf48b7dc70ef4c319fd9c71890d9dbbb', casOptions: [], agencyIdArray: [], @@ -195,86 +212,71 @@ export default { }, // mixins: [animate] beforeDestroy () { - this.timer && clearInterval(this.timer) + }, async mounted () { - this.userId = this.uid; + this.dataLoading = true await this.getAgencylist()//获取组织级别 - await nextTick(500) - this.getApiData(); + await this.getApiData() + + this.dataLoading = false + + this.getPie() }, methods: { async getApiData () { - - await this.getPie() + await this.getPieChart() await this.getTable(); }, // 获取当前登录人员信息及组织信息 - getAgencylist () { - const url = '/gov/org/customeragency/agencygridtree' - let params = {} - window.app.ajax.post( - url, - params, - (data, rspMsg) => { - this.agencyInfo = data - this.orgId = this.agencyInfo.agencyId - this.orgType = this.agencyInfo.level === 'grid' ? 'grid' : 'agency' - - - if (!this.agencyInfo.latitude) { - this.agencyInfo.latitude = 36.072227 - } - if (!this.agencyInfo.longitude) { - this.agencyInfo.longitude = 120.389455 - } - if (!this.agencyInfo.level) { - this.agencyInfo.level = 'street' - } + async getAgencylist () { + const url = "/gov/org/customeragency/agencygridtree"; + let params = {}; - //组织级联数据 - ++this.iscascaderShow - this.casOptions = [] - this.agencyIdArray.length = [] + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.agencyInfo = data + this.orgId = this.agencyInfo.agencyId + this.orgType = this.agencyInfo.level === 'grid' ? 'grid' : 'agency' - if (data) { - this.casOptions.push(data) - this.agencyIdArray.push(this.agencyInfo.orgLevel) - } - }, - (rspMsg, data) => { - this.$message.error(rspMsg) + if (!this.agencyInfo.latitude) { + this.agencyInfo.latitude = 36.072227 + } + if (!this.agencyInfo.longitude) { + this.agencyInfo.longitude = 120.389455 + } + if (!this.agencyInfo.level) { + this.agencyInfo.level = 'street' } - ) - }, + //组织级联数据 + ++this.iscascaderShow + this.casOptions = [] + this.agencyIdArray.length = [] - pieInitOk (dom) { - console.log('pie准备好了', dom) - this.pieChartS = dom - this.pieInitState = true + if (data) { + this.casOptions.push(data) + this.agencyIdArray.push(this.agencyInfo.orgLevel) + } - }, - getPie () { - if (this.pieInitState) { - this.getPieChart() } else { - setTimeout(() => { - this.getPie() - }, 500) + this.$message.error(msg); } + + }, // 获取饼状图 async getPieChart () { - this.$refs.pieChart.clear() - this.pieTotal = 0 - const _that = this - // this.$refs.pieChart.showLoading() + if (this.$refs.pieChart) { + this.$refs.pieChart.clear() + this.$refs.pieChart.showLoading() + } + const url = "/gov/issue/issue/resibuzz-leftpiechart"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz-leftpiechart"; let params = { @@ -286,54 +288,40 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { - // 获取pieChart配置 - this.pieOption = pieOption(this.pieChartS) if (data && data.length > 0) { + this.pieData = data } else { - this.pieData = [{ count: 0, categoryName: '无分类', color: '#00E5ED' }] - } + this.pieData = [] - let maxValue = this.pieData[0].count - let maxIndex = 0 - this.pieData[0].selected = true - - this.pieData.forEach((item, index) => { - item.name = item.categoryName - item.value = item.count - this.colorArray.push(item.color) - this.pieTotal = this.pieTotal + item.value - - if (item.value > maxValue) { - maxValue = item.value - maxIndex = index - item.selected = true - } else if (index !== 0) { - item.selected = false - } - - }); - - - this.pieOption.title.text = this.pieTotal - this.pieOption.series[1].itemStyle = { - color: function (params) { - return _that.colorArray[params.dataIndex] - } } - this.clickPie(maxIndex) - let fun = function (params) { - _that.clickPie(params.dataIndex) + if (this.$refs.pieChart) { + this.$refs.pieChart.hideLoading() } - this.$refs.pieChart.handleClick(fun) + } else { this.$message.error(msg); } + }, + + pieInitOk (dom) { + console.log('pie准备好了', dom) + this.pieChartS = dom + this.pieInitState = true }, + getPie () { + if (this.pieInitState) { + this.assignPieChart() + } else { + setTimeout(() => { + this.getPie() + }, 500) + } + }, clickPie (seriesIndex) { this.pieData.forEach((element, index) => { @@ -368,28 +356,76 @@ export default { } }); this.pieOption.series[1].data = this.pieData - // this.$refs.pieChart.hideLoading() + this.$refs.pieChart.setOption(this.pieOption) }, + assignPieChart () { + + this.pieTotal = 0 + + if (this.pieData.length > 0) { + this.pieNoData = false + const _that = this + let maxIndex = 0 + let maxValue = this.pieData[0].count + + this.pieData[0].selected = true + + this.pieData.forEach((item, index) => { + item.name = item.categoryName + item.value = item.count + this.colorArray.push(item.color) + this.pieTotal = this.pieTotal + item.value + + if (item.value > maxValue) { + maxValue = item.value + maxIndex = index + item.selected = true + } else if (index !== 0) { + item.selected = false + } + + }); + // 获取pieChart配置 + this.pieOption = pieOption(this.pieChartS) + this.pieOption.title.text = this.pieTotal + this.pieOption.series[1].itemStyle = { + color: function (params) { + return _that.colorArray[params.dataIndex] + } + } + this.clickPie(maxIndex) + + let fun = function (params) { + _that.clickPie(params.dataIndex) + } + this.$refs.pieChart.handleClick(fun) + } else { + this.pieNoData = true + } + + }, + handleChangeState (index) { this.getTable() }, - handleChangeAgency (value) { + async handleChangeAgency (value) { let orgArray = [] let key = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '' if (key) { orgArray = key.split('-') this.orgId = orgArray[0] - this.orgType = orgArray[1] + this.orgType = orgArray[1] === 'grid' ? 'grid' : 'agency' } else { this.orgId = '' this.orgType = '' } - this.getApiData() + await this.getApiData() + this.assignPieChart() }, @@ -410,6 +446,7 @@ export default { if (code === 0) { this.demand.total = data.total; + this.tableList = data.list this.demand.list = data.list.map((item) => { return [ { type: "index" }, @@ -434,8 +471,12 @@ export default { this.demand.pageNo = val; this.getTable(); }, - toUserInfo (uid) { - this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); + + async toIssueInfo (index) { + const { tableList } = this; + this.issueId = tableList[index].issueId + this.showIssue = true + }, }, props: { @@ -452,6 +493,9 @@ export default { cptCard, cptTb, screenEchartsFrame, + ScreenLoading, + ScreenNodata, + issueInfo }, watch: { diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue index 61e1bfd6..d6a9d629 100644 --- a/src/views/modules/visual/communityGovern/typeAnalyze.vue +++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue @@ -194,40 +194,38 @@ export default { }, // 获取当前登录人员信息及组织信息 - getAgencylist () { - const url = '/gov/org/customeragency/agencygridtree' - let params = {} - window.app.ajax.post( - url, - params, - (data, rspMsg) => { - this.agencyInfo = data - this.agencyId = this.agencyInfo.agencyId - if (!this.agencyInfo.latitude) { - this.agencyInfo.latitude = 36.072227 - } - if (!this.agencyInfo.longitude) { - this.agencyInfo.longitude = 120.389455 - } - if (!this.agencyInfo.level) { - this.agencyInfo.level = 'street' - } + async getAgencylist () { + const url = "/gov/org/customeragency/agencygridtree"; - //组织级联数据 - ++this.iscascaderShow - this.casOptions = [] - this.agencyIdArray.length = [] + let params = {}; - if (data) { - this.casOptions.push(data) - this.agencyIdArray.push(this.agencyId) - } + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.agencyInfo = data + this.agencyId = this.agencyInfo.agencyId + if (!this.agencyInfo.latitude) { + this.agencyInfo.latitude = 36.072227 + } + if (!this.agencyInfo.longitude) { + this.agencyInfo.longitude = 120.389455 + } + if (!this.agencyInfo.level) { + this.agencyInfo.level = 'street' + } - }, - (rspMsg, data) => { - this.$message.error(rspMsg) + //组织级联数据 + ++this.iscascaderShow + this.casOptions = [] + this.agencyIdArray.length = [] + + if (data) { + this.casOptions.push(data) + this.agencyIdArray.push(this.agencyId) } - ) + + } else { + this.$message.error(msg); + } }, diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index 107a6622..3e593ed5 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -49,10 +49,6 @@ let iconSource; // icon let select;//选中标注 -//url图标 - - - let polygonColorArray = [ 'rgba(210, 2, 2, 0.24)', 'rgba(43, 231, 253, 0.25)', @@ -60,8 +56,7 @@ let polygonColorArray = [ ]; -//变电站标注样式 - +//多边形标注样式 var polygonStyleFunction = (function () { return function (feature) { return new Style({ diff --git a/src/views/modules/visual/components/screen-nodata/index.vue b/src/views/modules/visual/components/screen-nodata/index.vue new file mode 100644 index 00000000..9c34b253 --- /dev/null +++ b/src/views/modules/visual/components/screen-nodata/index.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue index a39f7e78..e5114297 100644 --- a/src/views/modules/visual/measure/volunteer.vue +++ b/src/views/modules/visual/measure/volunteer.vue @@ -71,6 +71,12 @@
+
+ +
-
- -
-
@@ -487,6 +486,7 @@ export default { .card-wr:last-child { margin-left: 20px; } + padding: 25px 21px 15px 24px; } .card-title { display: flex; @@ -494,10 +494,10 @@ export default { cursor: pointer; .title-icon { display: block; - width: 46px; - height: 34px; + width: 36px; + height: 29px; box-sizing: border-box; - margin-right: 6px; + margin-right: 3px; } .title-label { font-size: 16px; @@ -593,17 +593,20 @@ export default { } .map-tips { - width: 100%; + width: 700px; display: flex; + justify-content: start; flex-wrap: wrap; padding-top: 10px; padding-bottom: 20px; .map-tips-item { display: flex; + align-items: center; - margin-top: 20px; + margin-top: 10px; margin-right: 40px; + .map-tips-icon { width: 20px; height: 10px; @@ -621,10 +624,12 @@ export default { .card-wr-map { height: calc(100vh - 110px); + text-align: center; .card-map { + margin-top: 10px; width: 100%; - height: calc(100vh - 255px); + height: calc(100vh - 295px); .map { width: 100%;