From f05f208360f31085aad7370f5ce9f38947332196 Mon Sep 17 00:00:00 2001 From: shixiaoman <531268472@qq.com> Date: Tue, 23 Nov 2021 21:19:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B1=9F=E6=B2=B3=E6=B0=B4=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecology/river-statis.js | 46 +++++ src/views/water/river/statistic/avg-index.vue | 162 +++++++++++++++++ .../water/river/statistic/avg-standard.vue | 170 ++++++++++++++++++ .../water/river/statistic/base-index.vue | 165 +++++++++++++++++ .../water/river/statistic/base-standard.vue | 167 +++++++++++++++++ src/views/water/river/statistic/index.vue | 19 +- 6 files changed, 724 insertions(+), 5 deletions(-) create mode 100644 src/api/ecology/river-statis.js create mode 100644 src/views/water/river/statistic/avg-index.vue create mode 100644 src/views/water/river/statistic/avg-standard.vue create mode 100644 src/views/water/river/statistic/base-index.vue create mode 100644 src/views/water/river/statistic/base-standard.vue diff --git a/src/api/ecology/river-statis.js b/src/api/ecology/river-statis.js new file mode 100644 index 0000000..45d7e45 --- /dev/null +++ b/src/api/ecology/river-statis.js @@ -0,0 +1,46 @@ +import axios from 'axios'; +// -------------------江河--水功能数据统计列表----------------------- +const autonomyWaterFunctionTotalUrl = '/waterFunctionArea/riverStatic/autoPage'; +const nationalWaterFunctionTotalUrl = '/waterFunctionArea/riverStatic/nationalPage'; +//国家级水功能统计 +const nationalWaterFunctionTotal = function (data) { + return axios.get("/waterFunctionArea/riverStatic/nationalPage",data) +} +// /自治区水功能统计 +const autonomyWaterFunctionTotal = function (data) { + return axios.get("/waterFunctionArea/riverStatic/autoPage",data) +} + + +// -------------------江河--水站数据统计列表-------------- +//水站同比环比统计 +const listWaterSiteYoy = function (data) { + return axios.post("/waterFunctionArea/riverStatic/waterSiteYoy",data) +} +// 水站日均值统计 +const listWaterSiteMonthTotal = function (data) { + return axios.post("/waterFunctionArea/riverStatic/waterSiteMonthTotal",data) +} + +//水质达标统计 +const listMonthWaterQualitySandard = function (data) { + return axios.post("/waterFunctionArea/riverStatic/monthWaterQualitySandard",data) +} + +//水质综合指数统计 +const listMonthCompositeIndex = function (data) { + return axios.post("/waterFunctionArea/riverStatic/monthCompositeIndex",data) +} + + +export { + autonomyWaterFunctionTotalUrl, + nationalWaterFunctionTotalUrl, + nationalWaterFunctionTotal, + autonomyWaterFunctionTotal, + listWaterSiteYoy, + listWaterSiteMonthTotal, + listMonthWaterQualitySandard, + listMonthCompositeIndex + +} diff --git a/src/views/water/river/statistic/avg-index.vue b/src/views/water/river/statistic/avg-index.vue new file mode 100644 index 0000000..b3916ed --- /dev/null +++ b/src/views/water/river/statistic/avg-index.vue @@ -0,0 +1,162 @@ + + + + + + diff --git a/src/views/water/river/statistic/avg-standard.vue b/src/views/water/river/statistic/avg-standard.vue new file mode 100644 index 0000000..d5981d1 --- /dev/null +++ b/src/views/water/river/statistic/avg-standard.vue @@ -0,0 +1,170 @@ + + + + + + diff --git a/src/views/water/river/statistic/base-index.vue b/src/views/water/river/statistic/base-index.vue new file mode 100644 index 0000000..fa01fd1 --- /dev/null +++ b/src/views/water/river/statistic/base-index.vue @@ -0,0 +1,165 @@ + + + + + + diff --git a/src/views/water/river/statistic/base-standard.vue b/src/views/water/river/statistic/base-standard.vue new file mode 100644 index 0000000..b0cef4d --- /dev/null +++ b/src/views/water/river/statistic/base-standard.vue @@ -0,0 +1,167 @@ + + + + + + diff --git a/src/views/water/river/statistic/index.vue b/src/views/water/river/statistic/index.vue index f47460c..745d45c 100644 --- a/src/views/water/river/statistic/index.vue +++ b/src/views/water/river/statistic/index.vue @@ -8,16 +8,16 @@ - + - + - + - + @@ -52,6 +52,11 @@ import NationalStatis from "../../water-function-area/statistic/national.vue"; import SiteStatis from "../../river-station/statistic/site.vue"; import SiteDayStatis from "../../river-station/statistic/site-day-avg.vue"; + + import MonthStandard from "./base-standard.vue"; + import AvgStandard from "./avg-standard.vue"; + import MonthIndex from "./base-index.vue"; + import AvgIndex from "./avg-index.vue"; export default { name: 'StatisticAirIndex', components: { @@ -59,7 +64,11 @@ AutoStatis, NationalStatis, SiteStatis, - SiteDayStatis + SiteDayStatis, + MonthStandard, + AvgStandard, + MonthIndex, + AvgIndex, }, data() { return { From 694ecf71efec4dcbf50ca104a822455fccb33d59 Mon Sep 17 00:00:00 2001 From: shixiaoman <531268472@qq.com> Date: Wed, 24 Nov 2021 14:00:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B1=9F=E6=B2=B3=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...功能区.xlsx => 水功能区-国家级水功能区数据表.xlsx} | Bin ...能区.xls => 水功能区-自治区级水站月均值数据表.xls} | Bin ...国家水站.xlsx => 水站-国家级水站历史数据表.xlsx} | 0 ...水站.xlsx => 水站-自治区级水站均值数据报表.xlsx} | 0 .../template/{江河.xlsx => 江河-断面共享数据表.xls} | Bin src/api/ecology/water/river-water.js | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) rename public/template/{国家级水功能区.xlsx => 水功能区-国家级水功能区数据表.xlsx} (100%) rename public/template/{区控水功能区.xls => 水功能区-自治区级水站月均值数据表.xls} (100%) rename public/template/{国家水站.xlsx => 水站-国家级水站历史数据表.xlsx} (100%) rename public/template/{广西水站.xlsx => 水站-自治区级水站均值数据报表.xlsx} (100%) rename public/template/{江河.xlsx => 江河-断面共享数据表.xls} (100%) diff --git a/public/template/国家级水功能区.xlsx b/public/template/水功能区-国家级水功能区数据表.xlsx similarity index 100% rename from public/template/国家级水功能区.xlsx rename to public/template/水功能区-国家级水功能区数据表.xlsx diff --git a/public/template/区控水功能区.xls b/public/template/水功能区-自治区级水站月均值数据表.xls similarity index 100% rename from public/template/区控水功能区.xls rename to public/template/水功能区-自治区级水站月均值数据表.xls diff --git a/public/template/国家水站.xlsx b/public/template/水站-国家级水站历史数据表.xlsx similarity index 100% rename from public/template/国家水站.xlsx rename to public/template/水站-国家级水站历史数据表.xlsx diff --git a/public/template/广西水站.xlsx b/public/template/水站-自治区级水站均值数据报表.xlsx similarity index 100% rename from public/template/广西水站.xlsx rename to public/template/水站-自治区级水站均值数据报表.xlsx diff --git a/public/template/江河.xlsx b/public/template/江河-断面共享数据表.xls similarity index 100% rename from public/template/江河.xlsx rename to public/template/江河-断面共享数据表.xls diff --git a/src/api/ecology/water/river-water.js b/src/api/ecology/water/river-water.js index 4386723..939c5aa 100644 --- a/src/api/ecology/water/river-water.js +++ b/src/api/ecology/water/river-water.js @@ -29,7 +29,7 @@ const getColumnOptions = function(column){ return axios.get("/waterFunctionArea/WaterStationPoint/options",{params:{column}}) } const listInfo = function(){ - return axios.post("/waterFunctionArea/autonomousWaterFunctionAreaPoint/listInfo",{}) + return axios.post("/waterFunctionArea/WaterStationPoint/listInfo",{}) } export { listInfo, From c6ddce366df61d0961e90317ba999d942d0a5448 Mon Sep 17 00:00:00 2001 From: shixiaoman <531268472@qq.com> Date: Wed, 24 Nov 2021 18:33:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../river-station/statistic/site-day-avg.vue | 7 +- .../water/river-station/statistic/site.vue | 4 + src/views/water/river/statistic/avg-index.vue | 10 +-- .../water/river/statistic/avg-standard.vue | 20 +++-- .../water/river/statistic/base-index.vue | 12 ++- .../water/river/statistic/base-standard.vue | 22 ++--- .../water-function-area/statistic/auto.vue | 83 +++++++++---------- .../statistic/national.vue | 4 + 8 files changed, 88 insertions(+), 74 deletions(-) diff --git a/src/views/water/river-station/statistic/site-day-avg.vue b/src/views/water/river-station/statistic/site-day-avg.vue index c324d69..54e77f9 100644 --- a/src/views/water/river-station/statistic/site-day-avg.vue +++ b/src/views/water/river-station/statistic/site-day-avg.vue @@ -35,9 +35,11 @@ + + @@ -147,9 +149,7 @@ methods: { /* 刷新表格 */ reload() { - // this.$refs.table.reload({ - // where: this.where, - // }); + this.loading = true; listWaterSiteMonthTotal(this.where).then((res) => { if (res.data.code == 0) { this.$message.success(res.data.msg); @@ -157,6 +157,7 @@ } else { this.$message.error(res.data.msg); } + this.loading = false; }); }, /* 重置搜索 */ diff --git a/src/views/water/river-station/statistic/site.vue b/src/views/water/river-station/statistic/site.vue index 69094bc..6c728ae 100644 --- a/src/views/water/river-station/statistic/site.vue +++ b/src/views/water/river-station/statistic/site.vue @@ -43,6 +43,7 @@ + @@ -50,6 +51,7 @@ + @@ -186,6 +188,7 @@ methods: { /* 刷新表格 */ reload() { + this.loading = true; listWaterSiteYoy(this.where).then((res) => { console.log(res.data.data); if (res.data.code == 0) { @@ -199,6 +202,7 @@ } else { this.$message.error(res.data.msg); } + this.loading = false; }); }, /* 重置搜索 */ diff --git a/src/views/water/river/statistic/avg-index.vue b/src/views/water/river/statistic/avg-index.vue index b3916ed..1544af3 100644 --- a/src/views/water/river/statistic/avg-index.vue +++ b/src/views/water/river/statistic/avg-index.vue @@ -30,9 +30,11 @@ + + @@ -54,7 +56,6 @@ return { data: [], momData: [], - yoyData: [], datasource: {}, columns: [{ title: '断面名称', @@ -118,19 +119,18 @@ methods: { /* 刷新表格 */ reload() { + this.loading=true; listMonthCompositeIndex(this.where).then((res) => { console.log(res.data.data); if (res.data.code == 0) { this.$message.success(res.data.msg); - res.data.data.momData.forEach((m) => { + res.data.data.forEach((m) => { this.momData.push(m); }) - res.data.data.yoyData.forEach((y) => { - this.yoyData.push(y); - }) } else { this.$message.error(res.data.msg); } + this.loading=false; }); }, /* 重置搜索 */ diff --git a/src/views/water/river/statistic/avg-standard.vue b/src/views/water/river/statistic/avg-standard.vue index d5981d1..a7b7662 100644 --- a/src/views/water/river/statistic/avg-standard.vue +++ b/src/views/water/river/statistic/avg-standard.vue @@ -36,9 +36,11 @@ - - + + + + @@ -69,8 +71,8 @@ }, { title: '断面名称', - dataIndex: 'stationName', - key: 'stationName', + dataIndex: 'sectionName', + key: 'sectionName', }, { title: '考核城市', @@ -126,19 +128,19 @@ methods: { /* 刷新表格 */ reload() { + this.loading = true; listMonthWaterQualitySandard(this.where).then((res) => { console.log(res.data.data); if (res.data.code == 0) { this.$message.success(res.data.msg); - res.data.data.momData.forEach((m) => { + res.data.data.forEach((m) => { + m.transnormalItem = "--" this.momData.push(m); }) - res.data.data.yoyData.forEach((y) => { - this.yoyData.push(y); - }) } else { this.$message.error(res.data.msg); } + this.loading = false; }); }, /* 重置搜索 */ diff --git a/src/views/water/river/statistic/base-index.vue b/src/views/water/river/statistic/base-index.vue index fa01fd1..061b38d 100644 --- a/src/views/water/river/statistic/base-index.vue +++ b/src/views/water/river/statistic/base-index.vue @@ -33,9 +33,11 @@ - - + + + + @@ -121,11 +123,12 @@ methods: { /* 刷新表格 */ reload() { + this.loading = true; listMonthCompositeIndex(this.where).then((res) => { console.log(res.data.data); if (res.data.code == 0) { this.$message.success(res.data.msg); - res.data.data.momData.forEach((m) => { + res.data.data.forEach((m) => { this.momData.push(m); }) res.data.data.yoyData.forEach((y) => { @@ -134,6 +137,7 @@ } else { this.$message.error(res.data.msg); } + this.loading = false; }); }, /* 重置搜索 */ diff --git a/src/views/water/river/statistic/base-standard.vue b/src/views/water/river/statistic/base-standard.vue index b0cef4d..f3f90fa 100644 --- a/src/views/water/river/statistic/base-standard.vue +++ b/src/views/water/river/statistic/base-standard.vue @@ -1,4 +1,4 @@ - +