-
-
@@ -15,7 +23,8 @@ export default {
orgId: {
type: String,
default: ''
- }
+ },
+ searchDate: Array
},
data() {
return {
@@ -25,44 +34,8 @@ export default {
pieOption: {},
pieInitState: false,
pieData: [],
- tabList: [
- '人资源',
- '物资源',
- '场所资源'
- // "下级人口分布",
- ],
- currentTab: '人资源',
- info: {
- male_count: 0,
- female_count: 0,
- resi_y_house_y_count: 0,
- resi_y_house_n_count: 0,
- resi_n_house_y_count: 0,
- primary_count: 0,
- junior_high_count: 0,
- second_speci_count: 0,
- high_school_count: 0,
- junior_college_count: 0,
- undergrad_count: 0,
- master_count: 0,
- doctor_count: 0,
- local_count: 0,
- field_count: 0,
- age50_count: 0,
- age5059_count: 0,
- age6069_count: 0,
- age7079_count: 0,
- age80_count: 0,
- culture_count: 0,
- committee_count: 0,
- capable_count: 0,
- friend_count: 0,
- agent_count: 0,
- mediator_count: 0,
- collector_count: 0,
- security_count: 0,
- party_mem_count: 0
- }
+
+ info: {}
};
},
components: {
@@ -71,6 +44,7 @@ export default {
mounted() {
this.init();
},
+
watch: {
currentTab() {
this.setPieData();
@@ -84,35 +58,18 @@ export default {
await this.getInfo();
this.getPie();
},
- handleClickItem(item) {
- // const { type, name } = item;
- // this.$router.push({
- // path: '/dataBoard/renfang/resi-analyze',
- // query: {
- // org_id: this.orgId,
- // type,
- // type_category: this.currentTab,
- // type_name: name
- // }
- // });
- },
+
// 获取房屋总数等
async getInfo() {
- let url = '';
- if (this.currentTab == '人资源') {
- url = 'people_res_view';
- } else if (this.currentTab == '物资源') {
- url = 'goods_res_view';
- } else {
- url = 'people_res_view';
- }
-
+ let url = 'common_service_view';
this.$refs.pieChart.showLoading();
const { data, code, msg } = await requestPostBi(
url,
{
queryParam: {
- org_id: this.orgId
+ org_id: this.orgId,
+ start_date: this.searchDate[0],
+ end_date: this.searchDate[1]
}
},
{
@@ -156,26 +113,42 @@ export default {
setPieData() {
const { currentTab, info } = this;
- let data = [
+ let { data } = this;
+ data = [
+ {
+ org_id: '',
+ name: '健康医疗',
+ count: 10
+ },
+ {
+ org_id: '',
+ name: '社区安全',
+ count: 20
+ },
+ {
+ org_id: '',
+ name: '社区治安',
+ count: 30
+ },
{
- name: '江',
- org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
- count: 61
+ org_id: '',
+ name: '社区卫生',
+ count: 40
},
{
- name: '平',
- org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
- count: 63
+ org_id: '',
+ name: '社区环境',
+ count: 50
},
{
- name: '究',
- org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
- count: 66
+ org_id: '',
+ name: '社区救助',
+ count: 60
},
{
- name: '布',
- org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28',
- count: 61
+ org_id: '',
+ name: '社区养老',
+ count: 70
}
];
data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value'));
diff --git a/src/views/dataBoard/sida/cpts/fw03zr.vue b/src/views/dataBoard/sida/cpts/fw03zr.vue
index 202bb6f89..56f5983ba 100644
--- a/src/views/dataBoard/sida/cpts/fw03zr.vue
+++ b/src/views/dataBoard/sida/cpts/fw03zr.vue
@@ -62,35 +62,7 @@ export default {
tabList: ['服务次数排名', '服务人数排名'],
currentTab: '服务次数排名',
info: {
- male_count: 0,
- female_count: 0,
- resi_y_house_y_count: 0,
- resi_y_house_n_count: 0,
- resi_n_house_y_count: 0,
- primary_count: 0,
- junior_high_count: 0,
- second_speci_count: 0,
- high_school_count: 0,
- junior_college_count: 0,
- undergrad_count: 0,
- master_count: 0,
- doctor_count: 0,
- local_count: 0,
- field_count: 0,
- age50_count: 0,
- age5059_count: 0,
- age6069_count: 0,
- age7079_count: 0,
- age80_count: 0,
- culture_count: 0,
- committee_count: 0,
- capable_count: 0,
- friend_count: 0,
- agent_count: 0,
- mediator_count: 0,
- collector_count: 0,
- security_count: 0,
- party_mem_count: 0
+
}
};
},
@@ -104,9 +76,7 @@ export default {
currentTab() {
this.getResiCategoryData();
},
- orgId() {
- this.init();
- }
+
},
methods: {
async init() {
diff --git a/src/views/dataBoard/sida/cpts/fw04gx.vue b/src/views/dataBoard/sida/cpts/fw04gx.vue
index 616dfc127..91c2c411c 100644
--- a/src/views/dataBoard/sida/cpts/fw04gx.vue
+++ b/src/views/dataBoard/sida/cpts/fw04gx.vue
@@ -26,7 +26,7 @@