From 8da42cc3cd43e194d5a2d97bf658f10c7a1202d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Tue, 12 Dec 2023 11:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../overview/components/MapDialog/index.vue | 1 + src/views/dataBoard/renfang/cpts/fwgl.vue | 17 +++++++++++--- src/views/dataBoard/renfang/cpts/jmgl.vue | 10 ++++++++ src/views/dataBoard/renfang/index.vue | 21 +++++++++-------- .../Problem/tddtlxsj/detail.vue | 4 ++-- .../Problem/tyqybtlx/detail.vue | 4 ++-- .../Problem/tyqybtlx/list.vue | 4 ++-- .../satisfactionEval/Problem/tyry/detail.vue | 4 ++-- .../modules/PersonnelPortrait/index.vue | 23 ++++++++++++++++++- .../modules/eventAnalysis/index.vue | 7 +++--- 10 files changed, 70 insertions(+), 25 deletions(-) diff --git a/src/views/dataBoard/overview/components/MapDialog/index.vue b/src/views/dataBoard/overview/components/MapDialog/index.vue index 975d05185..408b89145 100644 --- a/src/views/dataBoard/overview/components/MapDialog/index.vue +++ b/src/views/dataBoard/overview/components/MapDialog/index.vue @@ -190,6 +190,7 @@ export default { if (this.type === 'bmysxqk') { this.catVal = 1 this.$http.get('/governance/icEvent/dissatisfyByCategoryType?agencyId=' + orgId).then(({data: {data}}) => { + this.catValSub = data[0].datas[0].value this.bmysxqkTree = data.map((item, index) => { return { label: item.type + '(' + item.total + ')', diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue index 61068fc12..b07715b67 100644 --- a/src/views/dataBoard/renfang/cpts/fwgl.vue +++ b/src/views/dataBoard/renfang/cpts/fwgl.vue @@ -189,13 +189,24 @@ export default { // 设置三个配置值 this.pieOption.title.text = pandectData.homeCount; this.pieData = [ - {value: pandectData.selfStay, name: "自住房屋"}, - {value: pandectData.rentOut, name: "出租房屋"}, - {value: pandectData.vacantHouse, name: "闲置房屋"}, + {value: pandectData.selfStay, name: "自住"}, + {value: pandectData.rentOut, name: "出租"}, + {value: pandectData.vacantHouse, name: "闲置"}, ]; this.pieOption.series[0].data = this.pieData; console.log(this.pieOption, 'this.pieOption.series') this.$refs.pieChart.setOption(this.pieOption); + //饼状图点击事件 + this.$refs.pieChart.myChart.off('click').on('click', (param) =>{ //这里使用箭头函数代替function，this指向VueComponent + let index; + //当前扇区的dataIndex + index = param.dataIndex; + //自己的操作，这里是点击跳转路由，并携带参数 + if (index !== undefined) { + console.log(param) + this.toListPage(index, param.name) + } + }); // this.$refs.pieChart.hideLoading() }, diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue index 23241e485..f15d77bab 100644 --- a/src/views/dataBoard/renfang/cpts/jmgl.vue +++ b/src/views/dataBoard/renfang/cpts/jmgl.vue @@ -188,6 +188,16 @@ export default { this.pieOption.series[0].data = this.pieData; this.$refs.pieChart.setOption(this.pieOption); this.$refs.pieChart.myChart.setOption(this.pieOption); + this.$refs.pieChart.myChart.off('click').on('click', (param) =>{ //这里使用箭头函数代替function，this指向VueComponent + let index; + //当前扇区的dataIndex + index = param.dataIndex; + //自己的操作，这里是点击跳转路由，并携带参数 + if (index !== undefined) { + console.log(param) + this.toListPage(index, param.name) + } + }); /*this.$refs.pieChart.myChart.on('mouseover', (params) => { var oldIndex = currentIndex; var currentIndex = params.dataIndex; diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index 8c10a9f68..17a1a16d0 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -234,7 +234,6 @@ <template> <div - v-if="!displayedForecast" class="box-title-btn" @click="displayedForecast = true" > @@ -250,15 +249,17 @@ </div> </template> - - <div - v-else - class="box-title-btn" - @click="displayedForecast = false" - > - <img src="~@/assets/images/shuju/main/back-on.png"/> - <span style="color: #fff">返回</span> - </div> + <Title v-else text="居民分类统计-智能预测"> + <template> + <div + class="box-title-btn" + @click="displayedForecast = false" + > + <img src="~@/assets/images/shuju/renfang/index/znyc.png"/> + <span>居民概览</span> + </div> + </template> +
diff --git a/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue b/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue index ed3427464..c08d73a81 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tddtlxsj/detail.vue @@ -64,10 +64,10 @@ export default { path: "/dataBoard/satisfactionEval/index", name: "满意度评价", }, - { + /* { path: "/dataBoard/satisfactionEval/Problem/tddtlxsj", name: "同地点同类型重复投诉问题列表", - }, + },*/ { path: "", name: "详情", diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue index 2589ab4b3..6ebdb8471 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/detail.vue @@ -64,10 +64,10 @@ export default { path: "/dataBoard/satisfactionEval/index", name: "满意度评价", }, - { + /* { path: "/dataBoard/satisfactionEval/Problem/tyqybtlx", name: "同一区域不同类型重复投诉问题列表", - }, + },*/ { path: "", name: "详情", diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue index 00c6982d3..3cb6c5587 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tyqybtlx/list.vue @@ -30,7 +30,7 @@ element-loading-spinner="el-icon-loading" element-loading-text="加载中..." > - + @@ -128,7 +128,7 @@ export default { }, methods: { objectSpanMethod({row, column, rowIndex, columnIndex}) { - if (columnIndex === 1 || columnIndex === 0 || columnIndex === 4) { + if (columnIndex === 1 || columnIndex === 4) { if (rowIndex > 0 && row.address === this.data[rowIndex - 1].address) { return { rowspan: 0, diff --git a/src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue b/src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue index 0c909ac4e..b054f8e04 100644 --- a/src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue +++ b/src/views/dataBoard/satisfactionEval/Problem/tyry/detail.vue @@ -64,10 +64,10 @@ export default { path: "/dataBoard/satisfactionEval/index", name: "满意度评价", }, - { + /* { path: "/dataBoard/satisfactionEval/Problem/tyry", name: "同一人员重复投诉问题列表", - }, + },*/ { path: "", name: "详情", diff --git a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue index 47596faa4..0754effa0 100644 --- a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue @@ -19,7 +19,7 @@ {{ ageClassification }}
-
+
{{ residentTag }}
@@ -189,6 +189,8 @@ $light: #2ab6be; $green: #1b7d47; $orange: #f95619; $purple: #6642fd; +$purple2: #db42fd; +$green2: #58cc32; .personnel-portrait { padding: 16px 16px 40px; } @@ -367,6 +369,7 @@ $purple: #6642fd; &:nth-of-type(1) { left: 48px; top: 57px; + } } @@ -439,6 +442,24 @@ $purple: #6642fd; background: $purple; } } + .purple2 { + .text { + background: $purple2; + } + + &:after { + background: $purple2; + } + } + .green2 { + .text { + background: $green2; + } + + &:after { + background: $green2; + } + } } .btn { diff --git a/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue b/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue index 991b8dded..6ce4f7709 100644 --- a/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/eventAnalysis/index.vue @@ -227,13 +227,13 @@ export default { }).then(({data: {data}}) => { console.log(data) if(type === ''|| type === 1) { - this.list = data?data.addressMobileEvents: [] || [] + this.list = data?data.addressEvent: [] || [] } if(type === ''|| type === 2) { this.list2 = data?data.mobileEvent: [] || [] } if(type === ''|| type === 3) { - this.data = data?data.addressEvent: [] || [] + this.data = data?data.addressMobileEvents: [] || [] } }) }, @@ -346,7 +346,8 @@ export default { } .list-con { - overflow: auto; + overflow-x: hidden; + overflow-y: auto; height: 200px; } .no-data {