Merge remote-tracking branch 'origin/master'

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
 
 }

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;
 }
 

src/views/components/mapTableCenterPlace.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,25 +21,105 @@
 
 const columns = [
   {
-    title: '点位名称',
+    title: "区域",
-    dataIndex: 'place',
+    dataIndex: "col1",
   },
   {
-    title: '点位等级',
+    title: "南宁市",
-    className: 'regionLevel',
+    align: "center",
-    dataIndex: 'regionLevel',
+    children: [
+      {
+        title: "昼间",
+        align: "center",
+        dataIndex: "colDNAN_NING_SHI",
+      },
+      {
+        title: "夜间",
+        align: "center",
+        dataIndex: "colNNAN_NING_SHI",
+      },
+    ],
   },
   {
-    title: '所属地区',
+    title: "横州市",
-    dataIndex: 'area',
+    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: '所属路段',
+    title: "上林县",
-    dataIndex: 'road',
+    align: "center",
+    children: [
+      {
+        title: "昼间",
+        align: "center",
+        dataIndex: "colDSHANG_LIN_XIAN",
+      },
+      {
+        title: "夜间",
+        align: "center",
+        dataIndex: "colNSHANG_LIN_XIAN",
+      },
+    ],
   },
   {
-    title: '噪声 dB(A)',
+    title: "隆安县",
-    dataIndex: 'leq',
+    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 {
@@ -68,10 +148,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 +165,7 @@ export default {
   background-color: #fff;
   position: absolute;
   left: -40px;
-  bottom: 0;
+  top: 0;
   display: flex;
   justify-content: center;
   align-items: center;

src/views/components/tipToolPlace.vue

@@ -35,7 +35,8 @@ export default {
       default: false
     },
     data:{
-      type:Object
+      type:Object,
+      default: ()=> {}
     }
   },
   watch: {

src/views/sound/function/dict/function-type.vue

@@ -79,9 +79,9 @@
                             allow-clear
                         />
                     </a-form-item>
-                    <a-form-item label="父级功能区类别" name="ParentFunctionType">
+                    <a-form-item label="父级功能区类别" name="parentFunctionType">
                         <a-input
-                            v-model:value="form.ParentFunctionType"
+                            v-model:value="form.parentFunctionType"
                             placeholder="请输入父级功能区类别"
                             allow-clear
                         />
@@ -194,6 +194,10 @@ export default {
             selection: [],
             // 表格列配置
             columns: [
+              {
+                title: "年份",
+                dataIndex: "year",
+              },
                 {
                     title: "功能区类别",
                     dataIndex: "functionType",

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",

src/views/visualiz/sound/function/index.vue

@@ -37,7 +37,7 @@
     <tip-tool :flag="tipFlag" :x="currentX" :y="currentY" :data="tipData"></tip-tool>
     <mapNominal :param="nominalList" v-if="currentType == 0"></mapNominal>
     <mapNominalCate :param="cate" v-if="currentType == 1" @pointColor="pointColor"></mapNominalCate>
-<!--    <map-table-center :rowData="pointData"></map-table-center>-->
+    <map-table-center :rowData="gradeData"></map-table-center>
     <map-table :rowData="pointData"></map-table>
   </div>
 </template>
@@ -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: [
@@ -260,6 +262,7 @@ export default {
         myCompOverlay.addEventListener('mouseover', function (e) {
           let currentId = e.target.getAttribute("id")
 
+
           setTimeout(() => {
           }, 300)
           let bodyInfo = document.getElementsByTagName("body")[0]
@@ -272,8 +275,10 @@ export default {
 
           let calcWidth = screenWidth - mapWidth
           // let calcHeight = screenHeight - mapHeight
+          console.log("=================================================================================================")
+          that.tipData = that.pointData[Number(currentId.substring(2, currentId.length))]
           that.tipFlag = true
-          that.tipData = that.pointData[currentId.substring(2, currentId.length)]
+
           that.currentX = e.pageX - calcWidth
           that.currentY = e.pageY - 80
         })
@@ -318,6 +323,12 @@ export default {
       if (scene && pointLayer) {
         scene.removeLayer(pointLayer)
       }
+      getGradeAll(this.where.monitorYear).then(res=>{
+        that.gradeData = []
+        if (res.data.code == 0 && res.data.data.length > 0) {
+          this.gradeData = res.data.data
+        }
+      })
       getPlaceGis(this.where).then((res) => {
         that.pointData = []
         if (res.data.code == 0 && res.data.data.length > 0) {