From 5693a514ef6b569f77f1f2a21cb41e8775c9d69d Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 3 Nov 2023 17:52:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=E7=9A=84legend=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4,?= =?UTF-8?q?=E7=9C=81=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=B0=83=E6=9F=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/home/index.vue | 4 +- .../satisfactionProvince/index.vue | 977 +++++++++++------- 2 files changed, 594 insertions(+), 387 deletions(-) diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 1cfb2f0e6..a6695d330 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -274,7 +274,7 @@ export default { }, legend: { data: data.series.map((item) => item.name), - bottom: "10%", + bottom: "5%", icon: "rect", itemWidth: 20, itemHeight: 5, @@ -283,7 +283,7 @@ export default { grid: { left: "3%", right: "4%", - bottom: "25%", + bottom: "30%", containLabel: true, }, toolbox: { diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue index 0e8a322ee..0f8a7ea81 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/index.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue @@ -1,383 +1,592 @@ - - - - - \ No newline at end of file + + \ No newline at end of file From f1fb4e2a7ed484383ae3d9e3c2d9d39e7a3fa73c Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sat, 4 Nov 2023 14:05:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=A1=97=E9=81=93=E6=BB=A1=E6=84=8F?= =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=9F=A5=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../satisfactionProvince/formList.vue | 5 + .../satisfactionProvince/index.vue | 93 ++++++++++--------- 2 files changed, 56 insertions(+), 42 deletions(-) diff --git a/src/views/modules/satisfaction/satisfactionProvince/formList.vue b/src/views/modules/satisfaction/satisfactionProvince/formList.vue index a15dc566d..95c794b2e 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/formList.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/formList.vue @@ -194,6 +194,7 @@ export default { ...this.formData, pageNo: this.pageNo, pageSize: this.pageSize, + communityId:this.communityId }; let url = '/governance/provinceEvaluationRecord/pageInfo' const { data, code, msg } = await requestPost(url, params) @@ -217,6 +218,10 @@ export default { formObj: { type: Object, default: () => {} + }, + communityId:{ + type:String, + default:'' } }, //监听 diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue index 0f8a7ea81..19bbd1f2b 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/index.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue @@ -83,7 +83,7 @@
@@ -96,7 +96,7 @@ alt="Image" />
- +
{{ badTotal }}
综合得分
@@ -204,7 +204,7 @@ item.value - ); - const { data,code,msg } = await this.$http.post( - `/governance/provinceEvaluationRecord/staticPeopleNum`, - { ...this.formData } - ); - if(code == 0){ - this.option.series[0].data = []; - this.option.xAxis.data = []; - this.echartsData = data; - this.echartsData.forEach((item) => { - if (allowedCategories.includes(item.scopeId)) { - this.option.series[0].data.push(item.peopleNum); - this.option.xAxis.data.push(item.scopeName); + if (level != "street") { + const allowedCategories = this.dicts.satisfaction_category.map( + (item) => item.value + ); + const { data } = await this.$http.post( + `/governance/provinceEvaluationRecord/staticPeopleNum`, + { ...this.formData } + ); + this.option.series[0].data = []; + this.option.xAxis.data = []; + this.echartsData = data; + this.echartsData.forEach((item) => { + if (allowedCategories.includes(item.scopeId)) { + this.option.series[0].data.push(item.peopleNum); + this.option.xAxis.data.push(item.scopeName); + } + }); + this.myChart.setOption(this.option); + } else { + const { statistics, code, msg, tableList } = await requestPost( + `/governance/provinceEvaluationRecord/staticStreetPeopleNum`, + { ...this.formData } + ); + if (code == 0) { + statistics.forEach((item) => { + if (item.scopeId != "badTotal") { + this.badList.push({ + badNum: item.peopleNum, + satisfactionCategoryName: item.scopeName, + imgUrl: require(`@/assets/img/satisfaction/${item.scopeId}.png`), + }); } + this.tableList = tableList; + this.badTotal = + statistics.map((item) => item.scopeId == "badTotal").peopleNum || + 0; }); - this.myChart.setOption(this.option); - }else{ - this.$message.error(msg); - } - } else { - const { data,code,msg } = await this.$http.post( - `/governance/provinceEvaluationRecord/staticStreetPeopleNum`, - { ...this.formData } - ); - if(code == 0){ - console.log(data); - }else { - this.$message.error(msg); - } + this.$message.error(msg); } - } catch (error) { - console.log(error); } }, + handleView(row) { + this.showFormList = true; + this.communityId = row.communityId; + }, async handleExportModule() { let url = "/governance/provinceEvaluationRecord/provinceStatis/downloadImportTemplate"; From 6f0400dec4c1719f365c965545546f636be21336 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 6 Nov 2023 09:28:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/satisfaction/satisfactionProvince/index.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue index 19bbd1f2b..396917f90 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/index.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue @@ -351,8 +351,7 @@ export default { this.initEcharts(); } await this.getDicts(); - await this.getTableData(this.user.level); - console.log(this.user.level); + await this.getTableData(); }, methods: { // --------------------------------------字典------------------------------------------ @@ -441,8 +440,8 @@ export default { this.getTableData(); }, // 获取列表 - async getTableData(level) { - if (level != "street") { + async getTableData() { + if (this.user.level != "street") { const allowedCategories = this.dicts.satisfaction_category.map( (item) => item.value ); From 376abc64e03585fe36c0dccd1444aad1e6a7ce09 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 6 Nov 2023 11:05:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/satisfaction/communitySelfInsp/index.vue | 4 +++- .../satisfaction/satisfactionProvince/index.vue | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index bc38e6ff6..69d75c44d 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -295,7 +295,9 @@ export default { this.myChart.on("click", function (params) { than.handelClickChart(params.name,params.seriesName); }); - window.addEventListener("resize", this.handleWindowResize); + this.$nextTick(()=>{ + window.addEventListener("resize", this.handleWindowResize); + }) }, handleWindowResize() { if (this.myChart) { diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue index 396917f90..e0124743d 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/index.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue @@ -344,12 +344,11 @@ export default { this.formData.periodStart = util.formatDate(date, "yyyy-MM"); this.user = this.$store.state.user; }, - async mounted() { this.agencyId = this.user.agencyId; - if (this.user.level != "street") { + this.$nextTick(()=>{ this.initEcharts(); - } + }) await this.getDicts(); await this.getTableData(); }, @@ -378,14 +377,16 @@ export default { }, // ------------------------------------事件------------------------------------------ initEcharts() { + if(this.user.level == 'street') return this.myChart = echarts.init(document.getElementById("myCharts")); this.myChart.setOption(this.option); let than = this; this.myChart.on("click", function (params) { than.handelClickChart(params.name); }); - + this.$nextTick(()=>{ window.addEventListener("resize", this.handleWindowResize); + }) }, handleWindowResize() { if (this.myChart) { @@ -462,7 +463,7 @@ export default { } else { const { statistics, code, msg, tableList } = await requestPost( `/governance/provinceEvaluationRecord/staticStreetPeopleNum`, - { ...this.formData } + { ...this.formData,pageSize:this.pageSize,pageNo:this.pageNo } ); if (code == 0) { statistics.forEach((item) => { From 19349ab4f5ace7a22bce020b52b5214d41116f24 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 6 Nov 2023 16:20:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../satisfactionProvince/index.vue | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue index e0124743d..16e99e233 100644 --- a/src/views/modules/satisfaction/satisfactionProvince/index.vue +++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue @@ -442,6 +442,7 @@ export default { }, // 获取列表 async getTableData() { + this.badList = [] if (this.user.level != "street") { const allowedCategories = this.dicts.satisfaction_category.map( (item) => item.value @@ -474,11 +475,9 @@ export default { imgUrl: require(`@/assets/img/satisfaction/${item.scopeId}.png`), }); } - this.tableList = tableList; - this.badTotal = - statistics.map((item) => item.scopeId == "badTotal").peopleNum || - 0; }); + this.tableList = tableList; + this.badTotal = statistics.filter((item) => item.scopeId == "badTotal")[0].peopleNum; } else { this.$message.error(msg); } @@ -576,8 +575,17 @@ export default { this.$message.error("导入失败"); }); }, - handleCurrentChange() {}, - handleSizeChange() {}, + handleCurrentChange() { + console.log(`当前页: ${val}`) + this.pageNo = val + this.getTableData() + }, + handleSizeChange() { + console.log(`每页 ${val} 条`) + this.pageSize = val + window.localStorage.setItem("pageSize", val) + this.getTableData() + }, // 重置 resetSearch() { this.formData = {}; From ed0c916d2394c3249f585a89652c1ca5a78c72d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com> Date: Wed, 8 Nov 2023 09:43:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B8=A6=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/renfang/resi/classNew.vue | 273 +++++++++++++----- .../visualizing/components/dangyuan.vue | 8 +- .../visualizing/components/dibaorenyuan.vue | 4 +- .../visualizing/components/laonianren.vue | 9 +- .../visualizing/components/shiyerenyuan.vue | 18 +- .../visualizing/components/zhiyuanzhe.vue | 8 +- 6 files changed, 219 insertions(+), 101 deletions(-) diff --git a/src/views/dataBoard/renfang/resi/classNew.vue b/src/views/dataBoard/renfang/resi/classNew.vue index eb9fbc076..b18cb00fc 100644 --- a/src/views/dataBoard/renfang/resi/classNew.vue +++ b/src/views/dataBoard/renfang/resi/classNew.vue @@ -14,8 +14,10 @@
@@ -44,6 +47,7 @@ @@ -58,6 +62,7 @@ @@ -71,12 +76,14 @@
@@ -99,12 +107,14 @@
@@ -127,13 +138,14 @@
@@ -157,6 +170,7 @@ @@ -180,6 +194,7 @@ @@ -266,7 +281,7 @@ export default { value: ["80", "89"], }, { - label: "90岁以上", + label: "90岁及以上", value: ["90", "139"], }, ], @@ -312,10 +327,32 @@ export default { value: ["80", "89"], }, { - label: "90岁以上", + label: "90岁及以上", value: ["90", "139"], }, ], + oldAllList1: [ + { + label: "49岁及以下", + value: ["0", "49"], + }, + { + label: "50-59岁", + value: ["50", "59"], + }, + { + label: "60-69岁", + value: ["60", "69"], + }, + { + label: "70-79岁", + value: ["70", "79"], + }, + { + label: "80岁及以上", + value: ["80", "139"], + }, + ], colList: [ { align: "left", @@ -413,7 +450,7 @@ export default { url: "/actual/base/peopleRoomOverview/postPageList", }, ], - oldVal: ["60", "69"], + oldValsss: ["60", "69"], jzVal: "", searchParams: {}, unemploymentArr: [], @@ -424,9 +461,9 @@ export default { lowIncomeTypeArr: [], }; }, - activated() { const query = this.$route.query; + this.query = this.$route.query; this.org_id = query.org_id; this.type = query.type; this.type_id = query.type_id; @@ -445,33 +482,98 @@ export default { this.tableTitle = type_name + "居民列表"; this.pageNo = 1; const type = this.type; + if (type == "old") { + if (query.olds) { + const olds = this.oldList.filter((item) => query.olds == item.label)[0]; + this.changeOld(olds.value); + setTimeout(() => { + this.oldValsss = olds.value; + }, 200); + this.searchParams = { + resideSituation: null, + }; + } + if (query.qingk) { + this.searchParams = { + resideSituation: query.qingk, + }; + this.oldValsss = undefined; + } + } if (type == "dibao") { - this.searchParams = { - lowIncomeType: null, // 低保类型 - lowIncomeReason: null, // 低保原因 - }; + if (query.lowIncomeType) { + this.searchParams = { + lowIncomeType: query.lowIncomeType, // 低保类型 + lowIncomeReason: null, // 低保原因 + }; + } + if (query.lowIncomeReason) { + this.searchParams = { + lowIncomeType: null, // 低保类型 + lowIncomeReason: query.lowIncomeReason, // 低保原因 + }; + } } if (type == "shiye") { - this.searchParams = { - employmentWish: null, // 就业愿望 - unemploymentReason: null, // 失业原因 - startAge: null, - endAge: null, - }; + if (query.olds) { + const olds = this.oldAllList1.filter((item) => query.olds == item.label)[0]; + this.changeOld(olds.value); + setTimeout(() => { + this.oldValsss = olds.value; + }, 200); + this.searchParams = { + employmentWish: null, // 就业愿望 + unemploymentReason: null, // 失业原因 + }; + } + if (query.employmentWish) { + this.searchParams = { + employmentWish: query.employmentWish, // 就业愿望 + unemploymentReason: null, // 失业原因 + startAge: null, + endAge: null, + }; + } + if (query.unemploymentReason) { + this.searchParams = { + employmentWish: null, // 就业愿望 + unemploymentReason: query.unemploymentReason, // 失业原因 + startAge: null, + endAge: null, + }; + } } if (type == "dangyuan") { - this.searchParams = { - cultureLevel: null, // 学历 - startAge: null, - endAge: null, - }; + if (query.olds) { + const olds = this.oldAllList1.filter( + (item) => query.olds == item.label + )[0]; + this.changeOld(olds.value); + setTimeout(() => { + this.oldValsss = olds.value; + }, 200); + } + if (query.cultureLevel) { + this.searchParams = { + cultureLevel: query.cultureLevel, // 志愿者类型 + }; + } } - if (type == "zhiyuan") { - this.searchParams = { - gategoryCode: null, // 志愿者类型 - startAge: null, - endAge: null, - }; + if (type == "zhiyuanzhe") { + if (query.olds) { + const olds = this.oldAllList1.filter( + (item) => query.olds == item.label + )[0]; + this.changeOld(olds.value); + setTimeout(() => { + this.oldValsss = olds.value; + }, 200); + } + if (query.gategoryCode) { + this.searchParams = { + gategoryCode: query.gategoryCode, // 志愿者类型 + }; + } } if ( type == "fuwu" || @@ -483,7 +585,9 @@ export default { serviceOrgName: null, // 服务方名称 }; } - this.getList(); + if (!query.olds) { + this.getList(); + } if (this.pageType != "normal") { this.colList = [ { @@ -544,25 +648,39 @@ export default { this.pageNo = 1; }, watch: { - // $route(to, from) { - // this.$router.go(0); + // oldValsss: { + // handler(newVal) { + // // this.pageNo = 1; + // // const searchParams = { + // // startAge: newVal[0], + // // endAge: newVal[1], + // // }; + // // this.getList(searchParams); + // }, // }, - oldVal: { - handler(newVal, oldVal) { - this.pageNo = 1; - const searchParams = { - startAge: newVal[0], - endAge: newVal[1], - }; - this.getList(searchParams); - }, - }, - searchParams(newVal, oldVal) { + searchParams(newVal) { + this.pageNo = 1; this.getList(); }, }, - methods: { + changeOld(e) { + if (!e) { + this.oldValsss = undefined; + const searchParams = { + startAge: null, + endAge: null, + }; + this.getList(searchParams); + return; + } + const searchParams = { + startAge: e[0], + endAge: e[1], + }; + this.oldValsss = e; + this.getList(searchParams); + }, handleClickBreadItem({ item }) { this.$router.push({ path: item.path, @@ -613,17 +731,33 @@ export default { this.getList(); }, async getList(item) { - const { url } = this.typeList.filter((item) => item.type == this.type)[0]; + const { url } = this.typeList.filter((d) => d.type == this.type)[0]; const sourceType = ["公共服务", "共性需求", "政策找人", "服务找人"]; this.loading = true; + let params = {}; + if (this.oldValsss && this.oldValsss != "" && this.oldValsss.length != 0) { + params = { + startAge: this.oldValsss[0], + endAge: this.oldValsss[1], + }; + } else { + params = { + startAge: null, + endAge: null, + }; + } let queryParam = { pageNo: this.pageNo, pageSize: this.pageSize, ...this.searchParams, - ...item, + ...params, }; for (let key in queryParam) { - if (queryParam[key] == "ALL") { + if ( + queryParam[key] == "ALL" || + queryParam[key] == "" || + queryParam[key] == null + ) { queryParam[key] = undefined; } } @@ -641,8 +775,8 @@ export default { item.name ? item.name : "--", item.gridName ? item.gridName : "--", item.fullName ? item.fullName : "--", - item.mobile ? $sensitive(item.mobile, 3, 7) : "--", - item.idNum ? $sensitive(item.idNum, 0, 14) : "--", + item.mobile ? this.$sensitive(item.mobile, 3, 7) : "--", + item.idNum ? this.$sensitive(item.idNum, 0, 14) : "--", item.gender ? gender[item.gender] : "--", item.birthday ? item.birthday : "--", { type: "operate", list: ["查看"] }, @@ -680,9 +814,7 @@ export default { }, ...data.data, ]; - } catch (error) { - console.log(error, "获取居住情况字典"); - } + } catch (error) {} }, // async getPostNation() { // try { @@ -691,7 +823,6 @@ export default { // }); // this.PostDictonArr = data.data; // } catch (error) { - // console.log(error, "获取学历字典"); // } // }, async getUnemployment() { @@ -706,9 +837,7 @@ export default { }, ...data.data, ]; - } catch (error) { - console.log(error, "获取失业原因字典"); - } + } catch (error) {} }, async getCareer() { try { @@ -722,9 +851,7 @@ export default { }, ...data.data, ]; - } catch (error) { - console.log(error, "获取就业愿望字典"); - } + } catch (error) {} }, async getVolunteer() { try { @@ -738,9 +865,7 @@ export default { }, ...data.data, ]; - } catch (error) { - console.log(error, "获取志愿者类别字典"); - } + } catch (error) {} }, async getLowIncomeReason() { try { @@ -754,9 +879,7 @@ export default { }, ...data.data, ]; - } catch (error) { - console.log(error, "获取低保原因字典"); - } + } catch (error) {} }, async getLowIncomeType() { try { @@ -770,9 +893,7 @@ export default { }, ...data.data, ]; - } catch (error) { - console.log(error, "获取低保类型字典"); - } + } catch (error) {} }, async getPostNation() { try { @@ -786,14 +907,10 @@ export default { }, ...data.data, ]; - } catch (error) { - console.log(error, "获取学历字典"); - } + } catch (error) {} }, }, - destroyed() { - console.log("我已经离开了！"); - }, + destroyed() {}, }; diff --git a/src/views/dataBoard/renfang/visualizing/components/dangyuan.vue b/src/views/dataBoard/renfang/visualizing/components/dangyuan.vue index 5a130baf5..8ed932df3 100644 --- a/src/views/dataBoard/renfang/visualizing/components/dangyuan.vue +++ b/src/views/dataBoard/renfang/visualizing/components/dangyuan.vue @@ -157,7 +157,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.dyLeft && this.dyLeft.length > 0 ? [30, 130] : [0, 0], center: ["50%", "50%"], @@ -180,7 +179,7 @@ export default { ], }; this.myChart1.setOption(option); - this.myChart1.on("click", (a, b) => { + this.myChart1.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -189,6 +188,7 @@ export default { type_name: "党员", pageType: "normal", type: "dangyuan", + olds: e.data.name, }, }); }); @@ -273,7 +273,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.dyRight && this.dyRight.length > 0 ? [30, 130] : [0, 0], @@ -296,7 +295,7 @@ export default { }, ], }; - this.myChart2.on("click", (a, b) => { + this.myChart2.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -305,6 +304,7 @@ export default { type_name: "党员", pageType: "normal", type: "dangyuan", + cultureLevel: e.data.name, }, }); }); diff --git a/src/views/dataBoard/renfang/visualizing/components/dibaorenyuan.vue b/src/views/dataBoard/renfang/visualizing/components/dibaorenyuan.vue index d3fe20e6c..8e14787db 100644 --- a/src/views/dataBoard/renfang/visualizing/components/dibaorenyuan.vue +++ b/src/views/dataBoard/renfang/visualizing/components/dibaorenyuan.vue @@ -226,7 +226,7 @@ export default { ], }; this.myChart1.setOption(option); - this.myChart1.on("click", (a, b) => { + this.myChart1.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -235,6 +235,7 @@ export default { type_name: "低保人员", pageType: "normal", type: "dibao", + lowIncomeType: e.node.name, }, }); }); @@ -363,6 +364,7 @@ export default { type_name: "低保人员", pageType: "normal", type: "dibao", + lowIncomeReason: e.node.name, }, }); }); diff --git a/src/views/dataBoard/renfang/visualizing/components/laonianren.vue b/src/views/dataBoard/renfang/visualizing/components/laonianren.vue index 400ffcca9..98902ac35 100644 --- a/src/views/dataBoard/renfang/visualizing/components/laonianren.vue +++ b/src/views/dataBoard/renfang/visualizing/components/laonianren.vue @@ -157,7 +157,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.lnrLeft && this.lnrLeft.length > 0 ? [30, 130] : [0, 0], @@ -181,7 +180,7 @@ export default { ], }; this.myChart1.setOption(option); - this.myChart1.on("click", (a, b) => { + this.myChart1.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -190,6 +189,7 @@ export default { type_name: "老年人", pageType: "normal", type: "old", + olds: e.data.name, }, }); }); @@ -276,7 +276,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.lnrRight && this.lnrRight.length > 0 ? [30, 130] : [0, 0], @@ -299,7 +298,8 @@ export default { }, ], }; - this.myChart2.on("click", (a, b) => { + this.myChart2.on("click", (e) => { + console.log('a, b::', e); this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -308,6 +308,7 @@ export default { type_name: "老年人", pageType: "normal", type: "old", + qingk: e.data.name, }, }); }); diff --git a/src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue b/src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue index 94d72f9ae..d6633a692 100644 --- a/src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue +++ b/src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue @@ -222,7 +222,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.syryData1 && this.syryData1.length > 0 ? [30, 130] : [0, 0], @@ -246,7 +245,7 @@ export default { ], }; this.myChart1.setOption(option); - this.myChart1.on("click", (a, b) => { + this.myChart1.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -255,6 +254,7 @@ export default { type_name: "失业人员", pageType: "normal", type: "shiye", + unemploymentReason: e.name, }, }); }); @@ -352,7 +352,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.syryData2 && this.syryData2.length > 0 ? [30, 130] : [0, 0], @@ -376,7 +375,7 @@ export default { ], }; this.myChart2.setOption(option); - this.myChart2.on("click", (a, b) => { + this.myChart2.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -385,6 +384,7 @@ export default { type_name: "失业人员", pageType: "normal", type: "shiye", + employmentWish: e.name, }, }); }); @@ -484,7 +484,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.syryData3 && this.syryData3.length > 0 ? [30, 130] : [0, 0], @@ -508,7 +507,7 @@ export default { ], }; this.myChart3.setOption(option); - this.myChart3.on("click", (a, b) => { + this.myChart3.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -517,6 +516,7 @@ export default { type_name: "失业人员", pageType: "normal", type: "shiye", + olds: e.name, }, }); }); @@ -615,7 +615,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.syryData4 && this.syryData4.length > 0 ? [30, 130] : [0, 0], @@ -639,7 +638,7 @@ export default { ], }; this.myChart4.setOption(option); - this.myChart4.on("click", (a, b) => { + this.myChart4.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -746,7 +745,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.syryData5 && this.syryData5.length > 0 ? [30, 130] : [0, 0], @@ -770,7 +768,7 @@ export default { ], }; this.myChart5.setOption(option); - this.myChart5.on("click", (a, b) => { + this.myChart5.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { diff --git a/src/views/dataBoard/renfang/visualizing/components/zhiyuanzhe.vue b/src/views/dataBoard/renfang/visualizing/components/zhiyuanzhe.vue index 72ed67feb..57b8de1fb 100644 --- a/src/views/dataBoard/renfang/visualizing/components/zhiyuanzhe.vue +++ b/src/views/dataBoard/renfang/visualizing/components/zhiyuanzhe.vue @@ -157,7 +157,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.zyzLeft && this.zyzLeft.length > 0 ? [30, 130] : [0, 0], @@ -181,7 +180,7 @@ export default { ], }; this.myChart1.setOption(option); - this.myChart1.on("click", (a, b) => { + this.myChart1.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -190,6 +189,7 @@ export default { type_name: "志愿者", pageType: "normal", type: "zhiyuanzhe", + olds: e.data.name, }, }); }); @@ -276,7 +276,6 @@ export default { }, series: [ { - name: "Nightingale Chart", type: "pie", radius: this.zyzRight && this.zyzRight.length > 0 ? [30, 130] : [0, 0], @@ -299,7 +298,7 @@ export default { }, ], }; - this.myChart2.on("click", (a, b) => { + this.myChart2.on("click", (e) => { this.$router.push({ path: "/dataBoard/renfang/resi-class-new", query: { @@ -308,6 +307,7 @@ export default { type_name: "志愿者", pageType: "normal", type: "zhiyuanzhe", + gategoryCode: e.data.name, }, }); });