diff --git a/public/template/区控水功能区.xls b/public/template/区控水功能区.xls deleted file mode 100644 index f1f8541..0000000 Binary files a/public/template/区控水功能区.xls and /dev/null differ diff --git a/public/template/国家水站.xlsx b/public/template/国家水站.xlsx deleted file mode 100644 index 35f0eb3..0000000 --- a/public/template/国家水站.xlsx +++ /dev/null @@ -1 +0,0 @@ -
时间水温(℃)pH(无量纲)溶解氧(mg/L)电导率(μS/cm)浊度(NTU)高锰酸盐指数(mg/L)氨氮(mg/L)总磷(mg/L)总氮(mg/L)叶绿素α(mg/L)藻密度(cells/L)水质类别污染指标
日均值日均值日均值日均值日均值日均值日均值日均值日均值日均值日均值
12021-10-1625.685.8353.99.31.30.040.0451.76Ⅲ
22021-10-1724.785.9358.49.41.50.040.0501.87Ⅲ
32021-10-1824.385.8369.58.11.50.020.0512.05Ⅲ
42021-10-1924.485.7370.87.81.20.020.0501.98Ⅲ
52021-10-2024.686.2364.46.91.20.020.0452.04Ⅱ
62021-10-2124.186.0358.07.81.10.020.0431.87Ⅱ
72021-10-2223.686.2368.28.01.10.020.0441.89Ⅱ
82021-10-2323.486.2369.16.71.20.020.0451.96Ⅱ
92021-10-2423.586.4370.15.91.20.020.0432.01Ⅱ
102021-10-2523.486.7376.55.61.10.020.0462.06Ⅱ
112021-10-2623.386.9380.05.31.00.020.0442.05Ⅱ
122021-10-2723.687.1381.25.11.10.020.0412.08Ⅱ
132021-10-2823.687.0386.86.70.90.020.0412.17Ⅱ
142021-10-2923.587.0395.15.70.90.020.0352.23Ⅱ
152021-10-3023.386.9388.75.80.90.020.0392.10Ⅱ
162021-10-3123.286.8386.55.50.90.020.0382.10Ⅱ
\ No newline at end of file diff --git a/public/template/国家级水功能区.xlsx b/public/template/国家级水功能区.xlsx deleted file mode 100644 index 271162b..0000000 Binary files a/public/template/国家级水功能区.xlsx and /dev/null differ diff --git a/public/template/广西水站.xlsx b/public/template/广西水站.xlsx deleted file mode 100644 index c7a0859..0000000 --- a/public/template/广西水站.xlsx +++ /dev/null @@ -1 +0,0 @@ -
序号站点名称时间水质类别水温℃pH值无量纲溶解氧mg/L电导率us/cm浊度NTU高锰酸盐指数mg/L氨氮mg/L总磷mg/L总氮mg/L
三类标准6.0~9.0≧5.0≦6.0≦1.0≦0.2
1廖平桥2021-10-16 00:00:00323.276.6210.310.55.20.020.0662.14
2廖平桥2021-10-17 00:00:00322.676.5217.010.04.90.020.0612.05
3廖平桥2021-10-18 00:00:00222.676.7216.99.5--0.020.0622.23
4廖平桥2021-10-19 00:00:00222.876.8206.79.43.80.030.0602.19
5廖平桥2021-10-20 00:00:00223.576.8223.09.43.50.020.0572.31
6廖平桥2021-10-21 00:00:00223.376.6237.39.63.20.020.0572.25
7廖平桥2021-10-22 00:00:00222.577.0264.514.02.80.020.0632.29
8廖平桥2021-10-23 00:00:00222.077.4271.610.22.20.020.0632.20
9廖平桥2021-10-24 00:00:00222.377.6261.49.12.20.020.0602.23
10廖平桥2021-10-25 00:00:00222.577.8256.88.42.40.020.0552.13
11廖平桥2021-10-26 00:00:00222.577.9253.67.72.60.020.0522.08
12廖平桥2021-10-27 00:00:00223.077.8267.95.92.50.020.0522.23
13廖平桥2021-10-28 00:00:00223.8--7.9287.64.82.40.020.0482.31
14廖平桥2021-10-29 00:00:00223.877.6287.85.02.20.020.0512.32
15廖平桥2021-10-30 00:00:00223.377.0278.95.82.30.020.0522.30
16廖平桥2021-10-31 00:00:00222.886.7260.19.42.50.020.0552.24
17廖平桥平均值222.977.2250.18.73.00.020.0572.22
18廖平桥最大值23.887.9287.814.05.20.020.0662.32
19廖平桥最小值22.076.5206.74.82.20.020.0482.05
20廖平桥有效数据个数16161516161615161616
21廖平桥总数据个数16161616161616161616
\ No newline at end of file diff --git a/public/template/水功能区-国家级水功能区数据表.xlsx b/public/template/水功能区-国家级水功能区数据表.xlsx new file mode 100644 index 0000000..be30909 Binary files /dev/null and b/public/template/水功能区-国家级水功能区数据表.xlsx differ diff --git a/public/template/水功能区-自治区级水站月均值数据表.xls b/public/template/水功能区-自治区级水站月均值数据表.xls new file mode 100644 index 0000000..803e610 Binary files /dev/null and b/public/template/水功能区-自治区级水站月均值数据表.xls differ diff --git a/public/template/水站-国家级水站历史数据表.xlsx b/public/template/水站-国家级水站历史数据表.xlsx new file mode 100644 index 0000000..d62eed2 Binary files /dev/null and b/public/template/水站-国家级水站历史数据表.xlsx differ diff --git a/public/template/水站-自治区级水站均值数据报表.xlsx b/public/template/水站-自治区级水站均值数据报表.xlsx new file mode 100644 index 0000000..fcdec4d Binary files /dev/null and b/public/template/水站-自治区级水站均值数据报表.xlsx differ diff --git a/public/template/江河-断面共享数据表.xls b/public/template/江河-断面共享数据表.xls new file mode 100644 index 0000000..aafefed Binary files /dev/null and b/public/template/江河-断面共享数据表.xls differ diff --git a/public/template/江河.xlsx b/public/template/江河.xlsx deleted file mode 100644 index 6cb946b..0000000 Binary files a/public/template/江河.xlsx and /dev/null differ 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/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, 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 new file mode 100644 index 0000000..1544af3 --- /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..a7b7662 --- /dev/null +++ b/src/views/water/river/statistic/avg-standard.vue @@ -0,0 +1,172 @@ + + + + + + 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..65785a6 --- /dev/null +++ b/src/views/water/river/statistic/base-index.vue @@ -0,0 +1,166 @@ + + + + + + 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..f3f90fa --- /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 { diff --git a/src/views/water/water-function-area/statistic/auto.vue b/src/views/water/water-function-area/statistic/auto.vue index 8da09f3..8325936 100644 --- a/src/views/water/water-function-area/statistic/auto.vue +++ b/src/views/water/water-function-area/statistic/auto.vue @@ -31,9 +31,11 @@ - + + @@ -60,7 +62,7 @@ data: [], locale, datasource: {}, - // 表格数据接口 + // 表格数据接口 // url: autonomyWaterFunctionTotalUrl, selection: [], tableColumns, @@ -107,8 +109,8 @@ e.nTotal = "-1"; e.transp = "-1"; e.chla = "-1"; - e.ffeMajorOverStandardItemsMultiples = "-1"; - e.lprlMajorOverStandardItemsMultiples = "-1"; + e.ffeMajorOverStandardItemsMultiples = "-1"; + e.lprlMajorOverStandardItemsMultiples = "-1"; }) this.datasource = res.data.data; }); @@ -127,45 +129,44 @@ methods: { /* 刷新表格 */ reload() { - // this.$refs.table.reload({ - // where: this.where, - // }); + this.loading = true; autonomyWaterFunctionTotal().then((res) => { - res.data.data.forEach((e) => { - e.wTemp = "-1"; - e.ph = "-1"; - e.dissolvedOxygen = "-1"; - e.cod = "-1"; - e.fiveDayBod = "-1"; - e.ammonia = "-1"; - e.cu = "-1"; - e.zn = "-1"; - e.f = "-1"; - e.se = "-1"; - e.as = "-1"; - e.hg = "-1"; - e.cd = "-1"; - e.cr6 = "-1"; - e.pb = "-1"; - e.cyanide = "-1"; - e.vPhen = "-1"; - e.oils = "-1"; - e.anSaa = "-1"; - e.s = "-1"; - e.coloOrg = "-1"; - e.so4 = "-1"; - e.cl = "-1"; - e.nitrateNitrogen = "-1"; - e.fe = "-1"; - e.mn = "-1"; - e.nTotal = "-1"; - e.transp = "-1"; - e.chla = "-1"; - e.ffeMajorOverStandardItemsMultiples = "-1"; - e.lprlMajorOverStandardItemsMultiples = "-1"; - }) - this.datasource = res.data.data; - }); + res.data.data.forEach((e) => { + e.wTemp = "-1"; + e.ph = "-1"; + e.dissolvedOxygen = "-1"; + e.cod = "-1"; + e.fiveDayBod = "-1"; + e.ammonia = "-1"; + e.cu = "-1"; + e.zn = "-1"; + e.f = "-1"; + e.se = "-1"; + e.as = "-1"; + e.hg = "-1"; + e.cd = "-1"; + e.cr6 = "-1"; + e.pb = "-1"; + e.cyanide = "-1"; + e.vPhen = "-1"; + e.oils = "-1"; + e.anSaa = "-1"; + e.s = "-1"; + e.coloOrg = "-1"; + e.so4 = "-1"; + e.cl = "-1"; + e.nitrateNitrogen = "-1"; + e.fe = "-1"; + e.mn = "-1"; + e.nTotal = "-1"; + e.transp = "-1"; + e.chla = "-1"; + e.ffeMajorOverStandardItemsMultiples = "-1"; + e.lprlMajorOverStandardItemsMultiples = "-1"; + }) + this.datasource = res.data.data; + this.loading = false; + }); }, /* 重置搜索 */ reset() { diff --git a/src/views/water/water-function-area/statistic/national.vue b/src/views/water/water-function-area/statistic/national.vue index 6f1bc0c..14fce01 100644 --- a/src/views/water/water-function-area/statistic/national.vue +++ b/src/views/water/water-function-area/statistic/national.vue @@ -31,9 +31,11 @@ + + @@ -107,6 +109,7 @@ }; }, mounted() { + this.loading = true; nationalWaterFunctionTotal().then((res) => { res.data.data.forEach((e) => { e.wTemp = "-1"; @@ -142,6 +145,7 @@ e.lprlMajorOverStandardItemsMultiples = "-1"; }) this.datasource = res.data.data; + this.loading = false; }); }, created() {