From 9c1f1c1b8c0b5737942b60a42da412e63769a107 Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Wed, 15 Sep 2021 18:38:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=EF=BC=8C=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../noise/function-noise-function-type.js | 32 + .../ecology/noise/function-noise-leq-level.js | 32 + src/api/ecology/noise/function-noise-place.js | 32 + src/api/ecology/{ => noise}/function-sound.js | 0 src/api/ecology/noise/road-noise-leq-level.js | 32 + src/api/ecology/noise/road-noise-place.js | 32 + src/api/ecology/{ => noise}/road-sound.js | 4 +- src/api/ecology/{ => noise}/zone-sound.js | 0 .../ecology/water/surface-water-standard.js | 37 + .../acid-rain/statistic/average.vue | 2 +- .../atmosphere/acid-rain/statistic/source.vue | 2 +- .../atmosphere/acid-rain/statistic/year.vue | 2 +- src/views/sound/function/collect/index.vue | 2 +- .../sound/function/collect/noise-bill.vue | 2 +- src/views/sound/function/collect/noise.vue | 2 +- .../sound/function/dict/function-type.vue | 297 +++++++ src/views/sound/function/dict/index.vue | 46 ++ src/views/sound/function/dict/place.vue | 349 +++++++++ .../sound/function/statistic/average.vue | 2 +- src/views/sound/function/statistic/base.vue | 2 +- .../sound/function/statistic/compare.vue | 2 +- .../function/statistic/county-average.vue | 2 +- .../sound/function/statistic/leq-compare.vue | 2 +- src/views/sound/road/collect/index.vue | 485 ++++++------ src/views/sound/road/collect/noise-bill.vue | 2 +- src/views/sound/road/collect/noise.vue | 5 +- src/views/sound/road/dict/index.vue | 46 ++ src/views/sound/road/dict/leq-level.vue | 302 ++++++++ src/views/sound/road/dict/place.vue | 353 +++++++++ src/views/sound/road/statistic/average.vue | 2 +- src/views/sound/road/statistic/base.vue | 70 +- src/views/sound/road/statistic/compare.vue | 729 ++++++------------ src/views/sound/road/statistic/index.vue | 6 +- src/views/sound/road/statistic/year-end.vue | 146 ++++ src/views/sound/zone/collect/index.vue | 2 +- src/views/sound/zone/collect/noise-bill.vue | 2 +- src/views/sound/zone/collect/noise.vue | 2 +- src/views/sound/zone/dict/index.vue | 46 ++ src/views/sound/zone/dict/leq-level.vue | 302 ++++++++ src/views/sound/zone/dict/place.vue | 353 +++++++++ src/views/sound/zone/statistic/average.vue | 2 +- src/views/sound/zone/statistic/base.vue | 2 +- src/views/sound/zone/statistic/source.vue | 2 +- src/views/sound/zone/statistic/year.vue | 2 +- src/views/visualiz/sound/function/index.vue | 2 +- src/views/visualiz/sound/road/index.vue | 2 +- .../statistic/average.vue | 2 +- .../drinking-water-village/statistic/base.vue | 2 +- .../statistic/compare.vue | 2 +- src/views/water/drinking-water/dict/index.vue | 46 ++ src/views/water/drinking-water/dict/place.vue | 353 +++++++++ .../drinking-water/dict/surface-water.vue | 286 +++++++ .../drinking-water/statistic/average.vue | 2 +- .../water/drinking-water/statistic/base.vue | 2 +- .../drinking-water/statistic/compare.vue | 2 +- .../drinking-water/statistic/year-end.vue | 134 ++++ src/views/water/lake/statistic/average.vue | 2 +- src/views/water/lake/statistic/base.vue | 2 +- src/views/water/lake/statistic/source.vue | 2 +- src/views/water/lake/statistic/year.vue | 2 +- .../water/river-station/statistic/average.vue | 2 +- .../water/river-station/statistic/base.vue | 2 +- .../water/river-station/statistic/compare.vue | 2 +- src/views/water/sewage/statistic/average.vue | 2 +- src/views/water/sewage/statistic/base.vue | 2 +- src/views/water/sewage/statistic/source.vue | 2 +- src/views/water/sewage/statistic/year.vue | 2 +- .../water-function-area/statistic/base.vue | 2 +- 68 files changed, 3856 insertions(+), 779 deletions(-) create mode 100644 src/api/ecology/noise/function-noise-function-type.js create mode 100644 src/api/ecology/noise/function-noise-leq-level.js create mode 100644 src/api/ecology/noise/function-noise-place.js rename src/api/ecology/{ => noise}/function-sound.js (100%) create mode 100644 src/api/ecology/noise/road-noise-leq-level.js create mode 100644 src/api/ecology/noise/road-noise-place.js rename src/api/ecology/{ => noise}/road-sound.js (96%) rename src/api/ecology/{ => noise}/zone-sound.js (100%) create mode 100644 src/api/ecology/water/surface-water-standard.js create mode 100644 src/views/sound/function/dict/function-type.vue create mode 100644 src/views/sound/function/dict/index.vue create mode 100644 src/views/sound/function/dict/place.vue create mode 100644 src/views/sound/road/dict/index.vue create mode 100644 src/views/sound/road/dict/leq-level.vue create mode 100644 src/views/sound/road/dict/place.vue create mode 100644 src/views/sound/road/statistic/year-end.vue create mode 100644 src/views/sound/zone/dict/index.vue create mode 100644 src/views/sound/zone/dict/leq-level.vue create mode 100644 src/views/sound/zone/dict/place.vue create mode 100644 src/views/water/drinking-water/dict/index.vue create mode 100644 src/views/water/drinking-water/dict/place.vue create mode 100644 src/views/water/drinking-water/dict/surface-water.vue create mode 100644 src/views/water/drinking-water/statistic/year-end.vue diff --git a/src/api/ecology/noise/function-noise-function-type.js b/src/api/ecology/noise/function-noise-function-type.js new file mode 100644 index 0000000..592aa65 --- /dev/null +++ b/src/api/ecology/noise/function-noise-function-type.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/sound/function/functionType"; +const listAllUrl = baseUri + ""; + +// 添加 +const saveFunctionType = function (data) { + return axios.post("/sound/function/functionType",data) +} + +// 删除 +const removeFunctionType = function (id) { + return axios.delete(`/sound/function/functionType/${id}`,) +} +// 批量删除 +const removeBatchFunctionType = function (ids) { + return axios.delete("/sound/function/functionType/batch",{data:ids}) +} + +// 修改 +const updateFunctionType = function (data) { + return axios.put("/sound/function/functionType",data) +} + + +export { + listAllUrl, + saveFunctionType, + updateFunctionType, + removeBatchFunctionType, + removeFunctionType + +} diff --git a/src/api/ecology/noise/function-noise-leq-level.js b/src/api/ecology/noise/function-noise-leq-level.js new file mode 100644 index 0000000..eac7d27 --- /dev/null +++ b/src/api/ecology/noise/function-noise-leq-level.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/sound/function/noiseLeqLevel"; +const listAllUrl = baseUri + ""; + +// 添加 +const saveLeqLevel = function (data) { + return axios.post("/sound/function/noiseLeqLevel",data) +} + +// 删除 +const removeLeqLevel = function (id) { + return axios.delete(`/sound/function/noiseLeqLevel/${id}`,) +} +// 批量删除 +const removeBatchLeqLevel = function (ids) { + return axios.delete("/sound/function/noiseLeqLevel/batch",{data:ids}) +} + +// 修改 +const updateLeqLevel = function (data) { + return axios.put("/sound/function/noiseLeqLevel",data) +} + + +export { + listAllUrl, + saveLeqLevel, + updateLeqLevel, + removeBatchLeqLevel, + removeLeqLevel + +} diff --git a/src/api/ecology/noise/function-noise-place.js b/src/api/ecology/noise/function-noise-place.js new file mode 100644 index 0000000..ebd0625 --- /dev/null +++ b/src/api/ecology/noise/function-noise-place.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/sound/function/place"; +const listAllUrl = baseUri + ""; + +// 添加 +const savePlace = function (data) { + return axios.post("/sound/function/place",data) +} + +// 删除 +const removePlace = function (id) { + return axios.delete(`/sound/function/place/${id}`,) +} +// 批量删除 +const removeBatchPlace = function (ids) { + return axios.delete("/sound/function/place/batch",{data:ids}) +} + +// 修改 +const updatePlace = function (data) { + return axios.put("/sound/function/place",data) +} + + +export { + listAllUrl, + savePlace, + updatePlace, + removeBatchPlace, + removePlace + +} diff --git a/src/api/ecology/function-sound.js b/src/api/ecology/noise/function-sound.js similarity index 100% rename from src/api/ecology/function-sound.js rename to src/api/ecology/noise/function-sound.js diff --git a/src/api/ecology/noise/road-noise-leq-level.js b/src/api/ecology/noise/road-noise-leq-level.js new file mode 100644 index 0000000..c3f4e56 --- /dev/null +++ b/src/api/ecology/noise/road-noise-leq-level.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/sound/road/noiseLeqLevel"; +const listAllUrl = baseUri + ""; + +// 添加 +const saveLeqLevel = function (data) { + return axios.post("/sound/road/noiseLeqLevel",data) +} + +// 删除 +const removeLeqLevel = function (id) { + return axios.delete(`/sound/road/noiseLeqLevel/${id}`,) +} +// 批量删除 +const removeBatchLeqLevel = function (ids) { + return axios.delete("/sound/road/noiseLeqLevel/batch",{data:ids}) +} + +// 修改 +const updateLeqLevel = function (data) { + return axios.put("/sound/road/noiseLeqLevel",data) +} + + +export { + listAllUrl, + saveLeqLevel, + updateLeqLevel, + removeBatchLeqLevel, + removeLeqLevel + +} diff --git a/src/api/ecology/noise/road-noise-place.js b/src/api/ecology/noise/road-noise-place.js new file mode 100644 index 0000000..8f7cd31 --- /dev/null +++ b/src/api/ecology/noise/road-noise-place.js @@ -0,0 +1,32 @@ +import axios from 'axios'; +const baseUri = "/sound/road/place"; +const listAllUrl = baseUri + ""; + +// 添加 +const savePlace = function (data) { + return axios.post("/sound/road/place",data) +} + +// 删除 +const removePlace = function (id) { + return axios.delete(`/sound/road/place/${id}`,) +} +// 批量删除 +const removeBatchPlace = function (ids) { + return axios.delete("/sound/road/place/batch",{data:ids}) +} + +// 修改 +const updatePlace = function (data) { + return axios.put("/sound/road/place",data) +} + + +export { + listAllUrl, + savePlace, + updatePlace, + removeBatchPlace, + removePlace + +} diff --git a/src/api/ecology/road-sound.js b/src/api/ecology/noise/road-sound.js similarity index 96% rename from src/api/ecology/road-sound.js rename to src/api/ecology/noise/road-sound.js index c8b2a41..e65e58e 100644 --- a/src/api/ecology/road-sound.js +++ b/src/api/ecology/noise/road-sound.js @@ -56,6 +56,7 @@ const updateRoadNoise = function (data) { // -------------------------统计--------------------- const pageRoadNoiseStatisticUrl = '/sound/road/noise/statistic'; const pageRoadNoiseCompare = '/sound/road/noise/statistic/compare'; +const roadNoiseYearEnd = '/sound/road/noise/statistic/yearEnd'; const getHistoryyears = function () { return axios.get("/sound/road/noise/history-year") } @@ -89,6 +90,7 @@ export { getColumnOptions, listAll, getGisBase, - getGisArea + getGisArea, + roadNoiseYearEnd } diff --git a/src/api/ecology/zone-sound.js b/src/api/ecology/noise/zone-sound.js similarity index 100% rename from src/api/ecology/zone-sound.js rename to src/api/ecology/noise/zone-sound.js diff --git a/src/api/ecology/water/surface-water-standard.js b/src/api/ecology/water/surface-water-standard.js new file mode 100644 index 0000000..3c73dc9 --- /dev/null +++ b/src/api/ecology/water/surface-water-standard.js @@ -0,0 +1,37 @@ +import axios from "axios"; + +// const baseUri = "/api/waterFunctionArea/surfaceWaterEvaluationStandard"; +// 分页 +const pageSurfaceWaterStandardUrl = '/waterFunctionArea/surfaceWaterEvaluationStandard/page'; +const pageSurfaceWaterStandardAllUrl = '/waterFunctionArea/surfaceWaterEvaluationStandard'; +// 全部 +const listAllSurfaceWaterStandard = function (){ + return axios .get("/waterFunctionArea/surfaceWaterEvaluationStandard") +} +// 添加 +const saveSurfaceWaterStandard = function (data) { + return axios.post("/waterFunctionArea/surfaceWaterEvaluationStandard",data) +} + +// 删除 +const removeSurfaceWaterStandard = function (id) { + return axios.delete(`/waterFunctionArea/surfaceWaterEvaluationStandard/${id}`,) +} +// 批量删除 +const removeBatchSurfaceWaterStandard = function (ids) { + return axios.delete("/waterFunctionArea/surfaceWaterEvaluationStandard/batch",{data:ids}) +} + +// 修改 +const updateSurfaceWaterStandard = function (data) { + return axios.put("/waterFunctionArea/surfaceWaterEvaluationStandard",data) +} +export { + pageSurfaceWaterStandardUrl, + updateSurfaceWaterStandard, + removeBatchSurfaceWaterStandard, + removeSurfaceWaterStandard, + listAllSurfaceWaterStandard, + saveSurfaceWaterStandard, + pageSurfaceWaterStandardAllUrl +} \ No newline at end of file diff --git a/src/views/atmosphere/acid-rain/statistic/average.vue b/src/views/atmosphere/acid-rain/statistic/average.vue index 3abe54f..a657b1e 100644 --- a/src/views/atmosphere/acid-rain/statistic/average.vue +++ b/src/views/atmosphere/acid-rain/statistic/average.vue @@ -52,7 +52,7 @@ + + \ No newline at end of file diff --git a/src/views/sound/function/dict/index.vue b/src/views/sound/function/dict/index.vue new file mode 100644 index 0000000..5b55aa5 --- /dev/null +++ b/src/views/sound/function/dict/index.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/function/dict/place.vue b/src/views/sound/function/dict/place.vue new file mode 100644 index 0000000..990d8b0 --- /dev/null +++ b/src/views/sound/function/dict/place.vue @@ -0,0 +1,349 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/function/statistic/average.vue b/src/views/sound/function/statistic/average.vue index 7064d21..36986da 100644 --- a/src/views/sound/function/statistic/average.vue +++ b/src/views/sound/function/statistic/average.vue @@ -63,7 +63,7 @@ import XLSX from "xlsx"; import { pageFunctionNoiseStatisticUrl, getColumnOptions, -} from "@/api/ecology/function-sound"; +} from "@/api/ecology/noise/function-sound"; const columns = [ { title: "功能区类别", diff --git a/src/views/sound/function/statistic/base.vue b/src/views/sound/function/statistic/base.vue index 0006b77..6e7edbc 100644 --- a/src/views/sound/function/statistic/base.vue +++ b/src/views/sound/function/statistic/base.vue @@ -91,7 +91,7 @@ diff --git a/src/views/sound/road/collect/noise-bill.vue b/src/views/sound/road/collect/noise-bill.vue index 903cee2..57cd200 100644 --- a/src/views/sound/road/collect/noise-bill.vue +++ b/src/views/sound/road/collect/noise-bill.vue @@ -111,7 +111,7 @@ removeBatchRoadNoiseBill, updateRoadNoiseBill, verifyRoadNoiseBill - } from "@/api/ecology/road-sound"; + } from "@/api/ecology/noise/road-sound"; import moment from "moment"; export default { name: 'RoadCollectNoiseBill', diff --git a/src/views/sound/road/collect/noise.vue b/src/views/sound/road/collect/noise.vue index 3c414bc..d86bb6b 100644 --- a/src/views/sound/road/collect/noise.vue +++ b/src/views/sound/road/collect/noise.vue @@ -465,7 +465,7 @@ import { updateRoadNoise, getRoadNoiseBill, getColumnOptions, -} from "@/api/ecology/road-sound"; +} from "@/api/ecology/noise/road-sound"; import locale from "ant-design-vue/es/date-picker/locale/zh_CN"; import moment from "moment"; // import utils from "./utils"; @@ -487,6 +487,9 @@ export default { title: "监测日期", dataIndex: "monitorTime", sorter: true, + customRender: ({text})=>{ + return moment(text).format("Y-M-D H:m") + } }, { title: "测点名称", diff --git a/src/views/sound/road/dict/index.vue b/src/views/sound/road/dict/index.vue new file mode 100644 index 0000000..439d7ea --- /dev/null +++ b/src/views/sound/road/dict/index.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/road/dict/leq-level.vue b/src/views/sound/road/dict/leq-level.vue new file mode 100644 index 0000000..740f614 --- /dev/null +++ b/src/views/sound/road/dict/leq-level.vue @@ -0,0 +1,302 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/road/dict/place.vue b/src/views/sound/road/dict/place.vue new file mode 100644 index 0000000..b2efb8e --- /dev/null +++ b/src/views/sound/road/dict/place.vue @@ -0,0 +1,353 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/road/statistic/average.vue b/src/views/sound/road/statistic/average.vue index fb5825a..d482e65 100644 --- a/src/views/sound/road/statistic/average.vue +++ b/src/views/sound/road/statistic/average.vue @@ -96,7 +96,7 @@ diff --git a/src/views/sound/road/statistic/index.vue b/src/views/sound/road/statistic/index.vue index 7b7f135..f87a404 100644 --- a/src/views/sound/road/statistic/index.vue +++ b/src/views/sound/road/statistic/index.vue @@ -14,6 +14,9 @@ + + + @@ -29,12 +32,13 @@ // import QuarterStatistic from "./quarter.vue"; import Compare from "./compare.vue" import AverageStatistic from "./average.vue" + import YearEnd from "./year-end" export default { name: 'StatisticSoundRoad', components: { BaseStatistic, - // QuarterStatistic, + YearEnd, Compare, AverageStatistic }, diff --git a/src/views/sound/road/statistic/year-end.vue b/src/views/sound/road/statistic/year-end.vue new file mode 100644 index 0000000..5f1990f --- /dev/null +++ b/src/views/sound/road/statistic/year-end.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/zone/collect/index.vue b/src/views/sound/zone/collect/index.vue index 6899a0b..663219a 100644 --- a/src/views/sound/zone/collect/index.vue +++ b/src/views/sound/zone/collect/index.vue @@ -33,7 +33,7 @@ import XLSX from "xlsx"; import utils from "./utils"; import { Modal } from "ant-design-vue"; import NoiseBill from "./noise-bill.vue"; -import { saveZoneNoiseBill } from "@/api/ecology/zone-sound"; +import { saveZoneNoiseBill } from "@/api/ecology/noise/zone-sound"; export default { name: "ZoneCollectIndex", components: { diff --git a/src/views/sound/zone/collect/noise-bill.vue b/src/views/sound/zone/collect/noise-bill.vue index fe2c34e..a9b4341 100644 --- a/src/views/sound/zone/collect/noise-bill.vue +++ b/src/views/sound/zone/collect/noise-bill.vue @@ -111,7 +111,7 @@ removeBatchZoneNoiseBill, updateZoneNoiseBill, verifyZoneNoiseBill - } from "@/api/ecology/zone-sound"; + } from "@/api/ecology/noise/zone-sound"; import moment from "moment"; export default { name: 'ZoneCollectNoiseBill', diff --git a/src/views/sound/zone/collect/noise.vue b/src/views/sound/zone/collect/noise.vue index 37c2d30..ef0b297 100644 --- a/src/views/sound/zone/collect/noise.vue +++ b/src/views/sound/zone/collect/noise.vue @@ -340,7 +340,7 @@ import { updateZoneNoise, getZoneNoiseBill, getColumnOptions, -} from "@/api/ecology/zone-sound"; +} from "@/api/ecology/noise/zone-sound"; import locale from "ant-design-vue/es/date-picker/locale/zh_CN"; import moment from "moment"; // import utils from "./utils"; diff --git a/src/views/sound/zone/dict/index.vue b/src/views/sound/zone/dict/index.vue new file mode 100644 index 0000000..73d2acd --- /dev/null +++ b/src/views/sound/zone/dict/index.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/zone/dict/leq-level.vue b/src/views/sound/zone/dict/leq-level.vue new file mode 100644 index 0000000..740f614 --- /dev/null +++ b/src/views/sound/zone/dict/leq-level.vue @@ -0,0 +1,302 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/zone/dict/place.vue b/src/views/sound/zone/dict/place.vue new file mode 100644 index 0000000..b2efb8e --- /dev/null +++ b/src/views/sound/zone/dict/place.vue @@ -0,0 +1,353 @@ + + + + + \ No newline at end of file diff --git a/src/views/sound/zone/statistic/average.vue b/src/views/sound/zone/statistic/average.vue index 3abe54f..a657b1e 100644 --- a/src/views/sound/zone/statistic/average.vue +++ b/src/views/sound/zone/statistic/average.vue @@ -52,7 +52,7 @@ + + \ No newline at end of file diff --git a/src/views/water/drinking-water/dict/place.vue b/src/views/water/drinking-water/dict/place.vue new file mode 100644 index 0000000..b2efb8e --- /dev/null +++ b/src/views/water/drinking-water/dict/place.vue @@ -0,0 +1,353 @@ + + + + + \ No newline at end of file diff --git a/src/views/water/drinking-water/dict/surface-water.vue b/src/views/water/drinking-water/dict/surface-water.vue new file mode 100644 index 0000000..2ec302d --- /dev/null +++ b/src/views/water/drinking-water/dict/surface-water.vue @@ -0,0 +1,286 @@ + + + + + \ No newline at end of file diff --git a/src/views/water/drinking-water/statistic/average.vue b/src/views/water/drinking-water/statistic/average.vue index fb5825a..d482e65 100644 --- a/src/views/water/drinking-water/statistic/average.vue +++ b/src/views/water/drinking-water/statistic/average.vue @@ -96,7 +96,7 @@ + + \ No newline at end of file diff --git a/src/views/water/lake/statistic/average.vue b/src/views/water/lake/statistic/average.vue index 3abe54f..a657b1e 100644 --- a/src/views/water/lake/statistic/average.vue +++ b/src/views/water/lake/statistic/average.vue @@ -52,7 +52,7 @@