@@ -122,6 +123,19 @@ export default {
this.getPie();
},
+ handleClickItem(item) {
+ const { type, name } = item;
+ this.$router.push({
+ path: "/dataBoard/renfang/resi-list",
+ query: {
+ org_id: this.orgId,
+ type,
+ type_category: this.currentTab,
+ type_name: name,
+ },
+ });
+ },
+
// 获取房屋总数等
async getInfo() {
const url = "resident_analyze";
@@ -176,50 +190,166 @@ export default {
const { currentTab, info } = this;
if (currentTab == "性别") {
this.pieData = [
- { value: info.male_count, name: "男" },
- { value: info.female_count, name: "女" },
+ {
+ value: info.male_count,
+ type: "male_count",
+ name: "男性",
+ },
+ {
+ value: info.female_count,
+ type: "female_count",
+ name: "女性",
+ },
];
} else if (currentTab == "户籍") {
this.pieData = [
- { value: info.local_count, name: "本地户籍" },
- { value: info.field_count, name: "外地户籍" },
+ {
+ value: info.local_count,
+ type: "local_count",
+ name: "本地户籍",
+ },
+ {
+ value: info.field_count,
+ type: "field_count",
+ name: "外地户籍",
+ },
];
} else if (currentTab == "人户状况") {
this.pieData = [
- { value: info.resi_y_house_y_count, name: "人户一致" },
- { value: info.resi_y_house_n_count, name: "人在户不在" },
- { value: info.resi_n_house_y_count, name: "户在人不在" },
+ {
+ value: info.resi_y_house_y_count,
+ type: "resi_y_house_y_count",
+ name: "人户一致",
+ },
+ {
+ value: info.resi_y_house_n_count,
+ type: "resi_y_house_n_count",
+ name: "人在户不在",
+ },
+ {
+ value: info.resi_n_house_y_count,
+ type: "resi_n_house_y_count",
+ name: "户在人不在",
+ },
];
} else if (currentTab == "年龄") {
this.pieData = [
- { value: info.age50_count, name: "50岁以下" },
- { value: info.age5059_count, name: "50-59岁" },
- { value: info.age6069_count, name: "60-69岁" },
- { value: info.age7079_count, name: "70-79岁" },
- { value: info.age80_count, name: "80岁以上" },
+ {
+ value: info.age50_count,
+ type: "age50_count",
+ name: "50岁以下",
+ },
+ {
+ value: info.age5059_count,
+ type: "age5059_count",
+ name: "50-59岁",
+ },
+ {
+ value: info.age6069_count,
+ type: "age6069_count",
+ name: "60-69岁",
+ },
+ {
+ value: info.age7079_count,
+ type: "age7079_count",
+ name: "70-79岁",
+ },
+ {
+ value: info.age80_count,
+ type: "age80_count",
+ name: "80岁以上",
+ },
];
} else if (currentTab == "志愿者类别") {
this.pieData = [
- { value: info.culture_count, name: "文化队伍" },
- { value: info.committee_count, name: "楼委会" },
- { value: info.capable_count, name: "能人达人" },
- { value: info.friend_count, name: "老友俱乐部" },
- { value: info.agent_count, name: "代办员" },
- { value: info.mediator_count, name: "调解员" },
- { value: info.collector_count, name: "采集员" },
- { value: info.security_count, name: "治安巡逻员" },
- { value: info.party_mem_count, name: "党员中心户" },
+ {
+ value: info.culture_count,
+ type: "culture_count",
+ name: "文化队伍",
+ },
+ {
+ value: info.committee_count,
+ type: "committee_count",
+ name: "楼委会",
+ },
+ {
+ value: info.capable_count,
+ type: "capable_count",
+ name: "能人达人",
+ },
+ {
+ value: info.friend_count,
+ type: "friend_count",
+ name: "老友俱乐部",
+ },
+ {
+ value: info.agent_count,
+ type: "agent_count",
+ name: "代办员",
+ },
+ {
+ value: info.mediator_count,
+ type: "mediator_count",
+ name: "调解员",
+ },
+ {
+ value: info.collector_count,
+ type: "collector_count",
+ name: "采集员",
+ },
+ {
+ value: info.security_count,
+ type: "security_count",
+ name: "治安巡逻员",
+ },
+ {
+ value: info.party_mem_count,
+ type: "party_mem_count",
+ name: "党员中心户",
+ },
];
} else if (currentTab == "党员文化程度") {
this.pieData = [
- { value: info.primary_count, name: "小学及文盲" },
- { value: info.junior_high_count, name: "初中" },
- { value: info.second_speci_count, name: "中专" },
- { value: info.high_school_count, name: "高中" },
- { value: info.junior_college_count, name: "大专" },
- { value: info.undergrad_count, name: "本科" },
- { value: info.master_count, name: "硕士" },
- { value: info.doctor_count, name: "博士" },
+ {
+ value: info.primary_count,
+ type: "primary_count",
+ name: "小学及文盲",
+ },
+ {
+ value: info.junior_high_count,
+ type: "junior_high_count",
+ name: "初中",
+ },
+ {
+ value: info.second_speci_count,
+ type: "second_speci_count",
+ name: "中专",
+ },
+ {
+ value: info.high_school_count,
+ type: "high_school_count",
+ name: "高中",
+ },
+ {
+ value: info.junior_college_count,
+ type: "junior_college_count",
+ name: "大专",
+ },
+ {
+ value: info.undergrad_count,
+ type: "undergrad_count",
+ name: "本科",
+ },
+ {
+ value: info.master_count,
+ type: "master_count",
+ name: "硕士",
+ },
+ {
+ value: info.doctor_count,
+ type: "doctor_count",
+ name: "博士",
+ },
];
} else if (currentTab == "下级人口分布") {
this.pieData = [];
diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue
index ade2ad80f..099d3048b 100644
--- a/src/views/dataBoard/renfang/resi/list.vue
+++ b/src/views/dataBoard/renfang/resi/list.vue
@@ -139,9 +139,13 @@ export default {
};
},
- mounted() {
+ activated() {
this.org_id = getQueryPara("org_id");
this.resiType = getQueryPara("type");
+ const type_name = getQueryPara("type_name");
+ this.breadList[1].meta.title = type_name + "居民列表";
+ this.tableTitle = type_name + "居民列表";
+
this.getList();
},
diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue
index 560d0fab4..6105bb33d 100644
--- a/src/views/dataBoard/renfang/warn/resi.vue
+++ b/src/views/dataBoard/renfang/warn/resi.vue
@@ -123,7 +123,7 @@ export default {
};
},
- mounted() {
+ activated() {
this.getList();
},
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 1fc73f903..9ce10aa93 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -1,118 +1,142 @@
-
-
+
+
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index 62c9784ec..52fe8ae3d 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -587,7 +587,7 @@ export default {
}
},
},
- mounted() {
+ activated() {
this.getApiData();
this.firstSearch();