elink-star
/
epmet-oper-gov
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改个人详情跳转逻辑等

test
dai 4 years ago
parent
1180da6e78
commit
0d7720a292
4 changed files with 363 additions and 241 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 575
      src/views/modules/visual/basicinfo/people.vue
  2. 10
      src/views/modules/visual/basicinfo/peopleSearch.vue
  3. 11
      src/views/modules/visual/basicinfo/personCategory/index.vue
  4. 6
      src/views/modules/visual/cpts/tb.vue

575
src/views/modules/visual/basicinfo/people.vue
View File

@ -1,16 +1,18 @@
<template> <template>
<div class="g-wrr"> <div class="g-wrr">
<div class="g-bread"> <div class="g-bread" v-if="breadList.length > 1">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item v-for="item in breadList" :key="item.path" :to="{ path: item.path }"> <el-breadcrumb-item
v-for="item in breadList"
:key="item.path"
:to="{ path: item.path }"
>
{{ item.meta.title }} {{ item.meta.title }}
</el-breadcrumb-item> </el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<div class="g-cpt"> <div class="g-cpt">
<div class="g-l"> <div class="g-l">
<div class="m-people"> <div class="m-people">
<cpt-card> <cpt-card>
@ -18,11 +20,9 @@
<img src="@/assets/img/shuju/title-tip.png" /> <img src="@/assets/img/shuju/title-tip.png" />
<span>人员情况</span> <span>人员情况</span>
</div> </div>
<div class="more" <div class="more" @click="showedMoreInfo = true">查看更多</div>
@click="showedMoreInfo = true">查看更多</div>
<div class="ren"> <div class="ren">
<img class="pic-ren" <img class="pic-ren" src="@/assets/img/shuju/people/ren.png" />
src="@/assets/img/shuju/people/ren.png" />
<div class="ren-name"> <div class="ren-name">
<span>{{ info.name }}</span> <span>{{ info.name }}</span>
<img src="@/assets/img/shuju/people/arrow.png" /> <img src="@/assets/img/shuju/people/arrow.png" />
@ -119,11 +119,13 @@
</cpt-card> </cpt-card>
</div> </div>
<people-more v-show="showedMoreInfo" <people-more
v-if="userId" v-show="showedMoreInfo"
:userId="userId" v-if="userId"
:gridName="info.gridName" :userId="userId"
@close="showedMoreInfo = false" /> :gridName="info.gridName"
@close="showedMoreInfo = false"
/>
<div class="m-relation"> <div class="m-relation">
<cpt-card> <cpt-card>
@ -133,95 +135,177 @@
</div> </div>
<div class="info"> <div class="info">
<div class="huzhu"> <div class="huzhu">
<img class="huzhu-bg" <img
src="@/assets/img/shuju/people/huzhu.png" /> class="huzhu-bg"
<img class="huzhu-ico" src="@/assets/img/shuju/people/huzhu.png"
src="@/assets/img/shuju/people/huzhu-home.png" /> />
<div class="huzhu-name">{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}</div> <img
class="huzhu-ico"
src="@/assets/img/shuju/people/huzhu-home.png"
/>
<div class="huzhu-name">
{{
houseInfo && houseInfo.ownerName
? houseInfo.ownerName
: "暂不清楚"
}}
</div>
<p>（户主）</p> <p>（户主）</p>
</div> </div>
<div class="rel z-zuo-2" <div
@click="toUserInfo(houseInfo.userList[0].userId)" class="rel z-zuo-2"
v-if="houseInfo.userList[0]"> @click="toUserInfo(houseInfo.userList[0].userId)"
<img class="rel-bg" v-if="houseInfo.userList[0]"
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" /> >
<img class="rel-line" <img
src="@/assets/img/shuju/people/huzhu-line/zuo2.png" /> class="rel-bg"
<div class="rel-text" src="@/assets/img/shuju/people/huzhu-kuang-zuo.png"
:class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''"> />
<div class="rel-call">{{ houseInfo.userList[0].relation }}</div> <img
<div class="rel-name">{{ houseInfo.userList[0].userName }}</div> class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo2.png"
/>
<div
class="rel-text"
:class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''"
>
<div class="rel-call">
{{ houseInfo.userList[0].relation }}
</div>
<div class="rel-name">
{{ houseInfo.userList[0].userName }}
</div>
</div> </div>
</div> </div>
<div class="rel z-you-2" <div
@click="toUserInfo(houseInfo.userList[1].userId)" class="rel z-you-2"
v-if="houseInfo.userList[1]"> @click="toUserInfo(houseInfo.userList[1].userId)"
<img class="rel-bg" v-if="houseInfo.userList[1]"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" /> >
<img class="rel-line" <img
src="@/assets/img/shuju/people/huzhu-line/you2.png" /> class="rel-bg"
<div class="rel-text" src="@/assets/img/shuju/people/huzhu-kuang-you.png"
:class="houseInfo.userList[1].isSelf == '1' ? 'z-on' : ''"> />
<div class="rel-call">{{ houseInfo.userList[1].relation }}</div> <img
<div class="rel-name">{{ houseInfo.userList[1].userName }}</div> class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you2.png"
/>
<div
class="rel-text"
:class="houseInfo.userList[1].isSelf == '1' ? 'z-on' : ''"
>
<div class="rel-call">
{{ houseInfo.userList[1].relation }}
</div>
<div class="rel-name">
{{ houseInfo.userList[1].userName }}
</div>
</div> </div>
</div> </div>
<div class="rel z-zuo-1" <div
@click="toUserInfo(houseInfo.userList[2].userId)" class="rel z-zuo-1"
v-if="houseInfo.userList[2]"> @click="toUserInfo(houseInfo.userList[2].userId)"
<img class="rel-bg" v-if="houseInfo.userList[2]"
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" /> >
<img class="rel-line" <img
src="@/assets/img/shuju/people/huzhu-line/zuo1.png" /> class="rel-bg"
<div class="rel-text" src="@/assets/img/shuju/people/huzhu-kuang-zuo.png"
:class="houseInfo.userList[2].isSelf == '1' ? 'z-on' : ''"> />
<div class="rel-call">{{ houseInfo.userList[2].relation }}</div> <img
<div class="rel-name">{{ houseInfo.userList[2].userName }}</div> class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo1.png"
/>
<div
class="rel-text"
:class="houseInfo.userList[2].isSelf == '1' ? 'z-on' : ''"
>
<div class="rel-call">
{{ houseInfo.userList[2].relation }}
</div>
<div class="rel-name">
{{ houseInfo.userList[2].userName }}
</div>
</div> </div>
</div> </div>
<div class="rel z-you-1" <div
@click="toUserInfo(houseInfo.userList[3].userId)" class="rel z-you-1"
v-if="houseInfo.userList[3]"> @click="toUserInfo(houseInfo.userList[3].userId)"
<img class="rel-bg" v-if="houseInfo.userList[3]"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" /> >
<img class="rel-line" <img
src="@/assets/img/shuju/people/huzhu-line/you1.png" /> class="rel-bg"
<div class="rel-text" src="@/assets/img/shuju/people/huzhu-kuang-you.png"
:class="houseInfo.userList[3].isSelf == '1' ? 'z-on' : ''"> />
<div class="rel-call">{{ houseInfo.userList[3].relation }}</div> <img
<span class="rel-name">{{ houseInfo.userList[3].userName }}</span> class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you1.png"
/>
<div
class="rel-text"
:class="houseInfo.userList[3].isSelf == '1' ? 'z-on' : ''"
>
<div class="rel-call">
{{ houseInfo.userList[3].relation }}
</div>
<span class="rel-name">{{
houseInfo.userList[3].userName
}}</span>
</div> </div>
</div> </div>
<div class="rel z-zuo-3" <div
@click="toUserInfo(houseInfo.userList[4].userId)" class="rel z-zuo-3"
v-if="houseInfo.userList[4]"> @click="toUserInfo(houseInfo.userList[4].userId)"
<img class="rel-bg" v-if="houseInfo.userList[4]"
src="@/assets/img/shuju/people/huzhu-kuang-zuo.png" /> >
<img class="rel-line" <img
src="@/assets/img/shuju/people/huzhu-line/zuo3.png" /> class="rel-bg"
<div class="rel-text" src="@/assets/img/shuju/people/huzhu-kuang-zuo.png"
:class="houseInfo.userList[4].isSelf == '1' ? 'z-on' : ''"> />
<div class="rel-call">{{ houseInfo.userList[4].relation }}</div> <img
<div class="rel-name">{{ houseInfo.userList[4].userName }}</div> class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/zuo3.png"
/>
<div
class="rel-text"
:class="houseInfo.userList[4].isSelf == '1' ? 'z-on' : ''"
>
<div class="rel-call">
{{ houseInfo.userList[4].relation }}
</div>
<div class="rel-name">
{{ houseInfo.userList[4].userName }}
</div>
</div> </div>
</div> </div>
<div class="rel z-you-3" <div
@click="toUserInfo(houseInfo.userList[5].userId)" class="rel z-you-3"
v-if="houseInfo.userList[5]"> @click="toUserInfo(houseInfo.userList[5].userId)"
<img class="rel-bg" v-if="houseInfo.userList[5]"
src="@/assets/img/shuju/people/huzhu-kuang-you.png" /> >
<img class="rel-line" <img
src="@/assets/img/shuju/people/huzhu-line/you3.png" /> class="rel-bg"
<div class="rel-text" src="@/assets/img/shuju/people/huzhu-kuang-you.png"
:class="houseInfo.userList[5].isSelf == '1' ? 'z-on' : ''"> />
<div class="rel-call">{{ houseInfo.userList[5].relation }}</div> <img
<div class="rel-name">{{ houseInfo.userList[5].userName }}</div> class="rel-line"
src="@/assets/img/shuju/people/huzhu-line/you3.png"
/>
<div
class="rel-text"
:class="houseInfo.userList[5].isSelf == '1' ? 'z-on' : ''"
>
<div class="rel-call">
{{ houseInfo.userList[5].relation }}
</div>
<div class="rel-name">
{{ houseInfo.userList[5].userName }}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -237,20 +321,23 @@
</div> </div>
<div class="tb"> <div class="tb">
<cpt-tb :col-list="demand.colList" <cpt-tb
:loading="demand.loading" :col-list="demand.colList"
:header="demand.header" :loading="demand.loading"
:list="demand.list" :header="demand.header"
@operate="handleOperateDemandList"></cpt-tb> :list="demand.list"
@operate="handleOperateDemandList"
<div class="m-pagination" ></cpt-tb>
v-if="demand.total > demand.pageSize">
<el-pagination :current-page="demand.pageNo" <div class="m-pagination" v-if="demand.total > demand.pageSize">
:page-size="demand.pageSize" <el-pagination
:total="demand.total" :current-page="demand.pageNo"
background :page-size="demand.pageSize"
layout="prev, pager, next" :total="demand.total"
@current-change="handlePageNoChangeDemand"> background
layout="prev, pager, next"
@current-change="handlePageNoChangeDemand"
>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
@ -262,68 +349,86 @@
<cpt-card> <cpt-card>
<div class="title"> <div class="title">
<img src="@/assets/img/shuju/title-tip.png" /> <img src="@/assets/img/shuju/title-tip.png" />
<a :class="{ 'z-on': showedIncidentOrTopic == 'incident' }" <a
@click="showedIncidentOrTopic = 'incident'">上报事件</a> :class="{ 'z-on': showedIncidentOrTopic == 'incident' }"
<a :class="{ 'z-on': showedIncidentOrTopic == 'topic' }" @click="showedIncidentOrTopic = 'incident'"
@click="showedIncidentOrTopic = 'topic'">发布话题</a> >上报事件</a
>
<a
:class="{ 'z-on': showedIncidentOrTopic == 'topic' }"
@click="showedIncidentOrTopic = 'topic'"
>发布话题</a
>
</div> </div>
<div class="list-wrap" <div
v-show="showedIncidentOrTopic == 'incident'"> class="list-wrap"
v-show="showedIncidentOrTopic == 'incident'"
>
<div class="list"> <div class="list">
<div class="item" <div
:key="'incident' + index" class="item"
v-for="(item, index) in incident.list" :key="'incident' + index"
@click="handleClickIncident(index)"> v-for="(item, index) in incident.list"
@click="handleClickIncident(index)"
>
<div class="item-title">{{ item.eventContent }}</div> <div class="item-title">{{ item.eventContent }}</div>
<div class="item-date">{{ item.reportTime }}</div> <div class="item-date">{{ item.reportTime }}</div>
</div> </div>
</div> </div>
<div class="m-pagination" <div
v-if="incident.total > incident.pageSize"> class="m-pagination"
<el-pagination :current-page="incident.pageNo" v-if="incident.total > incident.pageSize"
:page-size="incident.pageSize" >
:total="incident.total" <el-pagination
background :current-page="incident.pageNo"
layout="prev, pager, next" :page-size="incident.pageSize"
@current-change="handlePageNoChangeIncident"> :total="incident.total"
background
layout="prev, pager, next"
@current-change="handlePageNoChangeIncident"
>
</el-pagination> </el-pagination>
</div> </div>
<div v-if="incident.list.length == 0" <div v-if="incident.list.length == 0" class="m-hint">
class="m-hint"> <img
<img src="@/assets/img/modules/visual/noData.png" src="@/assets/img/modules/visual/noData.png"
class="no-data-img" /> class="no-data-img"
/>
</div> </div>
</div> </div>
<div class="list-wrap" <div class="list-wrap" v-show="showedIncidentOrTopic == 'topic'">
v-show="showedIncidentOrTopic == 'topic'">
<div class="list"> <div class="list">
<div class="item" <div
:key="'topic' + index" class="item"
v-for="(item, index) in topic.list" :key="'topic' + index"
@click="handleClickTopic(index)"> v-for="(item, index) in topic.list"
@click="handleClickTopic(index)"
>
<div class="item-title">{{ item.topicContent }}</div> <div class="item-title">{{ item.topicContent }}</div>
<div class="item-date">{{ item.releaseTime }}</div> <div class="item-date">{{ item.releaseTime }}</div>
</div> </div>
</div> </div>
<div class="m-pagination" <div class="m-pagination" v-if="topic.total > topic.pageSize">
v-if="topic.total > topic.pageSize"> <el-pagination
<el-pagination :current-page="topic.pageNo" :current-page="topic.pageNo"
:page-size="topic.pageSize" :page-size="topic.pageSize"
:total="topic.total" :total="topic.total"
background background
layout="prev, pager, next" layout="prev, pager, next"
@current-change="handlePageNoChangeTopic"> @current-change="handlePageNoChangeTopic"
>
</el-pagination> </el-pagination>
</div> </div>
<div v-if="topic.list.length == 0" <div v-if="topic.list.length == 0" class="m-hint">
class="m-hint"> <img
<img src="@/assets/img/modules/visual/noData.png" src="@/assets/img/modules/visual/noData.png"
class="no-data-img" /> class="no-data-img"
/>
</div> </div>
</div> </div>
</cpt-card> </cpt-card>
@ -338,10 +443,12 @@
<div class="list-wrap"> <div class="list-wrap">
<div class="list"> <div class="list">
<div class="item" <div
:key="'point' + index" class="item"
v-for="(item, index) in point.list" :key="'point' + index"
@click="handleClickPoint(index)"> v-for="(item, index) in point.list"
@click="handleClickPoint(index)"
>
<div class="item-row"> <div class="item-row">
<div class="item-l"> <div class="item-l">
<div class="item-point">{{ item.point }}</div> <div class="item-point">{{ item.point }}</div>
@ -354,21 +461,23 @@
</div> </div>
</div> </div>
<div class="m-pagination" <div class="m-pagination" v-if="point.total > point.pageSize">
v-if="point.total > point.pageSize"> <el-pagination
<el-pagination :current-page="point.pageNo" :current-page="point.pageNo"
:page-size="point.pageSize" :page-size="point.pageSize"
:total="point.total" :total="point.total"
background background
layout="prev, pager, next" layout="prev, pager, next"
@current-change="handlePageNoChangePoint"> @current-change="handlePageNoChangePoint"
>
</el-pagination> </el-pagination>
</div> </div>
<div v-if="point.list.length == 0" <div v-if="point.list.length == 0" class="m-hint">
class="m-hint"> <img
<img src="@/assets/img/modules/visual/noData.png" src="@/assets/img/modules/visual/noData.png"
class="no-data-img" /> class="no-data-img"
/>
</div> </div>
</div> </div>
</cpt-card> </cpt-card>
@ -376,23 +485,29 @@
</div> </div>
</div> </div>
<demand-info v-if="demand.list.length > 0 && showedDemandInfo" <demand-info
:userId="userId" v-if="demand.list.length > 0 && showedDemandInfo"
queryOrigin="personal-data" :userId="userId"
:demandId="demand.srcList[demand.currentIndex].demandRecId" queryOrigin="personal-data"
@close="showedDemandInfo = false" /> :demandId="demand.srcList[demand.currentIndex].demandRecId"
@close="showedDemandInfo = false"
<incident-info v-if="incident.list.length > 0 && incident.showedInfo" />
:resiEventId="incident.list[incident.currentIndex].resiEventId"
:epmetUserIdList="info.epmetUserIdList" <incident-info
:icResiUserId="userId" v-if="incident.list.length > 0 && incident.showedInfo"
@close="incident.showedInfo = false" /> :resiEventId="incident.list[incident.currentIndex].resiEventId"
:epmetUserIdList="info.epmetUserIdList"
<topic-info v-if="topic.list.length > 0 && topic.showedInfo" :icResiUserId="userId"
:topicId="topic.list[topic.currentIndex].topicId" @close="incident.showedInfo = false"
:epmetUserIdList="info.epmetUserIdList" />
:icResiUserId="userId"
@close="topic.showedInfo = false" /> <topic-info
v-if="topic.list.length > 0 && topic.showedInfo"
:topicId="topic.list[topic.currentIndex].topicId"
:epmetUserIdList="info.epmetUserIdList"
:icResiUserId="userId"
@close="topic.showedInfo = false"
/>
</div> </div>
</div> </div>
</template> </template>
@ -409,7 +524,7 @@ import cptTb from "@/views/modules/visual/cpts/tb";
export default { export default {
name: "HomeMap", name: "HomeMap",
data () { data() {
return { return {
breadList: [], breadList: [],
showedMoreInfo: false, showedMoreInfo: false,
@ -530,68 +645,73 @@ export default {
topicInfo, topicInfo,
}, },
beforeRouteEnter(to, from, next) { beforeRouteEnter(to, from, next) {
const arr = [ {...from }, { ...to, meta: { title: '人员图谱'}}] console.log("让我看看", to);
next((vm) =>{ if (from) {
vm.breadList = [ ...arr ] const arr = [{ ...from }, { ...to, meta: { title: "个人详情" } }];
}) next((vm) => {
vm.breadList = [...arr];
});
} else {
next();
}
}, },
watch: { watch: {
uid (id) { uid(id) {
this.userId = id; this.userId = id;
}, },
userId () { userId() {
this.getApiData(); this.getApiData();
window.scrollTo(0, 0); window.scrollTo(0, 0);
}, },
$route(route) { $route(route) {
// if you go to the redirect page, do not update the breadcrumbs // if you go to the redirect page, do not update the breadcrumbs
if (route.path.startsWith('/redirect/')) { if (route.path.startsWith("/redirect/")) {
return return;
} }
// this.getBreadcrumb() // this.getBreadcrumb()
}, },
}, },
async mounted () { async mounted() {
this.userId = this.uid; this.userId = this.uid;
console.log(this.$router);
this.getApiData(); this.getApiData();
}, },
deactivated() { deactivated() {
this.breadList = [] this.breadList = [];
console.log('breadList-----', this.breadList) console.log("breadList-----", this.breadList);
}, },
destroyed() { destroyed() {
this.breadList = [];
this.breadList = [] console.log("breadList-----", this.breadList);
console.log('breadList-----', this.breadList)
}, },
methods: { methods: {
getBreadcrumb() { getBreadcrumb() {
// only show routes with meta.title // only show routes with meta.title
console.log('routest----', this.$route) console.log("routest----", this.$route);
let matched = this.$route.matched.filter( let matched = this.$route.matched.filter(
(item) => item.meta && item.meta.title (item) => item.meta && item.meta.title
) );
const first = matched[0] const first = matched[0];
if (!this.isDashboard(first)) { if (!this.isDashboard(first)) {
matched = [{ path: '/home', meta: { title: '首页' } }].concat(matched) matched = [{ path: "/home", meta: { title: "首页" } }].concat(matched);
} }
this.breadList = matched.filter( this.breadList = matched.filter(
(item) => item.meta && item.meta.title && item.meta.breadcrumb !== false (item) => item.meta && item.meta.title && item.meta.breadcrumb !== false
) );
}, },
isDashboard(route) { isDashboard(route) {
const name = route && route.name const name = route && route.name;
if (!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(); await this.getInfo();
this.getHouseInfo(); this.getHouseInfo();
this.getDemandData(); this.getDemandData();
@ -600,12 +720,12 @@ export default {
this.getPointData(); this.getPointData();
}, },
toUserInfo (uid) { toUserInfo(uid) {
this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` }); this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
}, },
//加载组织数据 //加载组织数据
async getInfo () { async getInfo() {
const url = "/epmetuser/icresiuser/persondata"; const url = "/epmetuser/icresiuser/persondata";
let params = { let params = {
userId: this.userId, userId: this.userId,
@ -621,7 +741,7 @@ export default {
}, },
//加载组织数据 //加载组织数据
async getHouseInfo () { async getHouseInfo() {
const url = "/epmetuser/icresiuser/ownerrelation"; const url = "/epmetuser/icresiuser/ownerrelation";
let params = { let params = {
userId: this.userId, userId: this.userId,
@ -636,12 +756,12 @@ export default {
} }
}, },
handlePageNoChangeDemand (val) { handlePageNoChangeDemand(val) {
this.demand.pageNo = val; this.demand.pageNo = val;
this.getDemandData(); this.getDemandData();
}, },
handleOperateDemandList (index, type) { handleOperateDemandList(index, type) {
if (type == "查看") { if (type == "查看") {
this.showedDemandInfo = true; this.showedDemandInfo = true;
this.demand.currentIndex = index; this.demand.currentIndex = index;
@ -649,7 +769,7 @@ export default {
}, },
//加载组织数据 //加载组织数据
async getDemandData () { async getDemandData() {
const url = "/heart/userdemand/mydemand"; const url = "/heart/userdemand/mydemand";
let params = { let params = {
epmetUserIdList: this.info.epmetUserIdList, epmetUserIdList: this.info.epmetUserIdList,
@ -679,18 +799,18 @@ export default {
} }
}, },
handlePageNoChangeIncident (val) { handlePageNoChangeIncident(val) {
this.incident.pageNo = val; this.incident.pageNo = val;
this.getIncidentData(); this.getIncidentData();
}, },
handleClickIncident (index) { handleClickIncident(index) {
this.incident.showedInfo = true; this.incident.showedInfo = true;
this.incident.currentIndex = index; this.incident.currentIndex = index;
}, },
//加载组织数据 //加载组织数据
async getIncidentData () { async getIncidentData() {
const url = "/gov/project/resievent/pageuserreported"; const url = "/gov/project/resievent/pageuserreported";
let params = { let params = {
epmetUserIdList: this.info.epmetUserIdList, epmetUserIdList: this.info.epmetUserIdList,
@ -710,18 +830,18 @@ export default {
} }
}, },
handlePageNoChangeTopic (val) { handlePageNoChangeTopic(val) {
this.topic.pageNo = val; this.topic.pageNo = val;
this.getTopicData(); this.getTopicData();
}, },
handleClickTopic (index) { handleClickTopic(index) {
this.topic.showedInfo = true; this.topic.showedInfo = true;
this.topic.currentIndex = index; this.topic.currentIndex = index;
}, },
//加载组织数据 //加载组织数据
async getTopicData () { async getTopicData() {
const url = "/data/aggregator/resigroup/pageusertopic"; const url = "/data/aggregator/resigroup/pageusertopic";
let params = { let params = {
epmetUserIdList: this.info.epmetUserIdList, epmetUserIdList: this.info.epmetUserIdList,
@ -741,18 +861,18 @@ export default {
} }
}, },
handlePageNoChangePoint (val) { handlePageNoChangePoint(val) {
this.point.pageNo = val; this.point.pageNo = val;
this.getPointData(); this.getPointData();
}, },
handleClickPoint (index) { handleClickPoint(index) {
this.point.showedInfo = true; this.point.showedInfo = true;
this.point.currentIndex = index; this.point.currentIndex = index;
}, },
//加载组织数据 //加载组织数据
async getPointData () { async getPointData() {
const url = "/point/resi/point/pageuserpoint"; const url = "/point/resi/point/pageuserpoint";
let params = { let params = {
epmetUserIdList: this.info.epmetUserIdList, epmetUserIdList: this.info.epmetUserIdList,
@ -778,24 +898,21 @@ export default {
<style <style
lang="scss" lang="scss"
src="@/assets/scss/modules/visual/people.scss" src="@/assets/scss/modules/visual/people.scss"
scoped> scoped
</style> ></style>
<style <style lang="scss" scoped>
lang="scss" .g-bread {
scoped> padding: 10px 20px;
.g-bread { ::v-deep .el-breadcrumb__item {
padding: 10px 20px; font-size: 16px;
::v-deep .el-breadcrumb__item { .el-breadcrumb__inner {
font-size: 16px; color: #fff;
.el-breadcrumb__inner {
color: #fff;
}
} }
::v-deep .el-breadcrumb__item:first-child { }
.el-breadcrumb__inner { ::v-deep .el-breadcrumb__item:first-child {
color: #a0c3d9; .el-breadcrumb__inner {
} color: #a0c3d9;
} }
} }
}
</style> </style>

10
src/views/modules/visual/basicinfo/peopleSearch.vue
View File

@ -130,8 +130,8 @@ export default {
}, },
activated () { activated () {
this.searchName = '' // this.searchName = ''
this.tableData = [] // this.tableData = []
}, },
@ -180,8 +180,10 @@ export default {
async toSubAgency (type, userId) { 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
}, },

11
src/views/modules/visual/basicinfo/personCategory/index.vue
View File

@ -14,7 +14,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="orgLevel!=='people'" <div v-show="orgLevel!=='people'"
@click="hiddenTypeList()" @click="hiddenTypeList()"
class="warning-box"> class="warning-box">
<cpt-card> <cpt-card>
@ -254,7 +254,9 @@ export default {
}, },
async handleChangeAgency (value) { 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 = this.$refs["myCascader"].getCheckedNodes()[0].label
this.agencyName = selAgency.name this.agencyName = selAgency.name
this.agencyId = selAgency.agencyId this.agencyId = selAgency.agencyId
@ -267,8 +269,9 @@ export default {
//下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情
async toSubAgency (userId) { async toSubAgency (userId) {
this.selUserId = userId return this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${userId}` });
this.orgLevel = 'people' // this.selUserId = userId
// this.orgLevel = 'people'
}, },
//返回所选组织 //返回所选组织

6
src/views/modules/visual/cpts/tb.vue
View File

@ -21,7 +21,7 @@
<div v-if="typeof item === 'string' || typeof item === 'number'"> <div v-if="typeof item === 'string' || typeof item === 'number'">
{{ item }} {{ item }}
</div> </div>
<div v-if="typeof item === 'object' && item.type == 'index'"> <div v-if="typeof item === 'object' && item && item.type == 'index'">
<img <img
v-if="highlightTop3 && index == 0" v-if="highlightTop3 && index == 0"
src="@/assets/img/shuju/top/1.png" src="@/assets/img/shuju/top/1.png"
@ -40,14 +40,14 @@
<span v-else>{{ index + 1 }}</span> <span v-else>{{ index + 1 }}</span>
</div> </div>
<a <a
v-else-if="typeof item === 'object' && item.type == 'operate'" v-else-if="typeof item === 'object' && item && item.type == 'operate'"
v-for="btn in item.list" v-for="btn in item.list"
:key="'operate' + index + btn" :key="'operate' + index + btn"
@click="handleClickBtn(index, btn)" @click="handleClickBtn(index, btn)"
>{{ btn }}</a >{{ btn }}</a
> >
<a <a
v-else-if="typeof item === 'object' && item.type == 'people'" v-else-if="typeof item === 'object' && item && item.type == 'people'"
@click="handleClickPeople(item)" @click="handleClickPeople(item)"
>{{ item.name }}</a >{{ item.name }}</a
> >

Write Preview
Loading…
Cancel
Save