From 2b65e12b7fe79bc6ff5707b8478beeab9285d925 Mon Sep 17 00:00:00 2001 From: tianq Date: Thu, 23 Mar 2023 14:23:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/dataBoard/renfang/index.scss | 31 +++-- src/views/dataBoard/sida/cpts/fw01gg.vue | 125 ++++++------------ src/views/dataBoard/sida/cpts/fw02gxxq.vue | 125 +++++++----------- src/views/dataBoard/sida/cpts/fw03zr.vue | 34 +---- src/views/dataBoard/sida/cpts/fw04gx.vue | 125 ++++++------------ src/views/dataBoard/sida/cpts/fw05zc.vue | 127 ++++++------------- src/views/dataBoard/sida/fw.vue | 26 ++-- src/views/dataBoard/sida/index.vue | 3 +- 8 files changed, 208 insertions(+), 388 deletions(-) diff --git a/src/assets/scss/dataBoard/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss index 082d87bc4..4de9f0966 100644 --- a/src/assets/scss/dataBoard/renfang/index.scss +++ b/src/assets/scss/dataBoard/renfang/index.scss @@ -226,7 +226,7 @@ ::v-deep .el-range-input { background: transparent; border: none; - color:#fff + color: #fff; } } } @@ -676,7 +676,20 @@ height: 270px; } } - +.pieMain2 { + .pie { + margin-top: 32px; + flex: 0px !important; + height: 270px; + } +} +.pieMain3 { + .pie { + margin-top: 32px; + flex: 0 0 480px !important; + height: 480px !important; + } +} .kuangkuang { width: 100%; // height: calc(100% - 120px); @@ -684,13 +697,10 @@ // background: rgba(26, 149, 255, 0.3); box-shadow: inset 0px 0px 20px 0px rgba(26, 149, 255, 1); background: linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) left top no-repeat, - linear-gradient(to bottom, rgb(26, 149, 255), rgb(26, 149, 255)) left top no-repeat, - linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) right top no-repeat, - linear-gradient(to bottom, rgb(26, 149, 255), rgb(26, 149, 255)) right top no-repeat, - linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) left bottom no-repeat, + linear-gradient(to bottom, rgb(26, 149, 255), rgb(26, 149, 255)) left top no-repeat, linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) right top no-repeat, + linear-gradient(to bottom, rgb(26, 149, 255), rgb(26, 149, 255)) right top no-repeat, linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) left bottom no-repeat, linear-gradient(to bottom, rgb(26, 149, 255), rgb(26, 149, 255)) left bottom no-repeat, - linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) right bottom no-repeat, - linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) right bottom no-repeat; + linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) right bottom no-repeat, linear-gradient(to left, rgb(26, 149, 255), rgb(26, 149, 255)) right bottom no-repeat; background-size: 3px 10px, 10px 3px, 3px 10px, 10px 3px; margin-top: 20px; text-align: center; @@ -702,7 +712,6 @@ color: #ffffff; line-height: 20px; margin-top: 16px; - } h2 { font-size: 32px; @@ -713,4 +722,6 @@ letter-spacing: 2px; } } -.cur{ cursor: pointer;} \ No newline at end of file +.cur { + cursor: pointer; +} diff --git a/src/views/dataBoard/sida/cpts/fw01gg.vue b/src/views/dataBoard/sida/cpts/fw01gg.vue index 60dbd8906..e121eb14e 100644 --- a/src/views/dataBoard/sida/cpts/fw01gg.vue +++ b/src/views/dataBoard/sida/cpts/fw01gg.vue @@ -14,7 +14,7 @@ -
+
@@ -28,7 +28,8 @@ export default { orgId: { type: String, default: '' - } + }, + searchDate: Array }, data() { return { @@ -38,44 +39,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: { @@ -84,48 +49,25 @@ export default { mounted() { this.init(); }, - watch: { - currentTab() { - this.setPieData(); - }, - orgId() { - this.init(); - } - }, + methods: { async init() { 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] } }, { @@ -167,34 +109,47 @@ export default { } }, setPieData() { - const { currentTab, info } = this; - - let data = [ + let { data } = this; + data = [ { - name: '江', - org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28', - count: 61 + org_id: '', + name: '健康医疗', + count: 10 }, { - name: '平', - org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28', - count: 63 + org_id: '', + name: '社区安全', + count: 20 }, { - name: '究', - org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28', - count: 66 + org_id: '', + name: '社区治安', + count: 30 }, { - name: '布', - org_id: '7b6f9a9f9f38d5f9fa7ce94a93d6eb28', - count: 61 + org_id: '', + name: '社区卫生', + count: 40 + }, + { + org_id: '', + name: '社区环境', + count: 50 + }, + { + org_id: '', + name: '社区救助', + count: 60 + }, + { + org_id: '', + name: '社区养老', + count:70 } ]; data = JSON.parse(JSON.stringify(data).replace(/count/g, 'value')); console.log('data', data); this.pieData = data; - this.iniPieChart(); }, // 获取饼状图 diff --git a/src/views/dataBoard/sida/cpts/fw02gxxq.vue b/src/views/dataBoard/sida/cpts/fw02gxxq.vue index 72c4b9051..099be1849 100644 --- a/src/views/dataBoard/sida/cpts/fw02gxxq.vue +++ b/src/views/dataBoard/sida/cpts/fw02gxxq.vue @@ -1,8 +1,16 @@ @@ -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 @@ -
+
@@ -40,7 +40,8 @@ export default { orgId: { type: String, default: '' - } + }, + searchDate: Array }, data() { return { @@ -49,45 +50,7 @@ export default { pieChart: '', 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 - } + pieData: [] }; }, components: { @@ -96,48 +59,26 @@ export default { mounted() { this.init(); }, - watch: { - currentTab() { - this.setPieData(); - }, - orgId() { - this.init(); - } - }, + + methods: { async init() { 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 = 'self_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] } }, { @@ -179,28 +120,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/fw05zc.vue b/src/views/dataBoard/sida/cpts/fw05zc.vue index 2a77387fc..f03112d28 100644 --- a/src/views/dataBoard/sida/cpts/fw05zc.vue +++ b/src/views/dataBoard/sida/cpts/fw05zc.vue @@ -20,9 +20,8 @@ -
-
+
+
@@ -35,7 +34,8 @@ export default { orgId: { type: String, default: '' - } + }, + searchDate: Array }, data() { return { @@ -44,45 +44,7 @@ export default { pieChart: '', 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 - } + pieData: [] }; }, components: { @@ -91,48 +53,25 @@ export default { mounted() { this.init(); }, - watch: { - currentTab() { - this.setPieData(); - }, - orgId() { - this.init(); - } - }, + methods: { async init() { 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] } }, { @@ -174,28 +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/fw.vue b/src/views/dataBoard/sida/fw.vue index 863f50504..d48ed1395 100644 --- a/src/views/dataBoard/sida/fw.vue +++ b/src/views/dataBoard/sida/fw.vue @@ -9,7 +9,7 @@
公共服务数据统计
-
+
@@ -19,7 +19,7 @@
共性需求待响应
-
+
@@ -29,7 +29,7 @@
服务找人数据统计
-
+
@@ -41,7 +41,7 @@
个性服务数据统计
-
+
@@ -51,7 +51,7 @@
政策找人数据统计
-
+
@@ -65,13 +65,9 @@ import fw03 from '@/views/dataBoard/sida/cpts/fw03zr'; import fw04 from '@/views/dataBoard/sida/cpts/fw04gx'; import fw05 from '@/views/dataBoard/sida/cpts/fw05zc'; import cptBread from '@/views/dataBoard/renfang/cpts/bread'; +import getQueryPara from 'dai-js/modules/getQueryPara'; export default { - props: { - orgId: { - type: String, - default: '' - } - }, + components: { fw01, fw02, @@ -80,9 +76,15 @@ export default { fw05, cptBread }, - + created() { + this.orgId = getQueryPara('org_id'); + this.searchDate = [getQueryPara('start_date'), getQueryPara('end_date')]; + console.log(this.orgId) + }, data() { return { + searchDate: [], + org_id: '', showNoData: false, barChart: '', barOption: {}, diff --git a/src/views/dataBoard/sida/index.vue b/src/views/dataBoard/sida/index.vue index eb60445d4..5efea308c 100644 --- a/src/views/dataBoard/sida/index.vue +++ b/src/views/dataBoard/sida/index.vue @@ -144,7 +144,8 @@ export default { this.$router.push({ path: '/dataBoard/sida/fw', query: { - org_id: this.orgId + org_id: this.orgId, + searchDate:this.searchDate } }); },