From e4d3ef2cf6d478163b9e54ebed580873cf442703 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Tue, 24 Aug 2021 18:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sound/function/statistic/base.vue | 157 ++++++--------------
 1 file changed, 44 insertions(+), 113 deletions(-)

diff --git a/src/views/sound/function/statistic/base.vue b/src/views/sound/function/statistic/base.vue
index 1d0bfac..56844b6 100644
--- a/src/views/sound/function/statistic/base.vue
+++ b/src/views/sound/function/statistic/base.vue
@@ -8,7 +8,7 @@
         :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
       >
         <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-col :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item label="区域等级:">
               <a-select v-model:value="where.regionLevel" allowClear showSearch>
                 <a-select-option
@@ -19,7 +19,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-col :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item label="测点名称:">
               <a-select v-model:value="where.place" allowClear showSearch>
                 <a-select-option
@@ -30,18 +30,18 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="路段:">
-              <a-select v-model:value="where.function" allowClear showSearch>
+          <a-col :lg="8" :md="12" :sm="24" :xs="24">
+            <a-form-item label="功能区类别:">
+              <a-select v-model:value="where.functionType" allowClear showSearch>
                 <a-select-option
-                  v-for="(item) in functionOptions"
+                  v-for="(item) in functionTypeOptions"
                   :key="item.value"
                   >{{ item.label }}</a-select-option
                 >
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-col :lg="8" :md="12" :sm="24" :xs="24">
             <a-form-item label="城区">
               <a-select v-model:value="where.area" allowClear showSearch>
                 <a-select-option
@@ -109,48 +109,49 @@ export default {
       // 表格列配置
       columns: [
         {
-          title: "监测日期",
+          title: "监测时间",
           dataIndex: "monitorTime",
           sorter: true,
         },
+        {
+          title: "点位编码",
+          dataIndex: "placeCode",
+          sorter: true,
+        },
         {
           title: "测点名称",
           dataIndex: "place",
           sorter: true,
         },
         {
-          title: "点号",
-          dataIndex: "placeCode",
+          title: "测点经度",
+          dataIndex: "placeLng",
           sorter: true,
         },
         {
-          title: "所属路段",
-          dataIndex: "function",
+          title: "测点纬度",
+          dataIndex: "placeLat",
+          sorter: true,
+        },
+         {
+          title: "测点高度",
+          dataIndex: "placeHeight",
+          sorter: true,
+        },
+        
+        {
+          title: "测点参照物",
+          dataIndex: "refObj",
           sorter: true,
         },
         {
-          title: "所属城区",
-          dataIndex: "area",
+          title: "功能区代码",
+          dataIndex: "functionCode",
           sorter: true,
         },
         {
-          title: "路长",
-          dataIndex: "functionLength",
-          sorter: true,
-        },
-        {
-          title: "路宽",
-          dataIndex: "functionWidth",
-          sorter: true,
-        },
-        {
-          title: "中小型车流量（辆/20分钟）",
-          dataIndex: "smallTrafficFlow",
-          sorter: true,
-        },
-        {
-          title: "大型车流量（辆/20分钟）",
-          dataIndex: "largeTrafficFlow",
+          title: "功能区类别",
+          dataIndex: "functionType",
           sorter: true,
         },
         {
@@ -181,9 +182,8 @@ export default {
         {
           title: "LeqdB(A)",
           dataIndex: "indexLeq",
-          slots: {customRender: "Leq"},
+          slots: { customRender: "Leq" },
           sorter: true,
-          
         },
         {
           title: "SDdB(A)",
@@ -215,42 +215,9 @@ export default {
           dataIndex: "indexLmax",
           sorter: true,
         },
-        {
-          title: "测点经度",
-          dataIndex: "placeLng",
-          sorter: true,
-        },
-        {
-          title: "测点纬度",
-          dataIndex: "placeLat",
-          sorter: true,
-        },
-        {
-          title: "机动车车道数",
-          dataIndex: "motorway",
-          sorter: true,
-        },
-        {
-          title: "车道类别",
-          dataIndex: "motorwayType",
-          sorter: true,
-        },
-        {
-          title: "道路等级",
-          dataIndex: "motorwayLevel",
-          sorter: true,
-        },
-        {
-          title: "测点参照物",
-          dataIndex: "refObj",
-          sorter: true,
-        },
-        {
-          title: "道路覆盖人口（万人）",
-          dataIndex: "people",
-          sorter: true,
-        },
-        {
+        
+       
+         {
           title: "监测站名",
           dataIndex: "station",
           sorter: true,
@@ -285,7 +252,7 @@ export default {
           dataIndex: "soundInstrumentCode",
           sorter: true,
         },
-         {
+        {
           title: "区域等级",
           dataIndex: "regionLevel",
           sorter: true,
@@ -303,7 +270,7 @@ export default {
       ],
       palceOptions: [],
       areaOptions: [],
-      functionOptions: [],
+      functionTypeOptions: [],
       regionLevelOptions: [],
       // 表格搜索条件
       where: {
@@ -335,8 +302,8 @@ export default {
           };
         });
       });
-      getColumnOptions("function").then((res) => {
-        this.functionOptions = res.data.data.map((item) => {
+      getColumnOptions("function_type").then((res) => {
+        this.functionTypeOptions = res.data.data.map((item) => {
           return {
             label: item,
             value: item,
@@ -400,33 +367,8 @@ export default {
           sorter: true,
         },
         {
-          title: "路段名称",
-          dataIndex: "function",
-          sorter: true,
-        },
-         {
-          title: "路段长度（m）",
-          dataIndex: "functionLength",
-          sorter: true,
-        },
-        {
-          title: "道路总宽度（m）",
-          dataIndex: "functionWidth",
-          sorter: true,
-        },
-         {
-          title: "机动车车道数",
-          dataIndex: "motorway",
-          sorter: true,
-        },
-        {
-          title: "车道类别",
-          dataIndex: "motorwayType",
-          sorter: true,
-        },
-        {
-          title: "道路等级",
-          dataIndex: "motorwayLevel",
+          title: "测点高度",
+          dataIndex: "placeHeight",
           sorter: true,
         },
         {
@@ -435,8 +377,8 @@ export default {
           sorter: true,
         },
          {
-          title: "路段覆盖人口（万人）",
-          dataIndex: "people",
+          title: "功能区代码",
+          dataIndex: "functionCode",
           sorter: true,
         },
         {
@@ -460,17 +402,6 @@ export default {
           sorter: true,
         },
        
-       
-        {
-          title: "中小型车20min车流量",
-          dataIndex: "smallTrafficFlow",
-          sorter: true,
-        },
-        {
-          title: "大型车20min车流量",
-          dataIndex: "largeTrafficFlow",
-          sorter: true,
-        },
         {
           title: "Leq",
           dataIndex: "indexLeq",