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 @@
+
+
+
(data = d.data)"
+ :scroll="{ x: 'max-content' }"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+ 导出excel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+ {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{comparOptions.find(item=>item.value == record.comparisonSymbol).label}}
+ {{record.categoryValue}}
+
+
+
+ 新增
+
+ 删除
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@