From bbd84223360f29383aa4707afaccdddca69d92fb Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Thu, 27 Jan 2022 03:13:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8C=BA=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ecology/noise/function-sound.js | 7 +- src/views/components/mapTableCenterPlace.vue | 106 ++++++++++++++++-- .../sound/function/dict/function-type.vue | 10 +- src/views/sound/function/dict/place.vue | 6 +- src/views/visualiz/sound/function/index.vue | 14 ++- 5 files changed, 123 insertions(+), 20 deletions(-) diff --git a/src/api/ecology/noise/function-sound.js b/src/api/ecology/noise/function-sound.js index 7bf8716..130d9fc 100644 --- a/src/api/ecology/noise/function-sound.js +++ b/src/api/ecology/noise/function-sound.js @@ -74,6 +74,10 @@ const getTrendChart = function(data){ return axios.post("/sound/function/noise/trend/chart",data) } +const getGradeAll = function (year){ + return axios.get("/sound/function/noise/statisticGradeAll",{params:{year}}) +} + export { pageBillUrl, saveFunctionNoiseBill, @@ -95,6 +99,7 @@ export { listAllFunctionNoise, pageFunctionNoiseStatisticAvgUrl, getPlaceByRegionLevel, - getTrendChart + getTrendChart, + getGradeAll } diff --git a/src/views/components/mapTableCenterPlace.vue b/src/views/components/mapTableCenterPlace.vue index 18dbeaa..1b86f2a 100644 --- a/src/views/components/mapTableCenterPlace.vue +++ b/src/views/components/mapTableCenterPlace.vue @@ -21,25 +21,109 @@ const columns = [ { - title: '点位名称', - dataIndex: 'place', + title: "年份", + dataIndex: "year", }, { - title: '点位等级', - className: 'regionLevel', - dataIndex: 'regionLevel', + title: "功能区类别", + dataIndex: "col1", }, { - title: '所属地区', - dataIndex: 'area', + title: "南宁市", + align: "center", + children: [ + { + title: "昼间", + align: "center", + dataIndex: "colDNAN_NING_SHI", + }, + { + title: "夜间", + align: "center", + dataIndex: "colNNAN_NING_SHI", + }, + ], }, { - title: '所属路段', - dataIndex: 'road', + title: "横州市", + align: "center", + children: [ + { + title: "昼间", + align: "center", + dataIndex: "colDHENG_ZHOU_SHI", + }, + { + title: "夜间", + align: "center", + dataIndex: "colNHENG_ZHOU_SHI", + }, + ], + }, + + { + title: "宾阳县", + align: "center", + children: [ + { + title: "昼间", + align: "center", + dataIndex: "colDBIN_YANG_XIAN", + }, + { + title: "夜间", + align: "center", + dataIndex: "colNBIN_YANG_XIAN", + }, + ], }, { - title: '噪声 dB(A)', - dataIndex: 'leq', + title: "上林县", + align: "center", + children: [ + { + title: "昼间", + align: "center", + dataIndex: "colDSHANG_LIN_XIAN", + }, + { + title: "夜间", + align: "center", + dataIndex: "colNSHANG_LIN_XIAN", + }, + ], + }, + { + title: "隆安县", + align: "center", + children: [ + { + title: "昼间", + align: "center", + dataIndex: "colDLONG_AN_XIAN", + }, + { + title: "夜间", + align: "center", + dataIndex: "colNLONG_AN_XIAN", + }, + ], + }, + { + title: "马山县", + align: "center", + children: [ + { + title: "昼间", + align: "center", + dataIndex: "colDMA_SHAN_XIAN", + }, + { + title: "夜间", + align: "center", + dataIndex: "colNMA_SHAN_XIAN", + }, + ], }, ]; export default { diff --git a/src/views/sound/function/dict/function-type.vue b/src/views/sound/function/dict/function-type.vue index f92e2e5..f9167a7 100644 --- a/src/views/sound/function/dict/function-type.vue +++ b/src/views/sound/function/dict/function-type.vue @@ -79,9 +79,9 @@ allow-clear /> - + @@ -194,6 +194,10 @@ export default { selection: [], // 表格列配置 columns: [ + { + title: "年份", + dataIndex: "year", + }, { title: "功能区类别", dataIndex: "functionType", @@ -416,4 +420,4 @@ export default { \ No newline at end of file + diff --git a/src/views/sound/function/dict/place.vue b/src/views/sound/function/dict/place.vue index c8d81b4..beb81ad 100644 --- a/src/views/sound/function/dict/place.vue +++ b/src/views/sound/function/dict/place.vue @@ -221,7 +221,9 @@ export default { dataIndex: "functionType", sorter: true, }, - {title: "功能区代码",dataIndex: "functionCode",sorter: true, }, + {title: "所属城区",dataIndex: "area",sorter: true, }, + + {title: "功能区代码",dataIndex: "functionCode",sorter: true, }, { title: "测点经度", dataIndex: "placeLng", @@ -506,4 +508,4 @@ export default { \ No newline at end of file + diff --git a/src/views/visualiz/sound/function/index.vue b/src/views/visualiz/sound/function/index.vue index 536179e..3c6e590 100644 --- a/src/views/visualiz/sound/function/index.vue +++ b/src/views/visualiz/sound/function/index.vue @@ -37,7 +37,7 @@ - + @@ -45,11 +45,12 @@ import { getPlaceGis, getColumnOptions, + getGradeAll } from "@/api/ecology/noise/function-sound"; import tipTool from "@/views/components/tipToolPlace"; import mapNominal from "@/views/components/mapNominalPlace"; import mapTable from "@/views/components/mapTablePlace"; -// import mapTableCenter from "@/views/components/mapTableCenterPlace"; +import mapTableCenter from "@/views/components/mapTableCenterPlace"; import mapNominalCate from "@/views/components/mapNominalCate"; let scene = null; @@ -61,7 +62,7 @@ export default { tipTool, mapNominal, mapTable, - // mapTableCenter, + mapTableCenter, mapNominalCate }, data() { @@ -80,6 +81,7 @@ export default { tipFlag: false, tipData: [], zoom: 13, + gradeData: [], dataSource: [], nominalList: [], nominalListDay: [ @@ -318,6 +320,12 @@ export default { if (scene && pointLayer) { scene.removeLayer(pointLayer) } + getGradeAll(this.where.monitorYear).then(res=>{ + that.pointData = [] + if (res.data.code == 0 && res.data.data.length > 0) { + this.gradeData = res.data + } + }) getPlaceGis(this.where).then((res) => { that.pointData = [] if (res.data.code == 0 && res.data.data.length > 0) { From 69c5a1a92141aa88c0b5c42779cd62d16c552bed Mon Sep 17 00:00:00 2001 From: weicw <594098497@qq.com> Date: Thu, 27 Jan 2022 03:53:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=99=AA=E5=A3=B0gis?= =?UTF-8?q?=E8=BE=BE=E6=A0=87=E7=8E=87=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/mapTableCenter.vue | 2 +- src/views/components/mapTableCenterPlace.vue | 16 ++++++---------- src/views/components/tipToolPlace.vue | 3 ++- src/views/visualiz/sound/function/index.vue | 9 ++++++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/views/components/mapTableCenter.vue b/src/views/components/mapTableCenter.vue index 9b80d6b..e0b4109 100644 --- a/src/views/components/mapTableCenter.vue +++ b/src/views/components/mapTableCenter.vue @@ -70,7 +70,7 @@ export default { padding: 10px; position: absolute; /*bottom: 300px;*/ - top: 50px; + top: 80px; transition: right 0.8s; } diff --git a/src/views/components/mapTableCenterPlace.vue b/src/views/components/mapTableCenterPlace.vue index 1b86f2a..2d6999d 100644 --- a/src/views/components/mapTableCenterPlace.vue +++ b/src/views/components/mapTableCenterPlace.vue @@ -1,5 +1,5 @@