From 4542c10045f7964f18c0613700d250503690c479 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Mon, 9 Aug 2021 18:03:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E7=82=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/road-place.js                 |  36 ++
 src/api/ecology/road-sound.js                 |   6 +-
 src/views/home/index.vue                      |   3 +-
 src/views/sound/road/collect/base.vue         | 363 ++++++++++++++
 src/views/sound/road/collect/index.vue        | 433 +++--------------
 src/views/sound/road/collect/other.vue        | 459 ------------------
 src/views/sound/road/collect/place.vue        | 361 ++++++++++++++
 src/views/sound/road/collect/utils.js         |  27 +-
 .../sound/road/statistic/base copy 2.vue      | 412 ++++++++++++++++
 src/views/sound/road/statistic/base.vue       | 412 ++++++++++++++++
 src/views/sound/road/statistic/index.vue      | 393 +--------------
 src/views/sound/road/statistic/quarter.vue    | 418 ++++++++++++++++
 12 files changed, 2119 insertions(+), 1204 deletions(-)
 create mode 100644 src/views/sound/road/collect/base.vue
 delete mode 100644 src/views/sound/road/collect/other.vue
 create mode 100644 src/views/sound/road/collect/place.vue
 create mode 100644 src/views/sound/road/statistic/base copy 2.vue
 create mode 100644 src/views/sound/road/statistic/base.vue
 create mode 100644 src/views/sound/road/statistic/quarter.vue

diff --git a/src/api/ecology/road-place.js b/src/api/ecology/road-place.js
index e69de29..24ff4e7 100644
--- a/src/api/ecology/road-place.js
+++ b/src/api/ecology/road-place.js
@@ -0,0 +1,36 @@
+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}`)
+}
+export {
+    pageBillUrl,
+    saveRoadPlaceBill,
+    removeRoadPlaceBill,
+    removeBatchRoadPlaceBill,
+    updateRoadPlaceBill,
+    verifyRoadPlaceBill,
+    getRoadPlaceBill
+}
\ No newline at end of file
diff --git a/src/api/ecology/road-sound.js b/src/api/ecology/road-sound.js
index 6473d5a..195a4d5 100644
--- a/src/api/ecology/road-sound.js
+++ b/src/api/ecology/road-sound.js
@@ -49,6 +49,9 @@ const updateRoadNoise = function (data) {
 
 // -------------------------统计---------------------
 const pageRoadNoiseStatisticUrl = '/sound/road/noise/statistic';
+const getHistoryyears = function () {
+    return axios.get("/sound/road/noise/history-year")
+}
 export {
     pageBillUrl,
     saveRoadNoiseBill,
@@ -62,6 +65,7 @@ export {
     removeRoadNoise,
     updateRoadNoise,
     removeBatchRoadNoise,
-    pageRoadNoiseStatisticUrl
+    pageRoadNoiseStatisticUrl,
+    getHistoryyears
   
 }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index d268f81..ba899db 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">这是首页
+    <a-card :bordered="false">
+      这是首页
     </a-card>
   </div>
 </template>
diff --git a/src/views/sound/road/collect/base.vue b/src/views/sound/road/collect/base.vue
new file mode 100644
index 0000000..d9117aa
--- /dev/null
+++ b/src/views/sound/road/collect/base.vue
@@ -0,0 +1,363 @@
+<template>
+  <div>
+            <!-- 表格 -->
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadNoiseBillId" :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.roadNoiseBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.roadNoiseBillId].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.roadNoiseBillId]" class="editable-cell-input-wrapper">
+              <a-date-picker v-model:value="editableData[record.roadNoiseBillId].reportTime"></a-date-picker>
+              <!-- <a-input v-model:value="editableData[record.roadNoiseBillId].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)">
+                <a-button type="primary" 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,
+    // saveRoadNoiseBill,
+    removeRoadNoiseBill,
+    removeBatchRoadNoiseBill,
+    updateRoadNoiseBill,
+    verifyRoadNoiseBill
+  } from "@/api/ecology/road-sound";
+  import moment from "moment";
+  export default {
+    name: 'RoadNoise',
+    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: '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/table/" + record.roadNoiseBillId
+        })
+      },
+      edit(record) {
+        this.editableData[record.roadNoiseBillId] = _.cloneDeep(record);
+        this.editableData[record.roadNoiseBillId].reportTime = moment(this.editableData[record.roadNoiseBillId]
+          .reportTime)
+      },
+      verify(record) {
+        const hide = this.$message.loading('请求中..', 0);
+        verifyRoadNoiseBill({
+          roadNoiseBillId: record.roadNoiseBillId
+        }).then(res => {
+          if (res.data.code == 0) {
+            record.checked = 1
+            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 {
+          roadNoiseBillId,
+          billName,
+          reportTime
+        } = this.editableData[record.roadNoiseBillId];
+        if (!roadNoiseBillId || !reportTime) {
+          this.$message.error('请填写完整信息再提交')
+          return
+        }
+        const hide = this.$message.loading('请求中..', 0);
+        reportTime = reportTime.format("x")
+        reportTime = Number(reportTime)
+        updateRoadNoiseBill({
+          roadNoiseBillId,
+          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.roadNoiseBillId]
+          hide()
+        })
+
+      },
+      /* 删除单个 */
+      remove(row) {
+        const hide = this.$message.loading('请求中..', 0);
+        removeRoadNoiseBill(row.roadNoiseBillId).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.roadNoiseBillId);
+        const hide = this.$message.loading('请求中..', 0);
+        removeBatchRoadNoiseBill(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>
\ No newline at end of file
diff --git a/src/views/sound/road/collect/index.vue b/src/views/sound/road/collect/index.vue
index bc2a353..606dfa0 100644
--- a/src/views/sound/road/collect/index.vue
+++ b/src/views/sound/road/collect/index.vue
@@ -1,333 +1,48 @@
 <template>
   <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form :model="where" :labelCol="{ offset: 1}">
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <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-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="表格名称:">
-              <a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="上报时间:">
-              <a-range-picker separator="~" v-model:value="reportTimeScope" />
-            </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>
-      <!-- 表格 -->
-      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="roadNoiseBillId" :datasource="url"
-        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
-        <template #toolbar>
-          <a-space>
-            <a-upload :before-upload="importFile" :showUploadList="false" accept=".xls,.xlsx,.csv">
-              <a-button>导入excel</a-button>
-            </a-upload>
-            <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 #billName="{ text, record }">
-          <div class="editable-cell">
-            <div v-if="editableData[record.roadNoiseBillId]" class="editable-cell-input-wrapper">
-              <a-input v-model:value="editableData[record.roadNoiseBillId].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.roadNoiseBillId]" class="editable-cell-input-wrapper">
-              <a-date-picker v-model:value="editableData[record.roadNoiseBillId].reportTime"></a-date-picker>
-              <!-- <a-input v-model:value="editableData[record.roadNoiseBillId].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']"  v-if="record.checked != 1">
-              <a-popconfirm :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
-                @confirm="verify(record)">
-                <a-button type="primary" shape="round" size="small">审核</a-button>
-              </a-popconfirm>
-            </span>
-            <span v-hasPermi="['ecology:sound:remove']"  v-if="record.checked != 1">
-              <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>
-            </span>
-            
-          </a-space>
-        </template>
-      </ele-pro-table>
+    <a-card style="width: 100%" :bordered="false">
+      <template #title>
+        <a-space>
+          <a-upload :before-upload="importFile" :showUploadList="false" accept=".xls,.xlsx,.csv">
+            <a-button>导入excel</a-button>
+          </a-upload>
+        </a-space>
+      </template>
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane tab="噪声信息" key="noise">
+          <noise ref="noise"></noise>
+        </a-tab-pane>
+        <a-tab-pane tab="其他信息" key="place">
+          <place ref="place"></place>
+        </a-tab-pane>
+      </a-tabs>
     </a-card>
   </div>
-  <!-- 编辑弹窗 -->
 </template>
 
 <script>
   import XLSX from 'xlsx';
-  import _ from "lodash"
-  import {
-    CheckOutlined,
-    EditOutlined
-  } from '@ant-design/icons-vue';
-  import {
-    pageBillUrl,
-    saveRoadNoiseBill,
-    removeRoadNoiseBill,
-    removeBatchRoadNoiseBill,
-    updateRoadNoiseBill,
-    verifyRoadNoiseBill
-  } from "@/api/ecology/road-sound";
   import utils from "./utils";
-  import moment from "moment";
+  import Noise from "./base.vue";
+  import Place from "./place.vue";
+
+  import {
+    saveRoadNoiseBill,
+  } from "@/api/ecology/road-sound";
+  import {saveRoadPlaceBill} from "@/api/ecology/road-place";
+
   export default {
-    name: 'RoadNoise',
     components: {
-      CheckOutlined,
-      EditOutlined
+      Noise,
+      Place
     },
     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: '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,
-      };
+        activeKey: 'noise'
+      }
     },
     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/table/" + record.roadNoiseBillId
-        })
-      },
-      edit(record) {
-        this.editableData[record.roadNoiseBillId] = _.cloneDeep(record);
-        this.editableData[record.roadNoiseBillId].reportTime = moment(this.editableData[record.roadNoiseBillId]
-          .reportTime)
-      },
-      verify(record) {
-        const hide = this.$message.loading('请求中..', 0);
-        verifyRoadNoiseBill({
-          roadNoiseBillId: record.roadNoiseBillId
-        }).then(res => {
-          if (res.data.code == 0) {
-            record.checked = 1
-            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 {
-          roadNoiseBillId,
-          billName,
-          reportTime
-        } = this.editableData[record.roadNoiseBillId];
-        if (!roadNoiseBillId || !reportTime) {
-          this.$message.error('请填写完整信息再提交')
-          return
-        }
-        const hide = this.$message.loading('请求中..', 0);
-        reportTime = reportTime.format("x")
-        reportTime = Number(reportTime)
-        updateRoadNoiseBill({
-          roadNoiseBillId,
-          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.roadNoiseBillId]
-          hide()
-        })
-
-      },
-      /* 删除单个 */
-      remove(row) {
-        const hide = this.$message.loading('请求中..', 0);
-        removeRoadNoiseBill(row.roadNoiseBillId).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.roadNoiseBillId);
-        const hide = this.$message.loading('请求中..', 0);
-        removeBatchRoadNoiseBill(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());
-      },
       /* 导入本地excel文件 */
       importFile(file) {
         try {
@@ -337,33 +52,62 @@
             let workbook = XLSX.read(data, {
               type: 'array'
             });
+            //0.昼间数据 1.夜间数据 2.其他信息
             let sheetNames = workbook.SheetNames;
-            // 解析成二维数组
+            // 解析成二维数组 
             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 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 reportDate3 = new Date();
+
             const roadNoiseList = aoa.filter(item => item.length == 21 && typeof item[0] == "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 billData2 = utils.toObjData(roadNoiseList2);
+            const billData3 = utils.toPlaceData(roadNoiseList3);
+
+            const tasks = [];
+            if (billData.length > 0) {
+              tasks.push(saveRoadNoiseBill({
+                reportTime: new Date(reportDate).getTime(),
+                billName: sheetNames[0] + reportDate,
+                roadNoiseList: billData
+              }))
+            }
+
+            if (billData2.length > 0) {
+              tasks.push(saveRoadNoiseBill({
+                reportTime: new Date(reportDate2).getTime(),
+                billName: sheetNames[1] + reportDate2,
+                roadNoiseList: billData2
+              }))
+            }
+
+            if (billData3.length > 0) {
+              tasks.push(saveRoadPlaceBill({
+                reportTime: reportDate3.getTime(),
+                billName: sheetNames[2] + reportDate3.getTime(),
+                roadPlaceList: billData3
+              }))
+            }
             // 上传到服务器
-            saveRoadNoiseBill({
-              reportTime: new Date(reportDate).getTime(),
-              billName: sheetNames[0] + reportDate,
-              roadNoiseList: billData
-            }).then(saveRoadNoiseBill({
-              reportTime: new Date(reportDate2).getTime(),
-              billName: sheetNames[1] + reportDate2,
-              roadNoiseList: billData2
-            })).then(() => {
-              this.reload()
+
+            Promise.all(tasks).then(() => {
+              this.$refs.noise.reload()
+              this.$refs.place.reload()
             })
+
             // console.log(billData);
 
           };
@@ -378,46 +122,5 @@
 </script>
 
 <style scoped 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>
\ No newline at end of file
diff --git a/src/views/sound/road/collect/other.vue b/src/views/sound/road/collect/other.vue
deleted file mode 100644
index 1734a7e..0000000
--- a/src/views/sound/road/collect/other.vue
+++ /dev/null
@@ -1,459 +0,0 @@
-<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.road" 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.area" 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.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"
-        :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>
-  <!-- 编辑弹窗 -->
-</template>
-
-<script>
-  import _ from "lodash"
-  import {
-    pageRoadNoiseUrl,
-    saveRoadNoise,
-    removeRoadNoise,
-    removeBatchRoadNoise,
-    updateRoadNoise,
-    getRoadNoiseBill
-  } from "@/api/ecology/road-sound";
-  import locale from 'ant-design-vue/es/date-picker/locale/zh_CN';
-  import moment from 'moment';
-  //   import utils from "./utils";
-  export default {
-    name: 'RoadNoise',
-    components: {},
-    data() {
-      const {
-        billId
-      } = this.$route.params
-
-      return {
-        locale,
-        bill:{},
-        // 表格数据接口
-        url: pageRoadNoiseUrl,
-        selection: [],
-        // 表格列配置
-        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: '操作',
-            key: 'action',
-            width: 150,
-            align: 'center',
-            fixed: 'right',
-            slots: {
-              customRender: 'action'
-            }
-          }
-        ],
-        // 表格搜索条件
-        roadNoiseBillId: billId,
-        where: {
-          roadNoiseBillId: billId
-        },
-        // 表格选中数据
-        selectionList: [],
-        // 是否显示编辑弹窗
-        showEdit: false,
-        // 表单数据
-        form: {},
-        loading: false,
-        rules: {}
-
-      };
-    },
-    mounted(){
-      const {
-        billId
-      } = this.$route.params
-      getRoadNoiseBill(billId).then(res=>{
-        this.bill = res.data.data
-        if(res.data.data.checked == 1){
-          this.columns.splice(this.columns.length-1,1)
-        }
-      })
-    },
-    methods: {
-      /* 刷新表格 */
-      reload() {
-        console.log(this.$route);
-        console.log(this.$router);
-        this.$refs.table.reload({
-          where: this.where
-        });
-      },
-      /* 重置搜索 */
-      reset() {
-        this.where = {
-          roadNoiseBillId: this.roadNoiseBillId
-        };
-        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.roadNoiseId) {
-          updateRoadNoise(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.roadNoiseBillId = this.roadNoiseBillId;
-             saveRoadNoise(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);
-        removeRoadNoise(row.roadNoiseId).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.roadNoiseId);
-        const hide = this.$message.loading('请求中..', 0);
-        removeBatchRoadNoise(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>
\ No newline at end of file
diff --git a/src/views/sound/road/collect/place.vue b/src/views/sound/road/collect/place.vue
new file mode 100644
index 0000000..b6f3465
--- /dev/null
+++ b/src/views/sound/road/collect/place.vue
@@ -0,0 +1,361 @@
+<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)">
+              <a-button type="primary" 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: 'RoadPlace',
+    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: '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/table/" + record.roadPlaceBillId
+        })
+      },
+      edit(record) {
+        this.editableData[record.roadPlaceBillId] = _.cloneDeep(record);
+        this.editableData[record.roadPlaceBillId].reportTime = moment(this.editableData[record.roadPlaceBillId]
+          .reportTime)
+      },
+      verify(record) {
+        const hide = this.$message.loading('请求中..', 0);
+        verifyRoadPlaceBill({
+          roadPlaceBillId: record.roadPlaceBillId
+        }).then(res => {
+          if (res.data.code == 0) {
+            record.checked = 1
+            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>
\ No newline at end of file
diff --git a/src/views/sound/road/collect/utils.js b/src/views/sound/road/collect/utils.js
index c69b8ff..e5e1d52 100644
--- a/src/views/sound/road/collect/utils.js
+++ b/src/views/sound/road/collect/utils.js
@@ -13,10 +13,11 @@ export default {
                 placeCode: item[2],
                 road: item[3],
                 area: item[4],
+                city: '南宁',
                 roadLength: item[5],
                 roadWidth: item[6],
                 smallTrafficFlow: item[7],
-                largeTrafficFlow: item[7],
+                largeTrafficFlow: item[8],
                 timeSlot: item[9],
                 monitorMonth: item[10],
                 monitorDay: item[11],
@@ -33,5 +34,29 @@ export default {
            }
        })
 
+    },
+    toPlaceData(excelData) {
+        return excelData.map(item => {
+            return {
+                place: item[0],
+                placeLng: item[1],
+                placeLat: item[2],
+                motorway: item[3],
+                motorwayType: item[4],
+                motorwayLevel: item[5],
+                refObj: item[6],
+                people: item[7],
+                station: item[8],
+                monitorInstrumentModel: item[9],
+                monitorInstrumentCode: item[10],
+                beforeMonitorValue: item[11],
+                afterMonitorValue: item[12],
+                soundPressureValue: item[13],
+                soundInstrumentModel: item[14],
+                soundInstrumentCode: item[15],
+               
+           }
+       })
+
     }
 }
\ No newline at end of file
diff --git a/src/views/sound/road/statistic/base copy 2.vue b/src/views/sound/road/statistic/base copy 2.vue
new file mode 100644
index 0000000..6641672
--- /dev/null
+++ b/src/views/sound/road/statistic/base copy 2.vue	
@@ -0,0 +1,412 @@
+<template>
+  <div class="">
+      <ele-pro-table ref="table" row-key="id" :datasource="url" :columns="columns" :where="where" :needPage="false"
+        @done="(d)=>data = d.data" :scroll="{x: 'max-content'}">
+        <template #toolbar>
+           <!-- 搜索表单 -->
+      <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-select :options="modelOptions" v-model:value="where.model" 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="timeSlotOptions" v-model:value="where.timeSlot" placeholder="昼夜">
+              </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>
+                <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-space>
+            
+          </a-space> -->
+        </template>
+      </ele-pro-table>
+  </div>
+</template>
+
+<script>
+  import _ from "lodash";
+  import XLSX from 'xlsx';
+  import {
+    pageRoadNoiseStatisticUrl
+  } from "@/api/ecology/road-sound"
+  const columns = [{
+      title: '测点',
+      dataIndex: 'place',
+
+    },
+    {
+      title: '路段',
+      dataIndex: 'road',
+
+    },
+    {
+      title: '城区',
+      dataIndex: 'area',
+    },
+      {
+      title: '市',
+      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: [{
+          title: '平均',
+          dataIndex: 'avgLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "SDdB(A)",
+      children: [{
+          title: '平均',
+          dataIndex: 'avgSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "L10dB(A)",
+      children: [
+
+        {
+          title: '平均',
+          dataIndex: 'avgL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    }, {
+      title: 'L50dB(A)',
+      children: [{
+          title: '平均',
+          dataIndex: 'avgL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "L90dB(A)",
+      children: [
+
+        {
+          title: '平均',
+          dataIndex: 'avgL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "LmindB(A)",
+      children: [{
+          title: '平均',
+          dataIndex: 'avgLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    }, {
+      title: 'LmaxdB(A)',
+      children: [{
+          title: '平均',
+          dataIndex: 'avgLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+
+
+
+  ]
+  export default {
+    name: 'StatisticSoundRoad',
+    components: {
+
+    },
+    data() {
+      return {
+        url: pageRoadNoiseStatisticUrl,
+        data: [],
+        where: {
+          model: "place"
+        },
+        timeScope: [],
+        columns,
+        modelOptions: [{
+          value: "place",
+          label: "测点",
+        }, {
+          value: "road",
+          label: "路段",
+        }, {
+          value: "area",
+          label: "城区",
+        },{
+          value: "city",
+          label: "市"
+        }],
+        timeSlotOptions: [{
+          value: "昼",
+          label: "昼"
+        }, {
+          value: "夜",
+          label: "夜"
+        }]
+
+      };
+    },
+    methods: {
+      /* 刷新表格 */
+      reload() {
+        this.$refs.table.reload({
+          where: {
+            model: this.where.model,
+            timeStart: this.timeScope.length == 2 ? this.timeScope[0].format("Y-M-D") : null,
+            timeEnd: this.timeScope.length == 2 ? this.timeScope[1].format("Y-M-D") : null,
+            timeSlot: this.where.timeSlot
+          }
+        });
+        let cloneColumns = _.cloneDeep(columns);
+        if (this.where.model == "area") {
+          this.columns = cloneColumns.filter(item => {
+            return item.dataIndex != "place" && item.dataIndex != "road";
+          })
+        } else if (this.where.model == "road") {
+          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";
+          })
+        }
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {
+          model: "place",
+          timeSlot: "昼"
+        };
+        this.this.timeScope = []
+
+        this.reload();
+      },
+      exportFile() {
+        let array = [
+          ['测点', '路段', '城区', '路长', '路宽', '平均Leq', '平均SD']
+        ];
+        this.data.forEach(d => {
+          array.push([d.place, d.road, d.area, d.roadLength, d.roadWidth, d.avgLeq, d.avgSD]);
+        });
+        let sheet = XLSX.utils.aoa_to_sheet(array);
+        // sheet['!merges'] = [
+        //   {s: {r: 0, c: 1}, e: {r: 0, c: 5}},  // 合并第0行第1列到第0行第5列
+        //   {s: {r: 0, c: 0}, e: {r: 1, c: 0}},  // 合并第0行第0列到第1行第0列
+        //   {s: {r: 0, c: 6}, e: {r: 1, c: 6}}  // 合并第0行第6列到第1行第6列
+        // ];
+        this.$util.exportSheet(XLSX, sheet, '道路交通噪声统计表');
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/sound/road/statistic/base.vue b/src/views/sound/road/statistic/base.vue
new file mode 100644
index 0000000..737ebf6
--- /dev/null
+++ b/src/views/sound/road/statistic/base.vue
@@ -0,0 +1,412 @@
+<template>
+  <div class="">
+      <ele-pro-table ref="table" row-key="id" :datasource="url" :columns="columns" :where="where" :needPage="false"
+        @done="(d)=>data = d.data" :scroll="{x: 'max-content'}">
+        <template #toolbar>
+           <!-- 搜索表单 -->
+      <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-select :options="modelOptions" v-model:value="where.model" 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="timeSlotOptions" v-model:value="where.timeSlot" placeholder="昼夜">
+              </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>
+                <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-space>
+            
+          </a-space> -->
+        </template>
+      </ele-pro-table>
+  </div>
+</template>
+
+<script>
+  import _ from "lodash";
+  import XLSX from 'xlsx';
+  import {
+    pageRoadNoiseStatisticUrl
+  } from "@/api/ecology/road-sound"
+  const columns = [{
+      title: '测点',
+      dataIndex: 'place',
+
+    },
+    {
+      title: '路段',
+      dataIndex: 'road',
+
+    },
+    {
+      title: '城区',
+      dataIndex: 'area',
+    },
+      {
+      title: '市',
+      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: [{
+          title: '平均',
+          dataIndex: 'avgLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "SDdB(A)",
+      children: [{
+          title: '平均',
+          dataIndex: 'avgSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "L10dB(A)",
+      children: [
+
+        {
+          title: '平均',
+          dataIndex: 'avgL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    }, {
+      title: 'L50dB(A)',
+      children: [{
+          title: '平均',
+          dataIndex: 'avgL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "L90dB(A)",
+      children: [
+
+        {
+          title: '平均',
+          dataIndex: 'avgL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "LmindB(A)",
+      children: [{
+          title: '平均',
+          dataIndex: 'avgLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    }, {
+      title: 'LmaxdB(A)',
+      children: [{
+          title: '平均',
+          dataIndex: 'avgLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+
+
+
+  ]
+  export default {
+    name: 'StatisticSoundRoadBase',
+    components: {
+
+    },
+    data() {
+      return {
+        url: pageRoadNoiseStatisticUrl,
+        data: [],
+        where: {
+          model: "place"
+        },
+        timeScope: [],
+        columns,
+        modelOptions: [{
+          value: "place",
+          label: "测点",
+        }, {
+          value: "road",
+          label: "路段",
+        }, {
+          value: "area",
+          label: "城区",
+        },{
+          value: "city",
+          label: "市"
+        }],
+        timeSlotOptions: [{
+          value: "昼",
+          label: "昼"
+        }, {
+          value: "夜",
+          label: "夜"
+        }]
+
+      };
+    },
+    methods: {
+      /* 刷新表格 */
+      reload() {
+        this.$refs.table.reload({
+          where: {
+            model: this.where.model,
+            timeStart: this.timeScope.length == 2 ? this.timeScope[0].format("Y-M-D") : null,
+            timeEnd: this.timeScope.length == 2 ? this.timeScope[1].format("Y-M-D") : null,
+            timeSlot: this.where.timeSlot
+          }
+        });
+        let cloneColumns = _.cloneDeep(columns);
+        if (this.where.model == "area") {
+          this.columns = cloneColumns.filter(item => {
+            return item.dataIndex != "place" && item.dataIndex != "road";
+          })
+        } else if (this.where.model == "road") {
+          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";
+          })
+        }
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {
+          model: "place",
+          timeSlot: "昼"
+        };
+        this.this.timeScope = []
+
+        this.reload();
+      },
+      exportFile() {
+        let array = [
+          ['测点', '路段', '城区', '路长', '路宽', '平均Leq', '平均SD']
+        ];
+        this.data.forEach(d => {
+          array.push([d.place, d.road, d.area, d.roadLength, d.roadWidth, d.avgLeq, d.avgSD]);
+        });
+        let sheet = XLSX.utils.aoa_to_sheet(array);
+        // sheet['!merges'] = [
+        //   {s: {r: 0, c: 1}, e: {r: 0, c: 5}},  // 合并第0行第1列到第0行第5列
+        //   {s: {r: 0, c: 0}, e: {r: 1, c: 0}},  // 合并第0行第0列到第1行第0列
+        //   {s: {r: 0, c: 6}, e: {r: 1, c: 6}}  // 合并第0行第6列到第1行第6列
+        // ];
+        this.$util.exportSheet(XLSX, sheet, '道路交通噪声统计表');
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/sound/road/statistic/index.vue b/src/views/sound/road/statistic/index.vue
index bbc3850..d289618 100644
--- a/src/views/sound/road/statistic/index.vue
+++ b/src/views/sound/road/statistic/index.vue
@@ -1,46 +1,15 @@
 <template>
   <div class="ele-body">
     <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form :model="where" :labelCol="{ offset: 1}">
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="统计模块:">
-              <a-select :options="modelOptions" v-model:value="where.model" 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="timeSlotOptions" v-model:value="where.timeSlot" placeholder="昼夜">
-              </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>
-                <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>
-      <ele-pro-table ref="table" row-key="id" :datasource="url" :columns="columns" :where="where" :needPage="false"
-        @done="(d)=>data = d.data" :scroll="{x: 'max-content'}">
-        <template #toolbar>
-          <a-space>
-            <a-button @click="exportFile">导出excel</a-button>
-          </a-space>
-        </template>
-      </ele-pro-table>
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane key="base" tab="通用统计">
+          <base-statistic></base-statistic>
+        </a-tab-pane>
+        <a-tab-pane key="quarter" tab="季度报告">
+         <quarter-statistic></quarter-statistic>
+        </a-tab-pane>
+      </a-tabs>
+   
     </a-card>
 
 
@@ -48,352 +17,22 @@
 </template>
 
 <script>
-  import _ from "lodash";
-  import XLSX from 'xlsx';
-  import {
-    pageRoadNoiseStatisticUrl
-  } from "@/api/ecology/road-sound"
-  const columns = [{
-      title: '测点',
-      dataIndex: 'place',
-
-    },
-    {
-      title: '路段',
-      dataIndex: 'road',
-
-    },
-    {
-      title: '城区',
-      dataIndex: 'area',
-    },
-    {
-      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: [{
-          title: '平均',
-          dataIndex: 'avgLeq',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxLeq',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minLeq',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    },
-    {
-      title: "SDdB(A)",
-      children: [{
-          title: '平均',
-          dataIndex: 'avgSD',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxSD',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minSD',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    },
-    {
-      title: "L10dB(A)",
-      children: [
-
-        {
-          title: '平均',
-          dataIndex: 'avgL10',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxL10',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minL10',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    }, {
-      title: 'L50dB(A)',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgL50',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxL50',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minL50',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    },
-    {
-      title: "L90dB(A)",
-      children: [
-
-        {
-          title: '平均',
-          dataIndex: 'avgL90',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxL90',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minL90',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    },
-    {
-      title: "LmindB(A)",
-      children: [{
-          title: '平均',
-          dataIndex: 'avgLmin',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxLmin',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minLmin',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    }, {
-      title: 'LmaxdB(A)',
-      children: [{
-          title: '平均',
-          dataIndex: 'avgLmax',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最大',
-          dataIndex: 'maxLmax',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-        {
-          title: '最小',
-          dataIndex: 'minLmax',
-          customRender: ({
-            text
-          }) => Number(text).toFixed(2)
-        },
-      ]
-    },
-
-
-
-  ]
+  import BaseStatistic from "./base.vue";
+  import QuarterStatistic from "./quarter.vue";
   export default {
     name: 'StatisticSoundRoad',
     components: {
-
+      BaseStatistic,
+      QuarterStatistic
     },
     data() {
       return {
-        url: pageRoadNoiseStatisticUrl,
-        data: [],
-        where: {
-          model: "place"
-        },
-        timeScope: [],
-        columns,
-        modelOptions: [{
-          value: "place",
-          label: "测点",
-        }, {
-          value: "road",
-          label: "路段",
-        }, {
-          value: "area",
-          label: "城区",
-        }],
-        timeSlotOptions: [{
-          value: "昼",
-          label: "昼"
-        }, {
-          value: "夜",
-          label: "夜"
-        }]
-
+        activeKey: 'quarter'
       };
+        
     },
     methods: {
-      /* 刷新表格 */
-      reload() {
-        this.$refs.table.reload({
-          where: {
-            model: this.where.model,
-            timeStart: this.timeScope.length == 2 ? this.timeScope[0].format("Y-M-D") : null,
-            timeEnd: this.timeScope.length == 2 ? this.timeScope[1].format("Y-M-D") : null,
-            timeSlot: this.where.timeSlot
-          }
-        });
-        let cloneColumns = _.cloneDeep(columns);
-        if (this.where.model == "area") {
-          this.columns = cloneColumns.filter(item => {
-            return item.dataIndex != "place" && item.dataIndex != "road";
-          })
-        } else if (this.where.model == "road") {
-          this.columns = cloneColumns.filter(item => {
-            return item.dataIndex != "place"
-          })
-        }
-      },
-      /* 重置搜索 */
-      reset() {
-        this.where = {
-          model: "place",
-          timeSlot: "昼"
-        };
-        this.this.timeScope = []
-
-        this.reload();
-      },
-      exportFile() {
-        let array = [
-          ['测点', '路段', '城区', '路长', '路宽', '平均Leq', '平均SD']
-        ];
-        this.data.forEach(d => {
-          array.push([d.place, d.road, d.area, d.roadLength, d.roadWidth, d.avgLeq, d.avgSD]);
-        });
-        let sheet = XLSX.utils.aoa_to_sheet(array);
-        // sheet['!merges'] = [
-        //   {s: {r: 0, c: 1}, e: {r: 0, c: 5}},  // 合并第0行第1列到第0行第5列
-        //   {s: {r: 0, c: 0}, e: {r: 1, c: 0}},  // 合并第0行第0列到第1行第0列
-        //   {s: {r: 0, c: 6}, e: {r: 1, c: 6}}  // 合并第0行第6列到第1行第6列
-        // ];
-        this.$util.exportSheet(XLSX, sheet, '道路交通噪声统计表');
-      }
+     
     }
 
   }
diff --git a/src/views/sound/road/statistic/quarter.vue b/src/views/sound/road/statistic/quarter.vue
new file mode 100644
index 0000000..d5897ca
--- /dev/null
+++ b/src/views/sound/road/statistic/quarter.vue
@@ -0,0 +1,418 @@
+<template>
+  <div class="">
+      <ele-pro-table ref="table" row-key="id" :datasource="url" :columns="columns" :where="where" :needPage="false"
+        @done="(d)=>data = d.data" :scroll="{x: 'max-content'}">
+        <template #toolbar>
+           <!-- 搜索表单 -->
+      <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-select v-model:value="where.monitorYear" 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 :options="timeSlotOptions" v-model:value="where.timeSlot" placeholder="昼夜">
+              </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>
+                <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-space>
+            
+          </a-space> -->
+        </template>
+      </ele-pro-table>
+  </div>
+</template>
+
+<script>
+  import _ from "lodash";
+  import XLSX from 'xlsx';
+  import {
+    pageRoadNoiseStatisticUrl
+  } from "@/api/ecology/road-sound"
+  import {getHistoryyears} from "@/api/ecology/road-sound"
+  const columns = [{
+      title: '测点',
+      dataIndex: 'place',
+
+    },
+    {
+      title: '路段',
+      dataIndex: 'road',
+
+    },
+    {
+      title: '城区',
+      dataIndex: 'area',
+    },
+      {
+      title: '市',
+      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: [{
+          title: '平均',
+          dataIndex: 'avgLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLeq',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "SDdB(A)",
+      children: [{
+          title: '平均',
+          dataIndex: 'avgSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minSD',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "L10dB(A)",
+      children: [
+
+        {
+          title: '平均',
+          dataIndex: 'avgL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL10',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    }, {
+      title: 'L50dB(A)',
+      children: [{
+          title: '平均',
+          dataIndex: 'avgL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL50',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "L90dB(A)",
+      children: [
+
+        {
+          title: '平均',
+          dataIndex: 'avgL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minL90',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+    {
+      title: "LmindB(A)",
+      children: [{
+          title: '平均',
+          dataIndex: 'avgLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLmin',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    }, {
+      title: 'LmaxdB(A)',
+      children: [{
+          title: '平均',
+          dataIndex: 'avgLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最大',
+          dataIndex: 'maxLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+        {
+          title: '最小',
+          dataIndex: 'minLmax',
+          customRender: ({
+            text
+          }) => Number(text).toFixed(2)
+        },
+      ]
+    },
+
+
+
+  ]
+  export default {
+    name: 'StatisticSoundRoad',
+    components: {
+
+    },
+    data() {
+      return {
+        url: pageRoadNoiseStatisticUrl,
+        data: [],
+        where: {
+          monitorYear: ""
+        },
+        timeScope: [],
+        columns,
+        modelOptions: [{
+          value: "place",
+          label: "测点",
+        }, {
+          value: "road",
+          label: "路段",
+        }, {
+          value: "area",
+          label: "城区",
+        },{
+          value: "city",
+          label: "市"
+        }],
+        yearOptions: [],
+        timeSlotOptions: [{
+          value: "昼",
+          label: "昼"
+        }, {
+          value: "夜",
+          label: "夜"
+        }]
+
+      };
+    },
+    created(){
+      getHistoryyears().then(res=>{this.yearOptions = res.data.data});
+    },
+    methods: {
+      /* 刷新表格 */
+      reload() {
+        this.$refs.table.reload({
+          where: {
+            model: this.where.model,
+            timeStart: this.timeScope.length == 2 ? this.timeScope[0].format("Y-M-D") : null,
+            timeEnd: this.timeScope.length == 2 ? this.timeScope[1].format("Y-M-D") : null,
+            timeSlot: this.where.timeSlot
+          }
+        });
+        let cloneColumns = _.cloneDeep(columns);
+        if (this.where.model == "area") {
+          this.columns = cloneColumns.filter(item => {
+            return item.dataIndex != "place" && item.dataIndex != "road";
+          })
+        } else if (this.where.model == "road") {
+          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";
+          })
+        }
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {
+          model: "place",
+          timeSlot: "昼"
+        };
+        this.this.timeScope = []
+
+        this.reload();
+      },
+      exportFile() {
+        let array = [
+          ['测点', '路段', '城区', '路长', '路宽', '平均Leq', '平均SD']
+        ];
+        this.data.forEach(d => {
+          array.push([d.place, d.road, d.area, d.roadLength, d.roadWidth, d.avgLeq, d.avgSD]);
+        });
+        let sheet = XLSX.utils.aoa_to_sheet(array);
+        // sheet['!merges'] = [
+        //   {s: {r: 0, c: 1}, e: {r: 0, c: 5}},  // 合并第0行第1列到第0行第5列
+        //   {s: {r: 0, c: 0}, e: {r: 1, c: 0}},  // 合并第0行第0列到第1行第0列
+        //   {s: {r: 0, c: 6}, e: {r: 1, c: 6}}  // 合并第0行第6列到第1行第6列
+        // ];
+        this.$util.exportSheet(XLSX, sheet, '道路交通噪声统计表');
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file