From bbe820c18226db6fb0b73a7b0d3956e6e3884e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com> Date: Fri, 13 Oct 2023 10:41:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/dataBoard/overview/index.scss | 6 +- src/views/dataBoard/cpts/map/index.vue | 2 +- src/views/dataBoard/cpts/personnel/index.vue | 6 + src/views/dataBoard/cpts/resi-details.vue | 1 - src/views/dataBoard/overview/index.vue | 10 + .../satisfactionEval/dissatisfied/index.vue | 246 ++++++++++++++---- 6 files changed, 219 insertions(+), 52 deletions(-) diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss index a6005c041..0e67501b5 100644 --- a/src/assets/scss/dataBoard/overview/index.scss +++ b/src/assets/scss/dataBoard/overview/index.scss @@ -769,7 +769,11 @@ background: rgba(3, 19, 51, 0.9); border-color: #006cff; box-shadow: inset 0px 0px 16px 0px rgba(0, 145, 255, 1); - + .popper__arrow{ + after{ + + } + } .el-date-picker__header-label { color: #a0cdff; } diff --git a/src/views/dataBoard/cpts/map/index.vue b/src/views/dataBoard/cpts/map/index.vue index 9fc9c864c..65ec3792e 100644 --- a/src/views/dataBoard/cpts/map/index.vue +++ b/src/views/dataBoard/cpts/map/index.vue @@ -186,7 +186,7 @@ export default { // level: item.level, center: [item.longitude, item.latitude], ...item, - parentName: srcGridData.parentName, + parentName: srcGridData.name, }, geometry: { type: "Polygon", diff --git a/src/views/dataBoard/cpts/personnel/index.vue b/src/views/dataBoard/cpts/personnel/index.vue index ed82a3674..2d554a855 100644 --- a/src/views/dataBoard/cpts/personnel/index.vue +++ b/src/views/dataBoard/cpts/personnel/index.vue @@ -62,6 +62,12 @@ export default { resId: "", }; }, + watch: { + "$route.query"() { + const query = this.$route.query; + this.resId = query.user_id; + }, + }, mounted() { const query = this.$route.query; this.resId = query.user_id; diff --git a/src/views/dataBoard/cpts/resi-details.vue b/src/views/dataBoard/cpts/resi-details.vue index 01e9a01a1..1c80be287 100644 --- a/src/views/dataBoard/cpts/resi-details.vue +++ b/src/views/dataBoard/cpts/resi-details.vue @@ -889,7 +889,6 @@ export default { // 根据房屋id获取详情 async getInfo() { const url = "resident_info"; - const { data, code, msg } = await requestPostBi( url, { diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index 8b2681dec..94782bc6e 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -104,6 +104,8 @@
- - - - + + + + + + - - + + + - - + + + - - - 查询 + + + 查询
- + @@ -32,13 +98,21 @@ - + @@ -74,13 +148,21 @@
- + @@ -177,18 +259,26 @@ export default { return; } const satisfactionSource = this.queryParams.satisfactionSource.toString(); - this.$http.get("/governance/satisfactionDetailList/getUnsatisfiedCategory?satisfactionSource=" + satisfactionSource).then(({ data: { data } }) => { - this.satisfactionCategoryOptions = data.map((item) => { - return { - label: item.categoryName, - value: item.categoryCode, - }; + this.$http + .get( + "/governance/satisfactionDetailList/getUnsatisfiedCategory?satisfactionSource=" + + satisfactionSource + ) + .then(({ data: { data } }) => { + this.satisfactionCategoryOptions = data.map((item) => { + return { + label: item.categoryName, + value: item.categoryCode, + }; + }); + this.queryParams.satisfactionCategory = + this.$route.params.type == 0 ? "" : this.$route.params.type; }); - this.queryParams.satisfactionCategory = this.$route.params.type == 0 ? "" : this.$route.params.type; - }); }, satisfactionSourceFormat(val) { - let satisfactionSource = this.satisfactionSourceOptions.filter((item) => item.value === val)[0]; + let satisfactionSource = this.satisfactionSourceOptions.filter( + (item) => item.value === val + )[0]; return satisfactionSource ? satisfactionSource : ""; }, search() { @@ -197,31 +287,39 @@ export default { }, getList() { this.loading = true; - this.$http.get("/governance/satisfactionDetailList/getUnsatisfiedMattersList?" + this.$paramsFormat(this.queryParams)).then(({ data: { data } }) => { - this.total = data.total; - this.list = data.list; - this.loading = false; - }); + this.$http + .get( + "/governance/satisfactionDetailList/getUnsatisfiedMattersList?" + + this.$paramsFormat(this.queryParams) + ) + .then(({ data: { data } }) => { + this.total = data.total; + this.list = data.list; + this.loading = false; + }); }, getOrg() { let params = { orgId: this.$store.state.chooseArea.chooseName.orgId, level: this.$store.state.chooseArea.chooseName.level, }; - this.$http.post(`/gov/org/agency/maporg`, params).then(async ({ data: { data } }) => { - this.queryParams.agencyId = this.$store.state.chooseArea.chooseName.orgId; - let parent = { value: data.id, label: data.name }; - this.orgOptions = [ - parent, - ...data.children.map((item) => { - return { - value: item.id, - label: item.name, - }; - }), - ]; - this.getList(); - }); + this.$http + .post(`/gov/org/agency/maporg`, params) + .then(async ({ data: { data } }) => { + this.queryParams.agencyId = + this.$store.state.chooseArea.chooseName.orgId; + let parent = { value: data.id, label: data.name }; + this.orgOptions = [ + parent, + ...data.children.map((item) => { + return { + value: item.id, + label: item.name, + }; + }), + ]; + this.getList(); + }); }, timeChange(type) { let startTime = "", @@ -230,20 +328,35 @@ export default { startTime = this.$moment().startOf("month").format("YYYY-MM-DD"); } if (type == 2) { - startTime = this.$moment().subtract(1, "months").startOf("month").format("YYYY-MM-DD"); + startTime = this.$moment() + .subtract(1, "months") + .startOf("month") + .format("YYYY-MM-DD"); } if (type == 3) { - startTime = this.$moment().subtract(2, "months").startOf("month").format("YYYY-MM-DD"); + startTime = this.$moment() + .subtract(2, "months") + .startOf("month") + .format("YYYY-MM-DD"); } if (type == 4) { - startTime = this.$moment().subtract(5, "months").startOf("month").format("YYYY-MM-DD"); + startTime = this.$moment() + .subtract(5, "months") + .startOf("month") + .format("YYYY-MM-DD"); } if (type == 5) { - startTime = this.$moment().subtract(11, "months").startOf("month").format("YYYY-MM-DD"); + startTime = this.$moment() + .subtract(11, "months") + .startOf("month") + .format("YYYY-MM-DD"); } if (type == 2) { - endTime = this.$moment().subtract(1, "months").endOf("month").format("YYYY-MM-DD"); + endTime = this.$moment() + .subtract(1, "months") + .endOf("month") + .format("YYYY-MM-DD"); } else { endTime = this.$moment().endOf("month").format("YYYY-MM-DD"); } @@ -310,4 +423,39 @@ export default { .red { color: #f95619; } + +::v-deep .date-current-weiyi { + background: rgba(3, 19, 51, 0.9); + border-color: #006cff; + box-shadow: inset 0px 0px 16px 0px rgba(0, 145, 255, 1); + + .el-date-picker__header-label { + color: #ffffff; + } + + .el-picker-panel__icon-btn { + color: #ffffff; + } + + .el-month-table { + td { + .cell { + color: #ffffff; + } + } + } + + .el-month-table td.current:not(.disabled) .cell { + color: #fff; + background-color: #409eff; + } + + .el-month-table td.today:not(.disabled) .cell { + color: #0056d6; + } + + .el-date-picker__header--bordered { + border-bottom: solid 1px #006cff; + } +}