diff --git a/src/assets/images/manyidu/qz_wjj.png b/src/assets/images/manyidu/qz_wjj.png index f89199047..dc5d8d4e5 100644 Binary files a/src/assets/images/manyidu/qz_wjj.png and b/src/assets/images/manyidu/qz_wjj.png differ diff --git a/src/assets/images/manyidu/qz_wmz.png b/src/assets/images/manyidu/qz_wmz.png index 5280fdf4f..b915043d0 100644 Binary files a/src/assets/images/manyidu/qz_wmz.png and b/src/assets/images/manyidu/qz_wmz.png differ diff --git a/src/assets/images/manyidu/qz_wx.png b/src/assets/images/manyidu/qz_wx.png index 14d4c77ce..68814ede0 100644 Binary files a/src/assets/images/manyidu/qz_wx.png and b/src/assets/images/manyidu/qz_wx.png differ diff --git a/src/assets/images/manyidu/xuanzhuan-bg.png b/src/assets/images/manyidu/xuanzhuan-bg.png new file mode 100644 index 000000000..1299446b9 Binary files /dev/null and b/src/assets/images/manyidu/xuanzhuan-bg.png differ diff --git a/src/assets/scss/dataBoardMain.scss b/src/assets/scss/dataBoardMain.scss index 73af2fabd..e9a71e469 100644 --- a/src/assets/scss/dataBoardMain.scss +++ b/src/assets/scss/dataBoardMain.scss @@ -271,5 +271,5 @@ } .g-cnt { - padding: 24px; + padding: 8px 24px; } \ No newline at end of file diff --git a/src/views/dataBoard/cpts/family/modules/MatterDetails.vue b/src/views/dataBoard/cpts/family/modules/MatterDetails.vue index 0b605892b..66604064f 100644 --- a/src/views/dataBoard/cpts/family/modules/MatterDetails.vue +++ b/src/views/dataBoard/cpts/family/modules/MatterDetails.vue @@ -110,28 +110,26 @@ export default { color: #fe0000; } &:nth-of-type(1) { - left: 0; - bottom: 15px; - } - - &:nth-of-type(2) { left: 42px; bottom: 185px; } + &:nth-of-type(2) { + left: 499px; + bottom: 157px; + } &:nth-of-type(3) { left: 194px; bottom: 245px; } - &:nth-of-type(4) { left: 384px; bottom: 240px; } &:nth-of-type(5) { - left: 499px; - bottom: 157px; + left: 0; + bottom: 15px; } &:nth-of-type(6) { diff --git a/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue index 307b12472..69649f0ae 100644 --- a/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue +++ b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue @@ -109,29 +109,28 @@ export default { background: url("@/assets/images/manyidu/dn_red.png") center no-repeat; color: #fe0000; } - &:nth-of-type(1) { - left: 0; - bottom: 15px; - } - &:nth-of-type(2) { + &:nth-of-type(1) { left: 42px; bottom: 185px; } + &:nth-of-type(2) { + left: 499px; + bottom: 157px; + } &:nth-of-type(3) { left: 194px; bottom: 245px; } - &:nth-of-type(4) { left: 384px; bottom: 240px; } &:nth-of-type(5) { - left: 499px; - bottom: 157px; + left: 0; + bottom: 15px; } &:nth-of-type(6) { diff --git a/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue index 07cfeccf3..d7a77b9d2 100644 --- a/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue @@ -1,39 +1,85 @@ @@ -46,15 +92,14 @@ export default { noServiceNum: 0, unFinishNum: 0, unSolvedNum: 0, - loading: true - } + loading: true, + }; }, props: { date: { type: Object, - default: () => { - } - } + default: () => {}, + }, }, watch: { "$store.state.chooseArea.chooseName"(val) { @@ -64,7 +109,7 @@ export default { }, date() { this.getData(); - } + }, }, mounted() { if (this.$store.state.chooseArea.chooseName.orgId) { @@ -74,24 +119,45 @@ export default { methods: { getData() { - this.loading = true + this.loading = true; let params = { level: this.$store.state.chooseArea.chooseName.level, orgId: this.$store.state.chooseArea.chooseName.orgId, - ...this.date - } - this.$http.get('/governance/satisfactionOverview/potentialSatisfactionGroup?' + this.$paramsFormat(params)).then(({data: {data}}) => { - this.noServiceNum = data.noServiceNum - this.unFinishNum = data.unFinishNum - this.unSolvedNum = data.unSolvedNum - this.loading = false - }) - } - } -} + ...this.date, + }; + this.$http + .get( + "/governance/satisfactionOverview/potentialSatisfactionGroup?" + + this.$paramsFormat(params) + ) + .then(({ data: { data } }) => { + this.noServiceNum = data.noServiceNum; + this.unFinishNum = data.unFinishNum; + this.unSolvedNum = data.unSolvedNum; + this.loading = false; + }); + }, + }, +}; \ No newline at end of file + diff --git a/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue b/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue index 7a0457eda..914b4a282 100644 --- a/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue +++ b/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue @@ -25,7 +25,7 @@ export default { value: 1 }, { - label: '社区自查结果走势', + label: '社区自查得分走势', value: 2 }], diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue index 1bd061dde..0b467d0d2 100644 --- a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue +++ b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue @@ -1,27 +1,50 @@