Browse Source

修改人房小区跳转

feature
战立标 2 years ago
parent
commit
6905ff16ae
  1. 4
      src/views/dataBoard/cpts/homeDetails/index.vue
  2. 30
      src/views/dataBoard/renfang/cpts/map-right.vue
  3. 134
      src/views/dataBoard/renfang/index.vue

4
src/views/dataBoard/cpts/homeDetails/index.vue

@ -4,8 +4,8 @@
<bread-crumb <bread-crumb
:list="[ :list="[
{ {
path: '/dataBoard/overview/index', path: '/dataBoard/renfang/index',
name: '概览', name: '人房数据',
}, },
{ {
name: homeText ? homeText : '', name: homeText ? homeText : '',

30
src/views/dataBoard/renfang/cpts/map-right.vue

@ -4,25 +4,10 @@
@click="isShow = !isShow"> @click="isShow = !isShow">
<div :class="isShow?'':'hidden'" class="map-right-content"> <div :class="isShow?'':'hidden'" class="map-right-content">
<div class="title"> <div class="title">
海伦路街道 {{orgData.name}}
</div> </div>
<div class="map-list"> <div class="map-list">
<div class="map-item">南昌路社区</div> <div class="map-item" v-for="(item,index) in orgData.children" :key="index" @click="clickAgency(item)">{{item.name}}</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
<div class="map-item">北岭山社区</div>
</div> </div>
</div> </div>
</div> </div>
@ -31,10 +16,21 @@
<script> <script>
export default { export default {
name: "map-right", name: "map-right",
props: {
orgData: {
type: Object,
default: () => {}
},
},
data() { data() {
return { return {
isShow: true isShow: true
} }
},
methods: {
clickAgency(item) {
this.$emit('clickAgency', item)
}
} }
} }
</script> </script>

134
src/views/dataBoard/renfang/index.vue

@ -1,9 +1,9 @@
<template> <template>
<div> <div>
<cpt-bread <cpt-bread
@tap="clickBreadItem" v-if="breadList.length > 1"
v-if="breadList.length > 1" :bread-list="breadList"
:bread-list="breadList" @tap="clickBreadItem"
/> />
<div class="g-row"> <div class="g-row">
<div class="g-left"> <div class="g-left">
@ -18,7 +18,7 @@
</div> </div>
<div class="bgImg"> <div class="bgImg">
<Title text="图谱画像"/> <Title text="图谱画像"/>
<jdtphx :id="orgId" /> <jdtphx :id="orgId" :current-level-data="{orgId:orgId, level:orgLevel}"/>
</div> </div>
</div> </div>
@ -111,7 +111,7 @@
@clickAgency="clickAgencyItem" @clickAgency="clickAgencyItem"
@clickDotBtn="handleClickDotBtn" @clickDotBtn="handleClickDotBtn"
/> />
<mapRight/> <mapRight :orgData="orgData" @clickAgency="clickAgencyItem"/>
</div> </div>
<div class="m-search"> <div class="m-search">
@ -136,10 +136,10 @@
</div> </div>
<input <input
type="text" v-model="searchModule.keyword"
placeholder="搜索本组织及下级的居民、小区、楼栋、房屋" placeholder="搜索本组织及下级的居民、小区、楼栋、房屋"
@keyup.enter="handleSearch" type="text"
v-model="searchModule.keyword" @keyup.enter="handleSearch"
/> />
<div class="i-div"></div> <div class="i-div"></div>
@ -194,12 +194,12 @@
</div> </div>
</div> </div>
<div class="card-list" v-if="searchModule.result.length > 0"> <div v-if="searchModule.result.length > 0" class="card-list">
<div <div
class="card-item" v-for="(item, index) in searchModule.result"
:key="item.title + index" :key="item.title + index"
@click="handleClickSearchItem(item)" class="card-item"
v-for="(item, index) in searchModule.result" @click="handleClickSearchItem(item)"
> >
<span>{{ item.title }}</span> <span>{{ item.title }}</span>
<img <img
@ -213,8 +213,8 @@
</div> </div>
</div> </div>
<div class="card-empty" v-else> <div v-else class="card-empty">
<img src="~@/assets/images/shuju/renfang/index/empty.png" /> <img src="~@/assets/images/shuju/renfang/index/empty.png"/>
<span>没有找到搜索结果</span> <span>没有找到搜索结果</span>
</div> </div>
</div> </div>
@ -294,17 +294,17 @@
</div> </div>
</div> </div>
<div class="empty" v-else> <div v-else class="empty">
<img src="~@/assets/images/shuju/renfang/index/empty.png" /> <img src="~@/assets/images/shuju/renfang/index/empty.png"/>
</div> </div>
</div> </div>
<div v-else> <div v-else>
<div class="list" v-if="resiCategoryForecastData.length > 0"> <div v-if="resiCategoryForecastData.length > 0" class="list">
<div <div
@click="toResiClassPage('ai', item.code, item.name)" v-for="(item, index) in resiCategoryForecastData"
class="item" :key="item.code + index"
:key="item.code + index" class="item"
v-for="(item, index) in resiCategoryForecastData" @click="toResiClassPage('ai', item.code, item.name)"
> >
<div>{{ ("0" + (index + 1)).substr(-2) }}.</div> <div>{{ ("0" + (index + 1)).substr(-2) }}.</div>
<div class="item-name">{{ item.name }}</div> <div class="item-name">{{ item.name }}</div>
@ -318,12 +318,12 @@
<div class="item-per"> <div class="item-per">
<span>较上一年</span> <span>较上一年</span>
<img <img
v-if="item.growth >= 0" v-if="item.growth >= 0"
src="~@/assets/images/shuju/renfang/index/up.png" src="~@/assets/images/shuju/renfang/index/up.png"
/> />
<img <img
v-else v-else
src="~@/assets/images/shuju/renfang/index/down.png" src="~@/assets/images/shuju/renfang/index/down.png"
/> />
<b>{{ item.growthAbs }}</b> <b>{{ item.growthAbs }}</b>
<span></span> <span></span>
@ -331,8 +331,8 @@
</div> </div>
</div> </div>
<div class="empty" v-else> <div v-else class="empty">
<img src="~@/assets/images/shuju/renfang/index/empty.png" /> <img src="~@/assets/images/shuju/renfang/index/empty.png"/>
</div> </div>
</div> </div>
</div> </div>
@ -359,7 +359,7 @@
</div>--> </div>-->
<div class="bgImg"> <div class="bgImg">
<Title text="信息采集统计"></Title> <Title text="信息采集统计"></Title>
<rfsjtj :currentLevelData="{orgId: orgId}"/> <rfsjtj :currentLevelData="{orgId:orgId, level:orgLevel}"/>
</div> </div>
<div class="bgImg"> <div class="bgImg">
<Title text="人口预警"></Title> <Title text="人口预警"></Title>
@ -369,7 +369,7 @@
'z-shrink': 'z-shrink':
orgLevel == 'district' || orgLevel == 'district' ||
orgLevel == 'street' || orgLevel == 'street' ||
orgLevel == 'city', orgLevel == 'city'
}" }"
class="m-subbox m-rkyj" class="m-subbox m-rkyj"
> >
@ -386,16 +386,16 @@
</div> </div>
<resi-details <resi-details
@close="popupShow = false" v-if="popupShow"
:popupShow='popupShow'
:resi-id="displayedResiId" :resi-id="displayedResiId"
:popupShow='popupShow' @close="popupShow = false"
v-if="popupShow"
/> />
<house-details <house-details
@close="displayedHouseId = ''"
:house-id="displayedHouseId"
v-if="displayedHouseId" v-if="displayedHouseId"
:house-id="displayedHouseId"
@close="displayedHouseId = ''"
/> />
</div> </div>
</template> </template>
@ -493,7 +493,7 @@ export default {
pandectData: {}, pandectData: {},
popupShow:false popupShow: false
}; };
}, },
@ -587,11 +587,16 @@ export default {
}, },
clickAgencyItem(item) { clickAgencyItem(item) {
this.toBread({ console.log(item)
orgId: item.id, if (item.level === 'neighborHood') {
orgLevel: item.level, this.$router.push('/homeDetails/index?id='+item.id)
meta: {title: item.name}, } else {
}); this.toBread({
orgId: item.id,
orgLevel: item.level,
meta: {title: item.name},
});
}
}, },
toBread(item) { toBread(item) {
@ -686,12 +691,12 @@ export default {
const url = "/actual/base/resiCategory/categoryCountPartList"; const url = "/actual/base/resiCategory/categoryCountPartList";
let params = { let params = {
orgId: this.orgId, orgId: this.orgId,
}; };
const { data, code, msg } = await requestGet( const {data, code, msg} = await requestGet(
url, url,
params params
); );
if (code === 0 && data) { if (code === 0 && data) {
@ -701,23 +706,23 @@ export default {
// }; // };
const resiCount = data.resiCount; const resiCount = data.resiCount;
Object.keys(data.categoryList).forEach((key) => { Object.keys(data.categoryList).forEach((key) => {
const category = data.categoryList[key]; const category = data.categoryList[key];
const categoryName = category.categoryName; const categoryName = category.categoryName;
const categoryCount = category.categoryCount; const categoryCount = category.categoryCount;
const radio = categoryCount/resiCount * 100; const radio = categoryCount / resiCount * 100;
if(categoryName == "OLD_PEOPLE_FLAG"){ if (categoryName == "OLD_PEOPLE_FLAG") {
this.perInfo.OLD_PEOPLE_FLAG=radio.toFixed(2); this.perInfo.OLD_PEOPLE_FLAG = radio.toFixed(2);
}else if(categoryName == "PARTY_FLAG"){ } else if (categoryName == "PARTY_FLAG") {
this.perInfo.PARTY_FLAG=radio.toFixed(2); this.perInfo.PARTY_FLAG = radio.toFixed(2);
}else if(categoryName == "UNEMPLOYED_FLAG"){ } else if (categoryName == "UNEMPLOYED_FLAG") {
this.perInfo.UNEMPLOYED_FLAG=radio.toFixed(2); this.perInfo.UNEMPLOYED_FLAG = radio.toFixed(2);
}else if(categoryName == "VOLUNTEER_FLAG"){ } else if (categoryName == "VOLUNTEER_FLAG") {
this.perInfo.VOLUNTEER_FLAG=radio.toFixed(2); this.perInfo.VOLUNTEER_FLAG = radio.toFixed(2);
}else if(categoryName == "SUBSISTENCE_ALLOWANCE_FLAG"){ } else if (categoryName == "SUBSISTENCE_ALLOWANCE_FLAG") {
this.perInfo.SUBSISTENCE_ALLOWANCE_FLAG=radio.toFixed(2); this.perInfo.SUBSISTENCE_ALLOWANCE_FLAG = radio.toFixed(2);
}else if(categoryName == "SPECIAL_CROWD_FLAG"){ } else if (categoryName == "SPECIAL_CROWD_FLAG") {
this.perInfo.SPECIAL_CROWD_FLAG=radio.toFixed(2); this.perInfo.SPECIAL_CROWD_FLAG = radio.toFixed(2);
} }
}); });
} else { } else {
@ -785,7 +790,7 @@ export default {
level: this.orgLevel, level: this.orgLevel,
}; };
const { data, code, msg } = await requestPost(url, params); const {data, code, msg} = await requestPost(url, params);
if (code === 0) { if (code === 0) {
this.orgData = data; this.orgData = data;
@ -828,6 +833,7 @@ export default {
background: url('@/assets/images/shuju/overview/box-bg.png') no-repeat; background: url('@/assets/images/shuju/overview/box-bg.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
.m-box { .m-box {
height: 320px; height: 320px;
} }

Loading…
Cancel
Save