From 8b0d9c7c0981edf6ae2be67be1aeea652deae20a Mon Sep 17 00:00:00 2001 From: PLUTO <> Date: Fri, 3 Nov 2023 11:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E6=94=B6=E6=8F=90?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DynamicHumanRoomData.vue | 23 +- src/views/dataBoard/overview/index.vue | 2 +- .../satisfactionEval/dissatisfied/index.vue | 210 +++++------------- 3 files changed, 63 insertions(+), 172 deletions(-) diff --git a/src/views/dataBoard/overview/components/DynamicHumanRoomData.vue b/src/views/dataBoard/overview/components/DynamicHumanRoomData.vue index 7c4a2694c..a2d9179ce 100644 --- a/src/views/dataBoard/overview/components/DynamicHumanRoomData.vue +++ b/src/views/dataBoard/overview/components/DynamicHumanRoomData.vue @@ -15,14 +15,11 @@
- {{ $moment(item.changeTime).format("HH:mm") }} + {{ getMomentTime(item.changeTime) }} +
- {{ item.orgName }}
@@ -35,11 +32,7 @@ {{ $moment(item.changeTime).format("HH:mm") }}
- {{ item.orgName }}
@@ -105,6 +98,14 @@ export default { } }); }, + + getMomentTime(date) { + if (this.$moment(date).format("YYYY-MM-DD") === this.$moment().format("YYYY-MM-DD")) { + return this.$moment(date).format("HH:mm"); + } else { + return this.$moment(date).format("MM-DD"); + } + }, }, }; diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index 5bbedf124..1a186ed83 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -89,7 +89,7 @@
- + diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue index 478f560db..a87e1a6be 100644 --- a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue +++ b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue @@ -3,93 +3,27 @@
- - - - - - + + + + - - - + + - - - + + - - - 查询 + + + 查询
- + @@ -101,18 +35,13 @@ + }"> {{ satisfactionSourceFormat(row.satisfactionSource).label }} - + @@ -148,21 +77,13 @@
- +
@@ -179,7 +100,7 @@ export default { return { hideSearch: false, queryParams: { - month: this.$moment().format("YYYY-MM"), + month: "", agencyId: "", satisfactionSource: [], satisfactionCategory: "", @@ -259,26 +180,18 @@ 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.queryParams.satisfactionCategory = - this.$route.params.type == 0 ? "" : this.$route.params.type; + 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; + }); }, 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() { @@ -287,39 +200,31 @@ 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 = "", @@ -328,35 +233,20 @@ 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"); }