From 185c21eb7352e9b71837d4583dc16ccd23fd908d Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Thu, 9 Sep 2021 02:47:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=82=E3=80=82=E3=80=82?= =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82=E3=80=82=E3=80=82=E3=80=82=E3=80=82?= =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecology/lake.js | 80 ++ src/api/ecology/river-station.js | 94 +++ src/api/ecology/sewage-city-river.js | 80 ++ src/api/ecology/sewage.js | 80 ++ src/api/ecology/special-lake.js | 80 ++ src/api/ecology/water-function-area.js | 40 +- src/views/water/lake/collect/colums.js | 31 + src/views/water/lake/collect/index.vue | 275 ++++--- src/views/water/lake/collect/noise.vue | 690 ------------------ .../{noise-bill.vue => special-bill.vue} | 87 ++- .../water/lake/collect/special-water.vue | 331 +++++++++ src/views/water/lake/collect/utils.js | 281 ++++--- src/views/water/lake/collect/water-bill.vue | 387 ++++++++++ src/views/water/lake/collect/water.vue | 331 +++++++++ .../water/river-station/collect/colums.js | 21 + .../water/river-station/collect/index.vue | 351 +++++++++ .../water/river-station/collect/utils.js | 3 + .../river-station/collect/water-bill.vue | 389 ++++++++++ .../water/river-station/collect/water.vue | 351 +++++++++ .../water/river-station/statistic/average.vue | 258 +++++++ .../water/river-station/statistic/base.vue | 571 +++++++++++++++ .../water/river-station/statistic/compare.vue | 508 +++++++++++++ .../water/river-station/statistic/index.vue | 56 ++ src/views/water/river/collect/index.vue | 198 ++++- src/views/water/river/collect/utils.js | 59 +- .../water/sewage/collect/city-river-bill.vue | 387 ++++++++++ src/views/water/sewage/collect/city-river.vue | 331 +++++++++ src/views/water/sewage/collect/colums.js | 52 ++ src/views/water/sewage/collect/index.vue | 241 ++++++ src/views/water/sewage/collect/utils.js | 73 ++ src/views/water/sewage/collect/water-bill.vue | 377 ++++++++++ src/views/water/sewage/collect/water.vue | 330 +++++++++ src/views/water/sewage/statistic/average.vue | 213 ++++++ src/views/water/sewage/statistic/base.vue | 477 ++++++++++++ src/views/water/sewage/statistic/index.vue | 62 ++ src/views/water/sewage/statistic/source.vue | 195 +++++ src/views/water/sewage/statistic/year.vue | 224 ++++++ .../water-function-area/collect/colums.js | 155 +--- .../water-function-area/collect/index.vue | 4 +- .../water-function-area/collect/utils.js | 54 -- .../collect/water-bill.vue | 57 +- .../water-function-area/collect/water.vue | 123 ++-- 42 files changed, 7693 insertions(+), 1294 deletions(-) create mode 100644 src/api/ecology/lake.js create mode 100644 src/api/ecology/river-station.js create mode 100644 src/api/ecology/sewage-city-river.js create mode 100644 src/api/ecology/sewage.js create mode 100644 src/api/ecology/special-lake.js create mode 100644 src/views/water/lake/collect/colums.js delete mode 100644 src/views/water/lake/collect/noise.vue rename src/views/water/lake/collect/{noise-bill.vue => special-bill.vue} (83%) create mode 100644 src/views/water/lake/collect/special-water.vue create mode 100644 src/views/water/lake/collect/water-bill.vue create mode 100644 src/views/water/lake/collect/water.vue create mode 100644 src/views/water/river-station/collect/colums.js create mode 100644 src/views/water/river-station/collect/index.vue create mode 100644 src/views/water/river-station/collect/utils.js create mode 100644 src/views/water/river-station/collect/water-bill.vue create mode 100644 src/views/water/river-station/collect/water.vue create mode 100644 src/views/water/river-station/statistic/average.vue create mode 100644 src/views/water/river-station/statistic/base.vue create mode 100644 src/views/water/river-station/statistic/compare.vue create mode 100644 src/views/water/river-station/statistic/index.vue create mode 100644 src/views/water/sewage/collect/city-river-bill.vue create mode 100644 src/views/water/sewage/collect/city-river.vue create mode 100644 src/views/water/sewage/collect/colums.js create mode 100644 src/views/water/sewage/collect/index.vue create mode 100644 src/views/water/sewage/collect/utils.js create mode 100644 src/views/water/sewage/collect/water-bill.vue create mode 100644 src/views/water/sewage/collect/water.vue create mode 100644 src/views/water/sewage/statistic/average.vue create mode 100644 src/views/water/sewage/statistic/base.vue create mode 100644 src/views/water/sewage/statistic/index.vue create mode 100644 src/views/water/sewage/statistic/source.vue create mode 100644 src/views/water/sewage/statistic/year.vue diff --git a/src/api/ecology/lake.js b/src/api/ecology/lake.js new file mode 100644 index 0000000..1134e78 --- /dev/null +++ b/src/api/ecology/lake.js @@ -0,0 +1,80 @@ +import axios from 'axios'; +// ----------------------列表----------------------- +const pageBillUrl = '/lakeLibrary/lakeLibraryInnerCityBill/page'; +// 添加 +const saveLakeBill = function (data) { + return axios.post("/lakeLibrary/lakeLibraryInnerCityBill/importBatch",data) +} + +// 删除 +const removeLakeBill = function (id) { + return axios.delete(`/lakeLibrary/lakeLibraryInnerCityBill/${id}`,) +} +// 批量删除 +const removeBatchLakeBill = function (ids) { + return axios.delete("/lakeLibrary/lakeLibraryInnerCityBill/batch",{data:ids}) +} + +// 修改 +const updateLakeBill = function (data) { + return axios.put("/lakeLibrary/lakeLibraryInnerCityBill",data) +} +// 审核 +const verifyLakeBill = function (data) { + return axios.put("/lakeLibrary/lakeLibraryInnerCityBill/verify",data); +} +const getLakeBill = function (id) { + return axios.get(`/lakeLibrary/lakeLibraryInnerCityBill/${id}`) +} +// -------------------------数据--------------------- +const pageLakeUrl = '/lakeLibrary/lakeLibraryInnerCity/page'; +// 添加 +const saveLake = function (data) { + return axios.post("/lakeLibrary/lakeLibraryInnerCity",data) +} + +// 删除 +const removeLake = function (id) { + return axios.delete(`/lakeLibrary/lakeLibraryInnerCity/${id}`,) +} +// 批量删除 +const removeBatchLake = function (ids) { + return axios.delete("/lakeLibrary/lakeLibraryInnerCity/batch",{data:ids}) +} + +// 修改 +const updateLake = function (data) { + return axios.put("/lakeLibrary/lakeLibraryInnerCity",data) +} + +// -------------------------统计--------------------- +const pageLakeStatisticUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic'; +const statisticSourceUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic/source'; +const statisticYearUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic/year'; +const getHistoryyears = function () { + return axios.get("/lakeLibrary/lakeLibraryInnerCity/history-year") +} +const getColumnOptions = function(column){ + return axios.get("/lakeLibrary/lakeLibraryInnerCity/options",{params:{column}}) +} + +export { + pageBillUrl, + saveLakeBill, + removeLakeBill, + updateLakeBill, + removeBatchLakeBill, + verifyLakeBill, + getLakeBill, + pageLakeUrl, + saveLake, + removeLake, + updateLake, + removeBatchLake, + pageLakeStatisticUrl, + getHistoryyears, + getColumnOptions, + statisticSourceUrl, + statisticYearUrl + +} diff --git a/src/api/ecology/river-station.js b/src/api/ecology/river-station.js new file mode 100644 index 0000000..403baf9 --- /dev/null +++ b/src/api/ecology/river-station.js @@ -0,0 +1,94 @@ +import axios from 'axios'; +// ----------------------列表----------------------- +const pageBillUrl = '/waterFunctionArea/waterStationWaterFunctionAreaBill/page'; +// 添加 +const saveRiverStationBill = function (data) { + return axios.post("/waterFunctionArea/waterStationWaterFunctionAreaBill/batch",data) +} + +// 删除 +const removeRiverStationBill = function (id) { + return axios.delete(`/waterFunctionArea/waterStationWaterFunctionAreaBill/${id}`,) +} +// 批量删除 +const removeBatchRiverStationBill = function (ids) { + return axios.delete("/waterFunctionArea/waterStationWaterFunctionAreaBill/batch",{data:ids}) +} + +// 修改 +const updateRiverStationBill = function (data) { + return axios.put("/waterFunctionArea/waterStationWaterFunctionAreaBill",data) +} +// 审核 +const verifyRiverStationBill = function (data) { + return axios.put("/waterFunctionArea/waterStationWaterFunctionAreaBill/verify",data); +} +const getRiverStationBill = function (id) { + return axios.get(`/waterFunctionArea/waterStationWaterFunctionAreaBill/${id}`) +} +// -------------------------数据--------------------- +const pageRiverStationUrl = '/waterFunctionArea/waterStationWaterFunctionArea/page'; + +const listAll = function(data){ + return axios.get("/waterFunctionArea/waterStationWaterFunctionArea",{params:data}) +} +// 添加 +const saveRiverStation = function (data) { + return axios.post("/waterFunctionArea/waterStationWaterFunctionArea",data) +} + +// 删除 +const removeRiverStation = function (id) { + return axios.delete(`/waterFunctionArea/waterStationWaterFunctionArea/${id}`,) +} +// 批量删除 +const removeBatchRiverStation = function (ids) { + return axios.delete("/waterFunctionArea/waterStationWaterFunctionArea/batch",{data:ids}) +} + +// 修改 +const updateRiverStation = function (data) { + return axios.put("/waterFunctionArea/waterStationWaterFunctionArea",data) +} + + + +// -------------------------统计--------------------- +const pageRiverStationStatisticUrl = '/waterFunctionArea/waterStationWaterFunctionArea/statistic'; +const pageRiverStationCompare = '/waterFunctionArea/waterStationWaterFunctionArea/statistic/compare'; +const getHistoryyears = function () { + return axios.get("/waterFunctionArea/waterStationWaterFunctionArea/history-year") +} +const getColumnOptions = function(column){ + return axios.get("/waterFunctionArea/waterStationWaterFunctionArea/options",{params:{column}}) +} + +const getGisBase = function(data){ + return axios.get("/waterFunctionArea/waterStationWaterFunctionArea/gis",{params:data}) +} + +const getGisArea = function(data){ + return axios.get("/waterFunctionArea/waterStationWaterFunctionArea/gis/area",{params:data}) +} +export { + pageBillUrl, + saveRiverStationBill, + removeRiverStationBill, + updateRiverStationBill, + removeBatchRiverStationBill, + verifyRiverStationBill, + getRiverStationBill, + pageRiverStationUrl, + saveRiverStation, + removeRiverStation, + updateRiverStation, + removeBatchRiverStation, + pageRiverStationStatisticUrl, + getHistoryyears, + pageRiverStationCompare, + getColumnOptions, + listAll, + getGisBase, + getGisArea + +} diff --git a/src/api/ecology/sewage-city-river.js b/src/api/ecology/sewage-city-river.js new file mode 100644 index 0000000..544409e --- /dev/null +++ b/src/api/ecology/sewage-city-river.js @@ -0,0 +1,80 @@ +import axios from 'axios'; +// ----------------------列表----------------------- +const pageBillUrl = '/blackSmellyWater/blackSmellyWaterCityRiverBill/page'; +// 添加 +const saveSewageBill = function (data) { + return axios.post("/blackSmellyWater/blackSmellyWaterCityRiverBill/importBatch",data) +} + +// 删除 +const removeSewageBill = function (id) { + return axios.delete(`/blackSmellyWater/blackSmellyWaterCityRiverBill/${id}`,) +} +// 批量删除 +const removeBatchSewageBill = function (ids) { + return axios.delete("/blackSmellyWater/blackSmellyWaterCityRiverBill/batch",{data:ids}) +} + +// 修改 +const updateSewageBill = function (data) { + return axios.put("/blackSmellyWater/blackSmellyWaterCityRiverBill",data) +} +// 审核 +const verifySewageBill = function (data) { + return axios.put("/blackSmellyWater/blackSmellyWaterCityRiverBill/verify",data); +} +const getSewageBill = function (id) { + return axios.get(`/blackSmellyWater/blackSmellyWaterCityRiverBill/${id}`) +} +// -------------------------数据--------------------- +const pageSewageUrl = '/blackSmellyWater/blackSmellyWaterCityRiver/page'; +// 添加 +const saveSewage = function (data) { + return axios.post("/blackSmellyWater/blackSmellyWaterCityRiver",data) +} + +// 删除 +const removeSewage = function (id) { + return axios.delete(`/blackSmellyWater/blackSmellyWaterCityRiver/${id}`,) +} +// 批量删除 +const removeBatchSewage = function (ids) { + return axios.delete("/blackSmellyWater/blackSmellyWaterCityRiver/batch",{data:ids}) +} + +// 修改 +const updateSewage = function (data) { + return axios.put("/blackSmellyWater/blackSmellyWaterCityRiver",data) +} + +// -------------------------统计--------------------- +const pageSewageStatisticUrl = '/blackSmellyWater/blackSmellyWaterCityRiver/statistic'; +const statisticSourceUrl = '/blackSmellyWater/blackSmellyWaterCityRiver/statistic/source'; +const statisticYearUrl = '/blackSmellyWater/blackSmellyWaterCityRiver/statistic/year'; +const getHistoryyears = function () { + return axios.get("/blackSmellyWater/blackSmellyWaterCityRiver/history-year") +} +const getColumnOptions = function(column){ + return axios.get("/blackSmellyWater/blackSmellyWaterCityRiver/options",{params:{column}}) +} + +export { + pageBillUrl, + saveSewageBill, + removeSewageBill, + updateSewageBill, + removeBatchSewageBill, + verifySewageBill, + getSewageBill, + pageSewageUrl, + saveSewage, + removeSewage, + updateSewage, + removeBatchSewage, + pageSewageStatisticUrl, + getHistoryyears, + getColumnOptions, + statisticSourceUrl, + statisticYearUrl + +} diff --git a/src/api/ecology/sewage.js b/src/api/ecology/sewage.js new file mode 100644 index 0000000..8b2e7ec --- /dev/null +++ b/src/api/ecology/sewage.js @@ -0,0 +1,80 @@ +import axios from 'axios'; +// ----------------------列表----------------------- +const pageBillUrl = '/blackSmellyWater/blackSmellyWaterBill/page'; +// 添加 +const saveSewageBill = function (data) { + return axios.post("/blackSmellyWater/blackSmellyWaterBill/importBatch",data) +} + +// 删除 +const removeSewageBill = function (id) { + return axios.delete(`/blackSmellyWater/blackSmellyWaterBill/${id}`,) +} +// 批量删除 +const removeBatchSewageBill = function (ids) { + return axios.delete("/blackSmellyWater/blackSmellyWaterBill/batch",{data:ids}) +} + +// 修改 +const updateSewageBill = function (data) { + return axios.put("/blackSmellyWater/blackSmellyWaterBill",data) +} +// 审核 +const verifySewageBill = function (data) { + return axios.put("/blackSmellyWater/blackSmellyWaterBill/verify",data); +} +const getSewageBill = function (id) { + return axios.get(`/blackSmellyWater/blackSmellyWaterBill/${id}`) +} +// -------------------------数据--------------------- +const pageSewageUrl = '/blackSmellyWater/blackSmellyWater/page'; +// 添加 +const saveSewage = function (data) { + return axios.post("/blackSmellyWater/blackSmellyWater",data) +} + +// 删除 +const removeSewage = function (id) { + return axios.delete(`/blackSmellyWater/blackSmellyWater/${id}`,) +} +// 批量删除 +const removeBatchSewage = function (ids) { + return axios.delete("/blackSmellyWater/blackSmellyWater/batch",{data:ids}) +} + +// 修改 +const updateSewage = function (data) { + return axios.put("/blackSmellyWater/blackSmellyWater",data) +} + +// -------------------------统计--------------------- +const pageSewageStatisticUrl = '/blackSmellyWater/blackSmellyWater/statistic'; +const statisticSourceUrl = '/blackSmellyWater/blackSmellyWater/statistic/source'; +const statisticYearUrl = '/blackSmellyWater/blackSmellyWater/statistic/year'; +const getHistoryyears = function () { + return axios.get("/blackSmellyWater/blackSmellyWater/history-year") +} +const getColumnOptions = function(column){ + return axios.get("/blackSmellyWater/blackSmellyWater/options",{params:{column}}) +} + +export { + pageBillUrl, + saveSewageBill, + removeSewageBill, + updateSewageBill, + removeBatchSewageBill, + verifySewageBill, + getSewageBill, + pageSewageUrl, + saveSewage, + removeSewage, + updateSewage, + removeBatchSewage, + pageSewageStatisticUrl, + getHistoryyears, + getColumnOptions, + statisticSourceUrl, + statisticYearUrl + +} diff --git a/src/api/ecology/special-lake.js b/src/api/ecology/special-lake.js new file mode 100644 index 0000000..000898a --- /dev/null +++ b/src/api/ecology/special-lake.js @@ -0,0 +1,80 @@ +import axios from 'axios'; +// ----------------------列表----------------------- +const pageBillUrl = '/lakeLibrary/lakeLibrarySpecialBill/page'; +// 添加 +const saveLakeBill = function (data) { + return axios.post("/lakeLibrary/lakeLibrarySpecialBill/importBatch",data) +} + +// 删除 +const removeLakeBill = function (id) { + return axios.delete(`/lakeLibrary/lakeLibrarySpecialBill/${id}`,) +} +// 批量删除 +const removeBatchLakeBill = function (ids) { + return axios.delete("/lakeLibrary/lakeLibrarySpecialBill/batch",{data:ids}) +} + +// 修改 +const updateLakeBill = function (data) { + return axios.put("/lakeLibrary/lakeLibrarySpecialBill",data) +} +// 审核 +const verifyLakeBill = function (data) { + return axios.put("/lakeLibrary/lakeLibrarySpecialBill/verify",data); +} +const getLakeBill = function (id) { + return axios.get(`/lakeLibrary/lakeLibrarySpecialBill/${id}`) +} +// -------------------------数据--------------------- +const pageLakeUrl = '/lakeLibrary/lakeLibrarySpecial/page'; +// 添加 +const saveLake = function (data) { + return axios.post("/lakeLibrary/lakeLibrarySpecial",data) +} + +// 删除 +const removeLake = function (id) { + return axios.delete(`/lakeLibrary/lakeLibrarySpecial/${id}`,) +} +// 批量删除 +const removeBatchLake = function (ids) { + return axios.delete("/lakeLibrary/lakeLibrarySpecial/batch",{data:ids}) +} + +// 修改 +const updateLake = function (data) { + return axios.put("/lakeLibrary/lakeLibrarySpecial",data) +} + +// -------------------------统计--------------------- +const pageLakeStatisticUrl = '/lakeLibrary/lakeLibrarySpecial/statistic'; +const statisticSourceUrl = '/lakeLibrary/lakeLibrarySpecial/statistic/source'; +const statisticYearUrl = '/lakeLibrary/lakeLibrarySpecial/statistic/year'; +const getHistoryyears = function () { + return axios.get("/lakeLibrary/lakeLibrarySpecial/history-year") +} +const getColumnOptions = function(column){ + return axios.get("/lakeLibrary/lakeLibrarySpecial/options",{params:{column}}) +} + +export { + pageBillUrl, + saveLakeBill, + removeLakeBill, + updateLakeBill, + removeBatchLakeBill, + verifyLakeBill, + getLakeBill, + pageLakeUrl, + saveLake, + removeLake, + updateLake, + removeBatchLake, + pageLakeStatisticUrl, + getHistoryyears, + getColumnOptions, + statisticSourceUrl, + statisticYearUrl + +} diff --git a/src/api/ecology/water-function-area.js b/src/api/ecology/water-function-area.js index eb6e0c7..eb173a7 100644 --- a/src/api/ecology/water-function-area.js +++ b/src/api/ecology/water-function-area.js @@ -1,74 +1,74 @@ import axios from 'axios'; // ----------------------列表----------------------- -const pageBillUrl = '/waterFunctionArea/waterFunctionAreaBill/page'; +const pageBillUrl = '/waterFunctionArea/nationalLevelWaterFunctionAreaBill/page'; // 添加 const saveWaterFunctionAreaBill = function (data) { - return axios.post("/waterFunctionArea/waterFunctionAreaBill/importBatch",data) + return axios.post("/waterFunctionArea/nationalLevelWaterFunctionAreaBill/importBatch",data) } // 删除 const removeWaterFunctionAreaBill = function (id) { - return axios.delete(`/waterFunctionArea/waterFunctionAreaBill/${id}`,) + return axios.delete(`/waterFunctionArea/nationalLevelWaterFunctionAreaBill/${id}`,) } // 批量删除 const removeBatchWaterFunctionAreaBill = function (ids) { - return axios.delete("/waterFunctionArea/waterFunctionAreaBill/batch",{data:ids}) + return axios.delete("/waterFunctionArea/nationalLevelWaterFunctionAreaBill/batch",{data:ids}) } // 修改 const updateWaterFunctionAreaBill = function (data) { - return axios.put("/waterFunctionArea/waterFunctionAreaBill",data) + return axios.put("/waterFunctionArea/nationalLevelWaterFunctionAreaBill",data) } // 审核 const verifyWaterFunctionAreaBill = function (data) { - return axios.put("/waterFunctionArea/waterFunctionAreaBill/verify",data); + return axios.put("/waterFunctionArea/nationalLevelWaterFunctionAreaBill/verify",data); } const getWaterFunctionAreaBill = function (id) { - return axios.get(`/waterFunctionArea/waterFunctionAreaBill/${id}`) + return axios.get(`/waterFunctionArea/nationalLevelWaterFunctionAreaBill/${id}`) } // -------------------------数据--------------------- -const pageWaterFunctionAreaUrl = '/waterFunctionArea/waterFunctionArea/page'; +const pageWaterFunctionAreaUrl = '/waterFunctionArea/nationalLevelWaterFunctionArea/page'; const listAll = function(data){ - return axios.get("/waterFunctionArea/waterFunctionArea",{params:data}) + return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea",{params:data}) } // 添加 const saveWaterFunctionArea = function (data) { - return axios.post("/waterFunctionArea/waterFunctionArea",data) + return axios.post("/waterFunctionArea/nationalLevelWaterFunctionArea",data) } // 删除 const removeWaterFunctionArea = function (id) { - return axios.delete(`/waterFunctionArea/waterFunctionArea/${id}`,) + return axios.delete(`/waterFunctionArea/nationalLevelWaterFunctionArea/${id}`,) } // 批量删除 const removeBatchWaterFunctionArea = function (ids) { - return axios.delete("/waterFunctionArea/waterFunctionArea/batch",{data:ids}) + return axios.delete("/waterFunctionArea/nationalLevelWaterFunctionArea/batch",{data:ids}) } // 修改 const updateWaterFunctionArea = function (data) { - return axios.put("/waterFunctionArea/waterFunctionArea",data) + return axios.put("/waterFunctionArea/nationalLevelWaterFunctionArea",data) } // -------------------------统计--------------------- -const pageWaterFunctionAreaStatisticUrl = '/waterFunctionArea/waterFunctionArea/statistic'; -const pageWaterFunctionAreaCompare = '/waterFunctionArea/waterFunctionArea/statistic/compare'; +const pageWaterFunctionAreaStatisticUrl = '/waterFunctionArea/nationalLevelWaterFunctionArea/statistic'; +const pageWaterFunctionAreaCompare = '/waterFunctionArea/nationalLevelWaterFunctionArea/statistic/compare'; const getHistoryyears = function () { - return axios.get("/waterFunctionArea/waterFunctionArea/history-year") + return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea/history-year") } const getColumnOptions = function(column){ - return axios.get("/waterFunctionArea/waterFunctionArea/options",{params:{column}}) + return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea/options",{params:{column}}) } const getGisBase = function(data){ - return axios.get("/waterFunctionArea/waterFunctionArea/gis",{params:data}) + return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea/gis",{params:data}) } const getGisArea = function(data){ - return axios.get("/waterFunctionArea/waterFunctionArea/gis/area",{params:data}) + return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea/gis/area",{params:data}) } export { pageBillUrl, @@ -90,5 +90,5 @@ export { listAll, getGisBase, getGisArea - + } diff --git a/src/views/water/lake/collect/colums.js b/src/views/water/lake/collect/colums.js new file mode 100644 index 0000000..b7a5040 --- /dev/null +++ b/src/views/water/lake/collect/colums.js @@ -0,0 +1,31 @@ +const tableColumns = [ + {title: "监测时间",dataIndex: "monitorTime",sorter: true,}, + {title: "点位名称",dataIndex: "pointName",sorter: true,}, + {title: "水温(℃)",dataIndex: "waterTemperature",sorter: true,}, + {title: "pH值（无量纲）",dataIndex: "ph",sorter: true,}, + {title: "透明度（cm）",dataIndex: "transparency",sorter: true,}, + {title: "溶解氧饱和度（﹪）",dataIndex: "dissolvedOxygenSaturation",sorter: true,}, + {title: "溶解氧",dataIndex: "dissolvedOxygen",sorter: true,}, + {title: "高锰酸盐指数",dataIndex: "permanganateIndex",sorter: true,}, + // {title: "监测时间",dataIndex: "monitorTime",sorter: true,}, + {title: "五日生化需氧量",dataIndex: "fiveDayBod",sorter: true,}, + {title: "总氮 ",dataIndex: "totalNitrogen",sorter: true,}, + {title: "氨氮",dataIndex: "ammonia",sorter: true,}, + {title: "挥发酚",dataIndex: "volatilePhenol",sorter: true,}, + {title: "砷",dataIndex: "as",sorter: true,}, + {title: "汞",dataIndex: "hg",sorter: true,}, + {title: "六价铬",dataIndex: "cr6",sorter: true,}, + {title: "铅(℃)",dataIndex: "pb",sorter: true,}, + {title: "镉",dataIndex: "cd",sorter: true,}, + {title: "总磷",dataIndex: "totalPhosphorus",sorter: true,}, + {title: "石油类",dataIndex: "petro",sorter: true,}, + {title: "粪大肠菌群（MPN/L）",dataIndex: "fecalColiforms",sorter: true,}, + {title: "化学需氧量",dataIndex: "cod",sorter: true,}, + {title: "叶绿素a（mg/m3）",dataIndex: "chlA",sorter: true,}, + {title: "阴离子表面活性剂",dataIndex: "anSaa",sorter: true,}, + {title: "硫化物",dataIndex: "s",sorter: true,}, + {title: "氧化还原电位（mV）",dataIndex: "oxidationReductionPotential",sorter: true,}, + {title: "备注",dataIndex: "remark",sorter: true,}, + ]; + + export {tableColumns} diff --git a/src/views/water/lake/collect/index.vue b/src/views/water/lake/collect/index.vue index 501b184..8271d8a 100644 --- a/src/views/water/lake/collect/index.vue +++ b/src/views/water/lake/collect/index.vue @@ -4,24 +4,35 @@ - - + + + + + @@ -31,22 +42,26 @@ \ No newline at end of file + diff --git a/src/views/water/lake/collect/noise.vue b/src/views/water/lake/collect/noise.vue deleted file mode 100644 index d04785a..0000000 --- a/src/views/water/lake/collect/noise.vue +++ /dev/null @@ -1,690 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/water/lake/collect/noise-bill.vue b/src/views/water/lake/collect/special-bill.vue similarity index 83% rename from src/views/water/lake/collect/noise-bill.vue rename to src/views/water/lake/collect/special-bill.vue index fe2c34e..9d9811d 100644 --- a/src/views/water/lake/collect/noise-bill.vue +++ b/src/views/water/lake/collect/special-bill.vue @@ -1,7 +1,7 @@