diff --git a/src/router/index.js b/src/router/index.js index bdfe6d479..03d4d03e3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -654,6 +654,47 @@ export const dataBoardRoutes = { isTab: false, }, }, + + { + path: "overview/potentialPeople", + props: true, + component: () => import("@/views/dataBoard/overview/potentialPeople/index"), + name: "dataBoard-overview-potentialPeople-index", + meta: { + title: "潜在不满意人数", + isTab: false, + }, + }, + { + path: "overview/potentialPeople/yxwxfw", + props: true, + component: () => import("@/views/dataBoard/overview/potentialPeople/yxwxfw"), + name: "dataBoard-overview-potentialPeople-yxwxfw", + meta: { + title: "应享未享服务人数", + isTab: false, + }, + }, + { + path: "overview/potentialPeople/sjwjj", + props: true, + component: () => import("@/views/dataBoard/overview/potentialPeople/sjwjj"), + name: "dataBoard-overview-potentialPeople-sjwjj", + meta: { + title: "事件未解决上报人数", + isTab: false, + }, + }, + { + path: "overview/potentialPeople/xqwmz", + props: true, + component: () => import("@/views/dataBoard/overview/potentialPeople/xqwmz"), + name: "dataBoard-overview-potentialPeople-xqwmz", + meta: { + title: "需求未满足人数", + isTab: false, + }, + }, { path: "satisfactionEval/Problem/tddtlxsj", props: true, diff --git a/src/views/dataBoard/cpts/sjkb-map/index.vue b/src/views/dataBoard/cpts/sjkb-map/index.vue index 947cc5f94..bac8d63c6 100644 --- a/src/views/dataBoard/cpts/sjkb-map/index.vue +++ b/src/views/dataBoard/cpts/sjkb-map/index.vue @@ -921,8 +921,8 @@ export default { },*/ setNumpoint(data) { this.clearMarkert(); - if (!scene.hasImage('rsources')) { - scene.addImage('rsources', require('@/assets/images/overview/map_num_green.png')); + if (!scene.hasImage('resources')) { + scene.addImage('resources', require('@/assets/images/overview/map_num_green.png')); scene.addImage('services', require('@/assets/images/overview/map_num_red.png')); scene.addImage('events', require('@/assets/images/overview/map_num_blue.png')); scene.addImage('problems', require('@/assets/images/overview/map_num_orange.png')); @@ -1234,7 +1234,7 @@ export default { color: #FFFFFF; background-repeat: no-repeat; - &.rsources { + &.resources { background-image: url("@/assets/images/overview/map_num_green.png"); } diff --git a/src/views/dataBoard/overview/components/jdjs.vue b/src/views/dataBoard/overview/components/jdjs.vue index 923084c36..c66988330 100644 --- a/src/views/dataBoard/overview/components/jdjs.vue +++ b/src/views/dataBoard/overview/components/jdjs.vue @@ -29,7 +29,7 @@
12345热线投诉人数
@@ -37,7 +37,7 @@
满意度调查不满意人数
@@ -45,7 +45,7 @@
社区自评不满意人数
@@ -110,14 +110,17 @@ export default { currentLevelData(val) { if (val.orgId) { this.getReport(val); - // this.getChartData(); + this.getData(); + this.getChartData(); } }, }, mounted() { - this.getReport(this.currentLevelData); - this.getChartData(); - this.getData() + if (this.currentLevelData.orgId) { + this.getReport(this.currentLevelData); + this.getChartData(); + this.getData() + } }, components: { titleSmall, @@ -329,8 +332,8 @@ export default { this.loading = true; let {startTime,endTime } = this let params = { - level: this.$store.state.chooseArea.chooseName.level, - orgId: this.$store.state.chooseArea.chooseName.orgId, + level: this.currentLevelData.orgLevel, + orgId: this.currentLevelData.orgId, startTime, endTime, }; diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index 3e4b2d89f..0f998c468 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -467,8 +467,8 @@ export default { }); }, showMapDialog(data) { - if (data.type === "rsources") { - this.setRsourcesPoint() + if (data.type === "resources") { + this.setResourcesPoint() } else { // -- njjwtqk = 难解决问题情况 // -- bmysxqk = 不满意事项情况 @@ -488,7 +488,7 @@ export default { }) } }, - setRsourcesPoint() { + setResourcesPoint() { }, getMapCount() { @@ -523,27 +523,29 @@ export default { item3.latitude = centerLngLat.lat item3.longitude = centerLngLat.lng } - if (item3.hasOwnProperty("rsources")) { - item3.type = 'rsources' - item3.num = item3.rsources; - // item3.offsets = [-50, 50]; + if (item3.hasOwnProperty("resources")) { + item3.type = 'resources' + item3.num = item3.resources; + item3.offsets = [-50, 50]; item3.latitude = centerLngLat.lat + 0.0012 item3.longitude = centerLngLat.lng } if (item3.hasOwnProperty("problems")) { item3.type = 'problems' item3.num = item3.problems; - // item3.offsets = [50, -50]; + item3.offsets = [50, -50]; item3.latitude = centerLngLat.lat item3.longitude = centerLngLat.lng + .0012 } if (item3.hasOwnProperty("events")) { item3.type = 'events' item3.num = item3.events; - // item3.offsets = [-50, -50]; + item3.offsets = [-50, -50]; item3.latitude = centerLngLat.lat + .0012 item3.longitude = centerLngLat.lng + .0012 } + // item3.latitude = item3.lat * 1 + // item3.longitude = item3.lon * 1 item3.id = item.agencyId + item3.type item3.agencyId = item.agencyId diff --git a/src/views/dataBoard/overview/potentialPeople/details/sjwjj.vue b/src/views/dataBoard/overview/potentialPeople/details/sjwjj.vue new file mode 100644 index 000000000..2a1cc3bc4 --- /dev/null +++ b/src/views/dataBoard/overview/potentialPeople/details/sjwjj.vue @@ -0,0 +1,345 @@ + + + + + + + diff --git a/src/views/dataBoard/overview/potentialPeople/details/xqwmz.vue b/src/views/dataBoard/overview/potentialPeople/details/xqwmz.vue new file mode 100644 index 000000000..ff912d49f --- /dev/null +++ b/src/views/dataBoard/overview/potentialPeople/details/xqwmz.vue @@ -0,0 +1,332 @@ + + + + + + + diff --git a/src/views/dataBoard/overview/potentialPeople/details/yxwxfw.vue b/src/views/dataBoard/overview/potentialPeople/details/yxwxfw.vue new file mode 100644 index 000000000..a6f4c6469 --- /dev/null +++ b/src/views/dataBoard/overview/potentialPeople/details/yxwxfw.vue @@ -0,0 +1,221 @@ + + + + + + + diff --git a/src/views/dataBoard/overview/potentialPeople/index.vue b/src/views/dataBoard/overview/potentialPeople/index.vue new file mode 100644 index 000000000..28cacd549 --- /dev/null +++ b/src/views/dataBoard/overview/potentialPeople/index.vue @@ -0,0 +1,274 @@ + + + + + diff --git a/src/views/dataBoard/overview/potentialPeople/sjwjj.vue b/src/views/dataBoard/overview/potentialPeople/sjwjj.vue new file mode 100644 index 000000000..58393b690 --- /dev/null +++ b/src/views/dataBoard/overview/potentialPeople/sjwjj.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/dataBoard/overview/potentialPeople/xqwmz.vue b/src/views/dataBoard/overview/potentialPeople/xqwmz.vue new file mode 100644 index 000000000..f66662fca --- /dev/null +++ b/src/views/dataBoard/overview/potentialPeople/xqwmz.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataBoard/overview/potentialPeople/yxwxfw.vue b/src/views/dataBoard/overview/potentialPeople/yxwxfw.vue new file mode 100644 index 000000000..f91d7777a --- /dev/null +++ b/src/views/dataBoard/overview/potentialPeople/yxwxfw.vue @@ -0,0 +1,115 @@ + + + + +