diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue index c019a6c93..47c4aebca 100644 --- a/src/views/dataBoard/overview/components/jdwgy.vue +++ b/src/views/dataBoard/overview/components/jdwgy.vue @@ -5,6 +5,7 @@ :data="list" v-if="currentLevelData.orgLevel != 'grid'" v-loading="loading" + element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px" > @@ -95,7 +96,15 @@ export default { } }, }, - mounted() {}, + mounted() { + if (this.currentLevelData.orgId) { + this.getData( + this.peopleType, + this.currentLevelData.orgLevel, + this.currentLevelData.orgId + ); + } + }, methods: { getData(peopleType, level = "", orgId = "") { this.loading = true; @@ -128,13 +137,14 @@ export default { } }, handleClick(item) { - console.log("handleClick::", item); - this.$router.push({ - path: "/dataBoard/overview/resident", - query: { - user_id: item.id, - }, - }); + if (item.id) { + this.$router.push({ + path: "/dataBoard/overview/resident", + query: { + user_id: item.id, + }, + }); + } }, }, }; diff --git a/src/views/dataBoard/overview/components/map-top.vue b/src/views/dataBoard/overview/components/map-top.vue index ab0097397..f11c4108f 100644 --- a/src/views/dataBoard/overview/components/map-top.vue +++ b/src/views/dataBoard/overview/components/map-top.vue @@ -89,6 +89,11 @@ export default { } }, }, + mounted() { + if (this.currentLevelData.orgId) { + this.getData(this.currentLevelData); + } + }, methods: { selectIcon(num, type) { this.selectIndex = num; diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 855554c22..6bc85b7fc 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -549,7 +549,7 @@ export default { }, toResiClassPage(pageType, type_id = "", type_name) { this.$router.push({ - path: "/dataBoard/renfang/resi-class-new", + path: "/dataBoard/renfang/resi-class", query: { org_id: this.orgId, type_id,