From 98248a84158236d037731afec96781fe062e093a Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Sun, 30 Jan 2022 07:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=8E=BF=E5=8C=BA=E5=9F=9F=E5=A3=B0?=
 =?UTF-8?q?=E6=BA=90=E5=99=AA=E5=A3=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/noise/zone-sound.js         |  6 +-
 src/views/components/mapTableCenterZone.vue | 73 ++++++++++++++++-----
 src/views/visualiz/sound/zone/index.vue     | 14 +++-
 3 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/src/api/ecology/noise/zone-sound.js b/src/api/ecology/noise/zone-sound.js
index c637f6a..867e983 100644
--- a/src/api/ecology/noise/zone-sound.js
+++ b/src/api/ecology/noise/zone-sound.js
@@ -72,6 +72,9 @@ const getTrendChart = function(data){
 const getPlaceByRegionLevel = function(column){
     return axios.get("/sound/zone/noise/place/region",{params:{column}})
 }
+const statisticAll = function (params){
+  return axios.get("/sound/zone/noise/statisticAll",{params})
+}
 export {
     pageBillUrl,
     saveZoneNoiseBill,
@@ -94,6 +97,7 @@ export {
     statisticLevelDistributionUrl,
     getPlaceGis,
     getTrendChart,
-    getPlaceByRegionLevel
+    getPlaceByRegionLevel,
+    statisticAll
 
 }
diff --git a/src/views/components/mapTableCenterZone.vue b/src/views/components/mapTableCenterZone.vue
index 5d4b45c..3627e24 100644
--- a/src/views/components/mapTableCenterZone.vue
+++ b/src/views/components/mapTableCenterZone.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="map-table-container " :style="{'right':type1 == 1 ? '0px':'-500px'}">
+  <div class="map-table-container " :style="{'right':type1 == 1 ? '0px':'-700px'}">
     <a-card title="区域噪声" :headStyle="{'padding':'0px 5px'}"
             :bodyStyle="{'padding':'0px 5px','height':'200px','overFlow':'scroll'}">
       <div class="left-close-button" @click="showTable(0)" v-if="type1 == 1">
@@ -11,7 +11,7 @@
         <img src="https://sqtt.oss-cn-qingdao.aliyuncs.com/Uploads/image/goods/2022-01-08/61d8e83754c7e.png" alt=""
              style="width: 30px;height: 30px">
       </div>
-      <a-table :columns="columns" :data-source="rowData" size="mini" :scroll="{y:150,x:500}" :pagination="false">
+      <a-table :columns="columns" :data-source="rowData" size="mini" :scroll="{y:150,x:700}" :pagination="false">
       </a-table>
     </a-card>
   </div>
@@ -21,26 +21,63 @@
 
 const columns = [
   {
-    title: '点位名称',
-    dataIndex: 'place',
-  },
-  {
-    title: '点位等级',
-    className: 'regionLevel',
-    dataIndex: 'regionLevel',
-  },
-  {
-    title: '所属地区',
+    title: '区域',
     dataIndex: 'area',
   },
   {
-    title: '所属路段',
-    dataIndex: 'road',
+    title: '测点数量',
+    children: [
+      {
+        title: '生活',
+        dataIndex: 'live',
+      },
+      {
+        title: '交通',
+        dataIndex: 'traffic',
+      },
+      {
+        title: '施工',
+        dataIndex: 'buid',
+      },
+      {
+        title: '工业',
+        dataIndex: 'industry',
+      },
+    ]
   },
   {
-    title: '噪声 dB(A)',
+    title: '声级覆盖点',
+    children: [
+      {
+        title: '≤50.0',
+        dataIndex: 'le50',
+      },
+      {
+        title: '50.1-55.0',
+        dataIndex: 'le55',
+      },
+      {
+        title: '55.1-60.0',
+        dataIndex: 'le60',
+      },
+      {
+        title: '60.1-65.0',
+        dataIndex: 'le65',
+      },
+      {
+        title: '>65.0',
+        dataIndex: 'gt65',
+      },
+    ]
+  },
+  {
+    title: 'LEQ',
     dataIndex: 'leq',
   },
+  {
+    title: '质量等级',
+    dataIndex: 'level',
+  },
 ];
 export default {
   props: {
@@ -68,10 +105,10 @@ export default {
 <style scoped>
 .map-table-container {
   box-sizing: border-box;
-  width: 500px;
+  width: 700px;
   padding: 10px;
   position: absolute;
-  bottom: 300px;
+  top: 80px;
   transition: right 0.8s;
 }
 
@@ -85,7 +122,7 @@ export default {
   background-color: #fff;
   position: absolute;
   left: -40px;
-  bottom: 0;
+  top: 0;
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/src/views/visualiz/sound/zone/index.vue b/src/views/visualiz/sound/zone/index.vue
index c61d562..c860e37 100644
--- a/src/views/visualiz/sound/zone/index.vue
+++ b/src/views/visualiz/sound/zone/index.vue
@@ -29,7 +29,7 @@
     <div id="map" ref="map" style="overflow: hidden"></div>
     <tip-tool :filedData="filed" :flag="tipFlag" :x="currentX" :y="currentY" :data="tipData"></tip-tool>
     <mapNominal :param="nominalList"></mapNominal>
-    <!--    <map-table-center :rowData="pointData"></map-table-center>-->
+    <map-table-center :rowData="noiseSourceData"></map-table-center>
     <map-table :rowData="pointData"></map-table>
   </div>
 </template>
@@ -37,11 +37,12 @@
 import {
   getPlaceGis,
   getColumnOptions,
+  statisticAll
 } from "@/api/ecology/noise/zone-sound";
 import tipTool from "@/views/components/tipToolZone";
 import mapNominal from "@/views/components/mapNominalZone";
 import mapTable from "@/views/components/mapTableZone";
-// import mapTableCenter from "@/views/components/mapTableCenterZone";
+import mapTableCenter from "@/views/components/mapTableCenterZone";
 
 let scene = null;
 let pointLayer = null;
@@ -52,7 +53,7 @@ export default {
     tipTool,
     mapNominal,
     mapTable,
-    // mapTableCenter
+    mapTableCenter
   },
   data() {
     return {
@@ -70,6 +71,7 @@ export default {
       tipFlag: false,
       tipData: [],
       dataSource: [],
+      noiseSourceData: [],
       zoom: 13,
       filed: [
         {'text': '点位名称', 'value': 'placeName'},
@@ -281,6 +283,12 @@ export default {
           that.addMarker()
         }
       })
+      statisticAll(this.where).then(res=>{
+        that.noiseSourceData = []
+        if (res.data.code == 0 && res.data.data.length > 0) {
+          that.noiseSourceData = res.data.data
+        }
+      })
     }
   }
 }