From 830a63f92f1f6e9a3bc2337460a4a072bfcf7031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=9E=97?= Date: Sat, 22 Jan 2022 12:08:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A5=AE=E7=94=A8=E6=B0=B4=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/ecology/new-drinking-water.js | 6 +++++- .../statistic/countryside/waterQualityCount.vue | 2 +- .../statistic/countryside/waterQualityUp.vue | 10 +++++----- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index 31b1eb7..ccd111c 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -VUE_APP_API_BASE_URL=http://localhost:10001/api +VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api diff --git a/src/api/ecology/new-drinking-water.js b/src/api/ecology/new-drinking-water.js index 404555f..7e69a6a 100644 --- a/src/api/ecology/new-drinking-water.js +++ b/src/api/ecology/new-drinking-water.js @@ -142,7 +142,11 @@ export const villageOverStandardCount = function (data) { return axios.post(villageOverStandardtUrl,data) } - +//农村—水质统计 +export const villageWaterQualityCountUrl = '/drinkingWaterVillage/drinkingWaterVillage/getVillageWaterQualityStatistics'; +export const villageWaterQualityCountData = function (data) { + return axios.post(villageWaterQualityCountUrl,data) +} // /api/waterFunctionArea/drinkingWaterEvaluationStandard export const filterList = function (data) { diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue index cc915e0..52d812c 100644 --- a/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue +++ b/src/views/water/drinking-water/statistic/countryside/waterQualityCount.vue @@ -32,7 +32,7 @@ import XLSX from "xlsx"; import { - waterQualityCountData + villageWaterQualityCountData as waterQualityCountData } from "@/api/ecology/new-drinking-water"; import locale from "ant-design-vue/es/date-picker/locale/zh_CN"; diff --git a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue index 69436e4..01dc722 100644 --- a/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue +++ b/src/views/water/drinking-water/statistic/countryside/waterQualityUp.vue @@ -105,12 +105,12 @@ export default { this.$message.error(res.data.msg); this.datasource = [] }else{ - // let newData = [] + let newData = [] const resData = res.data.data || [] - // for(let i in resData){ - // newData.push(...resData[i]) - // } - this.datasource = resData + for(let i in resData){ + newData.push(...resData[i]) + } + this.datasource = newData } }).catch(()=>{ this.loading = false;