From ba36439ac7d3b20798508700109587806ac9f62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Thu, 16 Dec 2021 20:55:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/water/drinking-water/statistic/city/base.vue | 1 + .../drinking-water/statistic/components/citySearch.vue | 6 +++++- .../drinking-water/statistic/components/countySearch.vue | 6 +++++- .../statistic/components/countySideSeatch.vue | 6 +++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/views/water/drinking-water/statistic/city/base.vue b/src/views/water/drinking-water/statistic/city/base.vue index 44dd5e6..ec22536 100644 --- a/src/views/water/drinking-water/statistic/city/base.vue +++ b/src/views/water/drinking-water/statistic/city/base.vue @@ -11,6 +11,7 @@ @filterColumns="changeFilter" :visiable="visiable" :loading="loading" + :loadSearch="true" /> Date: Thu, 16 Dec 2021 22:23:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E6=A0=87?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecology/new-drinking-water.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/ecology/new-drinking-water.js b/src/api/ecology/new-drinking-water.js index b50e605..813798c 100644 --- a/src/api/ecology/new-drinking-water.js +++ b/src/api/ecology/new-drinking-water.js @@ -89,7 +89,7 @@ export const countyDescripFormData = function (data) { } //县级—超标评价 -export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/getCompositeNutritionIndex'; +export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/getWaterEvaluate'; export const countyOverStandardCount = function (data) { return axios.post(countyOverStandardtUrl,data) } From c40ae033eb2ff636648dc10d84de4dc66b4364c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Sat, 18 Dec 2021 21:08:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BC=A0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecology/new-drinking-water.js | 10 +++++++++- .../drinking-water/statistic/city/situation.vue | 16 ++++++++-------- .../statistic/components/citySearch.vue | 15 ++++++++++++++- .../statistic/components/countySearch.vue | 14 +++++++++++++- .../statistic/components/countySideSeatch.vue | 13 ++++++++++++- .../statistic/county/situation.vue | 10 +++++----- 6 files changed, 61 insertions(+), 17 deletions(-) diff --git a/src/api/ecology/new-drinking-water.js b/src/api/ecology/new-drinking-water.js index 813798c..41bad3f 100644 --- a/src/api/ecology/new-drinking-water.js +++ b/src/api/ecology/new-drinking-water.js @@ -135,4 +135,12 @@ export const villageWaterQualityUpData = function (data) { export const villageOverStandardtUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterVillageEvaluate'; export const villageOverStandardCount = function (data) { return axios.post(villageOverStandardtUrl,data) -} \ No newline at end of file +} + + +// /api/waterFunctionArea/drinkingWaterEvaluationStandard + +export const filterList = function (data) { + return axios.post('/waterFunctionArea/drinkingWaterEvaluationStandard',data) +} + diff --git a/src/views/water/drinking-water/statistic/city/situation.vue b/src/views/water/drinking-water/statistic/city/situation.vue index 9005522..97d4731 100644 --- a/src/views/water/drinking-water/statistic/city/situation.vue +++ b/src/views/water/drinking-water/statistic/city/situation.vue @@ -47,13 +47,13 @@ @@ -131,10 +131,10 @@ export default { {title:"县城",dataIndex:"county",slots:{customRender:'county'}}, {title:"水源地名称",dataIndex:"sourceWaterName",}, {title:"类型",dataIndex:"waterSourceProperty",}, - {title:"监测时间",dataIndex:"reportTime"}, + {title:"监测时间",dataIndex:"monitorTime"}, // {title:"监测时间",dataIndex:"reportTime",customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")}, - {title:"应当监测项目个数",dataIndex:'index1'}, - {title:"未测个数",dataIndex:"index2",}, + {title:"应当监测项目个数",dataIndex:'index1', }, + {title:"未测个数",dataIndex:"noCheckNum",}, {title:"独立分析项目个数",dataIndex:"index3", slots: { customRender: 'enumber', @@ -143,8 +143,8 @@ export default { {title:"外送分析项目个数",dataIndex:"index4", slots: { customRender: 'wnumber', },}, - {title:"超标项目",dataIndex:"index5",}, - {title:"情况说明或原因",dataIndex:"index6", slots: { + {title:"超标项目",dataIndex:"exceedingStandard",}, + {title:"情况说明或原因",dataIndex:"reason", slots: { customRender: 'desc', }}, {title:"备注",dataIndex:"remark",slots: { diff --git a/src/views/water/drinking-water/statistic/components/citySearch.vue b/src/views/water/drinking-water/statistic/components/citySearch.vue index d589b57..2b04583 100644 --- a/src/views/water/drinking-water/statistic/components/citySearch.vue +++ b/src/views/water/drinking-water/statistic/components/citySearch.vue @@ -250,7 +250,9 @@ export default { }, searchData() { if(Array.isArray(this.filter) && this.filter.length){ - this.where.filter = [...this.filter] + this.where.filter = this.changeKeyToName([...this.filter]) + }else{ + delete this.where.filter; } const sectionNames = this.where.sectionNames if(sectionNames && Array.isArray(sectionNames) && !sectionNames.length){ @@ -258,6 +260,17 @@ export default { } this.$emit("search", this.where); }, + + // 将key转文字 + changeKeyToName(keys){ + const targetNames = filterColumns.map(item=>{ + if(keys.indexOf(item.dataIndex)>-1){ + return item.title + } + }) + return targetNames; + }, + exportFile() { this.$emit("exportFile"); }, diff --git a/src/views/water/drinking-water/statistic/components/countySearch.vue b/src/views/water/drinking-water/statistic/components/countySearch.vue index 587b7a7..f6bb3e4 100644 --- a/src/views/water/drinking-water/statistic/components/countySearch.vue +++ b/src/views/water/drinking-water/statistic/components/countySearch.vue @@ -250,10 +250,22 @@ export default { }, searchData() { if(Array.isArray(this.filter) && this.filter.length){ - this.where.filter = [...this.filter] + this.where.filter = this.changeKeyToName([...this.filter]) + }else{ + delete this.where.filter; } this.$emit("search", this.where); }, + // 将key转文字 + changeKeyToName(keys){ + const targetNames = filterColumns.map(item=>{ + if(keys.indexOf(item.dataIndex)>-1){ + return item.title + } + }) + return targetNames; + }, + exportFile() { this.$emit("exportFile"); }, diff --git a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue index f6e3c27..54838f8 100644 --- a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue +++ b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue @@ -250,9 +250,20 @@ export default { }, searchData() { if(Array.isArray(this.filter) && this.filter.length){ - this.where.filter = [...this.filter] + this.where.filter = this.changeKeyToName([...this.filter]) + }else{ + delete this.where.filter; } this.$emit("search", this.where); + }, + // 将key转文字 + changeKeyToName(keys){ + const targetNames = filterColumns.map(item=>{ + if(keys.indexOf(item.dataIndex)>-1){ + return item.title + } + }) + return targetNames; }, exportFile() { this.$emit("exportFile"); diff --git a/src/views/water/drinking-water/statistic/county/situation.vue b/src/views/water/drinking-water/statistic/county/situation.vue index ab0a9a5..56f35af 100644 --- a/src/views/water/drinking-water/statistic/county/situation.vue +++ b/src/views/water/drinking-water/statistic/county/situation.vue @@ -132,10 +132,10 @@ export default { {title:"县城",dataIndex:"county",slots:{customRender:'county'}}, {title:"水源地名称",dataIndex:"sourceWaterName",}, {title:"类型",dataIndex:"waterSourceProperty",}, - {title:"监测时间",dataIndex:"reportTime"}, + {title:"监测时间",dataIndex:"monitorTime"}, // {title:"监测时间",dataIndex:"reportTime",customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")}, - {title:"应当监测项目个数",dataIndex:'index1'}, - {title:"未测个数",dataIndex:"index2",}, + {title:"应当监测项目个数",dataIndex:'index1', }, + {title:"未测个数",dataIndex:"noCheckNum",}, {title:"独立分析项目个数",dataIndex:"index3", slots: { customRender: 'enumber', @@ -144,8 +144,8 @@ export default { {title:"外送分析项目个数",dataIndex:"index4", slots: { customRender: 'wnumber', },}, - {title:"超标项目",dataIndex:"index5",}, - {title:"情况说明或原因",dataIndex:"index6", slots: { + {title:"超标项目",dataIndex:"exceedingStandard",}, + {title:"情况说明或原因",dataIndex:"reason", slots: { customRender: 'desc', }}, {title:"备注",dataIndex:"remark",slots: {