筛选、导出、弹框优化

package.json

@@ -11,6 +11,9 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "~1.0.1",
+    "@antv/l7": "^2.5.8",
+    "@antv/l7-district": "^2.3.11",
+    "@antv/l7-maps": "^2.5.8",
     "@tinymce/tinymce-vue": "~4.0.4",
     "ant-design-vue": "~2.2.2",
     "axios": "~0.21.1",
@@ -22,6 +25,7 @@
     "lodash": "^4.17.21",
     "nprogress": "~0.2.0",
     "tinymce": "~5.8.2",
+    "uuid-js": "^0.7.5",
     "vue": "~3.1.5",
     "vue-axios": "~3.2.4",
     "vue-i18n": "~9.1.7",

src/api/ecology/road-place.js

@@ -1,71 +0,0 @@
-import axios from 'axios';
-// ----------------------列表-----------------------
-const pageBillUrl = '/sound/road/place/bill/page';
-// 添加
-const saveRoadPlaceBill = function (data) {
-    return axios.post("/sound/road/place/bill",data)
-}
-
-// 删除
-const removeRoadPlaceBill = function (id) {
-    return axios.delete(`/sound/road/place/bill/${id}`,)
-}
-// 批量删除
-const removeBatchRoadPlaceBill = function (ids) {
-    return axios.delete("/sound/road/place/bill/batch",{data:ids})
-}
-
-// 修改
-const updateRoadPlaceBill = function (data) {
-    return axios.put("/sound/road/place/bill",data)
-}
-// 审核
-const verifyRoadPlaceBill = function (data) {
-    return axios.put("/sound/road/place/bill/verify",data);
-}
-const getRoadPlaceBill = function (id) {
-    return axios.get(`/sound/road/place/bill/${id}`)
-}
-// -------------------------数据---------------------
-const pageRoadPlaceUrl = '/sound/road/place/page';
-// 添加
-const saveRoadPlace = function (data) {
-    return axios.post("/sound/road/place",data)
-}
-
-// 删除
-const removeRoadPlace = function (id) {
-    return axios.delete(`/sound/road/place/${id}`,)
-}
-// 批量删除
-const removeBatchRoadPlace = function (ids) {
-    return axios.delete("/sound/road/place/batch",{data:ids})
-}
-
-// 修改
-const updateRoadPlace = function (data) {
-        return axios.put("/sound/road/place",data)
-}
-
-// -------------------------统计---------------------
-const pageRoadPlaceStatisticUrl = '/sound/road/place/statistic';
-const getHistoryyears = function () {
-    return axios.get("/sound/road/place/history-year")
-}
-export {
-    pageBillUrl,
-    saveRoadPlaceBill,
-    removeRoadPlaceBill,
-    updateRoadPlaceBill,
-    removeBatchRoadPlaceBill,
-    verifyRoadPlaceBill,
-    getRoadPlaceBill,
-    pageRoadPlaceUrl,
-    saveRoadPlace,
-    removeRoadPlace,
-    updateRoadPlace,
-    removeBatchRoadPlace,
-    pageRoadPlaceStatisticUrl,
-    getHistoryyears
-  
-}

src/api/ecology/road-sound.js

@@ -53,6 +53,9 @@ const pageRoadNoiseCompare = '/sound/road/noise/statistic/compare';
 const getHistoryyears = function () {
     return axios.get("/sound/road/noise/history-year")
 }
+const getColumnOptions = function(column){
+    return axios.get("/sound/road/noise/options",{params:{column}})
+}
 export {
     pageBillUrl,
     saveRoadNoiseBill,
@@ -68,6 +71,7 @@ export {
     removeBatchRoadNoise,
     pageRoadNoiseStatisticUrl,
     getHistoryyears,
-    pageRoadNoiseCompare
+    pageRoadNoiseCompare,
+    getColumnOptions
   
 }

src/components/ele-admin-pro/packages/ele-pro-header/src/main.vue

@@ -3,8 +3,8 @@
   <div :class="['ele-admin-header', {'ele-bg-primary': isPrimary}]">
     <!-- logo -->
     <div class="ele-admin-logo" @click="onLogoClick">
-      <slot name="logo"/>
+      <!-- <slot name="logo"/> -->
-      <span v-if="projectName">{{ projectName }}</span>
+      <span style="font-size: 15px;" v-if="projectName">{{projectName}}</span>
     </div>
     <!-- 左侧功能区 -->
     <div class="ele-admin-header-tool" v-if="showLeftTool">

src/main.js

@@ -9,7 +9,7 @@ import './config/axios-config';
 import permission from './utils/permission';
 import './styles/index.less';
 import EleAdminPro from './components/ele-admin-pro/packages';
-import ModalUtil from '@/components/ele-admin-pro/packages/modal-util';
+import ModalUtil from './components/ele-admin-pro/packages/modal-util';
 import i18n from './lang';
 import diyDirective from './directive';
 

src/styles/index.less

@@ -1,10 +1,10 @@
 /** 全局样式 */
 
 // 如果不需要切换主题使用这个
-//@import "~ele-admin-pro/packages/style/index.less";
+@import "../components/ele-admin-pro/packages/style/index.less";
 // 如果不需要切换主题固定为夜间主题使用这个
 //@import "~ele-admin-pro/packages/style/dark.less";
 // 需要在线切换主题使用这个
-@import "../components/ele-admin-pro/packages/style/dynamic.less";
+// @import "../components/ele-admin-pro/packages/style/dynamic.less";
 
 /* 需要覆盖框架样式变量写最下面, 具体请到文档查看 */

src/utils/excel-util.js

@@ -0,0 +1,34 @@
+const exportTableData = function(columns,data){rt
+
+    return columns + data
+}
+
+export {
+    exportTableData
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -25,7 +25,7 @@
   import utils from "./utils";
   import NoiseBill from "./noise-bill.vue";
   import PlaceBill from "./place-bill.vue";
-
+  import _ from "lodash";
   import {
     saveFunctionNoiseBill,
   } from "@/api/ecology/function-sound";
@@ -47,7 +47,7 @@
     methods: {
       /* 导入本地excel文件 */
       importFile(file) {
-
+        console.log(_._uniqueId("road_noise"));
         let reader = new FileReader();
         reader.onload = (e) => {
           let data = new Uint8Array(e.target.result);
@@ -63,7 +63,7 @@
           let aoa2 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[1]], {
             header: 1,
           });
-
+          
           const reportDate = aoa[1][0].replace(/[^\d]+/g, "-")
           const reportDate2 = new Date();
 

src/views/sound/function/collect/noise.vue

@@ -12,7 +12,7 @@
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="功能区类别:">
-              <a-select v-model:value="where.functionType" placeholder="选择功能区类型">
+              <a-select v-model:value="where.functionType" placeholder="功能区类别">
                 <a-select-option value="1">1</a-select-option>
                 <a-select-option value="2">2</a-select-option>
                 <a-select-option value="4">3</a-select-option>
@@ -177,27 +177,6 @@
             dataIndex: 'functionType',
             sorter: true
           },
-
-          //   {
-          //     title: '月',
-          //     dataIndex: 'monitorMonth',
-          //     sorter: true
-          //   },
-          //   {
-          //     title: '日',
-          //     dataIndex: 'monitorDay',
-          //     sorter: true
-          //   },
-          //   {
-          //     title: '时',
-          //     dataIndex: 'monitorHour',
-          //     sorter: true
-          //   },
-          //   {
-          //     title: '分',
-          //     dataIndex: 'monitorMinute',
-          //     sorter: true
-          //   },
           {
             title: 'LeqdB(A)',
             dataIndex: 'indexLeq',

src/views/sound/function/statistic/average.vue

@@ -7,16 +7,8 @@
       <a-form :model="where" layout="inline" :labelCol="{ offset: 1}">
         <a-row>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="年份:">
+            <a-form-item label="统计模块:">
-              <a-select v-model:value="where.monitorYear" placeholder="选择年份">
+              <a-select :options="modelOptions" v-model:value="where.model" placeholder="统计模块">
-                <a-select-option v-for="(o) in yearOptions" :key="o" :value="o">{{o}}</a-select-option>
-              </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.monitorQuarter" placeholder="选择季度">
-                <a-select-option v-for="(o) in quarterOptions" :key="o.value" :value="o.value">{{o.label}}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -26,6 +18,13 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="8" :md="12" :sm="24" :xs="24">
+            <a-form-item label="时间范围:">
+              <!-- <a-month-picker v-model:value="timeScope" placeholder="起始" /> -->
+              <a-range-picker v-model:value="timeScope" format="YYYY-MM-DD" />
+            </a-form-item>
+          </a-col>
+
           <a-col :lg="4" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
               <a-space>
@@ -49,92 +48,30 @@
   import _ from "lodash";
   import XLSX from 'xlsx';
   import {
-    pageRoadNoiseStatisticUrl
+    pageFunctionNoiseStatisticUrl
-  } from "@/api/ecology/road-sound"
+  } from "@/api/ecology/function-sound"
-  import {getHistoryyears} from "@/api/ecology/road-sound"
   const columns = [{
-      title: '测点',
+      title: '点位名称',
       dataIndex: 'place',
 
     },
     {
-      title: '路段',
+      title: "点位编码",
-      dataIndex: 'road',
+      dataIndex: "placeCode"
+    },
+    {
+      title: '功能区类别',
+      dataIndex: 'functionType',
 
     },
-    {
+    // {
-      title: '城区',
+    //   title: '城区',
-      dataIndex: 'area',
+    //   dataIndex: 'area',
-    },
+    // },
-      {
+    // {
-      title: '市',
+    //   title: '市',
-      dataIndex: 'city',
+    //   dataIndex: 'city',
-    },
+    // },
-    {
-      title: '路长',
-      dataIndex: 'roadLength',
-      customRender: ({
-        text
-      }) => Math.round(text)
-
-    },
-    {
-      title: '路宽',
-      dataIndex: 'roadWidth',
-      customRender: ({
-        text
-      }) => Math.round(text)
-    },
-    {
-      title: '20分钟中小型车流量',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgSmallTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxSmallTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minSmallTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-      ],
-    },
-    {
-      title: '20分钟大型车流量',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgLargeTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxLargeTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minLargeTrafficFlow',
-          customRender: ({
-            text
-          }) => Math.round(text)
-        },
-      ]
-    },
     {
       title: 'LeqdB(A)',
       children: [{
@@ -317,31 +254,16 @@
 
   ]
   export default {
-    name: 'StatisticSoundRoad',
+    name: 'StatisticSoundFunctionAverage',
     components: {
 
     },
     data() {
-      const quarterOptions = [{
-        label: "第一季度",
-        value: 1
-      },
-      {
-        label: "第二季度",
-        value: 2
-      },
-      {
-        label: "第三季度",
-        value: 3
-      },{
-        label: "第四季度",
-        value: 4
-      }];
       return {
-        url: pageRoadNoiseStatisticUrl,
+        url: pageFunctionNoiseStatisticUrl,
         data: [],
         where: {
-          monitorYear: ""
+          model: "place"
         },
         timeScope: [],
         columns,
@@ -349,17 +271,18 @@
           value: "place",
           label: "测点",
         }, {
-          value: "road",
+          value: "function_type",
-          label: "路段",
+          label: "功能区类别",
-        }, {
+        }, 
-          value: "area",
+        // {
-          label: "城区",
+        //   value: "area",
-        },{
+        //   label: "城区",
-          value: "city",
+        // },
-          label: "市"
+        // {
-        }],
+        //   value: "city",
-        yearOptions: [],
+        //   label: "市"
-        quarterOptions,
+        // }
+        ],
         timeSlotOptions: [{
           value: "昼",
           label: "昼"
@@ -370,9 +293,6 @@
 
       };
     },
-    created(){
-      getHistoryyears().then(res=>{this.yearOptions = res.data.data});
-    },
     methods: {
       /* 刷新表格 */
       reload() {
@@ -387,15 +307,15 @@
         let cloneColumns = _.cloneDeep(columns);
         if (this.where.model == "area") {
           this.columns = cloneColumns.filter(item => {
-            return item.dataIndex != "place" && item.dataIndex != "road";
+            return item.dataIndex != "place" && item.dataIndex != "function";
           })
-        } else if (this.where.model == "road") {
+        } else if (this.where.model == "function_type") {
           this.columns = cloneColumns.filter(item => {
-            return item.dataIndex != "place"
+            return item.dataIndex != "place" && item.dataIndex != "placeCode"
           })
         }else if(this.where.model == "city"){
         this.columns = cloneColumns.filter(item => {
-            return item.dataIndex != "place" && item.dataIndex != "road"  && item.dataIndex != "area";
+            return item.dataIndex != "place" && item.dataIndex != "function"  && item.dataIndex != "area";
           })
         }
       },
@@ -414,7 +334,7 @@
           ['测点', '路段', '城区', '路长', '路宽', '平均Leq', '平均SD']
         ];
         this.data.forEach(d => {
-          array.push([d.place, d.road, d.area, d.roadLength, d.roadWidth, d.avgLeq, d.avgSD]);
+          array.push([d.place, d.function, d.area, d.functionLength, d.functionWidth, d.avgLeq, d.avgSD]);
         });
         let sheet = XLSX.utils.aoa_to_sheet(array);
         // sheet['!merges'] = [

src/views/sound/function/statistic/base.vue

@@ -0,0 +1,376 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+      <a-form :model="where" :label-col="{md: {span: 6}, sm: {span: 24}}"
+        :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
+        <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item label="测点名称:">
+              <a-input v-model:value.trim="where.place" placeholder="请输入测点名称" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item label="功能区类别:">
+              <a-input v-model:value.trim="where.functionType" placeholder="请输入功能区类别" allow-clear />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item label="时段">
+              <a-input v-model:value.trim="where.timeSlot" placeholder="请输入时段" allow-clear />
+            </a-form-item>
+          </a-col> -->
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
+              <a-space>
+                <a-button type="primary" @click="reload">查询</a-button>
+                <a-button @click="reset">重置</a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+      <a-modal v-model:visible="showEdit" :title="form.functionNoiseId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
+        :width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
+        <a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
+          :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
+          <a-row>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="日期" name="monitorDate">
+                <a-date-picker v-model:value="form.monitorDate" :locale="locale" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="时间" name="monitorTime">
+                <a-time-picker v-model:value="form.monitorTime" format="HH:mm" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="时段" name="timeSlot">
+                <a-select v-model:value="form.timeSlot">
+                  <a-select-option value="昼">昼</a-select-option>
+                  <a-select-option value="夜">夜</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="12" :sm="24">
+              <a-form-item label="测点名称" name="place">
+                <a-input v-model:value="form.place" placeholder="请输入测点名称" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="点号" name="placeCode">
+                <a-input v-model:value="form.placeCode" placeholder="请输入点号" allow-clear />
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="12" :sm="24">
+              <a-form-item label="所属路段" name="function">
+                <a-input v-model:value="form.function" placeholder="请输入测点名称" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="所属城区" name="area">
+                <a-input v-model:value="form.area" placeholder="请输入点号" allow-clear />
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="12" :sm="24">
+              <a-form-item label="路长" name="functionLength">
+                <a-input v-model:value="form.functionLength" placeholder="请输入路长（米）" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="总路宽" name="functionWidth">
+                <a-input v-model:value="form.functionWidth" placeholder="请输入总路宽（米）" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="中小型车流量" name="smallTrafficFlow">
+                <a-input type="number" v-model:value="form.smallTrafficFlow" placeholder="请输入中小型车流量（辆/20分钟）"
+                  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="大型车流量" name="largeTrafficFlow">
+                <a-input type="number" v-model:value="form.largeTrafficFlow" placeholder="请输入大型车流量（辆/20分钟）"
+                  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="LeqdB(A)" name="indexLeq">
+                <a-input type="number" v-model:value="form.indexLeq" placeholder="请输入LeqdB(A)" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="SDdB(A)" name="indexSd">
+                <a-input type="number" v-model:value="form.indexSd" placeholder="请输入大SDdB(A)" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="L10dB(A)" name="indexL10">
+                <a-input type="number" v-model:value="form.indexL10" placeholder="请输入L10dB(A)" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="L50dB(A)" name="indexL50">
+                <a-input type="number" v-model:value="form.indexL50" placeholder="请输入L50dB(A)" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="L90dB(A)" name="indexL90">
+                <a-input type="number" v-model:value="form.indexL90" placeholder="请输入L90dB(A)" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="LmindB(A)" name="indexLmin">
+                <a-input type="number" v-model:value="form.indexLmin" placeholder="请输入LmindB(A)" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="LmaxdB(A)" name="indexLmax">
+                <a-input type="number" v-model:value="form.indexLmax" placeholder="请输入LmaxdB(A)" allow-clear />
+              </a-form-item>
+            </a-col>
+          </a-row>
+
+        </a-form>
+
+      </a-modal>
+      <!-- 表格 -->
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="functionNoiseId" :datasource="url"
+        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+  import _ from "lodash"
+  import {
+    pageFunctionNoiseUrl,
+    saveFunctionNoise,
+    removeFunctionNoise,
+    removeBatchFunctionNoise,
+    updateFunctionNoise,
+  } from "@/api/ecology/function-sound";
+  import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
+  import moment from 'moment';
+  //   import utils from "./utils";
+  export default {
+    name: 'StatisticSoundFunctionBase',
+    components: {},
+    data() {
+    
+      return {
+        locale,
+        bill:{},
+        // 表格数据接口
+        url: pageFunctionNoiseUrl,
+        selection: [],
+        // 表格列配置
+        columns: [
+          {
+            title: '监测日期',
+            dataIndex: 'monitorTime',
+            sorter: true
+          },
+          {
+            title: '点位名称',
+            dataIndex: 'place',
+            sorter: true
+          },
+          {
+            title: '点位编码',
+            dataIndex: 'placeCode',
+            sorter: true
+          },
+          {
+            title: '功能区类别',
+            dataIndex: 'functionType',
+            sorter: true
+          },
+          {
+            title: '时段',
+            dataIndex: 'timeSlot',
+            sorter: true
+          },
+          {
+            title: 'LeqdB(A)',
+            dataIndex: 'indexLeq',
+            sorter: true
+          },
+          {
+            title: 'SDdB(A)',
+            dataIndex: 'indexSd',
+            sorter: true
+          },
+          {
+            title: 'L10dB(A)',
+            dataIndex: 'indexL10',
+            sorter: true
+          },
+          {
+            title: 'L50dB(A)',
+            dataIndex: 'indexL50',
+            sorter: true
+          },
+          {
+            title: 'L90dB(A)',
+            dataIndex: 'indexL90',
+            sorter: true
+          },
+          {
+            title: 'LmindB(A)',
+            dataIndex: 'indexLmin',
+            sorter: true
+          },
+          {
+            title: 'LmaxdB(A)',
+            dataIndex: 'indexLmax',
+            sorter: true
+          },
+           {
+            title: '创建人',
+            dataIndex: 'username',
+            sorter: true
+          },
+        ],
+        // 表格搜索条件
+        where: {
+          checked: 1
+        },
+        // 表格选中数据
+        selectionList: [],
+        // 是否显示编辑弹窗
+        showEdit: false,
+        // 表单数据
+        form: {},
+        loading: false,
+        rules: {}
+
+      };
+    },
+    mounted(){
+    
+    },
+    methods: {
+      /* 刷新表格 */
+      reload() {
+       
+        this.$refs.table.reload({
+          where: this.where
+        });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {
+           checked: 1
+        };
+        this.reload();
+      },
+      /* 显示编辑 */
+      openEdit(record) {
+        const cloneRecord = _.cloneDeep(record)
+        if (record && cloneRecord.monitorTime) {
+          console.log(moment(cloneRecord.monitorTime).format('YYYY MM DD'));
+          cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
+          cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
+        }
+        // cloneRecord.mi
+        this.form = Object.assign({}, cloneRecord);
+        this.showEdit = true;
+        this.$nextTick(() => {
+          this.$refs.form.clearValidate(); // 清除表单验证信息
+        });
+      },
+    
+      save() {
+        const hide = this.$message.loading('请求中..', 0);
+        const form = _.cloneDeep(this.form);
+        const date = new Date();
+        date.setFullYear(form.monitorDate.year());
+        date.setMonth(form.monitorDate.month());
+        date.setDate(form.monitorDate.date());
+        date.setHours(form.monitorTime.hour());
+        date.setMinutes(form.monitorTime.minutes());
+        form.monitorTime = date.getTime();
+        form.monitorYear = date.getFullYear();
+        form.monitorMonth = date.getMonth() + 1;
+        form.monitorDay = date.getDate();
+        form.monitorHour = date.getHours();
+        form.monitorMinute = date.getMinutes();
+        delete form['monitorDate']
+        if (form.functionNoiseId) {
+          updateFunctionNoise(form).then(res => {
+            if (res.data.code == 0) {
+            this.showEdit = false;
+              this.$message.success(res.data.msg);
+              this.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          }).catch((error)=>{
+              this.$message.error(error.message);
+          }).finally(()=>{
+              console.log("finallyfinallyfinallyfinally");
+              hide();
+          })
+        }else{
+            form.functionNoiseBillId = this.functionNoiseBillId;
+             saveFunctionNoise(form).then(res => {
+            if (res.data.code == 0) {
+                this.showEdit = false;
+              this.$message.success(res.data.msg);
+              this.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          }).catch((error)=>{
+              this.$message.error(error.message);
+          }).finally(()=>{
+              hide();
+          })
+        }
+       
+
+      },
+      /* 删除单个 */
+      remove(row) {
+        const hide = this.$message.loading('请求中..', 0);
+        removeFunctionNoise(row.functionNoiseId).then(res => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+          this.$message.error(e.msg);
+        }).finally(() => hide());
+      },
+      removeBatch() {
+        const ids = this.selectionList.map(item => item.functionNoiseId);
+        const hide = this.$message.loading('请求中..', 0);
+        removeBatchFunctionNoise(ids).then(res => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+
+          this.$message.error(e.msg);
+        }).finally(() => hide());
+      },
+
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  
+</style>

src/views/sound/function/statistic/compare.vue

@@ -0,0 +1,476 @@
+<template>
+  <div class="">
+    <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
+      <a-row>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="统计模块:">
+            <a-select
+              :options="groupModelOptions"
+              v-model:value="where.groupModel"
+              placeholder="统计模块"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="时间细度:">
+            <a-select
+              :options="groupTimeLengthOptions"
+              v-model:value="where.groupTimeLength"
+              placeholder=""
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item name="timeRange" label="时间范围:">
+            <a-range-picker
+              @panelChange="timeRangePanelChange"
+              v-model:value="timeRange"
+              format="YYYY"
+              :mode="['year', 'year']"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="昼夜:">
+            <a-select
+              :options="timeSlotOptions"
+              v-model:value="where.timeSlot"
+              placeholder="昼夜"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+
+        <a-col :lg="12" :md="12" :sm="24" :xs="24">
+          <a-form-item label="类型:">
+            <a-select
+              v-model:value="where.valueType"
+              :options="valueTypeOptions"
+              mode="multiple"
+              placeholder="至少选择一项"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
+              <a-form-item label="时间范围:">
+                <a-range-picker @change="reportTimeScopeChange" :mode="['year','year']" separator="~" v-model:value="where.reportTimeScope" ><a-range-picker>
+                   <template #renderExtraFooter>
+                      extra footer
+                    </template>
+                </a-range-picker>
+              </a-form-item>
+            </a-col> -->
+
+        <a-col :lg="12" :md="12" :sm="24" :xs="24">
+          <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+            <a-space>
+              <a-button type="primary" @click="reload">查询</a-button>
+              <a-button @click="reset">重置</a-button>
+              <a-button @click="exportFile">导出Excel</a-button>
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+    <ele-pro-table
+      v-if="hisYears.length > 0"
+      ref="table"
+      row-key="id"
+      :datasource="url"
+      :columns="columns"
+      :where="where"
+      :needPage="false"
+      :initLoad="false"
+      :scroll="{ x: 'max-content' }"
+      :method="'POST'"
+      @done="(d) => (data = d.data)"
+    >
+      <template #toolbar>
+        <!-- 搜索表单 -->
+
+        <!-- <a-space>
+            
+        </a-space> -->
+      </template>
+    </ele-pro-table>
+  </div>
+</template>
+
+<script>
+// import _ from "lodash";
+import { ref } from "vue";
+import XLSX from "xlsx";
+import {
+  pageFunctionNoiseCompare,
+  getHistoryyears,
+} from "@/api/ecology/function-sound";
+export default {
+  name: "StatisticSoundFunctionCompare",
+  components: {},
+  data() {
+    const groupModelOptions = [
+      { label: "测点", value: "place" },
+      { label: "城区", value: "area" },
+      { label: "市", value: "city" },
+    ];
+    const groupTimeLengthOptions = [
+      {
+        label: "年",
+        value: "monitor_year",
+      },
+      {
+        label: "季度",
+        value: "quarter",
+      },
+    ];
+
+    // const valueTypeOptions = ['Leq','SD','L10','L50','L90','Lmin','Lmax'];
+    const valueTypeOptions = [
+      {
+        label: "Leq",
+        value: "index_Leq",
+      },
+      {
+        label: "SD",
+        value: "index_SD",
+      },
+      {
+        label: "L10",
+        value: "index_L10",
+      },
+      {
+        label: "L50",
+        value: "index_L50",
+      },
+      {
+        label: "L90",
+        value: "index_L90",
+      },
+      {
+        label: "Lmin",
+        value: "index_Lmin",
+      },
+      {
+        label: "Lmax",
+        value: "index_Lmax",
+      },
+    ];
+
+    const whereRules = {};
+    return {
+      url: pageFunctionNoiseCompare,
+      data: [],
+      where: {
+        groupModel: "area",
+        groupTimeLength: "monitor_year",
+        reportTimeScope: [],
+        valueType: ["index_Leq"],
+        timeRange: [],
+      },
+      timeRange: [],
+      whereRules,
+      hisYears: [],
+      timeScope: [],
+      columns: [{ title: "年", dataIndex: "year" }],
+      groupModelOptions,
+      groupTimeLengthOptions,
+      valueTypeOptions: ref(valueTypeOptions),
+      timeSlotOptions: [
+        {
+          value: "昼",
+          label: "昼",
+        },
+        {
+          value: "夜",
+          label: "夜",
+        },
+      ],
+    };
+  },
+  mounted() {
+    getHistoryyears().then((res) => {
+      this.hisYears = res.data.data;
+      this.$nextTick(() => {
+        this.reload();
+      });
+    });
+  },
+  methods: {
+    /* 刷新表格 */
+    reload() {
+      if (this.where.valueType.length == 0) {
+        this.$message.error("请至少选择一个类型");
+        return;
+      }
+
+      // 结束时间必须大于开始时间
+      if (this.where.timeRange && this.where.timeRange.length == 2) {
+        if (this.where.timeRange[0] > this.where.timeRange[1]) {
+          this.$message.error("结束时间必须大于起始时间");
+          return;
+        }
+        this.where.startYear = this.where.timeRange[0];
+        this.where.endYear = this.where.timeRange[1];
+      }
+      this.stableDone();
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        model: "place",
+      };
+      this.this.timeScope = [];
+      this.reload();
+    },
+    reportTimeScopeChange(d, dstr) {
+      console.log(d, dstr);
+    },
+    timeRangePanelChange(val) {
+      val[0] && (this.where.timeRange[0] = val[0].year());
+      val[1] && (this.where.timeRange[1] = val[1].year());
+      this.timeRange = val;
+    },
+    // 数据加载完成
+    stableDone() {
+      const columns = [];
+      if (this.where.groupModel == "area") {
+        columns.push({
+          title: "城区",
+          dataIndex: "area",
+          sorter: true,
+        });
+      } else if (this.where.groupModel == "place") {
+        columns.push({
+          title: "测点",
+          dataIndex: "area",
+          sorter: true,
+        });
+      } else if (this.where.groupModel == "city") {
+        columns.push({
+          title: "城市",
+          dataIndex: "area",
+          sorter: true,
+        });
+      }
+
+      this.hisYears.forEach((item) => {
+        if (
+          (!this.where.timeRange[0] ||
+          this.where.timeRange[0] <= item) &&
+          (!this.where.timeRange[1] ||
+          this.where.timeRange[1] >= item)
+        ) {
+          if (this.where.groupTimeLength == "quarter") {
+            columns.push({
+              title: item + "年第一季度Leq",
+              dataIndex: item + "1" + "Leq",
+            });
+            columns.push({
+              title: item + "年第二季度Leq",
+              dataIndex: item + "2" + "Leq",
+            });
+            columns.push({
+              title: item + "年第三季度Leq",
+              dataIndex: item + "3" + "Leq",
+            });
+            columns.push({
+              title: item + "年第四季度Leq",
+              dataIndex: item + "4" + "Leq",
+            });
+            columns.push({
+              title: item + "年第一季度SD",
+              dataIndex: item + "1" + "Sd",
+            });
+            columns.push({
+              title: item + "年第二季度SD",
+              dataIndex: item + "2" + "Sd",
+            });
+            columns.push({
+              title: item + "年第三季度SD",
+              dataIndex: item + "3" + "Sd",
+            });
+            columns.push({
+              title: item + "年第四季度SD",
+              dataIndex: item + "4" + "Sd",
+            });
+            columns.push({
+              title: item + "年第一季度L10",
+              dataIndex: item + "1" + "L10",
+            });
+            columns.push({
+              title: item + "年第二季度L10",
+              dataIndex: item + "2" + "L10",
+            });
+            columns.push({
+              title: item + "年第三季度L10",
+              dataIndex: item + "3" + "L10",
+            });
+            columns.push({
+              title: item + "年第四季度L10",
+              dataIndex: item + "4" + "L10",
+            });
+            columns.push({
+              title: item + "年第一季度L50",
+              dataIndex: item + "1" + "L50",
+            });
+            columns.push({
+              title: item + "年第二季度L50",
+              dataIndex: item + "2" + "L50",
+            });
+            columns.push({
+              title: item + "年第三季度L50",
+              dataIndex: item + "3" + "L50",
+            });
+            columns.push({
+              title: item + "年第四季度L50",
+              dataIndex: item + "4" + "L50",
+            });
+            columns.push({
+              title: item + "年第一季度L90",
+              dataIndex: item + "1" + "L90",
+            });
+            columns.push({
+              title: item + "年第二季度L90",
+              dataIndex: item + "2" + "L90",
+            });
+            columns.push({
+              title: item + "年第三季度L90",
+              dataIndex: item + "3" + "L90",
+            });
+            columns.push({
+              title: item + "年第四季度L90",
+              dataIndex: item + "4" + "L90",
+            });
+            columns.push({
+              title: item + "年第一季度Lmin",
+              dataIndex: item + "1" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第二季度Lmin",
+              dataIndex: item + "2" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第三季度Lmin",
+              dataIndex: item + "3" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第四季度Lmin",
+              dataIndex: item + "4" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第一季度Lmax",
+              dataIndex: item + "1" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第二季度Lmax",
+              dataIndex: item + "2" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第三季度Lmax",
+              dataIndex: item + "3" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第四季度Lmax",
+              dataIndex: item + "4" + "Lmax",
+            });
+          } else {
+            if (this.where.valueType.includes("index_Leq")) {
+              columns.push({
+                title: item + "年Leq",
+                dataIndex: item + "Leq",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_SD")) {
+              columns.push({
+                title: item + "年SD",
+                dataIndex: item + "Sd",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_L10")) {
+              columns.push({
+                title: item + "年L10",
+                dataIndex: item + "L10",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+
+            if (this.where.valueType.includes("index_L50")) {
+              columns.push({
+                title: item + "年L50",
+                dataIndex: item + "L50",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_L90")) {
+              columns.push({
+                title: item + "年L90",
+                dataIndex: item + "L90",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_Lmin")) {
+              columns.push({
+                title: item + "年Lmin",
+                dataIndex: item + "Lmin",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_Lmax")) {
+              columns.push({
+                title: item + "年Lmax",
+                dataIndex: item + "Lmax",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+          }
+        }
+      });
+      //
+      this.columns = columns;
+    },
+    exportFile() {
+      const arr = [];
+      const th = this.columns.map((item) => item.title);
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = this.columns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>

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

@@ -0,0 +1,56 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane key="base" tab="总览">
+          <base-statistic></base-statistic>
+        </a-tab-pane>
+        <a-tab-pane key="average" tab="平均">
+          <average-statistic></average-statistic>
+        </a-tab-pane>
+        <!-- <a-tab-pane key="quarter" tab="季度报告">
+         <quarter-statistic></quarter-statistic>
+        </a-tab-pane> -->
+        <!-- <a-tab-pane key="year-compare" tab="同比">
+         <compare></compare>
+        </a-tab-pane> -->
+      </a-tabs>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  /**
+   * 
+   * 
+   * 
+   */
+  import BaseStatistic from "./base.vue";
+  // import QuarterStatistic from "./quarter.vue";
+  // import Compare from "./compare.vue"
+  import AverageStatistic from "./average.vue"
+
+  export default {
+    name: 'StatisticSoundFunction',
+    components: {
+      BaseStatistic,
+      // QuarterStatistic,
+      // Compare,
+      AverageStatistic
+    },
+    data() {
+      return {
+        activeKey: 'year-compare'
+      };
+        
+    },
+    methods: {
+     
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/sound/road/collect/index.vue

@@ -3,7 +3,11 @@
     <a-card style="width: 100%" :bordered="false">
       <template #title>
         <a-space>
-          <a-upload :before-upload="importFile" :showUploadList="false" accept=".xls,.xlsx,.csv">
+          <a-upload
+            :before-upload="importFile"
+            :showUploadList="false"
+            accept=".xls,.xlsx,.csv"
+          >
             <a-button>导入excel</a-button>
           </a-upload>
         </a-space>
@@ -12,119 +16,150 @@
         <a-tab-pane tab="噪声信息" key="noise">
           <noise-bill ref="noise"></noise-bill>
         </a-tab-pane>
-        <a-tab-pane tab="其他信息" key="place">
-          <place-bill ref="place"></place-bill>
-        </a-tab-pane>
       </a-tabs>
     </a-card>
   </div>
 </template>
 
 <script>
-  import XLSX from 'xlsx';
+import XLSX from "xlsx";
-  import utils from "./utils";
+import utils from "./utils";
-  import NoiseBill from "./noise-bill.vue";
+import { Modal } from "ant-design-vue";
-  import PlaceBill from "./place-bill.vue";
+import NoiseBill from "./noise-bill.vue";
+import { saveRoadNoiseBill } from "@/api/ecology/road-sound";
+export default {
+  name: "RoadCollectIndex",
+  components: {
+    NoiseBill,
+  },
+  data() {
+    return {
+      activeKey: "noise",
+    };
+  },
+  methods: {
+    /* 导入本地excel文件 */
+    importFile(file) {
+      const hide = this.$message.loading("导入中..", 0);
 
-  import {
+      let reader = new FileReader();
-    saveRoadNoiseBill,
+      reader.onload = (e) => {
-  } from "@/api/ecology/road-sound";
-  import {saveRoadPlaceBill} from "@/api/ecology/road-place";
-
-  export default {
-    name: "RoadCollectIndex",
-    components: {
-      NoiseBill,
-      PlaceBill
-    },
-    data() {
-
-      return {
-        activeKey: 'noise'
-      }
-    },
-    methods: {
-      /* 导入本地excel文件 */
-      importFile(file) {
-        const hide = this.$message.loading('导入中..', 0);
         try {
-          let reader = new FileReader();
+          let data = new Uint8Array(e.target.result);
-          reader.onload = (e) => {
+          let workbook = XLSX.read(data, {
-            let data = new Uint8Array(e.target.result);
+            type: "array",
-            let workbook = XLSX.read(data, {
+          });
-              type: 'array'
+          //0.昼间数据 1.夜间数据 2.其他信息
-            });
+          let sheetNames = workbook.SheetNames;
-            //0.昼间数据 1.夜间数据 2.其他信息
+          // 解析成二维数组
-            let sheetNames = workbook.SheetNames;
+          let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
-            // 解析成二维数组 
+            header: 1,
-            let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
+          });
-              header: 1,
+          let aoa2 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[1]], {
-            });
+            header: 1,
-            let aoa2 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[1]], {
+          });
-              header: 1,
+          let aoa3 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[2]], {
-            });
+            header: 1,
-            let aoa3 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[2]], {
+          });
-              header: 1,
+          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
-            });
+          const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-");
-            const reportDate = aoa[1][0].replace(/[^\d]+/g, "-")
-            const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-")
-            const reportDate3 = new Date();
 
-            const roadNoiseList = aoa.filter(item => item.length == 21 && typeof item[0] == "number");
+          const roadNoiseList = aoa.filter(
-            const roadNoiseList2 = aoa2.filter(item => item.length == 21 && typeof item[0] == "number");
+            (item) => item.length == 21 && typeof item[0] == "number"
-            const roadNoiseList3 = aoa3.filter(item => item.length == 16 && typeof item[1] == "number");
+          );
+          const roadNoiseList2 = aoa2.filter(
+            (item) => item.length == 21 && typeof item[0] == "number"
+          );
+          const roadNoiseList3 = aoa3.filter(
+            (item) => item.length == 16 && typeof item[1] == "number"
+          );
 
-            // 解析成对象数组
+          // 解析成对象数组
-            const billData = utils.toObjData(roadNoiseList);
+          const billName = aoa[0][0];
-            const billData2 = utils.toObjData(roadNoiseList2);
+          const billData = utils.toObjData(roadNoiseList);
-            const billData3 = utils.toPlaceData(roadNoiseList3);
+          const billName2 = aoa2[0][0];
+          const billData2 = utils.toObjData(roadNoiseList2);
+          // 其他信息
+          const billData3 = utils.toPlaceData(roadNoiseList3);
+          if (
+            (!billData || billData.length == 0) &&
+            (!billData2 || billData2.length == 0)
+          ) {
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
 
-            const tasks = [];
+          const tasks = [];
-            if (billData.length > 0) {
+          if (billData.length > 0) {
-              tasks.push(saveRoadNoiseBill({
+            billData.forEach((item) => {
+              Object.assign(
+                item,
+                billData3.find((b3Item) => b3Item.place == item.place)
+              );
+            });
+            tasks.push(
+              saveRoadNoiseBill({
                 reportTime: new Date(reportDate).getTime(),
-                billName: sheetNames[0] + reportDate,
+                billName: billName,
-                roadNoiseList: billData
+                roadNoiseList: billData,
-              }))
+              })
-            }
+            );
+          }
 
-            if (billData2.length > 0) {
+          if (billData2.length > 0) {
-              tasks.push(saveRoadNoiseBill({
+            billData.forEach((item) => {
+              Object.assign(
+                item,
+                billData3.find((b3Item) => b3Item.place == item.place)
+              );
+            });
+            tasks.push(
+              saveRoadNoiseBill({
                 reportTime: new Date(reportDate2).getTime(),
-                billName: sheetNames[1] + reportDate2,
+                billName: billName2,
-                roadNoiseList: billData2
+                roadNoiseList: billData2,
-              }))
+              })
-            }
+            );
+          }
 
-            if (billData3.length > 0) {
+          // 上传到服务器
-              tasks.push(saveRoadPlaceBill({
-                reportTime: reportDate3.getTime(),
-                billName: sheetNames[2] + reportDate3.getTime(),
-                roadPlaceList: billData3
-              }))
-            }
-            // 上传到服务器
 
-            Promise.all(tasks).then(() => {
+          Promise.all(tasks)
-              this.$refs.noise&&this.$refs.noise.reload()
+            .then(() => {
-              this.$refs.place&&this.$refs.place.reload()
+               Modal.success({
-            }).finally(()=>{
+                title: "导入成功"
-              hide();
+              });
+              this.$refs.noise && this.$refs.noise.reload();
+              this.$refs.place && this.$refs.place.reload();
             })
-
+            .catch(() => {
-            // console.log(billData);
+              Modal.error({
-
+                title: "导入失败",
-          };
+                content: "数据上传出错",
-          reader.readAsArrayBuffer(file);
+              });
+            })
+            .finally(() => {
+              hide();
+            });
         } catch (error) {
-          this.$message.error("表格格式有误，请检查后重新上传！");
+          hide()
+          Modal.error({
+            title: "导入失败",
+            content: "表格格式有误，请检查后重新上传！",
+          });
         }
-        return false;
+        // console.log(billData);
-      }
+      };
-    }
+      reader.readAsArrayBuffer(file);
-  }
+
+      return false;
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-
 </style>

src/views/sound/road/collect/noise-bill.vue

@@ -97,6 +97,7 @@
     CheckOutlined,
     EditOutlined
   } from '@ant-design/icons-vue';
+  import { Modal } from 'ant-design-vue';
   import {
     pageBillUrl,
     // saveRoadNoiseBill,
@@ -249,9 +250,15 @@
         }).then(res => {
           if (res.data.code == 0) {
             record.checked = checked
-            this.$message.success(res.data.msg);
+            Modal.success({
+              title: "提示",
+              content: checked?"审核成功":"撤回成功"
+            });
           } else {
-            this.$message.error(res.data.msg);
+            Modal.error({
+              title: "提示",
+              content: res.data.msg
+            });
           }
         }).catch((e) => {
           this.$message.error(e.message);

src/views/sound/road/collect/place-bill.vue

@@ -1,372 +0,0 @@
-<template>
-  <div>
-    <!-- 表格 -->
-    <ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadPlaceBillId" :datasource="url"
-      :columns="columns" :where="where" :scroll="{x: 'max-content'}">
-      <template #toolbar>
-
-        <!-- 搜索表单 -->
-        <a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
-          <a-form-item label="审核状态:">
-            <a-select v-model:value="where.checked" allowClear placeholder="未选择">
-              <a-select-option :value="1">已审核</a-select-option>
-              <a-select-option :value="0">未审核</a-select-option>
-            </a-select>
-          </a-form-item>
-
-          <a-form-item label="表格名称:">
-            <a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
-          </a-form-item>
-
-          <a-form-item label="上报时间:">
-            <a-range-picker separator="~" v-model:value="reportTimeScope" />
-          </a-form-item>
-
-          <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
-            <a-space>
-              <a-button type="primary" @click="reload">查询</a-button>
-              <a-button @click="reset">重置</a-button>
-            </a-space>
-          </a-form-item>
-        </a-form>
-      </template>
-      <template #toolkit>
-        <a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`" ok-text="Yes"
-          cancel-text="No" @confirm="removeBatch">
-          <a-button :disabled="selectionList.length == 0" type="primary" ghost danger>批量删除</a-button>
-        </a-popconfirm>
-      </template>
-      <template #billName="{ text, record }">
-        <div class="editable-cell">
-          <div v-if="editableData[record.roadPlaceBillId]" class="editable-cell-input-wrapper">
-            <a-input v-model:value="editableData[record.roadPlaceBillId].billName" @pressEnter="save(record)" />
-            <check-outlined class="editable-cell-icon-check" @click="save(record)" />
-          </div>
-          <div v-else class="editable-cell-text-wrapper">
-            {{ text || ' ' }}
-            <edit-outlined class="editable-cell-icon" @click="edit(record)" />
-          </div>
-        </div>
-      </template>
-      <template #reportTime="{ text, record }">
-        <div class="editable-cell">
-          <div v-if="editableData[record.roadPlaceBillId]" class="editable-cell-input-wrapper">
-            <a-date-picker v-model:value="editableData[record.roadPlaceBillId].reportTime"></a-date-picker>
-            <!-- <a-input v-model:value="editableData[record.roadPlaceBillId].reportTime" @pressEnter="save(record)" /> -->
-            <check-outlined class="editable-cell-icon-check" @click="save(record)" />
-          </div>
-          <div v-else class="editable-cell-text-wrapper">
-            {{ $util.toDateString(text,'yyyy-MM-dd') || ' ' }}
-            <edit-outlined class="editable-cell-icon" @click="edit(record)" />
-          </div>
-        </div>
-      </template>
-      <template #checked="{text}">
-        <span>
-          <a-tag v-if="text" color="green">已审核</a-tag>
-          <a-tag v-else color="orange">未审核</a-tag>
-        </span>
-      </template>
-
-      <template #action="{ record }">
-        <a-space>
-          <a-button @click="detail(record)" shape="round" size="small">查看</a-button>
-          <span v-hasPermi="['ecology:sound:verify']">
-            <a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
-              @confirm="verify(record,1)">
-              <a-button type="primary" shape="round" size="small">审核</a-button>
-            </a-popconfirm>
-            <a-popconfirm v-else :title="`撤回重新编辑，确认？`" ok-text="Yes" cancel-text="No" @confirm="verify(record,0)">
-              <a-button type="dashed" shape="round" size="small">撤回</a-button>
-            </a-popconfirm>
-          </span>
-          <a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
-            <a-button type="primary" danger shape="round" size="small">删除</a-button>
-          </a-popconfirm>
-        </a-space>
-      </template>
-    </ele-pro-table>
-  </div>
-</template>
-
-<script>
-  import _ from "lodash"
-  import {
-    CheckOutlined,
-    EditOutlined
-  } from '@ant-design/icons-vue';
-  import {
-    pageBillUrl,
-    removeRoadPlaceBill,
-    removeBatchRoadPlaceBill,
-    updateRoadPlaceBill,
-    verifyRoadPlaceBill
-  } from "@/api/ecology/road-place";
-  import moment from "moment";
-  export default {
-    name: 'RoadCollectPlaceBill',
-    components: {
-      CheckOutlined,
-      EditOutlined
-    },
-    data() {
-
-      return {
-        // 表格数据接口
-        url: pageBillUrl,
-        selection: [],
-        // 表格列配置
-        columns: [{
-            key: 'index',
-            dataIndex: 'index',
-            width: 48,
-            align: 'center',
-            customRender: ({
-              index
-            }) => index + 1
-          },
-          {
-            title: '表格名称',
-            dataIndex: 'billName',
-            sorter: true,
-            slots: {
-              customRender: 'billName',
-            },
-
-          },
-          {
-            title: '条目',
-            dataIndex: 'recordSize',
-            sorter: true,
-
-          },
-          // {
-          //   title: '菜单名称',
-          //   dataIndex: 'title',
-          //   sorter: true
-          // },
-          {
-            title: '上报时间',
-            dataIndex: 'reportTime',
-            sorter: true,
-            slots: {
-              customRender: 'reportTime',
-            },
-            // customRender: ({
-            //   text
-            // }) => this.$util.toDateString(text)
-          },
-          {
-            title: '导入时间',
-            dataIndex: 'createTime',
-            sorter: true,
-            customRender: ({
-              text
-            }) => this.$util.toDateString(text)
-          },
-          {
-            title: '审核状态',
-            dataIndex: 'checked',
-            sorter: true,
-            slots: {
-              customRender: 'checked',
-            },
-
-          },
-          {
-            title: '创建人',
-            dataIndex: 'username',
-            sorter: true,
-
-          },
-          // {
-          //   title: '更新时间',
-          //   dataIndex: 'updateTime',
-          //   sorter: true,
-          //   customRender: ({
-          //     text
-          //   }) => this.$util.toDateString(text)
-          // },
-          {
-            title: '操作',
-            key: 'action',
-            width: 150,
-            align: 'center',
-            slots: {
-              customRender: 'action'
-            }
-          }
-        ],
-        // 表格搜索条件
-        where: {},
-        reportTimeScope: [],
-        // 表格选中数据
-        selectionList: [],
-        editableData: {},
-        // 当前编辑数据
-        current: null,
-      };
-    },
-    methods: {
-
-
-      /* 刷新表格 */
-      reload() {
-        this.where.reportTimeStart = null;
-        this.where.reportTimeEnd = null;
-        if (this.reportTimeScope && this.reportTimeScope.length == 2) {
-          this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
-          this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
-        }
-        this.$refs.table.reload({
-          where: this.where
-        });
-      },
-      /* 重置搜索 */
-      reset() {
-        this.where = {};
-        this.reportTimeScope = [];
-        this.reload();
-      },
-      detail(record) {
-        this.$router.replace({
-          path: "/sound/road/collect/place/" + record.roadPlaceBillId
-        })
-      },
-      edit(record) {
-        this.editableData[record.roadPlaceBillId] = _.cloneDeep(record);
-        this.editableData[record.roadPlaceBillId].reportTime = moment(this.editableData[record.roadPlaceBillId]
-          .reportTime)
-      },
-      verify(record, checked) {
-        const hide = this.$message.loading('请求中..', 0);
-        verifyRoadPlaceBill({
-          roadPlaceBillId: record.roadPlaceBillId,
-          checked
-        }).then(res => {
-          if (res.data.code == 0) {
-            record.checked = checked
-            this.$message.success(res.data.msg);
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch((e) => {
-          this.$message.error(e.message);
-        }).finally(() => {
-          hide();
-        })
-      },
-      save(record) {
-
-        let {
-          roadPlaceBillId,
-          billName,
-          reportTime
-        } = this.editableData[record.roadPlaceBillId];
-        if (!roadPlaceBillId || !reportTime) {
-          this.$message.error('请填写完整信息再提交')
-          return
-        }
-        const hide = this.$message.loading('请求中..', 0);
-        reportTime = reportTime.format("x")
-        reportTime = Number(reportTime)
-        updateRoadPlaceBill({
-          roadPlaceBillId,
-          billName,
-          reportTime
-        }).then(res => {
-          if (res.data.code == 0) {
-            this.$message.success(res.data.msg);
-            record.billName = billName;
-            record.reportTime = reportTime
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-          console.log(e);
-          this.$message.error(e.message);
-        }).finally(() => {
-          delete this.editableData[record.roadPlaceBillId]
-          hide()
-        })
-
-      },
-      /* 删除单个 */
-      remove(row) {
-        const hide = this.$message.loading('请求中..', 0);
-        removeRoadPlaceBill(row.roadPlaceBillId).then(res => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-          this.$message.error(e.msg);
-        }).finally(() => hide());
-      },
-      // 批量删除
-      removeBatch() {
-        const ids = this.selectionList.map(item => item.roadPlaceBillId);
-        const hide = this.$message.loading('请求中..', 0);
-        removeBatchRoadPlaceBill(ids).then(res => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        }).catch(e => {
-
-          this.$message.error(e.msg);
-        }).finally(() => hide());
-      },
-
-    }
-  }
-</script>
-
-<style lang="less">
-  .editable-cell {
-    position: relative;
-
-    .editable-cell-input-wrapper,
-    .editable-cell-text-wrapper {
-      padding-right: 24px;
-    }
-
-    .editable-cell-text-wrapper {
-      padding: 5px 24px 5px 5px;
-    }
-
-    .editable-cell-icon,
-    .editable-cell-icon-check {
-      position: absolute;
-      right: 0;
-      width: 20px;
-      cursor: pointer;
-    }
-
-    .editable-cell-icon {
-      margin-top: 4px;
-      display: none;
-    }
-
-    .editable-cell-icon-check {
-      line-height: 28px;
-    }
-
-    .editable-cell-icon:hover,
-    .editable-cell-icon-check:hover {
-      color: #108ee9;
-    }
-
-    .editable-add-btn {
-      margin-bottom: 8px;
-    }
-  }
-
-  .editable-cell:hover .editable-cell-icon {
-    display: inline-block;
-  }
-</style>

src/views/sound/road/statistic/base.vue

@@ -2,145 +2,70 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <!-- 搜索表单 -->
-      <a-form :model="where" :label-col="{md: {span: 6}, sm: {span: 24}}"
+      <a-form
-        :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
+        :model="where"
+        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
+      >
         <a-row>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="测点名称:">
-              <a-input v-model:value.trim="where.place" placeholder="请输入测点名称" allow-clear />
+              <a-select v-model:value.trim="where.place" allowClear showSearch>
+                <a-select-option
+                  v-for="(item, index) in palceOptions"
+                  :value="item.value"
+                  :key="index"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="路段:">
-              <a-input v-model:value.trim="where.road" placeholder="请输入路段名称" allow-clear />
+              <a-select v-model:value.trim="where.road" allowClear showSearch>
+                <a-select-option
+                  v-for="(item, index) in roadOptions"
+                  :value="item.value"
+                  :key="index"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="城区">
-              <a-input v-model:value.trim="where.area" placeholder="请输入城区名称" allow-clear />
+              <a-select v-model:value.trim="where.area" allowClear showSearch>
+                <a-select-option
+                  v-for="(item, index) in areaOptions"
+                  :value="item.value"
+                  :key="index"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
+            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
                 <a-button type="primary" @click="reload">查询</a-button>
                 <a-button @click="reset">重置</a-button>
+                <a-button @click="exportFile">导出Excel</a-button>
               </a-space>
             </a-form-item>
           </a-col>
         </a-row>
       </a-form>
-      <a-modal v-model:visible="showEdit" :title="form.roadNoiseId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
-        :width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
-        <a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
-          :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
-          <a-row>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="日期" name="monitorDate">
-                <a-date-picker v-model:value="form.monitorDate" :locale="locale" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="时间" name="monitorTime">
-                <a-time-picker v-model:value="form.monitorTime" format="HH:mm" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="时段" name="timeSlot">
-                <a-select v-model:value="form.timeSlot">
-                  <a-select-option value="昼">昼</a-select-option>
-                  <a-select-option value="夜">夜</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点名称" name="place">
-                <a-input v-model:value="form.place" placeholder="请输入测点名称" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="点号" name="placeCode">
-                <a-input v-model:value="form.placeCode" placeholder="请输入点号" allow-clear />
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="12" :sm="24">
-              <a-form-item label="所属路段" name="road">
-                <a-input v-model:value="form.road" placeholder="请输入测点名称" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="所属城区" name="area">
-                <a-input v-model:value="form.area" placeholder="请输入点号" allow-clear />
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="12" :sm="24">
-              <a-form-item label="路长" name="roadLength">
-                <a-input v-model:value="form.roadLength" placeholder="请输入路长（米）" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="总路宽" name="roadWidth">
-                <a-input v-model:value="form.roadWidth" placeholder="请输入总路宽（米）" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="中小型车流量" name="smallTrafficFlow">
-                <a-input type="number" v-model:value="form.smallTrafficFlow" placeholder="请输入中小型车流量（辆/20分钟）"
-                  allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="大型车流量" name="largeTrafficFlow">
-                <a-input type="number" v-model:value="form.largeTrafficFlow" placeholder="请输入大型车流量（辆/20分钟）"
-                  allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LeqdB(A)" name="indexLeq">
-                <a-input type="number" v-model:value="form.indexLeq" placeholder="请输入LeqdB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="SDdB(A)" name="indexSd">
-                <a-input type="number" v-model:value="form.indexSd" placeholder="请输入大SDdB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L10dB(A)" name="indexL10">
-                <a-input type="number" v-model:value="form.indexL10" placeholder="请输入L10dB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L50dB(A)" name="indexL50">
-                <a-input type="number" v-model:value="form.indexL50" placeholder="请输入L50dB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L90dB(A)" name="indexL90">
-                <a-input type="number" v-model:value="form.indexL90" placeholder="请输入L90dB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LmindB(A)" name="indexLmin">
-                <a-input type="number" v-model:value="form.indexLmin" placeholder="请输入LmindB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LmaxdB(A)" name="indexLmax">
-                <a-input type="number" v-model:value="form.indexLmax" placeholder="请输入LmaxdB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-          </a-row>
-
-        </a-form>
-
-      </a-modal>
       <!-- 表格 -->
-      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadNoiseId" :datasource="url"
+      <ele-pro-table
-        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="roadNoiseId"
+        :datasource="url"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
       </ele-pro-table>
     </a-card>
   </div>
@@ -148,275 +73,446 @@
 </template>
 
 <script>
-  import _ from "lodash"
+// import _ from "lodash";
-  import {
+import XLSX from "xlsx";
-    pageRoadNoiseUrl,
+import { pageRoadNoiseUrl, getColumnOptions } from "@/api/ecology/road-sound";
-    saveRoadNoise,
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
-    removeRoadNoise,
+// import moment from "moment";
-    removeBatchRoadNoise,
+//   import utils from "./utils";
-    updateRoadNoise,
+export default {
-  } from "@/api/ecology/road-sound";
+  name: "StatisticSoundRoadBase",
-  import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
+  components: {},
-  import moment from 'moment';
+  data() {
-  //   import utils from "./utils";
+    return {
-  export default {
+      data: [],
-    name: 'StatisticSoundRoadBase',
+      locale,
-    components: {},
+      bill: {},
-    data() {
+      // 表格数据接口
-    
+      url: pageRoadNoiseUrl,
-      return {
+      selection: [],
-        locale,
+      // 表格列配置
-        bill:{},
+      columns: [
-        // 表格数据接口
+        {
-        url: pageRoadNoiseUrl,
+          title: "监测日期",
-        selection: [],
+          dataIndex: "monitorTime",
-        // 表格列配置
+          sorter: true,
-        columns: [
-          {
-            title: '监测日期',
-            dataIndex: 'monitorTime',
-            sorter: true
-          },
-          {
-            title: '测点名称',
-            dataIndex: 'place',
-            sorter: true
-          },
-          {
-            title: '点号',
-            dataIndex: 'placeCode',
-            sorter: true
-          },
-          {
-            title: '所属路段',
-            dataIndex: 'road',
-            sorter: true
-          },
-          {
-            title: '所属城区',
-            dataIndex: 'area',
-            sorter: true
-          },
-          {
-            title: '路长',
-            dataIndex: 'roadLength',
-            sorter: true
-          },
-          {
-            title: '路宽',
-            dataIndex: 'roadWidth',
-            sorter: true
-          },
-          {
-            title: '中小型车流量（辆/20分钟）',
-            dataIndex: 'smallTrafficFlow',
-            sorter: true
-          },
-          {
-            title: '大型车流量（辆/20分钟）',
-            dataIndex: 'largeTrafficFlow',
-            sorter: true
-          },
-          {
-            title: '时段',
-            dataIndex: 'timeSlot',
-            sorter: true
-          },
-          //   {
-          //     title: '月',
-          //     dataIndex: 'monitorMonth',
-          //     sorter: true
-          //   },
-          //   {
-          //     title: '日',
-          //     dataIndex: 'monitorDay',
-          //     sorter: true
-          //   },
-          //   {
-          //     title: '时',
-          //     dataIndex: 'monitorHour',
-          //     sorter: true
-          //   },
-          //   {
-          //     title: '分',
-          //     dataIndex: 'monitorMinute',
-          //     sorter: true
-          //   },
-          {
-            title: 'LeqdB(A)',
-            dataIndex: 'indexLeq',
-            sorter: true
-          },
-          {
-            title: 'SDdB(A)',
-            dataIndex: 'indexSd',
-            sorter: true
-          },
-          {
-            title: 'L10dB(A)',
-            dataIndex: 'indexL10',
-            sorter: true
-          },
-          {
-            title: 'L50dB(A)',
-            dataIndex: 'indexL50',
-            sorter: true
-          },
-          {
-            title: 'L90dB(A)',
-            dataIndex: 'indexL90',
-            sorter: true
-          },
-          {
-            title: 'LmindB(A)',
-            dataIndex: 'indexLmin',
-            sorter: true
-          },
-          {
-            title: 'LmaxdB(A)',
-            dataIndex: 'indexLmax',
-            sorter: true
-          },
-           {
-            title: '创建人',
-            dataIndex: 'username',
-            sorter: true
-          },
-        ],
-        // 表格搜索条件
-        where: {
-          checked: 1
         },
-        // 表格选中数据
+        {
-        selectionList: [],
+          title: "测点名称",
-        // 是否显示编辑弹窗
+          dataIndex: "place",
-        showEdit: false,
+          sorter: true,
-        // 表单数据
+        },
-        form: {},
+        {
-        loading: false,
+          title: "点号",
-        rules: {}
+          dataIndex: "placeCode",
-
+          sorter: true,
+        },
+        {
+          title: "所属路段",
+          dataIndex: "road",
+          sorter: true,
+        },
+        {
+          title: "所属城区",
+          dataIndex: "area",
+          sorter: true,
+        },
+        {
+          title: "路长",
+          dataIndex: "roadLength",
+          sorter: true,
+        },
+        {
+          title: "路宽",
+          dataIndex: "roadWidth",
+          sorter: true,
+        },
+        {
+          title: "中小型车流量（辆/20分钟）",
+          dataIndex: "smallTrafficFlow",
+          sorter: true,
+        },
+        {
+          title: "大型车流量（辆/20分钟）",
+          dataIndex: "largeTrafficFlow",
+          sorter: true,
+        },
+        {
+          title: "时段",
+          dataIndex: "timeSlot",
+          sorter: true,
+        },
+        //   {
+        //     title: '月',
+        //     dataIndex: 'monitorMonth',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '日',
+        //     dataIndex: 'monitorDay',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '时',
+        //     dataIndex: 'monitorHour',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '分',
+        //     dataIndex: 'monitorMinute',
+        //     sorter: true
+        //   },
+        {
+          title: "LeqdB(A)",
+          dataIndex: "indexLeq",
+          sorter: true,
+        },
+        {
+          title: "SDdB(A)",
+          dataIndex: "indexSd",
+          sorter: true,
+        },
+        {
+          title: "L10dB(A)",
+          dataIndex: "indexL10",
+          sorter: true,
+        },
+        {
+          title: "L50dB(A)",
+          dataIndex: "indexL50",
+          sorter: true,
+        },
+        {
+          title: "L90dB(A)",
+          dataIndex: "indexL90",
+          sorter: true,
+        },
+        {
+          title: "LmindB(A)",
+          dataIndex: "indexLmin",
+          sorter: true,
+        },
+        {
+          title: "LmaxdB(A)",
+          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,
+        },
+        {
+          title: "监测仪器型号",
+          dataIndex: "monitorInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "监测仪器编号",
+          dataIndex: "monitorInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "监测前校准值",
+          dataIndex: "beforeMonitorValue",
+          sorter: true,
+        },
+        {
+          title: "声校准器测量声压值",
+          dataIndex: "soundPressureValue",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器型号",
+          dataIndex: "soundInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器编号",
+          dataIndex: "soundInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "创建人",
+          dataIndex: "username",
+          sorter: true,
+        },
+      ],
+      palceOptions: [],
+      areaOptions: [],
+      roadOptions: [],
+      // 表格搜索条件
+      where: {
+        checked: 1,
+      },
+      // 表格选中数据
+      selectionList: [],
+    };
+  },
+  mounted() {
+    this.loadOptionData();
+  },
+  methods: {
+    /**获取下来框数据 */
+    loadOptionData() {
+      getColumnOptions("place").then((res) => {
+        this.palceOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("area").then((res) => {
+        this.areaOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("road").then((res) => {
+        this.roadOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+    },
+    /* 刷新表格 */
+    reload() {
+      console.log(this.$route);
+      console.log(this.$router);
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        checked: 1,
       };
+      this.reload();
     },
-    mounted(){
+    exportFile() {
-    
+      const columns = [
-    },
+        {
-    methods: {
+          title: "监测年度",
-      /* 刷新表格 */
+          dataIndex: "monitorYear",
-      reload() {
+          sorter: true,
-        console.log(this.$route);
+        },
-        console.log(this.$router);
+        {
-        this.$refs.table.reload({
+          title: "点位编码",
-          where: this.where
+          dataIndex: "placeCode",
-        });
+          sorter: true,
-      },
+        },
-      /* 重置搜索 */
+        {
-      reset() {
+          title: "测点名称",
-        this.where = {
+          dataIndex: "place",
-           checked: 1
+          sorter: true,
-        };
+        },
-        this.reload();
+        {
-      },
+          title: "测点经度",
-      /* 显示编辑 */
+          dataIndex: "placeLng",
-      openEdit(record) {
+          sorter: true,
-        const cloneRecord = _.cloneDeep(record)
+        },
-        if (record && cloneRecord.monitorTime) {
+        {
-          console.log(moment(cloneRecord.monitorTime).format('YYYY MM DD'));
+          title: "测点纬度",
-          cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
+          dataIndex: "placeLat",
-          cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
+          sorter: true,
-        }
+        },
-        // cloneRecord.mi
+        {
-        this.form = Object.assign({}, cloneRecord);
+          title: "路段名称",
-        this.showEdit = true;
+          dataIndex: "road",
-        this.$nextTick(() => {
+          sorter: true,
-          this.$refs.form.clearValidate(); // 清除表单验证信息
+        },
-        });
+         {
-      },
+          title: "路段长度（m）",
-    
+          dataIndex: "roadLength",
-      save() {
+          sorter: true,
-        const hide = this.$message.loading('请求中..', 0);
+        },
-        const form = _.cloneDeep(this.form);
+        {
-        const date = new Date();
+          title: "道路总宽度（m）",
-        date.setFullYear(form.monitorDate.year());
+          dataIndex: "roadWidth",
-        date.setMonth(form.monitorDate.month());
+          sorter: true,
-        date.setDate(form.monitorDate.date());
+        },
-        date.setHours(form.monitorTime.hour());
+         {
-        date.setMinutes(form.monitorTime.minutes());
+          title: "机动车车道数",
-        form.monitorTime = date.getTime();
+          dataIndex: "motorway",
-        form.monitorYear = date.getFullYear();
+          sorter: true,
-        form.monitorMonth = date.getMonth() + 1;
+        },
-        form.monitorDay = date.getDate();
+        {
-        form.monitorHour = date.getHours();
+          title: "车道类别",
-        form.monitorMinute = date.getMinutes();
+          dataIndex: "motorwayType",
-        delete form['monitorDate']
+          sorter: true,
-        if (form.roadNoiseId) {
+        },
-          updateRoadNoise(form).then(res => {
+        {
-            if (res.data.code == 0) {
+          title: "道路等级",
-            this.showEdit = false;
+          dataIndex: "motorwayLevel",
-              this.$message.success(res.data.msg);
+          sorter: true,
-              this.reload();
+        },
-            } else {
+        {
-              this.$message.error(res.data.msg);
+          title: "测点参照物",
-            }
+          dataIndex: "refObj",
-          }).catch((error)=>{
+          sorter: true,
-              this.$message.error(error.message);
+        },
-          }).finally(()=>{
+        {
-              console.log("finallyfinallyfinallyfinally");
+          title: "月",
-              hide();
+          dataIndex: "monitorMonth",
-          })
+          sorter: true,
-        }else{
+        },
-            form.roadNoiseBillId = this.roadNoiseBillId;
+        {
-             saveRoadNoise(form).then(res => {
+          title: "日",
-            if (res.data.code == 0) {
+          dataIndex: "monitorDay",
-                this.showEdit = false;
+          sorter: true,
-              this.$message.success(res.data.msg);
+        },
-              this.reload();
+        {
-            } else {
+          title: "时",
-              this.$message.error(res.data.msg);
+          dataIndex: "monitorHour",
-            }
+          sorter: true,
-          }).catch((error)=>{
+        },
-              this.$message.error(error.message);
+        {
-          }).finally(()=>{
+          title: "分",
-              hide();
+          dataIndex: "monitorMinute",
-          })
+          sorter: true,
-        }
+        },
        
-
+       
-      },
+        {
-      /* 删除单个 */
+          title: "中小型车20min车流量",
-      remove(row) {
+          dataIndex: "smallTrafficFlow",
-        const hide = this.$message.loading('请求中..', 0);
+          sorter: true,
-        removeRoadNoise(row.roadNoiseId).then(res => {
+        },
-          if (res.data.code === 0) {
+        {
-            this.$message.success(res.data.msg);
+          title: "大型车20min车流量",
-            this.reload();
+          dataIndex: "largeTrafficFlow",
-          } else {
+          sorter: true,
-            this.$message.error(res.data.msg);
+        },
-          }
+        {
-        }).catch(e => {
+          title: "Leq",
-          this.$message.error(e.msg);
+          dataIndex: "indexLeq",
-        }).finally(() => hide());
+          sorter: true,
-      },
+        },
-      removeBatch() {
+        
-        const ids = this.selectionList.map(item => item.roadNoiseId);
+        {
-        const hide = this.$message.loading('请求中..', 0);
+          title: "L10",
-        removeBatchRoadNoise(ids).then(res => {
+          dataIndex: "indexL10",
-          if (res.data.code === 0) {
+          sorter: true,
-            this.$message.success(res.data.msg);
+        },
-            this.reload();
+        {
-          } else {
+          title: "L50",
-            this.$message.error(res.data.msg);
+          dataIndex: "indexL50",
-          }
+          sorter: true,
-        }).catch(e => {
+        },
-
+        {
-          this.$message.error(e.msg);
+          title: "L90",
-        }).finally(() => hide());
+          dataIndex: "indexL90",
-      },
+          sorter: true,
-
+        },
-    }
+        {
-  }
+          title: "最大值",
+          dataIndex: "indexLmax",
+          sorter: true,
+        },
+         {
+          title: "最小值",
+          dataIndex: "indexLmin",
+          sorter: true,
+        },
+       {
+          title: "标准差(SD)",
+          dataIndex: "indexSd",
+          sorter: true,
+        },
+        {
+          title: "监测站名",
+          dataIndex: "station",
+          sorter: true,
+        },
+        {
+          title: "监测仪器型号",
+          dataIndex: "monitorInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "监测仪器编号",
+          dataIndex: "monitorInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "监测前校准值",
+          dataIndex: "beforeMonitorValue",
+          sorter: true,
+        },
+        {
+          title: "声校准器测量声压值",
+          dataIndex: "soundPressureValue",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器型号",
+          dataIndex: "soundInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器编号",
+          dataIndex: "soundInstrumentCode",
+          sorter: true,
+        },
+      ];
+      const arr = [];
+      const th = columns.map((item) => item.title);
+      th.unshift("行政区划代码");
+      th.push("备注");
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = columns.map((item) => d[item.dataIndex]);
+        td.unshift("")
+        // td.push("备注")
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-  
 </style>

src/views/sound/road/statistic/compare.vue

@@ -168,7 +168,7 @@ export default {
         groupTimeLength: "monitor_year",
         reportTimeScope: [],
         valueType: ["index_Leq"],
-        timeRange:[]
+        timeRange: [],
       },
       timeRange: [],
       whereRules,
@@ -212,6 +212,8 @@ export default {
           this.$message.error("结束时间必须大于起始时间");
           return;
         }
+        this.where.startYear = this.where.timeRange[0];
+        this.where.endYear = this.where.timeRange[1];
       }
       this.stableDone();
       this.$refs.table.reload({
@@ -230,8 +232,8 @@ export default {
       console.log(d, dstr);
     },
     timeRangePanelChange(val) {
-      val[0]&&(this.where.timeRange[0] = val[0].year());
+      val[0] && (this.where.timeRange[0] = val[0].year());
-      val[1]&&(this.where.timeRange[1] = val[1].year());
+      val[1] && (this.where.timeRange[1] = val[1].year());
       this.timeRange = val;
     },
     // 数据加载完成
@@ -258,190 +260,197 @@ export default {
       }
 
       this.hisYears.forEach((item) => {
-        if (this.where.groupTimeLength == "quarter") {
+        if (
-          columns.push({
+          (!this.where.timeRange[0] ||
-            title: item + "年第一季度Leq",
+          this.where.timeRange[0] <= item) &&
-            dataIndex: item+'1'+"Leq",
+          (!this.where.timeRange[1] ||
-          });
+          this.where.timeRange[1] >= item)
-           columns.push({
+        ) {
-            title: item + "年第二季度Leq",
+          if (this.where.groupTimeLength == "quarter") {
-            dataIndex: item+'2'+"Leq",
-          });
-           columns.push({
-            title: item + "年第三季度Leq",
-             dataIndex: item+'3'+"Leq",
-          });
-           columns.push({
-            title: item + "年第四季度Leq",
-             dataIndex: item+'4'+"Leq",
-          });
-           columns.push({
-            title: item + "年第一季度SD",
-            dataIndex: item+'1'+"Sd",
-          });
-           columns.push({
-            title: item + "年第二季度SD",
-            dataIndex: item+'2'+"Sd",
-          });
-           columns.push({
-            title: item + "年第三季度SD",
-             dataIndex: item+'3'+"Sd",
-          });
-           columns.push({
-            title: item + "年第四季度SD",
-             dataIndex: item+'4'+"Sd",
-          });
-           columns.push({
-            title: item + "年第一季度L10",
-            dataIndex: item+'1'+"L10",
-          });
-           columns.push({
-            title: item + "年第二季度L10",
-            dataIndex: item+'2'+"L10",
-          });
-           columns.push({
-            title: item + "年第三季度L10",
-             dataIndex: item+'3'+"L10",
-          });
-           columns.push({
-            title: item + "年第四季度L10",
-             dataIndex: item+'4'+"L10",
-          });
-           columns.push({
-            title: item + "年第一季度L50",
-            dataIndex: item+'1'+"L50",
-          });
-           columns.push({
-            title: item + "年第二季度L50",
-            dataIndex: item+'2'+"L50",
-          });
-           columns.push({
-            title: item + "年第三季度L50",
-             dataIndex: item+'3'+"L50",
-          });
-           columns.push({
-            title: item + "年第四季度L50",
-             dataIndex: item+'4'+"L50",
-          });
-         columns.push({
-            title: item + "年第一季度L90",
-            dataIndex: item+'1'+"L90",
-          });
-           columns.push({
-            title: item + "年第二季度L90",
-            dataIndex: item+'2'+"L90",
-          });
-           columns.push({
-            title: item + "年第三季度L90",
-             dataIndex: item+'3'+"L90",
-          });
-           columns.push({
-            title: item + "年第四季度L90",
-             dataIndex: item+'4'+"L90",
-          });
-          columns.push({
-            title: item + "年第一季度Lmin",
-            dataIndex: item+'1'+"Lmin",
-          });
-           columns.push({
-            title: item + "年第二季度Lmin",
-            dataIndex: item+'2'+"Lmin",
-          });
-           columns.push({
-            title: item + "年第三季度Lmin",
-             dataIndex: item+'3'+"Lmin",
-          });
-           columns.push({
-            title: item + "年第四季度Lmin",
-             dataIndex: item+'4'+"Lmin",
-          });
-          columns.push({
-            title: item + "年第一季度Lmax",
-            dataIndex: item+'1'+"Lmax",
-          });
-           columns.push({
-            title: item + "年第二季度Lmax",
-            dataIndex: item+'2'+"Lmax",
-          });
-           columns.push({
-            title: item + "年第三季度Lmax",
-             dataIndex: item+'3'+"Lmax",
-          });
-           columns.push({
-            title: item + "年第四季度Lmax",
-             dataIndex: item+'4'+"Lmax",
-          });
-        } else {
-          if (this.where.valueType.includes("index_Leq")) {
             columns.push({
-              title: item + "年Leq",
+              title: item + "年第一季度Leq",
-              dataIndex: item + "Leq",
+              dataIndex: item + "1" + "Leq",
-              customRender: ({ text }) => {
-                const val = text ? Number(text).toFixed(2) : "";
-                return val;
-              },
             });
-          }
-          if (this.where.valueType.includes("index_SD")) {
             columns.push({
-              title: item + "年SD",
+              title: item + "年第二季度Leq",
-              dataIndex: item + "Sd",
+              dataIndex: item + "2" + "Leq",
-              customRender: ({ text }) => {
-                const val = text ? Number(text).toFixed(2) : "";
-                return val;
-              },
             });
-          }
-          if (this.where.valueType.includes("index_L10")) {
             columns.push({
-              title: item + "年L10",
+              title: item + "年第三季度Leq",
-              dataIndex: item + "L10",
+              dataIndex: item + "3" + "Leq",
-              customRender: ({ text }) => {
-                const val = text ? Number(text).toFixed(2) : "";
-                return val;
-              },
             });
-          }
+            columns.push({
+              title: item + "年第四季度Leq",
+              dataIndex: item + "4" + "Leq",
+            });
+            columns.push({
+              title: item + "年第一季度SD",
+              dataIndex: item + "1" + "Sd",
+            });
+            columns.push({
+              title: item + "年第二季度SD",
+              dataIndex: item + "2" + "Sd",
+            });
+            columns.push({
+              title: item + "年第三季度SD",
+              dataIndex: item + "3" + "Sd",
+            });
+            columns.push({
+              title: item + "年第四季度SD",
+              dataIndex: item + "4" + "Sd",
+            });
+            columns.push({
+              title: item + "年第一季度L10",
+              dataIndex: item + "1" + "L10",
+            });
+            columns.push({
+              title: item + "年第二季度L10",
+              dataIndex: item + "2" + "L10",
+            });
+            columns.push({
+              title: item + "年第三季度L10",
+              dataIndex: item + "3" + "L10",
+            });
+            columns.push({
+              title: item + "年第四季度L10",
+              dataIndex: item + "4" + "L10",
+            });
+            columns.push({
+              title: item + "年第一季度L50",
+              dataIndex: item + "1" + "L50",
+            });
+            columns.push({
+              title: item + "年第二季度L50",
+              dataIndex: item + "2" + "L50",
+            });
+            columns.push({
+              title: item + "年第三季度L50",
+              dataIndex: item + "3" + "L50",
+            });
+            columns.push({
+              title: item + "年第四季度L50",
+              dataIndex: item + "4" + "L50",
+            });
+            columns.push({
+              title: item + "年第一季度L90",
+              dataIndex: item + "1" + "L90",
+            });
+            columns.push({
+              title: item + "年第二季度L90",
+              dataIndex: item + "2" + "L90",
+            });
+            columns.push({
+              title: item + "年第三季度L90",
+              dataIndex: item + "3" + "L90",
+            });
+            columns.push({
+              title: item + "年第四季度L90",
+              dataIndex: item + "4" + "L90",
+            });
+            columns.push({
+              title: item + "年第一季度Lmin",
+              dataIndex: item + "1" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第二季度Lmin",
+              dataIndex: item + "2" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第三季度Lmin",
+              dataIndex: item + "3" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第四季度Lmin",
+              dataIndex: item + "4" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第一季度Lmax",
+              dataIndex: item + "1" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第二季度Lmax",
+              dataIndex: item + "2" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第三季度Lmax",
+              dataIndex: item + "3" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第四季度Lmax",
+              dataIndex: item + "4" + "Lmax",
+            });
+          } else {
+            if (this.where.valueType.includes("index_Leq")) {
+              columns.push({
+                title: item + "年Leq",
+                dataIndex: item + "Leq",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_SD")) {
+              columns.push({
+                title: item + "年SD",
+                dataIndex: item + "Sd",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_L10")) {
+              columns.push({
+                title: item + "年L10",
+                dataIndex: item + "L10",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
 
-          if (this.where.valueType.includes("index_L50")) {
+            if (this.where.valueType.includes("index_L50")) {
-            columns.push({
+              columns.push({
-              title: item + "年L50",
+                title: item + "年L50",
-              dataIndex: item + "L50",
+                dataIndex: item + "L50",
-              customRender: ({ text }) => {
+                customRender: ({ text }) => {
-                const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(2) : "";
-                return val;
+                  return val;
-              },
+                },
-            });
+              });
-          }
+            }
-          if (this.where.valueType.includes("index_L90")) {
+            if (this.where.valueType.includes("index_L90")) {
-            columns.push({
+              columns.push({
-              title: item + "年L90",
+                title: item + "年L90",
-              dataIndex: item + "L90",
+                dataIndex: item + "L90",
-              customRender: ({ text }) => {
+                customRender: ({ text }) => {
-                const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(2) : "";
-                return val;
+                  return val;
-              },
+                },
-            });
+              });
-          }
+            }
-          if (this.where.valueType.includes("index_Lmin")) {
+            if (this.where.valueType.includes("index_Lmin")) {
-            columns.push({
+              columns.push({
-              title: item + "年Lmin",
+                title: item + "年Lmin",
-              dataIndex: item + "Lmin",
+                dataIndex: item + "Lmin",
-              customRender: ({ text }) => {
+                customRender: ({ text }) => {
-                const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(2) : "";
-                return val;
+                  return val;
-              },
+                },
-            });
+              });
-          }
+            }
-          if (this.where.valueType.includes("index_Lmax")) {
+            if (this.where.valueType.includes("index_Lmax")) {
-            columns.push({
+              columns.push({
-              title: item + "年Lmax",
+                title: item + "年Lmax",
-              dataIndex: item + "Lmax",
+                dataIndex: item + "Lmax",
-              customRender: ({ text }) => {
+                customRender: ({ text }) => {
-                const val = text ? Number(text).toFixed(2) : "";
+                  const val = text ? Number(text).toFixed(2) : "";
-                return val;
+                  return val;
-              },
+                },
-            });
+              });
+            }
           }
         }
       });

src/views/sound/road/statistic/index.vue

@@ -11,7 +11,7 @@
         <!-- <a-tab-pane key="quarter" tab="季度报告">
          <quarter-statistic></quarter-statistic>
         </a-tab-pane> -->
-        <a-tab-pane key="year-compare" tab="年度报告">
+        <a-tab-pane key="year-compare" tab="同比">
          <compare></compare>
         </a-tab-pane>
       </a-tabs>
@@ -40,7 +40,7 @@
     },
     data() {
       return {
-        activeKey: 'year-compare'
+        activeKey: 'base'
       };
         
     },

src/views/sound/zone/statistic/average.vue

@@ -48,8 +48,8 @@
   import _ from "lodash";
   import XLSX from 'xlsx';
   import {
-    pageRoadNoiseStatisticUrl
+    pageZoneNoiseStatisticUrl
-  } from "@/api/ecology/road-sound"
+  } from "@/api/ecology/zone-sound"
   const columns = [{
       title: '测点',
       dataIndex: 'place',
@@ -57,7 +57,7 @@
     },
     {
       title: '路段',
-      dataIndex: 'road',
+      dataIndex: 'zone',
 
     },
     {
@@ -70,7 +70,7 @@
     },
     {
       title: '路长',
-      dataIndex: 'roadLength',
+      dataIndex: 'zoneLength',
       customRender: ({
         text
       }) => Math.round(text)
@@ -78,7 +78,7 @@
     },
     {
       title: '路宽',
-      dataIndex: 'roadWidth',
+      dataIndex: 'zoneWidth',
       customRender: ({
         text
       }) => Math.round(text)
@@ -315,13 +315,13 @@
 
   ]
   export default {
-    name: 'StatisticSoundRoad',
+    name: 'StatisticSoundZoneAverage',
     components: {
 
     },
     data() {
       return {
-        url: pageRoadNoiseStatisticUrl,
+        url: pageZoneNoiseStatisticUrl,
         data: [],
         where: {
           model: "place"
@@ -332,7 +332,7 @@
           value: "place",
           label: "测点",
         }, {
-          value: "road",
+          value: "zone",
           label: "路段",
         }, {
           value: "area",
@@ -365,15 +365,15 @@
         let cloneColumns = _.cloneDeep(columns);
         if (this.where.model == "area") {
           this.columns = cloneColumns.filter(item => {
-            return item.dataIndex != "place" && item.dataIndex != "road";
+            return item.dataIndex != "place" && item.dataIndex != "zone";
           })
-        } else if (this.where.model == "road") {
+        } else if (this.where.model == "zone") {
           this.columns = cloneColumns.filter(item => {
             return item.dataIndex != "place"
           })
         }else if(this.where.model == "city"){
         this.columns = cloneColumns.filter(item => {
-            return item.dataIndex != "place" && item.dataIndex != "road"  && item.dataIndex != "area";
+            return item.dataIndex != "place" && item.dataIndex != "zone"  && item.dataIndex != "area";
           })
         }
       },
@@ -392,7 +392,7 @@
           ['测点', '路段', '城区', '路长', '路宽', '平均Leq', '平均SD']
         ];
         this.data.forEach(d => {
-          array.push([d.place, d.road, d.area, d.roadLength, d.roadWidth, d.avgLeq, d.avgSD]);
+          array.push([d.place, d.zone, d.area, d.zoneLength, d.zoneWidth, d.avgLeq, d.avgSD]);
         });
         let sheet = XLSX.utils.aoa_to_sheet(array);
         // sheet['!merges'] = [

src/views/sound/zone/statistic/base.vue

@@ -12,7 +12,7 @@
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item label="路段:">
-              <a-input v-model:value.trim="where.road" placeholder="请输入路段名称" allow-clear />
+              <a-input v-model:value.trim="where.zone" placeholder="请输入路段名称" allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -30,89 +30,107 @@
           </a-col>
         </a-row>
       </a-form>
-      <a-modal v-model:visible="showEdit" :title="form.roadPlaceId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
+      <a-modal v-model:visible="showEdit" :title="form.zoneNoiseId!==undefined?'修改用户':'添加用户'" :confirm-loading="loading"
         :width="1000" :body-style="{paddingBottom: '8px'}" @ok="save">
         <a-form ref="form" :model="form" :rules="rules" :label-col="{md: {span: 6}, sm: {span: 24}}"
           :wrapper-col="{md: {span: 18}, sm: {span: 24}}">
           <a-row>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="日期" name="monitorDate">
+                <a-date-picker v-model:value="form.monitorDate" :locale="locale" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="时间" name="monitorTime">
+                <a-time-picker v-model:value="form.monitorTime" format="HH:mm" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="时段" name="timeSlot">
+                <a-select v-model:value="form.timeSlot">
+                  <a-select-option value="昼">昼</a-select-option>
+                  <a-select-option value="夜">夜</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+
             <a-col :md="12" :sm="24">
               <a-form-item label="测点名称" name="place">
                 <a-input v-model:value="form.place" placeholder="请输入测点名称" allow-clear />
               </a-form-item>
             </a-col>
-             <a-col :md="12" :sm="24">
+            <a-col :md="12" :sm="24">
-              <a-form-item label="道路等级" name="motorwayLevel">
+              <a-form-item label="点号" name="placeCode">
-                <a-input v-model:value="form.motorwayLevel" placeholder="请输入道路等级" allow-clear />
+                <a-input v-model:value="form.placeCode" placeholder="请输入点号" allow-clear />
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="12" :sm="24">
+              <a-form-item label="所属路段" name="zone">
+                <a-input v-model:value="form.zone" placeholder="请输入测点名称" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="车道类别" name="motorwayType">
+              <a-form-item label="所属城区" name="area">
-                <a-input v-model:value="form.motorwayType" placeholder="请输入车道类别" allow-clear />
+                <a-input v-model:value="form.area" placeholder="请输入点号" allow-clear />
+              </a-form-item>
+            </a-col>
+
+            <a-col :md="12" :sm="24">
+              <a-form-item label="路长" name="zoneLength">
+                <a-input v-model:value="form.zoneLength" placeholder="请输入路长（米）" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="机动车车道数" name="motorway">
+              <a-form-item label="总路宽" name="zoneWidth">
-                <a-input v-model:value="form.motorway" placeholder="请输入机动车车道数" allow-clear />
+                <a-input v-model:value="form.zoneWidth" placeholder="请输入总路宽（米）" allow-clear />
-              </a-form-item>
-            </a-col>
-             <a-col :md="12" :sm="24">
-              <a-form-item label="测点参照物" name="refObj">
-                <a-input v-model:value="form.refObj" placeholder="请输入测点测点参照物" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="测点经度" name="placeLng">
+              <a-form-item label="中小型车流量" name="smallTrafficFlow">
-                <a-input type="number" v-model:value="form.placeLng" placeholder="请输入测点经度" allow-clear />
+                <a-input type="number" v-model:value="form.smallTrafficFlow" placeholder="请输入中小型车流量（辆/20分钟）"
+                  allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="测点纬度" name="placeLat">
+              <a-form-item label="大型车流量" name="largeTrafficFlow">
-                <a-input type="number" v-model:value="form.placeLat" placeholder="请输入测点纬度" allow-clear />
+                <a-input type="number" v-model:value="form.largeTrafficFlow" placeholder="请输入大型车流量（辆/20分钟）"
+                  allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="道路覆盖人口" name="people">
+              <a-form-item label="LeqdB(A)" name="indexLeq">
-                <a-input type="number" v-model:value="form.people" placeholder="请输入道路覆盖人口（万人）" allow-clear />
+                <a-input type="number" v-model:value="form.indexLeq" placeholder="请输入LeqdB(A)" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="监测站名" name="station">
+              <a-form-item label="SDdB(A)" name="indexSd">
-                <a-input v-model:value="form.station" placeholder="请输入监测站名" allow-clear />
+                <a-input type="number" v-model:value="form.indexSd" placeholder="请输入大SDdB(A)" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="监测仪器型号" name="monitorInstrumentModel">
+              <a-form-item label="L10dB(A)" name="indexL10">
-                <a-input v-model:value="form.monitorInstrumentModel" placeholder="请输入监测仪器型号" allow-clear />
+                <a-input type="number" v-model:value="form.indexL10" placeholder="请输入L10dB(A)" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="监测仪器编号" name="monitorInstrumentCode">
+              <a-form-item label="L50dB(A)" name="indexL50">
-                <a-input v-model:value="form.monitorInstrumentCode" placeholder="请输入监测仪器编号" allow-clear />
+                <a-input type="number" v-model:value="form.indexL50" placeholder="请输入L50dB(A)" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="监测前校准值" name="beforeMonitorValue">
+              <a-form-item label="L90dB(A)" name="indexL90">
-                <a-input v-model:value="form.beforeMonitorValue" placeholder="请输入监测前校准值" allow-clear />
+                <a-input type="number" v-model:value="form.indexL90" placeholder="请输入L90dB(A)" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="监测后校准值" name="afterMonitorValue">
+              <a-form-item label="LmindB(A)" name="indexLmin">
-                <a-input v-model:value="form.afterMonitorValue" placeholder="请输入监测后校准值" allow-clear />
+                <a-input type="number" v-model:value="form.indexLmin" placeholder="请输入LmindB(A)" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :md="12" :sm="24">
-              <a-form-item label="声校准器测量声压值" name="soundPressureValue">
+              <a-form-item label="LmaxdB(A)" name="indexLmax">
-                <a-input v-model:value="form.soundPressureValue" placeholder="请输入声校准器测量声压值" allow-clear />
+                <a-input type="number" v-model:value="form.indexLmax" placeholder="请输入LmaxdB(A)" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准仪器型号" name="soundInstrumentModel">
-                <a-input v-model:value="form.soundInstrumentModel" placeholder="请输入声校准仪器型号" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准仪器编号" name="soundInstrumentCode">
-                <a-input v-model:value="form.soundInstrumentCode" placeholder="请输入声校准仪器编号" allow-clear />
               </a-form-item>
             </a-col>
           </a-row>
@@ -121,25 +139,8 @@
 
       </a-modal>
       <!-- 表格 -->
-      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadPlaceId" :datasource="url"
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="zoneNoiseId" :datasource="url"
         :columns="columns" :where="where" :scroll="{x: 'max-content'}">
-        <template v-if="bill.checked !=  1" #toolbar>
-          <a-space>
-            <a-button @click="openEdit" type="primary">新增</a-button>
-            <a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`"
-              ok-text="Yes" cancel-text="No" @confirm="removeBatch">
-              <a-button :disabled="selectionList.length == 0" type="primary" ghost danger>删除</a-button>
-            </a-popconfirm>
-          </a-space>
-        </template>
-        <template #action="{ record }">
-          <a-space>
-            <a-button @click="openEdit(record)" type="primary" shape="round" size="small">修改</a-button>
-            <a-popconfirm :title="`确认删除这条数据吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
-              <a-button type="primary" danger shape="round" size="small">删除</a-button>
-            </a-popconfirm>
-          </a-space>
-        </template>
       </ele-pro-table>
     </a-card>
   </div>
@@ -149,126 +150,142 @@
 <script>
   import _ from "lodash"
   import {
-    pageRoadPlaceUrl,
+    pageZoneNoiseUrl,
-    saveRoadPlace,
+    saveZoneNoise,
-    removeRoadPlace,
+    removeZoneNoise,
-    removeBatchRoadPlace,
+    removeBatchZoneNoise,
-    updateRoadPlace,
+    updateZoneNoise,
-    getRoadPlaceBill
+  } from "@/api/ecology/zone-sound";
-  } from "@/api/ecology/road-place";
   import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
+  import moment from 'moment';
   //   import utils from "./utils";
   export default {
-    name: 'RoadCollectPlace',
+    name: 'StatisticSoundZoneBase',
     components: {},
     data() {
-      const {
+    
-        billId
-      } = this.$route.params
       return {
         locale,
         bill:{},
         // 表格数据接口
-        url: pageRoadPlaceUrl,
+        url: pageZoneNoiseUrl,
         selection: [],
         // 表格列配置
         columns: [
-      
+          {
+            title: '监测日期',
+            dataIndex: 'monitorTime',
+            sorter: true
+          },
           {
             title: '测点名称',
             dataIndex: 'place',
             sorter: true
           },
           {
-            title: '测点经度',
+            title: '点号',
-            dataIndex: 'placeLng',
+            dataIndex: 'placeCode',
             sorter: true
           },
           {
-            title: '测点纬度',
+            title: '所属路段',
-            dataIndex: 'placeLat',
+            dataIndex: 'zone',
-            sorter: true
-          },
-           {
-            title: '机动车车道数',
-            dataIndex: 'motorway',
             sorter: true
           },
           {
-            title: '车道类别',
+            title: '所属城区',
-            dataIndex: 'motorwayType',
+            dataIndex: 'area',
-            sorter: true
-          },
-           {
-            title: '道路等级',
-            dataIndex: 'motorwayLevel',
             sorter: true
           },
           {
-            title: '测点参照物',
+            title: '路长',
-            dataIndex: 'refObj',
+            dataIndex: 'zoneLength',
+            sorter: true
+          },
+          {
+            title: '路宽',
+            dataIndex: 'zoneWidth',
+            sorter: true
+          },
+          {
+            title: '中小型车流量（辆/20分钟）',
+            dataIndex: 'smallTrafficFlow',
+            sorter: true
+          },
+          {
+            title: '大型车流量（辆/20分钟）',
+            dataIndex: 'largeTrafficFlow',
+            sorter: true
+          },
+          {
+            title: '时段',
+            dataIndex: 'timeSlot',
+            sorter: true
+          },
+          //   {
+          //     title: '月',
+          //     dataIndex: 'monitorMonth',
+          //     sorter: true
+          //   },
+          //   {
+          //     title: '日',
+          //     dataIndex: 'monitorDay',
+          //     sorter: true
+          //   },
+          //   {
+          //     title: '时',
+          //     dataIndex: 'monitorHour',
+          //     sorter: true
+          //   },
+          //   {
+          //     title: '分',
+          //     dataIndex: 'monitorMinute',
+          //     sorter: true
+          //   },
+          {
+            title: 'LeqdB(A)',
+            dataIndex: 'indexLeq',
+            sorter: true
+          },
+          {
+            title: 'SDdB(A)',
+            dataIndex: 'indexSd',
+            sorter: true
+          },
+          {
+            title: 'L10dB(A)',
+            dataIndex: 'indexL10',
+            sorter: true
+          },
+          {
+            title: 'L50dB(A)',
+            dataIndex: 'indexL50',
+            sorter: true
+          },
+          {
+            title: 'L90dB(A)',
+            dataIndex: 'indexL90',
+            sorter: true
+          },
+          {
+            title: 'LmindB(A)',
+            dataIndex: 'indexLmin',
+            sorter: true
+          },
+          {
+            title: 'LmaxdB(A)',
+            dataIndex: 'indexLmax',
             sorter: true
           },
            {
-            title: '道路覆盖人口（万人）',
-            dataIndex: 'people',
-            sorter: true
-          },
-           {
-            title: '监测站名',
-            dataIndex: 'station',
-            sorter: true
-          },
-           {
-            title: '监测仪器型号',
-            dataIndex: 'monitorInstrumentModel',
-            sorter: true
-          },
-           {
-            title: '监测仪器编号',
-            dataIndex: 'monitorInstrumentCode',
-            sorter: true
-          },
-           {
-            title: '监测前校准值',
-            dataIndex: 'beforeMonitorValue',
-            sorter: true
-          },
-           {
-            title: '声校准器测量声压值',
-            dataIndex: 'soundPressureValue',
-            sorter: true
-          },
-           {
-            title: '声校准仪器型号',
-            dataIndex: 'soundInstrumentModel',
-            sorter: true
-          },
-           {
-            title: '声校准仪器编号',
-            dataIndex: 'soundInstrumentCode',
-            sorter: true
-          },
-            {
             title: '创建人',
             dataIndex: 'username',
             sorter: true
           },
-          {
-            title: '操作',
-            key: 'action',
-            width: 150,
-            align: 'center',
-            fixed: 'right',
-            slots: {
-              customRender: 'action'
-            }
-          }
         ],
         // 表格搜索条件
-        roadPlaceBillId: billId,
         where: {
-          roadPlaceBillId: billId
+          checked: 1
         },
         // 表格选中数据
         selectionList: [],
@@ -283,12 +300,6 @@
     },
     mounted(){
     
-      getRoadPlaceBill(this.roadPlaceBillId).then(res=>{
-        this.bill = res.data.data
-        if(res.data.data.checked == 1){
-          this.columns.splice(this.columns.length-1,1)
-        }
-      })
     },
     methods: {
       /* 刷新表格 */
@@ -302,13 +313,18 @@
       /* 重置搜索 */
       reset() {
         this.where = {
-          roadPlaceBillId: this.roadPlaceBillId
+           checked: 1
         };
         this.reload();
       },
       /* 显示编辑 */
       openEdit(record) {
         const cloneRecord = _.cloneDeep(record)
+        if (record && cloneRecord.monitorTime) {
+          console.log(moment(cloneRecord.monitorTime).format('YYYY MM DD'));
+          cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
+          cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
+        }
         // cloneRecord.mi
         this.form = Object.assign({}, cloneRecord);
         this.showEdit = true;
@@ -320,9 +336,21 @@
       save() {
         const hide = this.$message.loading('请求中..', 0);
         const form = _.cloneDeep(this.form);
+        const date = new Date();
+        date.setFullYear(form.monitorDate.year());
+        date.setMonth(form.monitorDate.month());
+        date.setDate(form.monitorDate.date());
+        date.setHours(form.monitorTime.hour());
+        date.setMinutes(form.monitorTime.minutes());
+        form.monitorTime = date.getTime();
+        form.monitorYear = date.getFullYear();
+        form.monitorMonth = date.getMonth() + 1;
+        form.monitorDay = date.getDate();
+        form.monitorHour = date.getHours();
+        form.monitorMinute = date.getMinutes();
         delete form['monitorDate']
-        if (form.roadPlaceId) {
+        if (form.zoneNoiseId) {
-          updateRoadPlace(form).then(res => {
+          updateZoneNoise(form).then(res => {
             if (res.data.code == 0) {
             this.showEdit = false;
               this.$message.success(res.data.msg);
@@ -337,8 +365,8 @@
               hide();
           })
         }else{
-            form.roadPlaceBillId = this.roadPlaceBillId;
+            form.zoneNoiseBillId = this.zoneNoiseBillId;
-             saveRoadPlace(form).then(res => {
+             saveZoneNoise(form).then(res => {
             if (res.data.code == 0) {
                 this.showEdit = false;
               this.$message.success(res.data.msg);
@@ -358,8 +386,7 @@
       /* 删除单个 */
       remove(row) {
         const hide = this.$message.loading('请求中..', 0);
-        console.log(row);
+        removeZoneNoise(row.zoneNoiseId).then(res => {
-        removeRoadPlace(row.roadPlaceId).then(res => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();
@@ -371,9 +398,9 @@
         }).finally(() => hide());
       },
       removeBatch() {
-        const ids = this.selectionList.map(item => item.roadPlaceId);
+        const ids = this.selectionList.map(item => item.zoneNoiseId);
         const hide = this.$message.loading('请求中..', 0);
-        removeBatchRoadPlace(ids).then(res => {
+        removeBatchZoneNoise(ids).then(res => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();

src/views/sound/zone/statistic/compare.vue

@@ -0,0 +1,476 @@
+<template>
+  <div class="">
+    <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
+      <a-row>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="统计模块:">
+            <a-select
+              :options="groupModelOptions"
+              v-model:value="where.groupModel"
+              placeholder="统计模块"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="时间细度:">
+            <a-select
+              :options="groupTimeLengthOptions"
+              v-model:value="where.groupTimeLength"
+              placeholder=""
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item name="timeRange" label="时间范围:">
+            <a-range-picker
+              @panelChange="timeRangePanelChange"
+              v-model:value="timeRange"
+              format="YYYY"
+              :mode="['year', 'year']"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="昼夜:">
+            <a-select
+              :options="timeSlotOptions"
+              v-model:value="where.timeSlot"
+              placeholder="昼夜"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+
+        <a-col :lg="12" :md="12" :sm="24" :xs="24">
+          <a-form-item label="类型:">
+            <a-select
+              v-model:value="where.valueType"
+              :options="valueTypeOptions"
+              mode="multiple"
+              placeholder="至少选择一项"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
+              <a-form-item label="时间范围:">
+                <a-range-picker @change="reportTimeScopeChange" :mode="['year','year']" separator="~" v-model:value="where.reportTimeScope" ><a-range-picker>
+                   <template #renderExtraFooter>
+                      extra footer
+                    </template>
+                </a-range-picker>
+              </a-form-item>
+            </a-col> -->
+
+        <a-col :lg="12" :md="12" :sm="24" :xs="24">
+          <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+            <a-space>
+              <a-button type="primary" @click="reload">查询</a-button>
+              <a-button @click="reset">重置</a-button>
+              <a-button @click="exportFile">导出Excel</a-button>
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+    <ele-pro-table
+      v-if="hisYears.length > 0"
+      ref="table"
+      row-key="id"
+      :datasource="url"
+      :columns="columns"
+      :where="where"
+      :needPage="false"
+      :initLoad="false"
+      :scroll="{ x: 'max-content' }"
+      :method="'POST'"
+      @done="(d) => (data = d.data)"
+    >
+      <template #toolbar>
+        <!-- 搜索表单 -->
+
+        <!-- <a-space>
+            
+        </a-space> -->
+      </template>
+    </ele-pro-table>
+  </div>
+</template>
+
+<script>
+// import _ from "lodash";
+import { ref } from "vue";
+import XLSX from "xlsx";
+import {
+  pageZoneNoiseCompare,
+  getHistoryyears,
+} from "@/api/ecology/zone-sound";
+export default {
+  name: "StatisticSoundZoneCompare",
+  components: {},
+  data() {
+    const groupModelOptions = [
+      { label: "测点", value: "place" },
+      { label: "城区", value: "area" },
+      { label: "市", value: "city" },
+    ];
+    const groupTimeLengthOptions = [
+      {
+        label: "年",
+        value: "monitor_year",
+      },
+      {
+        label: "季度",
+        value: "quarter",
+      },
+    ];
+
+    // const valueTypeOptions = ['Leq','SD','L10','L50','L90','Lmin','Lmax'];
+    const valueTypeOptions = [
+      {
+        label: "Leq",
+        value: "index_Leq",
+      },
+      {
+        label: "SD",
+        value: "index_SD",
+      },
+      {
+        label: "L10",
+        value: "index_L10",
+      },
+      {
+        label: "L50",
+        value: "index_L50",
+      },
+      {
+        label: "L90",
+        value: "index_L90",
+      },
+      {
+        label: "Lmin",
+        value: "index_Lmin",
+      },
+      {
+        label: "Lmax",
+        value: "index_Lmax",
+      },
+    ];
+
+    const whereRules = {};
+    return {
+      url: pageZoneNoiseCompare,
+      data: [],
+      where: {
+        groupModel: "area",
+        groupTimeLength: "monitor_year",
+        reportTimeScope: [],
+        valueType: ["index_Leq"],
+        timeRange: [],
+      },
+      timeRange: [],
+      whereRules,
+      hisYears: [],
+      timeScope: [],
+      columns: [{ title: "年", dataIndex: "year" }],
+      groupModelOptions,
+      groupTimeLengthOptions,
+      valueTypeOptions: ref(valueTypeOptions),
+      timeSlotOptions: [
+        {
+          value: "昼",
+          label: "昼",
+        },
+        {
+          value: "夜",
+          label: "夜",
+        },
+      ],
+    };
+  },
+  mounted() {
+    getHistoryyears().then((res) => {
+      this.hisYears = res.data.data;
+      this.$nextTick(() => {
+        this.reload();
+      });
+    });
+  },
+  methods: {
+    /* 刷新表格 */
+    reload() {
+      if (this.where.valueType.length == 0) {
+        this.$message.error("请至少选择一个类型");
+        return;
+      }
+
+      // 结束时间必须大于开始时间
+      if (this.where.timeRange && this.where.timeRange.length == 2) {
+        if (this.where.timeRange[0] > this.where.timeRange[1]) {
+          this.$message.error("结束时间必须大于起始时间");
+          return;
+        }
+        this.where.startYear = this.where.timeRange[0];
+        this.where.endYear = this.where.timeRange[1];
+      }
+      this.stableDone();
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        model: "place",
+      };
+      this.this.timeScope = [];
+      this.reload();
+    },
+    reportTimeScopeChange(d, dstr) {
+      console.log(d, dstr);
+    },
+    timeRangePanelChange(val) {
+      val[0] && (this.where.timeRange[0] = val[0].year());
+      val[1] && (this.where.timeRange[1] = val[1].year());
+      this.timeRange = val;
+    },
+    // 数据加载完成
+    stableDone() {
+      const columns = [];
+      if (this.where.groupModel == "area") {
+        columns.push({
+          title: "城区",
+          dataIndex: "area",
+          sorter: true,
+        });
+      } else if (this.where.groupModel == "place") {
+        columns.push({
+          title: "测点",
+          dataIndex: "area",
+          sorter: true,
+        });
+      } else if (this.where.groupModel == "city") {
+        columns.push({
+          title: "城市",
+          dataIndex: "area",
+          sorter: true,
+        });
+      }
+
+      this.hisYears.forEach((item) => {
+        if (
+          (!this.where.timeRange[0] ||
+          this.where.timeRange[0] <= item) &&
+          (!this.where.timeRange[1] ||
+          this.where.timeRange[1] >= item)
+        ) {
+          if (this.where.groupTimeLength == "quarter") {
+            columns.push({
+              title: item + "年第一季度Leq",
+              dataIndex: item + "1" + "Leq",
+            });
+            columns.push({
+              title: item + "年第二季度Leq",
+              dataIndex: item + "2" + "Leq",
+            });
+            columns.push({
+              title: item + "年第三季度Leq",
+              dataIndex: item + "3" + "Leq",
+            });
+            columns.push({
+              title: item + "年第四季度Leq",
+              dataIndex: item + "4" + "Leq",
+            });
+            columns.push({
+              title: item + "年第一季度SD",
+              dataIndex: item + "1" + "Sd",
+            });
+            columns.push({
+              title: item + "年第二季度SD",
+              dataIndex: item + "2" + "Sd",
+            });
+            columns.push({
+              title: item + "年第三季度SD",
+              dataIndex: item + "3" + "Sd",
+            });
+            columns.push({
+              title: item + "年第四季度SD",
+              dataIndex: item + "4" + "Sd",
+            });
+            columns.push({
+              title: item + "年第一季度L10",
+              dataIndex: item + "1" + "L10",
+            });
+            columns.push({
+              title: item + "年第二季度L10",
+              dataIndex: item + "2" + "L10",
+            });
+            columns.push({
+              title: item + "年第三季度L10",
+              dataIndex: item + "3" + "L10",
+            });
+            columns.push({
+              title: item + "年第四季度L10",
+              dataIndex: item + "4" + "L10",
+            });
+            columns.push({
+              title: item + "年第一季度L50",
+              dataIndex: item + "1" + "L50",
+            });
+            columns.push({
+              title: item + "年第二季度L50",
+              dataIndex: item + "2" + "L50",
+            });
+            columns.push({
+              title: item + "年第三季度L50",
+              dataIndex: item + "3" + "L50",
+            });
+            columns.push({
+              title: item + "年第四季度L50",
+              dataIndex: item + "4" + "L50",
+            });
+            columns.push({
+              title: item + "年第一季度L90",
+              dataIndex: item + "1" + "L90",
+            });
+            columns.push({
+              title: item + "年第二季度L90",
+              dataIndex: item + "2" + "L90",
+            });
+            columns.push({
+              title: item + "年第三季度L90",
+              dataIndex: item + "3" + "L90",
+            });
+            columns.push({
+              title: item + "年第四季度L90",
+              dataIndex: item + "4" + "L90",
+            });
+            columns.push({
+              title: item + "年第一季度Lmin",
+              dataIndex: item + "1" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第二季度Lmin",
+              dataIndex: item + "2" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第三季度Lmin",
+              dataIndex: item + "3" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第四季度Lmin",
+              dataIndex: item + "4" + "Lmin",
+            });
+            columns.push({
+              title: item + "年第一季度Lmax",
+              dataIndex: item + "1" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第二季度Lmax",
+              dataIndex: item + "2" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第三季度Lmax",
+              dataIndex: item + "3" + "Lmax",
+            });
+            columns.push({
+              title: item + "年第四季度Lmax",
+              dataIndex: item + "4" + "Lmax",
+            });
+          } else {
+            if (this.where.valueType.includes("index_Leq")) {
+              columns.push({
+                title: item + "年Leq",
+                dataIndex: item + "Leq",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_SD")) {
+              columns.push({
+                title: item + "年SD",
+                dataIndex: item + "Sd",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_L10")) {
+              columns.push({
+                title: item + "年L10",
+                dataIndex: item + "L10",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+
+            if (this.where.valueType.includes("index_L50")) {
+              columns.push({
+                title: item + "年L50",
+                dataIndex: item + "L50",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_L90")) {
+              columns.push({
+                title: item + "年L90",
+                dataIndex: item + "L90",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_Lmin")) {
+              columns.push({
+                title: item + "年Lmin",
+                dataIndex: item + "Lmin",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_Lmax")) {
+              columns.push({
+                title: item + "年Lmax",
+                dataIndex: item + "Lmax",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(2) : "";
+                  return val;
+                },
+              });
+            }
+          }
+        }
+      });
+      //
+      this.columns = columns;
+    },
+    exportFile() {
+      const arr = [];
+      const th = this.columns.map((item) => item.title);
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = this.columns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>

src/views/sound/zone/statistic/index.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane key="base" tab="总览">
+          <base-statistic></base-statistic>
+        </a-tab-pane>
+        <a-tab-pane key="average" tab="平均">
+          <average-statistic></average-statistic>
+        </a-tab-pane>
+        <!-- <a-tab-pane key="quarter" tab="季度报告">
+         <quarter-statistic></quarter-statistic>
+        </a-tab-pane> -->
+        <a-tab-pane key="year-compare" tab="同比">
+         <compare></compare>
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  /**
+   * 
+   * 
+   * 
+   */
+  import BaseStatistic from "./base.vue";
+  // import QuarterStatistic from "./quarter.vue";
+  import Compare from "./compare.vue"
+  import AverageStatistic from "./average.vue"
+
+  export default {
+    name: 'StatisticSoundZone',
+    components: {
+      BaseStatistic,
+      // QuarterStatistic,
+      Compare,
+      AverageStatistic
+    },
+    data() {
+      return {
+        activeKey: 'year-compare'
+      };
+        
+    },
+    methods: {
+     
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <div id="map"></div>
+  </div>
+</template>
+
+<script>
+import { Scene } from "@antv/l7";
+import { Mapbox } from "@antv/l7-maps";
+// import axios from "axios";
+// import { GaodeMap } from "@antv/l7-maps";
+import { CityLayer } from "@antv/l7-district";
+export default {
+  mounted() {
+    const scene = new Scene({
+      id: "map",
+      map: new Mapbox({
+        center: [108.33, 22.84],
+        pitch: 0,
+        style: "blank",
+        zoom: 3,
+        minZoom: 3,
+        maxZoom: 10,
+      }),
+    });
+
+    scene.on("loaded", () => {
+      new CityLayer(scene, {
+        // data: res,
+        joinBy: ["adcode", "citycode"],
+        adcode: ["450100", "771"],
+        depth: 3,
+        label: {
+          field: "NAME_CHN",
+          textAllowOverlap: false,
+        },
+
+        popup: {
+          enable: true,
+          Html: (props) => {
+            return `<span>${props.NAME_CHN}:</span><span>${props.citycode}</span>`;
+          },
+        },
+      });
+    });
+  },
+};
+</script>
+
+<style>
+</style>

vue.config.js

@@ -1,5 +1,5 @@
 const CompressionWebpackPlugin = require('compression-webpack-plugin');
-const DynamicAntdLess = require('./dynamicTheme.js');
+// const DynamicAntdLess = require('./dynamicTheme.js');
 
 module.exports = {
   productionSourceMap: false,
@@ -19,7 +19,7 @@ module.exports = {
       less: {
         lessOptions: {
           javascriptEnabled: true,
-          plugins: [new DynamicAntdLess()]
+          // plugins: [new DynamicAntdLess()]
         }
       }
     }