diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss index 39c6e7af3..a756b8c18 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/assets/scss/modules/visual/warning.scss b/src/assets/scss/modules/visual/warning.scss index 36260a7f7..265c38895 100644 --- a/src/assets/scss/modules/visual/warning.scss +++ b/src/assets/scss/modules/visual/warning.scss @@ -87,7 +87,7 @@ content: ""; width: 8px; height: 8px; - background: #f0f3f7; + background: #fef200; border-radius: 50%; position: absolute; left: 12px; @@ -95,6 +95,12 @@ transform: translate(0, -50%); } + &:nth-of-type(2) { + &::after { + background: #e70014; + } + } + div:nth-child(1) { font-size: 16px; font-family: PingFang SC; diff --git a/src/assets/scss/modules/warning.scss b/src/assets/scss/modules/warning.scss index 2353a9435..f28535b94 100644 --- a/src/assets/scss/modules/warning.scss +++ b/src/assets/scss/modules/warning.scss @@ -85,7 +85,7 @@ content: ""; width: 8px; height: 8px; - background: #f5f502; + background: #fef200; border-radius: 50%; position: absolute; left: 12px; @@ -95,7 +95,7 @@ &:nth-of-type(2) { &::after { - background: #fb500d; + background: #e70014; } } diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index 7a394a0cd..30fdeb7da 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -130,7 +130,7 @@ align="center" label="单位或学校 " /> - +
- +
+ + + +
{{ dataForm.houseHolderName }}
+ + + +
{{ dataForm.address }}
+ +
+ + +
{{ dataForm.houseType }}
+ + + +
{{ dataForm.totalResi }}
+ +
+ + + + + + + + + + + + + + + + +
@@ -221,6 +282,7 @@ export default { endTime: "", address: '' }, + dataForm: {}, communityList: [], spanIndex: [], // 合并的行 importBtnTitle: "导入", @@ -330,10 +392,23 @@ export default { this.handleSearch() }, - async handleWatch (rowIndex) { - this.formShow = true; + async handleWatch (row) { + // this.formShow = true; await nextTick(); - this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]); + const url = "/epmetuser/icresicollect/detail"; + + const { data, code, msg } = await requestPost(url, { + id: row.id, + }); + + if (code === 0) { + console.log('data----de', data) + this.dataForm = { ...data, houseType: data.houseType == '1' ? '自有' : '租住' } + // this.getTableData(); + this.formShow = true; + } else { + this.$message.success("操作失败！"); + } }, async handleEdit (rowIndex) { @@ -466,4 +541,7 @@ export default { position: relative; overflow: visible; } +.wd50 { + min-width: 200px; +} diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 8c552f2c4..7f2b7357a 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -414,7 +414,7 @@ export default { computed: { ...mapGetters(['clientHeight', 'iframeHeight']), tableHeight() { - const h = this.clientHeight - this.searchH - 310 + this.iframeHeigh + const h = this.clientHeight - this.searchH - 310 + this.iframeHeight const _h = this.clientHeight - 310 - this.searchH return this.$store.state.inIframe ? h : _h } diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index 12bcfd1fc..959397b4a 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; } diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index ef34596dc..c754ff017 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 4f9503e5f..c28c2cf3a 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 f164545b3..fb48e03e0 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/basicinfo/personCategory/recordList.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue index c2a228cb2..0d36a46cc 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; diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue index 4a2788302..317f438f0 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 }} diff --git a/src/views/modules/visual/warning/components/screen-table/people-list.vue b/src/views/modules/visual/warning/components/screen-table/people-list.vue index 8efffffa9..0cc25b6b9 100644 --- a/src/views/modules/visual/warning/components/screen-table/people-list.vue +++ b/src/views/modules/visual/warning/components/screen-table/people-list.vue @@ -17,7 +17,7 @@ :loading="loading" :header="header" :list="list" - @operate="toUserInfo" + @operate="handlePeopleItem" >
@@ -50,7 +50,7 @@