From b95db1ce31a3694f575a1e3475d007335f5598dc Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 6 May 2022 17:05:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A1=86=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/basicInfoCommunity.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index 12bcfd1f..959397b4 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -557,7 +557,9 @@ export default { min-width: 50px !important; margin-top: 5px !important; padding: 3px !important; - background-color: rgb(247, 250, 253); + background-color: #06186d; + color: #1a64cc; + border-color: #1a64cc; text-align: center; } From 0d7720a29208770acf42f58fb12a49ea0e8060db Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 6 May 2022 17:38:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/people.vue | 575 +++++++++++------- .../modules/visual/basicinfo/peopleSearch.vue | 10 +- .../visual/basicinfo/personCategory/index.vue | 13 +- src/views/modules/visual/cpts/tb.vue | 6 +- 4 files changed, 363 insertions(+), 241 deletions(-) diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index ef34596d..c754ff01 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -1,16 +1,18 @@ @@ -409,7 +524,7 @@ import cptTb from "@/views/modules/visual/cpts/tb"; export default { name: "HomeMap", - data () { + data() { return { breadList: [], showedMoreInfo: false, @@ -530,68 +645,73 @@ export default { topicInfo, }, beforeRouteEnter(to, from, next) { - const arr = [ {...from }, { ...to, meta: { title: '人员图谱'}}] - next((vm) =>{ - vm.breadList = [ ...arr ] - }) + console.log("让我看看", to); + if (from) { + const arr = [{ ...from }, { ...to, meta: { title: "个人详情" } }]; + next((vm) => { + vm.breadList = [...arr]; + }); + } else { + next(); + } }, watch: { - uid (id) { + uid(id) { this.userId = id; }, - userId () { + userId() { this.getApiData(); window.scrollTo(0, 0); }, $route(route) { // if you go to the redirect page, do not update the breadcrumbs - if (route.path.startsWith('/redirect/')) { - return + if (route.path.startsWith("/redirect/")) { + return; } // this.getBreadcrumb() }, }, - async mounted () { + async mounted() { this.userId = this.uid; + console.log(this.$router); this.getApiData(); }, deactivated() { - this.breadList = [] - console.log('breadList-----', this.breadList) + this.breadList = []; + console.log("breadList-----", this.breadList); }, destroyed() { - - this.breadList = [] - console.log('breadList-----', this.breadList) + this.breadList = []; + console.log("breadList-----", this.breadList); }, methods: { getBreadcrumb() { // only show routes with meta.title - console.log('routest----', this.$route) + console.log("routest----", this.$route); let matched = this.$route.matched.filter( (item) => item.meta && item.meta.title - ) - const first = matched[0] + ); + const first = matched[0]; if (!this.isDashboard(first)) { - matched = [{ path: '/home', meta: { title: '首页' } }].concat(matched) + matched = [{ path: "/home", meta: { title: "首页" } }].concat(matched); } this.breadList = matched.filter( (item) => item.meta && item.meta.title && item.meta.breadcrumb !== false - ) + ); }, isDashboard(route) { - const name = route && route.name + const name = route && route.name; if (!name) { - return false + return false; } - return name.trim().toLocaleLowerCase() === 'Home'.toLocaleLowerCase() + return name.trim().toLocaleLowerCase() === "Home".toLocaleLowerCase(); }, - handleSearch () { }, + handleSearch() {}, - async getApiData () { + async getApiData() { await this.getInfo(); this.getHouseInfo(); this.getDemandData(); @@ -600,12 +720,12 @@ export default { this.getPointData(); }, - toUserInfo (uid) { + toUserInfo(uid) { this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); }, //加载组织数据 - async getInfo () { + async getInfo() { const url = "/epmetuser/icresiuser/persondata"; let params = { userId: this.userId, @@ -621,7 +741,7 @@ export default { }, //加载组织数据 - async getHouseInfo () { + async getHouseInfo() { const url = "/epmetuser/icresiuser/ownerrelation"; let params = { userId: this.userId, @@ -636,12 +756,12 @@ export default { } }, - handlePageNoChangeDemand (val) { + handlePageNoChangeDemand(val) { this.demand.pageNo = val; this.getDemandData(); }, - handleOperateDemandList (index, type) { + handleOperateDemandList(index, type) { if (type == "查看") { this.showedDemandInfo = true; this.demand.currentIndex = index; @@ -649,7 +769,7 @@ export default { }, //加载组织数据 - async getDemandData () { + async getDemandData() { const url = "/heart/userdemand/mydemand"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -679,18 +799,18 @@ export default { } }, - handlePageNoChangeIncident (val) { + handlePageNoChangeIncident(val) { this.incident.pageNo = val; this.getIncidentData(); }, - handleClickIncident (index) { + handleClickIncident(index) { this.incident.showedInfo = true; this.incident.currentIndex = index; }, //加载组织数据 - async getIncidentData () { + async getIncidentData() { const url = "/gov/project/resievent/pageuserreported"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -710,18 +830,18 @@ export default { } }, - handlePageNoChangeTopic (val) { + handlePageNoChangeTopic(val) { this.topic.pageNo = val; this.getTopicData(); }, - handleClickTopic (index) { + handleClickTopic(index) { this.topic.showedInfo = true; this.topic.currentIndex = index; }, //加载组织数据 - async getTopicData () { + async getTopicData() { const url = "/data/aggregator/resigroup/pageusertopic"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -741,18 +861,18 @@ export default { } }, - handlePageNoChangePoint (val) { + handlePageNoChangePoint(val) { this.point.pageNo = val; this.getPointData(); }, - handleClickPoint (index) { + handleClickPoint(index) { this.point.showedInfo = true; this.point.currentIndex = index; }, //加载组织数据 - async getPointData () { + async getPointData() { const url = "/point/resi/point/pageuserpoint"; let params = { epmetUserIdList: this.info.epmetUserIdList, @@ -778,24 +898,21 @@ export default { - + +} + diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue index 4f9503e5..c28c2cf3 100644 --- a/src/views/modules/visual/basicinfo/peopleSearch.vue +++ b/src/views/modules/visual/basicinfo/peopleSearch.vue @@ -130,8 +130,8 @@ export default { }, activated () { - this.searchName = '' - this.tableData = [] + // this.searchName = '' + // this.tableData = [] }, @@ -180,8 +180,10 @@ export default { async toSubAgency (type, userId) { - this.orgLevel = 'people' - this.selUserId = userId + + return this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${userId}` }); + // this.orgLevel = 'people' + // this.selUserId = userId }, diff --git a/src/views/modules/visual/basicinfo/personCategory/index.vue b/src/views/modules/visual/basicinfo/personCategory/index.vue index f164545b..fb48e03e 100644 --- a/src/views/modules/visual/basicinfo/personCategory/index.vue +++ b/src/views/modules/visual/basicinfo/personCategory/index.vue @@ -14,7 +14,7 @@ -
@@ -254,7 +254,9 @@ export default { }, async handleChangeAgency (value) { - let selAgency = this.$refs["myCascader"].getCheckedNodes()[0].data + let arr = this.$refs["myCascader"].getCheckedNodes(); + if(!Array.isArray(arr) || arr.length==0) return; + let selAgency = arr[0].data // this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label this.agencyName = selAgency.name this.agencyId = selAgency.agencyId @@ -266,9 +268,10 @@ export default { //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 async toSubAgency (userId) { - - this.selUserId = userId - this.orgLevel = 'people' + + return this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${userId}` }); + // this.selUserId = userId + // this.orgLevel = 'people' }, //返回所选组织 diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue index 4a278830..317f438f 100644 --- a/src/views/modules/visual/cpts/tb.vue +++ b/src/views/modules/visual/cpts/tb.vue @@ -21,7 +21,7 @@
{{ item }}
-
+
{{ index + 1 }}
{{ btn }} {{ item.name }} From 062be3c43687144052b644d0cf7ce00e43745e98 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 7 May 2022 09:46:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/personCategory.scss | 2 +- .../modules/visual/basicinfo/personCategory/recordList.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss index 39c6e7af..a756b8c1 100644 --- a/src/assets/scss/modules/visual/personCategory.scss +++ b/src/assets/scss/modules/visual/personCategory.scss @@ -159,7 +159,7 @@ &-bottom { box-sizing: border-box; width: 100%; - height: calc(100vh - 535px); + // height: calc(100vh - 535px); min-height: 300px; margin-top: 60px; } diff --git a/src/views/modules/visual/basicinfo/personCategory/recordList.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue index c2a228cb..0d36a46c 100644 --- a/src/views/modules/visual/basicinfo/personCategory/recordList.vue +++ b/src/views/modules/visual/basicinfo/personCategory/recordList.vue @@ -110,7 +110,7 @@ export default { dateId: '', categoryKey: '', pageNo: 1, - pageSize: 7, + pageSize: 10, total: 0, }; @@ -289,7 +289,8 @@ export default { &-body { box-sizing: border-box; width: 100%; - height: calc(100% - 50px); + height: 550px; + // height: calc(100% - 50px); font-size: 18px; font-weight: 400; color: #ffffff; From 24c55c6d9b91dfb724c2ef56b48d677c186fb4fb Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sat, 7 May 2022 13:32:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/buildTable.vue | 50 +++++++++++-------- .../modules/base/community/roomTable.vue | 50 ++++++++++++------- 2 files changed, 61 insertions(+), 39 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 0f201362..edbafb2e 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -69,27 +69,15 @@ :selectable="checkSelect" width="55"> - - + +