diff --git a/src/api/ecology/noise/function-sound.js b/src/api/ecology/noise/function-sound.js index 1007ef7..97dbac5 100644 --- a/src/api/ecology/noise/function-sound.js +++ b/src/api/ecology/noise/function-sound.js @@ -53,6 +53,7 @@ const updateFunctionNoise = function (data) { // -------------------------统计--------------------- const pageFunctionNoiseStatisticUrl = '/sound/function/noise/statistic'; +const pageFunctionNoiseStatisticAvgUrl = '/sound/function/noise/statistic/avg'; const getHistoryyears = function () { return axios.get("/sound/function/noise/history-year") } @@ -85,6 +86,7 @@ export { getGisBase, getGisArea, listAllFunctionNoiseUrl, - listAllFunctionNoise + listAllFunctionNoise, + pageFunctionNoiseStatisticAvgUrl } diff --git a/src/api/ecology/noise/zone-noise-source.js b/src/api/ecology/noise/zone-noise-source.js new file mode 100644 index 0000000..1fdf65c --- /dev/null +++ b/src/api/ecology/noise/zone-noise-source.js @@ -0,0 +1,41 @@ +import axios from 'axios'; +const baseUri = "/sound/zone/noiseSource"; +const listAllUrl = baseUri + ""; + +// 添加 +const saveSource = function (data) { + return axios.post("/sound/zone/noiseSource",data) +} + +// 删除 +const removeSource = function (id) { + return axios.delete(`/sound/zone/noiseSource/${id}`,) +} +// 批量删除 +const removeBatchSource = function (ids) { + return axios.delete("/sound/zone/noiseSource/batch",{data:ids}) +} + +// 修改 +const updateSource = function (data) { + return axios.put("/sound/zone/noiseSource",data) +} +const getColumnOptions = function(column){ + return axios.get("/sound/zone/noiseSource/options",{params:{column}}) +} + +const copyBatchSource = function (data){ + return axios.post("/sound/zone/noiseSource/copyBatch",data) +} + + +export { + listAllUrl, + saveSource, + updateSource, + removeBatchSource, + removeSource, + getColumnOptions, + copyBatchSource + +} diff --git a/src/api/ecology/noise/zone-sound.js b/src/api/ecology/noise/zone-sound.js index c43265c..cd3138e 100644 --- a/src/api/ecology/noise/zone-sound.js +++ b/src/api/ecology/noise/zone-sound.js @@ -53,6 +53,7 @@ const updateZoneNoise = function (data) { // -------------------------统计--------------------- const pageZoneNoiseStatisticUrl = '/sound/zone/noise/statistic'; +const statisticLevelDistributionUrl = '/sound/zone/noise/statistic/levelDistribution'; const statisticSourceUrl = '/sound/zone/noise/statistic/source'; const statisticYearUrl = '/sound/zone/noise/statistic/year'; const getHistoryyears = function () { @@ -80,6 +81,7 @@ export { getColumnOptions, statisticSourceUrl, statisticYearUrl, - listALlZoneNoise + listALlZoneNoise, + statisticLevelDistributionUrl } diff --git a/src/views/sound/function/statistic/average.vue b/src/views/sound/function/statistic/average.vue index 36986da..3c97cd2 100644 --- a/src/views/sound/function/statistic/average.vue +++ b/src/views/sound/function/statistic/average.vue @@ -1,216 +1,222 @@ diff --git a/src/views/sound/function/statistic/index.vue b/src/views/sound/function/statistic/index.vue index f72d488..2853199 100644 --- a/src/views/sound/function/statistic/index.vue +++ b/src/views/sound/function/statistic/index.vue @@ -5,7 +5,7 @@ - + + + + + + + {{ + item.label + }} + + + + + + + 第一季度 + 第二季度 + 第三季度 + 第四季度 + + + + + + + 查询 + 重置 + 导出excel + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/sound/road/statistic/year-end.vue b/src/views/sound/road/statistic/year-end.vue index 5f1990f..1bf565a 100644 --- a/src/views/sound/road/statistic/year-end.vue +++ b/src/views/sound/road/statistic/year-end.vue @@ -14,25 +14,26 @@ - - - - - - - - - - 查询 - 重置 - 导出excel - - - + 导出excel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 69a4537..fe62bf3 100644 --- a/src/views/sound/zone/statistic/average.vue +++ b/src/views/sound/zone/statistic/average.vue @@ -8,25 +8,26 @@ :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }" > - - - - {{ item.label }} - - - - + + + + 导出Excel + + + + + + + + + + + + + - - 查询 - - 导出Excel - + @@ -146,9 +147,14 @@ export default { columns.push({ title: item.value + "年噪声值", dataIndex: item.value + "Leq", - customRender: ({text})=>{return Number(text).toFixed(1)} + customRender: ({text})=>{return Number(text)?Number(text).toFixed(1):undefined} }) + + columns.push({ + title: item.value + "年噪声等级", + dataIndex: item.value + "Level", + }) } }) @@ -163,41 +169,7 @@ export default { this.reload(); }, exportFile() { - const columns = [ - { - title: "噪声源分类", - dataIndex: "source", - }, - { - title: "测点数(个)", - dataIndex: "count", - }, - { - title: "声源占比(%)", - dataIndex: "rate", - }, - { - title: "时段", - dataIndex: "timeSlot", - }, - - { - title: "Leq", - dataIndex: "leq", - }, - { - title: "L10", - dataIndex: "l10", - }, - { - title: "L50", - dataIndex: "l50", - }, - { - title: "L90", - dataIndex: "l90", - }, - ]; + const columns = this.columns.filter(item=>item.dataIndex) const arr = []; const th = columns.map((item) => item.title); arr.push(th); diff --git a/src/views/sound/zone/statistic/index.vue b/src/views/sound/zone/statistic/index.vue index 60174f3..d4dfe45 100644 --- a/src/views/sound/zone/statistic/index.vue +++ b/src/views/sound/zone/statistic/index.vue @@ -1,58 +1,61 @@ \ No newline at end of file