From bcfc64295f5faf266111dfbdf1768f217e16c920 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 14:42:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A5=AE=E7=94=A8=E6=B0=B4=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=8D=86=E7=BB=91=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 | 12 +- .../drinking-water/statistic/city/base.vue | 3 +- .../drinking-water/statistic/city/index.vue | 4 +- .../statistic/city/overStandard.vue | 13 +- .../statistic/city/situation.vue | 7 +- .../statistic/city/waterCount.vue | 3 +- .../statistic/city/waterNutritional.vue | 3 +- .../statistic/city/waterQuality.vue | 1 - .../statistic/city/waterQualityCount.vue | 3 +- .../statistic/city/waterQualityUp.vue | 6 +- .../statistic/components/citySearch.vue | 15 +- .../statistic/countryside/base.vue | 5 +- .../statistic/countryside/index.vue | 45 +---- .../statistic/countryside/overStandard.vue | 156 ++++++++++++++++++ .../statistic/countryside/waterQuality.vue | 3 +- .../countryside/waterQualityCount.vue | 5 +- .../statistic/countryside/waterQualityUp.vue | 7 +- .../drinking-water/statistic/county/base.vue | 5 +- .../drinking-water/statistic/county/index.vue | 16 +- .../statistic/county/overStandard.vue | 13 +- .../statistic/county/situation.vue | 6 +- .../statistic/county/waterCount.vue | 5 +- .../statistic/county/waterQuality.vue | 3 +- .../statistic/county/waterQualityCount.vue | 5 +- .../statistic/county/waterQualityUp.vue | 7 +- 25 files changed, 226 insertions(+), 125 deletions(-) create mode 100644 src/views/water/drinking-water/statistic/countryside/overStandard.vue diff --git a/src/api/ecology/new-drinking-water.js b/src/api/ecology/new-drinking-water.js index 9667d27..22b0cdf 100644 --- a/src/api/ecology/new-drinking-water.js +++ b/src/api/ecology/new-drinking-water.js @@ -20,6 +20,8 @@ export const villageListInfo = function (data) { return axios.get(villageListInfoUrl,data) } +// 下拉结束 + // 市级监测数据报送表 export const pageBsaeListUrl = '/drinkingWater/drinkingWater/AnalysePage'; export const analysePageData = function (data) { @@ -41,7 +43,7 @@ export const getWaterCount = function (data) { } //市级—超标评价 -export const overStandardtUrl = '/drinkingWater/drinkingWater/AnalysePage'; +export const overStandardtUrl = '/drinkingWater/drinkingWater/getWaterEvaluate'; export const overStandardCount = function (data) { return axios.post(overStandardtUrl,data) } @@ -87,7 +89,7 @@ export const countyDescripFormData = function (data) { } //县级—超标评价 -export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/AnalysePage'; +export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/getCompositeNutritionIndex'; export const countyOverStandardCount = function (data) { return axios.post(countyOverStandardtUrl,data) } @@ -127,4 +129,10 @@ export const villageWaterQualityData = function (data) { export const villageWaterQualityUpUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterQualityStandard'; export const villageWaterQualityUpData = function (data) { return axios.post(villageWaterQualityUpUrl,data) +} + +//农村—超标评价 +export const villageOverStandardtUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterVillageEvaluate'; +export const villageOverStandardCount = function (data) { + return axios.post(villageOverStandardtUrl,data) } \ No newline at end of file diff --git a/src/views/water/drinking-water/statistic/city/base.vue b/src/views/water/drinking-water/statistic/city/base.vue index 7decdba..44dd5e6 100644 --- a/src/views/water/drinking-water/statistic/city/base.vue +++ b/src/views/water/drinking-water/statistic/city/base.vue @@ -14,7 +14,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/city/index.vue b/src/views/water/drinking-water/statistic/city/index.vue index fd495f3..ce6f7b1 100644 --- a/src/views/water/drinking-water/statistic/city/index.vue +++ b/src/views/water/drinking-water/statistic/city/index.vue @@ -77,9 +77,7 @@ checked: 1, page:1, limit:10, - drinkingWaterAnalyse:{ - regionLevel:"市级" - }, + regionLevel:"市级" }, filterKeys:[] }; diff --git a/src/views/water/drinking-water/statistic/city/overStandard.vue b/src/views/water/drinking-water/statistic/city/overStandard.vue index 8315d48..5072771 100644 --- a/src/views/water/drinking-water/statistic/city/overStandard.vue +++ b/src/views/water/drinking-water/statistic/city/overStandard.vue @@ -12,7 +12,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/city/situation.vue b/src/views/water/drinking-water/statistic/city/situation.vue index 4b7dc4c..9005522 100644 --- a/src/views/water/drinking-water/statistic/city/situation.vue +++ b/src/views/water/drinking-water/statistic/city/situation.vue @@ -86,8 +86,7 @@ import { } from "@/api/ecology/new-drinking-water"; import locale from "ant-design-vue/es/date-picker/locale/zh_CN"; -// import { tableColumns } from "./colums"; -// import moment from "moment"; + import Search from "./../components/citySearch.vue"; import { CheckOutlined, EditOutlined } from '@ant-design/icons-vue'; @@ -217,7 +216,7 @@ export default { this.getPageData() this.columns[6].filters = [] - if(this.where.drinkingWaterAnalyse.waterSourceType ==1 ){ + if(this.where.waterSourceType ==1 ){ // 地表水 this.columns[6].filters = [ { @@ -234,7 +233,7 @@ export default { }, ] } - if(this.where.drinkingWaterAnalyse.waterSourceType ==2 ){ + if(this.where.waterSourceType ==2 ){ // 地下水 this.columns[6].filters = [ { diff --git a/src/views/water/drinking-water/statistic/city/waterCount.vue b/src/views/water/drinking-water/statistic/city/waterCount.vue index 5d6a1dd..46dd0d0 100644 --- a/src/views/water/drinking-water/statistic/city/waterCount.vue +++ b/src/views/water/drinking-water/statistic/city/waterCount.vue @@ -12,7 +12,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/city/waterNutritional.vue b/src/views/water/drinking-water/statistic/city/waterNutritional.vue index 63a8328..1284f5c 100644 --- a/src/views/water/drinking-water/statistic/city/waterNutritional.vue +++ b/src/views/water/drinking-water/statistic/city/waterNutritional.vue @@ -13,7 +13,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/city/waterQuality.vue b/src/views/water/drinking-water/statistic/city/waterQuality.vue index 6a99bff..b6a7e43 100644 --- a/src/views/water/drinking-water/statistic/city/waterQuality.vue +++ b/src/views/water/drinking-water/statistic/city/waterQuality.vue @@ -13,7 +13,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue index 42bf3e9..144be3a 100644 --- a/src/views/water/drinking-water/statistic/city/waterQualityUp.vue +++ b/src/views/water/drinking-water/statistic/city/waterQualityUp.vue @@ -13,7 +13,6 @@ /> { @@ -156,7 +156,7 @@ export default { const arr = []; const th = columns.map((item) => item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/components/citySearch.vue b/src/views/water/drinking-water/statistic/components/citySearch.vue index 6f04b8f..1df666d 100644 --- a/src/views/water/drinking-water/statistic/components/citySearch.vue +++ b/src/views/water/drinking-water/statistic/components/citySearch.vue @@ -7,7 +7,7 @@ - + 地表水 地下水 @@ -15,7 +15,7 @@ - + 在用 备用 @@ -48,7 +48,7 @@ - + {{ item.sectionName }} @@ -137,7 +137,6 @@ export default { indeterminate:false, checkAll: true, where: { - drinkingWaterAnalyse:{} }, filter:[], columnsKey:[], @@ -241,9 +240,7 @@ export default { checked: 1, limit: 10, page: 1, - drinkingWaterAnalyse:{ - regionLevel: this.where.drinkingWaterAnalyse.regionLevel - } + regionLevel:this.where.regionLevel } this.searchData(); }, @@ -251,9 +248,9 @@ export default { if(Array.isArray(this.filter) && this.filter.length){ this.where.filter = [...this.filter] } - const sectionNames = this.where.drinkingWaterAnalyse.sectionNames + const sectionNames = this.where.sectionNames if(sectionNames && Array.isArray(sectionNames) && !sectionNames.length){ - delete this.where.drinkingWaterAnalyse.sectionNames; + delete this.where.sectionNames; } this.$emit("search", this.where); }, diff --git a/src/views/water/drinking-water/statistic/countryside/base.vue b/src/views/water/drinking-water/statistic/countryside/base.vue index 0699843..1d612dd 100644 --- a/src/views/water/drinking-water/statistic/countryside/base.vue +++ b/src/views/water/drinking-water/statistic/countryside/base.vue @@ -14,7 +14,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/countryside/index.vue b/src/views/water/drinking-water/statistic/countryside/index.vue index c4f27c8..f855130 100644 --- a/src/views/water/drinking-water/statistic/countryside/index.vue +++ b/src/views/water/drinking-water/statistic/countryside/index.vue @@ -9,30 +9,18 @@ - - - - - - @@ -46,37 +34,24 @@ */ //市级监测数据报表 import BaseStatistic from "./base.vue" - // 报送情况说明 - // import countyAppraise from "./situation.vue" - // // 取水量 - // import countyWaterWithdrawal from "./waterCount.vue" // // 超标评价 - // import countyOverStandard from './overStandard.vue' + import overStandard from './overStandard.vue' // 水质类别 import waterQuality from "./waterQuality.vue" // // 水质统计 import waterQualityCount from "./waterQualityCount.vue"; // 水质达标情况 import waterQualityUp from "./waterQualityUp.vue"; -// //综合营养指数 - -// import waterNutritional from "./waterNutritional.vue" - - - export default { name: 'city-com', components: { BaseStatistic, - // countyAppraise, waterQuality, waterQualityCount, waterQualityUp, - // waterNutritional, - // countyWaterWithdrawal, - // countyOverStandard + overStandard }, data() { return { @@ -85,9 +60,7 @@ checked: 1, page:1, limit:10, - drinkingWaterVillageAnalyse:{ - regionLevel:"农村" - }, + regionLevel:"农村" }, filterKeys:[] }; diff --git a/src/views/water/drinking-water/statistic/countryside/overStandard.vue b/src/views/water/drinking-water/statistic/countryside/overStandard.vue new file mode 100644 index 0000000..6d710a3 --- /dev/null +++ b/src/views/water/drinking-water/statistic/countryside/overStandard.vue @@ -0,0 +1,156 @@ + + + + + + diff --git a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue index 167d604..c4ddee6 100644 --- a/src/views/water/drinking-water/statistic/countryside/waterQuality.vue +++ b/src/views/water/drinking-water/statistic/countryside/waterQuality.vue @@ -13,7 +13,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue index 115e9ca..b01fd1d 100644 --- a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue +++ b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue @@ -13,7 +13,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/county/base.vue b/src/views/water/drinking-water/statistic/county/base.vue index 21a5efc..f99a076 100644 --- a/src/views/water/drinking-water/statistic/county/base.vue +++ b/src/views/water/drinking-water/statistic/county/base.vue @@ -14,7 +14,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/county/index.vue b/src/views/water/drinking-water/statistic/county/index.vue index 7ca0611..93e185c 100644 --- a/src/views/water/drinking-water/statistic/county/index.vue +++ b/src/views/water/drinking-water/statistic/county/index.vue @@ -25,13 +25,7 @@ - @@ -57,12 +51,6 @@ import waterQualityCount from "./waterQualityCount.vue"; // 水质达标情况 import waterQualityUp from "./waterQualityUp.vue"; -// //综合营养指数 - -// import waterNutritional from "./waterNutritional.vue" - - - export default { @@ -84,9 +72,7 @@ checked: 1, page:1, limit:10, - drinkingWaterCountyAnalyse:{ - regionLevel:"县级" - }, + regionLevel:"县级" }, filterKeys:[] }; diff --git a/src/views/water/drinking-water/statistic/county/overStandard.vue b/src/views/water/drinking-water/statistic/county/overStandard.vue index 5233da1..e07ced7 100644 --- a/src/views/water/drinking-water/statistic/county/overStandard.vue +++ b/src/views/water/drinking-water/statistic/county/overStandard.vue @@ -12,7 +12,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/county/situation.vue b/src/views/water/drinking-water/statistic/county/situation.vue index e6cac9a..eaf6da5 100644 --- a/src/views/water/drinking-water/statistic/county/situation.vue +++ b/src/views/water/drinking-water/statistic/county/situation.vue @@ -89,7 +89,7 @@ import locale from "ant-design-vue/es/date-picker/locale/zh_CN"; // import { tableColumns } from "./colums"; // import moment from "moment"; -import Search from "./../components/countySearch.vue"; +import Search from "./../components/citySearch.vue"; import { CheckOutlined, EditOutlined } from '@ant-design/icons-vue'; export default { name: "DrinkingWaterBase", @@ -217,7 +217,7 @@ export default { this.getPageData() this.columns[6].filters = [] - if(this.where.drinkingWaterCountyAnalyse.waterSourceType ==1 ){ + if(this.where.waterSourceType ==1 ){ // 地表水 this.columns[6].filters = [ { @@ -234,7 +234,7 @@ export default { }, ] } - if(this.where.drinkingWaterCountyAnalyse.waterSourceType ==2 ){ + if(this.where.waterSourceType ==2 ){ // 地下水 this.columns[6].filters = [ { diff --git a/src/views/water/drinking-water/statistic/county/waterCount.vue b/src/views/water/drinking-water/statistic/county/waterCount.vue index 377b640..46dd0d0 100644 --- a/src/views/water/drinking-water/statistic/county/waterCount.vue +++ b/src/views/water/drinking-water/statistic/county/waterCount.vue @@ -12,7 +12,6 @@ /> // import _ from "lodash"; import XLSX from "xlsx"; -import Search from "./../components/countySearch.vue"; +import Search from "./../components/citySearch.vue"; import { getWaterCount @@ -144,7 +143,7 @@ export default { const arr = []; const th = columns.map((item) => item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/county/waterQuality.vue b/src/views/water/drinking-water/statistic/county/waterQuality.vue index 2856b4a..9fce8b9 100644 --- a/src/views/water/drinking-water/statistic/county/waterQuality.vue +++ b/src/views/water/drinking-water/statistic/county/waterQuality.vue @@ -13,7 +13,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); diff --git a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue index f3aa4e1..60a86ac 100644 --- a/src/views/water/drinking-water/statistic/county/waterQualityUp.vue +++ b/src/views/water/drinking-water/statistic/county/waterQualityUp.vue @@ -13,7 +13,6 @@ /> item.title); arr.push(th); - this.data.forEach((d) => { + this.datasource.forEach((d) => { const td = columns.map((item) => d[item.dataIndex]); arr.push(td); }); From 4b4aaa036eaaae8a3afba541f5ff141d12ea1269 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 14:57:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistic/components/countySearch.vue | 11 ++++------- .../statistic/components/countySideSeatch.vue | 11 ++++------- .../drinking-water/statistic/countryside/base.vue | 2 +- .../statistic/countryside/overStandard.vue | 2 +- .../statistic/countryside/waterQuality.vue | 2 +- .../statistic/countryside/waterQualityCount.vue | 2 +- .../statistic/countryside/waterQualityUp.vue | 2 +- .../water/drinking-water/statistic/county/base.vue | 2 +- .../drinking-water/statistic/county/overStandard.vue | 2 +- .../drinking-water/statistic/county/situation.vue | 2 +- .../drinking-water/statistic/county/waterCount.vue | 2 +- .../drinking-water/statistic/county/waterQuality.vue | 2 +- .../statistic/county/waterQualityCount.vue | 2 +- .../statistic/county/waterQualityUp.vue | 2 +- 14 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/views/water/drinking-water/statistic/components/countySearch.vue b/src/views/water/drinking-water/statistic/components/countySearch.vue index 107bf2e..766b71d 100644 --- a/src/views/water/drinking-water/statistic/components/countySearch.vue +++ b/src/views/water/drinking-water/statistic/components/countySearch.vue @@ -7,7 +7,7 @@ - + 地表水 地下水 @@ -15,7 +15,7 @@ - + 在用 备用 @@ -48,7 +48,7 @@ - + {{ item.sectionName }} @@ -137,7 +137,6 @@ export default { indeterminate:false, checkAll: true, where: { - drinkingWaterCountyAnalyse:{} }, filter:[], columnsKey:[], @@ -241,9 +240,7 @@ export default { checked: 1, limit: 10, page: 1, - drinkingWaterCountyAnalyse:{ - regionLevel: this.where.drinkingWaterCountyAnalyse.regionLevel - } + regionLevel:this.where.regionLevel } this.searchData(); }, diff --git a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue index 9719e7f..25beed7 100644 --- a/src/views/water/drinking-water/statistic/components/countySideSeatch.vue +++ b/src/views/water/drinking-water/statistic/components/countySideSeatch.vue @@ -7,7 +7,7 @@ - + 地表水 地下水 @@ -15,7 +15,7 @@ - + 在用 备用 @@ -48,7 +48,7 @@ - + {{ item.sectionName }} @@ -137,7 +137,6 @@ export default { indeterminate:false, checkAll: true, where: { - drinkingWaterVillageAnalyse:{} }, filter:[], columnsKey:[], @@ -241,9 +240,7 @@ export default { checked: 1, limit: 10, page: 1, - drinkingWaterVillageAnalyse:{ - regionLevel: this.where.drinkingWaterVillageAnalyse.regionLevel - } + regionLevel:this.where.regionLevel } this.searchData(); }, diff --git a/src/views/water/drinking-water/statistic/countryside/base.vue b/src/views/water/drinking-water/statistic/countryside/base.vue index 1d612dd..3be5850 100644 --- a/src/views/water/drinking-water/statistic/countryside/base.vue +++ b/src/views/water/drinking-water/statistic/countryside/base.vue @@ -65,7 +65,7 @@ import { } from "@/api/ecology/new-drinking-water"; import locale from "ant-design-vue/es/date-picker/locale/zh_CN"; import { tableColumns } from "./../colums/base"; -import Search from "./../components/citySearch.vue"; +import Search from "./../components/countySideSeatch.vue"; export default { name: "DrinkingWaterBase", diff --git a/src/views/water/drinking-water/statistic/countryside/overStandard.vue b/src/views/water/drinking-water/statistic/countryside/overStandard.vue index 6d710a3..3de29fb 100644 --- a/src/views/water/drinking-water/statistic/countryside/overStandard.vue +++ b/src/views/water/drinking-water/statistic/countryside/overStandard.vue @@ -31,7 +31,7 @@