diff --git a/src/assets/images/shuju/renfang/index/per/bg.png b/src/assets/images/shuju/renfang/index/per/bg.png new file mode 100644 index 000000000..79ab3a87e Binary files /dev/null and b/src/assets/images/shuju/renfang/index/per/bg.png differ diff --git a/src/assets/images/shuju/renfang/index/per/dy.png b/src/assets/images/shuju/renfang/index/per/dy.png index 41a464aaf..ae6a61994 100644 Binary files a/src/assets/images/shuju/renfang/index/per/dy.png and b/src/assets/images/shuju/renfang/index/per/dy.png differ diff --git a/src/assets/images/shuju/renfang/index/per/lnr.png b/src/assets/images/shuju/renfang/index/per/lnr.png index 759f64934..b092ba183 100644 Binary files a/src/assets/images/shuju/renfang/index/per/lnr.png and b/src/assets/images/shuju/renfang/index/per/lnr.png differ diff --git a/src/assets/images/shuju/renfang/index/per/qsn.png b/src/assets/images/shuju/renfang/index/per/qsn.png index 1d13cb93c..05161720e 100644 Binary files a/src/assets/images/shuju/renfang/index/per/qsn.png and b/src/assets/images/shuju/renfang/index/per/qsn.png differ diff --git a/src/assets/images/shuju/renfang/index/per/syry.png b/src/assets/images/shuju/renfang/index/per/syry.png index 646fc1b35..31ac12a7d 100644 Binary files a/src/assets/images/shuju/renfang/index/per/syry.png and b/src/assets/images/shuju/renfang/index/per/syry.png differ diff --git a/src/assets/images/shuju/renfang/index/per/tsrq.png b/src/assets/images/shuju/renfang/index/per/tsrq.png new file mode 100644 index 000000000..3d54f0a39 Binary files /dev/null and b/src/assets/images/shuju/renfang/index/per/tsrq.png differ diff --git a/src/assets/images/shuju/renfang/index/per/zyz.png b/src/assets/images/shuju/renfang/index/per/zyz.png index b619f5870..3d54f0a39 100644 Binary files a/src/assets/images/shuju/renfang/index/per/zyz.png and b/src/assets/images/shuju/renfang/index/per/zyz.png differ diff --git a/src/assets/scss/dataBoard/renfang/index.scss b/src/assets/scss/dataBoard/renfang/index.scss index 90811c0ea..2a9c5b0aa 100644 --- a/src/assets/scss/dataBoard/renfang/index.scss +++ b/src/assets/scss/dataBoard/renfang/index.scss @@ -353,20 +353,25 @@ .item { display: flex; - width: 120px; + width: 140px; + background: url('@/assets/images/shuju/renfang/index/per/bg.png') no-repeat; + height: 70px; + justify-content: center; + align-items: center; + padding-top: 6px; .item-info { font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: rgba(255, 255, 255, 0.65); - line-height: 40px; + //line-height: 40px; vertical-align: bottom; div { - margin-bottom: 6px; &:first-child { + margin-bottom: 6px; line-height: 20px; } } @@ -380,9 +385,22 @@ } b { + width: 61px; + height: 23px; + font-size: 30px; + //font-weight: bold; + font-style: italic; + color: #64C1FF; font-weight: 500; - font-size: 24px; - color: #ffffff; + } + .blue { + color: #3CF5FF; + } + .orange { + color: #FFB73C; + } + .red { + color: #F37346; } } } diff --git a/src/views/dataBoard/overview/components/DemandCharts.vue b/src/views/dataBoard/overview/components/DemandCharts.vue index 033e6ad83..a48855db0 100644 --- a/src/views/dataBoard/overview/components/DemandCharts.vue +++ b/src/views/dataBoard/overview/components/DemandCharts.vue @@ -22,19 +22,19 @@ export default { data() { return { dateList: [{ - label: '上月', + label: '当月', value: 1 }, { - label: '近三个月', - value: 2 + label: '前三个月', + value: 3 }, { label: '近半年', - value: 3 + value: 6 }, { label: '近一年', - value: 4 + value: 12 }], - date: 4 + date: 12 } }, mounted() { @@ -42,10 +42,10 @@ export default { }, methods: { timeChange() { - + this.initChart(); }, initChart() { - this.$http.post('/governance/userdemand/countByCategory').then(({data:{data}}) => { + this.$http.post('/governance/userdemand/countByCategory',{monthTime: this.date} ).then(({data:{data}}) => { let div = document.getElementById('DemandCharts'); this.myChart = echarts.init(div); var getname = data.map(item => item.categoryName); // 课程名 diff --git a/src/views/dataBoard/overview/components/DemandCharts2.vue b/src/views/dataBoard/overview/components/DemandCharts2.vue index 456f2b4fe..a84b0ea39 100644 --- a/src/views/dataBoard/overview/components/DemandCharts2.vue +++ b/src/views/dataBoard/overview/components/DemandCharts2.vue @@ -22,19 +22,19 @@ export default { data() { return { dateList: [{ - label: '上月', + label: '当月', value: 1 }, { - label: '近三个月', - value: 2 + label: '前三个月', + value: 3 }, { label: '近半年', - value: 3 + value: 6 }, { label: '近一年', - value: 4 + value: 12 }], - date: 4 + date: 12 } }, mounted() { @@ -42,10 +42,10 @@ export default { }, methods: { timeChange() { - + this.initChart(); }, initChart() { - this.$http.post('/governance/commonDemand/countByCategory').then(({data:{data}}) => { + this.$http.post('/governance/commonDemand/countByCategory',{monthTime: this.date}).then(({data:{data}}) => { let div = document.getElementById('DemandCharts2'); this.myChart = echarts.init(div); var getname = data.map(item => item.categoryName); // 课程名 diff --git a/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue b/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue index 695d15030..0491e2722 100644 --- a/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue +++ b/src/views/dataBoard/overview/components/MapDialog/SatisfactionList.vue @@ -110,7 +110,7 @@ export default { let params = { ...this.queryParams, agencyId: this.currentLevelData.orgId, - secondIdList: [this.catVal] + satisfactionCategory: this.catVal } this.$http.get("/governance/satisfactionDetailList/getUnsatisfiedMattersList?" + this.$paramsFormat(params)).then(({data: {data}}) => { this.list = data.list; diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue index 2baa0da36..4e9491067 100644 --- a/src/views/dataBoard/renfang/cpts/rkfx.vue +++ b/src/views/dataBoard/renfang/cpts/rkfx.vue @@ -484,7 +484,8 @@ export default { .pie { flex: 0 0 280px; - height: 146px; + min-height: 146px; + height: 100%; margin-top: 32px; } } diff --git a/src/views/dataBoard/renfang/cpts/rkfxPieOption.js b/src/views/dataBoard/renfang/cpts/rkfxPieOption.js index 5c4e33fe9..4c3ce315f 100644 --- a/src/views/dataBoard/renfang/cpts/rkfxPieOption.js +++ b/src/views/dataBoard/renfang/cpts/rkfxPieOption.js @@ -30,35 +30,28 @@ export function pieOption() { avoidLabelOverlap: true, labelLine: { show: true, + normal: { + length: 3, + length2: 0 + } }, label: { - normal: { show: true, color: "#FFFFFF", formatter: '{name|{b}}\n{rate|{d}%}', - minMargin: 5, - edgeDistance: 1, - lineHeight: 15, fontSize: 14, // distanceToLabelLine: -60, rich: { name: { - padding: [0, 0, 10, 0], + padding: [0, 0, 2, 0], }, rate: { - padding: [10, 0, 0, 0], + padding: [2, 0, 0, 0], } } }, }, - emphasis: { - label: { - show: true, - // fontSize: 36, - fontWeight: "bold", - }, - }, data: [], }, ], diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue index a750015ec..8c10a9f68 100644 --- a/src/views/dataBoard/renfang/index.vue +++ b/src/views/dataBoard/renfang/index.vue @@ -45,7 +45,7 @@ />低保人员
- {{ perInfo.SUBSISTENCE_ALLOWANCE_FLAG }} + {{ perInfo.SUBSISTENCE_ALLOWANCE_FLAG }} %
@@ -58,7 +58,7 @@ />失业人员
- {{ perInfo.UNEMPLOYED_FLAG }} + {{ perInfo.UNEMPLOYED_FLAG }} %
@@ -71,7 +71,7 @@ />党员
- {{ perInfo.PARTY_FLAG }} + {{ perInfo.PARTY_FLAG }} %
@@ -84,7 +84,7 @@ />志愿者
- {{ perInfo.VOLUNTEER_FLAG }} + {{ perInfo.VOLUNTEER_FLAG }} %
@@ -93,7 +93,7 @@
特殊人群
diff --git a/src/views/dataBoard/satisfactionEval/components/Title/index.vue b/src/views/dataBoard/satisfactionEval/components/Title/index.vue index 3f8e1168d..e20e85c0c 100644 --- a/src/views/dataBoard/satisfactionEval/components/Title/index.vue +++ b/src/views/dataBoard/satisfactionEval/components/Title/index.vue @@ -28,7 +28,7 @@ export default { .title { // width: 100%; height: 40px; - background: url(../../../../../assets/images/shuju/overview/title-bg.png) no-repeat; + background: url(@/assets/images/shuju/overview/title-bg.png) no-repeat; background-size: 100% 100%; padding: 8px 16px 8px 45px; display: flex; diff --git a/src/views/dataBoard/satisfactionEval/index.vue b/src/views/dataBoard/satisfactionEval/index.vue index 4710a3dcf..76b04a144 100644 --- a/src/views/dataBoard/satisfactionEval/index.vue +++ b/src/views/dataBoard/satisfactionEval/index.vue @@ -1,9 +1,11 @@