diff --git a/src/api/ecology/noise/function-sound.js b/src/api/ecology/noise/function-sound.js
index b8eb258..1007ef7 100644
--- a/src/api/ecology/noise/function-sound.js
+++ b/src/api/ecology/noise/function-sound.js
@@ -28,6 +28,10 @@ const getFunctionNoiseBill = function (id) {
 }
 // -------------------------数据---------------------
 const pageFunctionNoiseUrl = '/sound/function/noise/page';
+const listAllFunctionNoiseUrl = '/sound/function/noise';
+const listAllFunctionNoise = function (params){
+    return axios.get(listAllFunctionNoiseUrl, {params})
+}
 // 添加
 const saveFunctionNoise = function (data) {
     return axios.post("/sound/function/noise",data)
@@ -79,6 +83,8 @@ export {
     getHistoryyears,
     getColumnOptions,
     getGisBase,
-    getGisArea
+    getGisArea,
+    listAllFunctionNoiseUrl,
+    listAllFunctionNoise
   
 }
diff --git a/src/api/ecology/noise/zone-noise-leq-level.js b/src/api/ecology/noise/zone-noise-leq-level.js
new file mode 100644
index 0000000..e8ad9e2
--- /dev/null
+++ b/src/api/ecology/noise/zone-noise-leq-level.js
@@ -0,0 +1,32 @@
+import axios from 'axios';
+const baseUri = "/sound/zone/noiseLeqLevel";
+const listAllUrl = baseUri + "";
+
+// 添加
+const saveLeqLevel = function (data) {
+    return axios.post("/sound/zone/noiseLeqLevel",data)
+}
+
+// 删除
+const removeLeqLevel = function (id) {
+    return axios.delete(`/sound/zone/noiseLeqLevel/${id}`,)
+}
+// 批量删除
+const removeBatchLeqLevel = function (ids) {
+    return axios.delete("/sound/zone/noiseLeqLevel/batch",{data:ids})
+}
+
+// 修改
+const updateLeqLevel = function (data) {
+    return axios.put("/sound/zone/noiseLeqLevel",data)
+}
+
+
+export {
+    listAllUrl,
+    saveLeqLevel,
+    updateLeqLevel,
+    removeBatchLeqLevel,
+    removeLeqLevel
+
+}
diff --git a/src/api/ecology/noise/zone-noise-place.js b/src/api/ecology/noise/zone-noise-place.js
new file mode 100644
index 0000000..ef776ba
--- /dev/null
+++ b/src/api/ecology/noise/zone-noise-place.js
@@ -0,0 +1,32 @@
+import axios from 'axios';
+const baseUri = "/sound/zone/place";
+const listAllUrl = baseUri + "";
+
+// 添加
+const savePlace = function (data) {
+    return axios.post("/sound/zone/place",data)
+}
+
+// 删除
+const removePlace = function (id) {
+    return axios.delete(`/sound/zone/place/${id}`,)
+}
+// 批量删除
+const removeBatchPlace = function (ids) {
+    return axios.delete("/sound/zone/place/batch",{data:ids})
+}
+
+// 修改
+const updatePlace = function (data) {
+    return axios.put("/sound/zone/place",data)
+}
+
+
+export {
+    listAllUrl,
+    savePlace,
+    updatePlace,
+    removeBatchPlace,
+    removePlace
+
+}
diff --git a/src/api/ecology/noise/zone-sound.js b/src/api/ecology/noise/zone-sound.js
index 1b63912..c43265c 100644
--- a/src/api/ecology/noise/zone-sound.js
+++ b/src/api/ecology/noise/zone-sound.js
@@ -28,6 +28,10 @@ const getZoneNoiseBill = function (id) {
 }
 // -------------------------数据---------------------
 const pageZoneNoiseUrl = '/sound/zone/noise/page';
+const listAllZoneNoiseUrl = '/sound/zone/noise';
+const listALlZoneNoise = function (params){
+    return axios.get(listAllZoneNoiseUrl,{params})
+}
 // 添加
 const saveZoneNoise = function (data) {
     return axios.post("/sound/zone/noise",data)
@@ -75,6 +79,7 @@ export {
     getHistoryyears,
     getColumnOptions,
     statisticSourceUrl,
-    statisticYearUrl
+    statisticYearUrl,
+    listALlZoneNoise
   
 }
diff --git a/src/views/atmosphere/acid-rain/dict/index.vue b/src/views/atmosphere/acid-rain/dict/index.vue
new file mode 100644
index 0000000..73d2acd
--- /dev/null
+++ b/src/views/atmosphere/acid-rain/dict/index.vue
@@ -0,0 +1,46 @@
+<template>
+    <div class="ele-body">
+        <a-card :bordered="false">
+            <a-tabs v-model:activeKey="activeKey">
+                <a-tab-pane key="place" tab="点位信息">
+                    <place></place>
+                </a-tab-pane>
+                <a-tab-pane key="leqLevel" tab="Leq等级">
+                    <leq-level></leq-level>
+                </a-tab-pane>
+
+            </a-tabs>
+        </a-card>
+    </div>
+</template>
+
+<script>
+/**
+ *
+ *
+ *
+ */
+import LeqLevel from "./leq-level"
+import Place from "./place"
+
+
+export default {
+    name: 'ZoneNoiseDictIndex',
+    components: {
+        LeqLevel,
+        Place
+    },
+    data() {
+        return {
+            activeKey: 'place'
+        };
+
+    },
+    methods: {}
+
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/atmosphere/acid-rain/dict/leq-level.vue b/src/views/atmosphere/acid-rain/dict/leq-level.vue
new file mode 100644
index 0000000..0ea43ec
--- /dev/null
+++ b/src/views/atmosphere/acid-rain/dict/leq-level.vue
@@ -0,0 +1,302 @@
+<template>
+    <div class="ele-body">
+        <a-card :bordered="false">
+            <a-modal
+                v-model:visible="showEdit"
+                :title="form.id !== undefined ? '修改' : '添加'"
+                :confirm-loading="loading"
+                :width="500"
+                :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-form-item label="最小值" name="minLeq">
+                        <a-input-number @change="minLeqChange" :step=".1" :precision="1" v-model:value="form.minLeq"  />
+                    </a-form-item>
+                    <a-form-item label="最大值" name="maxLeq">
+                        <a-input-number :step=".1" :precision="1" v-model:value="form.maxLeq"  />
+                    </a-form-item>
+                    <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-form-item label="等级" name="level">
+                        <a-input
+                            v-model:value="form.level"
+                            placeholder="请输入等级"
+                            allow-clear
+                        />
+                    </a-form-item>
+
+                    <a-form-item label="评价" name="evaluate">
+                        <a-input
+                            v-model:value="form.evaluate"
+                            placeholder="请输入评价"
+                            allow-clear
+                        />
+                    </a-form-item>
+                    <a-form-item label="排序" name="sortNumber">
+                        <a-input-number :step="1" :precision="0" v-model:value="form.sortNumber"  />
+                    </a-form-item>
+                </a-form>
+            </a-modal>
+            <!-- 表格 -->
+            <ele-pro-table
+                v-model:selection="selectionList"
+                ref="table"
+                row-key="id"
+                :datasource="url"
+                :columns="columns"
+                :where="where"
+                :scroll="{ x: 'max-content' }"
+            >
+                <template #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 {
+    listAllUrl,
+    saveLeqLevel,
+    updateLeqLevel,
+    removeLeqLevel,
+    removeBatchLeqLevel
+} from "@/api/ecology/noise/zone-noise-leq-level";
+import { message } from 'ant-design-vue';
+// import moment from "moment";
+export default {
+    name: "ZoneNoiseLeqLevel",
+    components: {},
+    data() {
+        return {
+            data: [],
+            // 表格数据接口
+            url: listAllUrl,
+            selection: [],
+            // 表格列配置
+            columns: [
+                {
+                    title: "时段",
+                    dataIndex: "timeSlot",
+                },
+                {
+                    title: "等级",
+                    dataIndex: "level",
+                },
+                {
+                    title: "最小值",
+                    dataIndex: "minLeq",
+                    customRender: ({text})=>{
+                        return text!=undefined? text.toFixed(1):undefined
+                    }
+                },
+                {
+                    title: "最大值",
+                    dataIndex: "maxLeq",
+                    customRender: ({text})=>{
+                        return text!=undefined? text.toFixed(1):undefined
+                    }
+                },
+                {
+                    title: "评价",
+                    dataIndex: "evaluate",
+                },
+                {
+                    title: "排序",
+                    dataIndex: "sortNumber",
+                },
+                {
+                    title: "操作",
+                    key: "action",
+                    width: 150,
+                    align: "center",
+                    fixed: "right",
+                    slots: {
+                        customRender: "action",
+                    },
+                },
+            ],
+
+            // 表格搜索条件
+            where: {},
+            // 表格选中数据
+            selectionList: [],
+            // 是否显示编辑弹窗
+            showEdit: false,
+            // 表单数据
+            form: {},
+            loading: false,
+            rules: {
+                timeSlot:[{required: true,message: '请选择时段'}],
+                // minLeq: [{required: true,message: '请输入最小值',},],
+                // maxLeq: [{required: true,message: '请输入最大值',},],
+                level: [{required: true,message: '请输入等级',},],
+                // evaluate: [{required: true,message: '请输入评价',},],
+                sortNumber: [{required: true,message: '请输入排序',},],
+            },
+        };
+    },
+    mounted() {
+    },
+    methods: {
+        minLeqChange(e){
+            console.log(e)
+        },
+        /* 刷新表格 */
+        reload() {
+
+            this.$refs.table.reload({
+                where: this.where,
+            });
+        },
+        /* 重置搜索 */
+        reset() {
+            this.where = {};
+            this.reload();
+        },
+        /* 打开编辑弹窗 */
+        openEdit(row) {
+            // cloneRecord.mi
+            this.form = Object.assign({}, row);
+            this.showEdit = true;
+            this.$nextTick(() => {
+                this.$refs.form.clearValidate(); // 清除表单验证信息
+            });
+        },
+        async save() {
+            await this.$refs.form.validate();
+            const {minLeq,maxLeq }  = this.form;
+            if(minLeq == undefined && maxLeq == undefined ){
+                message.error("最小值和最大值请至少填写一项！")
+                return;
+            }
+            const hide = this.$message.loading('请求中..', 0);
+            const form = this.form;
+            if (form.id) {
+                updateLeqLevel(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();
+                    });
+            } else {
+                saveLeqLevel(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);
+            removeLeqLevel(row.id).then((res) => {
+                hide();
+                if (res.data.code === 0) {
+                    this.$message.success(res.data.msg);
+                    this.reload();
+                } else {
+                    this.$message.error(res.data.msg);
+                }
+            }).catch(e => {
+                hide();
+                this.$message.error(e.message);
+            })
+        },
+        /* 批量删除 */
+        removeBatch() {
+            const hide = this.$message.loading('请求中..', 0);
+            const ids = this.selectionList.map((item) => item.id);
+            removeBatchLeqLevel(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.message);
+            }).finally(() => {
+                hide();
+            })
+        }
+
+    },
+};
+</script>
+
+<style scoped lang="less">
+</style>
\ No newline at end of file
diff --git a/src/views/atmosphere/acid-rain/dict/place.vue b/src/views/atmosphere/acid-rain/dict/place.vue
new file mode 100644
index 0000000..4e3c05b
--- /dev/null
+++ b/src/views/atmosphere/acid-rain/dict/place.vue
@@ -0,0 +1,334 @@
+<template>
+    <div class="ele-body">
+        <a-card :bordered="false">
+            <a-modal
+                v-model:visible="showEdit"
+                :title="form.zoneNoisePlaceId !== undefined ? '修改' : '添加'"
+                :confirm-loading="loading"
+                :width="800"
+                :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-form-item label="测点名称" name="placeName">
+                        <a-input v-model:value="form.placeName" placeholder="请输入测点名称" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="点位编码" name="placeCode">
+                        <a-input v-model:value="form.placeCode" placeholder="请输入点位编码" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="测点经度" name="placeLng">
+                        <a-input v-model:value="form.placeLng" placeholder="请输入测点经度" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="测点纬度" name="placeLat">
+                        <a-input v-model:value="form.placeLat" placeholder="请输入测点纬度" allow-clear />
+                    </a-form-item>
+
+                    <a-form-item label="测点参照物" name="refObj">
+                        <a-input v-model:value="form.refObj" placeholder="请输入测点参照物" allow-clear />
+                    </a-form-item>
+<!--                    <a-form-item label="网格覆盖人口（万人）" name="people">-->
+<!--                        <a-input v-model:value="form.people" placeholder="请输入网格覆盖人口（万人）" allow-clear />-->
+<!--                    </a-form-item>-->
+                    <a-form-item label="监测站名" name="station">
+                        <a-input v-model:value="form.station" placeholder="请输入监测站名" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="监测仪器型号" name="monitorInstrumentModel">
+                        <a-input v-model:value="form.monitorInstrumentModel" placeholder="请输入测监测仪器型号" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="监测仪器编号" name="monitorInstrumentCode">
+                        <a-input v-model:value="form.monitorInstrumentCode" placeholder="请输入监测仪器编号" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="监测前校准值" name="beforeMonitorValue">
+                        <a-input v-model:value="form.beforeMonitorValue" placeholder="请输入监测前校准值" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="监测后校准值" name="afterMonitorValue">
+                        <a-input v-model:value="form.afterMonitorValue" placeholder="请输入监测后校准值" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="声校准器测量声压值" name="soundPressureValue">
+                        <a-input v-model:value="form.soundPressureValue" placeholder="请输入声校准器测量声压值" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="声校准仪器型号" name="soundInstrumentModel">
+                        <a-input v-model:value="form.soundInstrumentModel" placeholder="请输入声校准仪器型号" allow-clear />
+                    </a-form-item>
+                    <a-form-item label="声校准仪器编号" name="soundInstrumentCode">
+                        <a-input v-model:value="form.soundInstrumentCode" placeholder="请输入声校准仪器编号" allow-clear />
+                    </a-form-item>
+                </a-form>
+            </a-modal>
+            <!-- 表格 -->
+            <ele-pro-table
+                v-model:selection="selectionList"
+                ref="table"
+                row-key="zoneNoisePlaceId"
+                :datasource="url"
+                :columns="columns"
+                :where="where"
+                :scroll="{ x: 'max-content' }"
+            >
+                <template #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 {
+    listAllUrl,
+    savePlace,
+    updatePlace,
+    removePlace,
+    removeBatchPlace
+} from "@/api/ecology/noise/zone-noise-place";
+// import moment from "moment";
+export default {
+    name: "ZoneNoisePlace",
+    components: {},
+    data() {
+        return {
+            data: [],
+            // 表格数据接口
+            url: listAllUrl,
+            selection: [],
+            // 表格列配置
+            columns: [
+                {
+                    title: "测点名称",
+                    dataIndex: "placeName",
+                    sorter: true,
+                }, {
+                    title: "点位编码",
+                    dataIndex: "placeCode",
+                    sorter: true,
+                },
+                {
+                    title: "测点经度",
+                    dataIndex: "placeLng",
+                    sorter: true,
+                },
+                {
+                    title: "测点纬度",
+                    dataIndex: "placeLat",
+                    sorter: true,
+                },
+                {
+                    title: "测点参照物",
+                    dataIndex: "refObj",
+                    sorter: true,
+                },
+
+                {
+                    title: "监测站名",
+                    dataIndex: "station",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器型号",
+                    dataIndex: "monitorInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器编号",
+                    dataIndex: "monitorInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "监测前校准值",
+                    dataIndex: "beforeMonitorValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准器测量声压值",
+                    dataIndex: "soundPressureValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器型号",
+                    dataIndex: "soundInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器编号",
+                    dataIndex: "soundInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "操作",
+                    key: "action",
+                    width: 150,
+                    align: "center",
+                    fixed: "right",
+                    slots: {
+                        customRender: "action",
+                    },
+                },
+            ],
+
+            // 表格搜索条件
+            where: {},
+            // 表格选中数据
+            selectionList: [],
+            // 是否显示编辑弹窗
+            showEdit: false,
+            // 表单数据
+            form: {},
+            loading: false,
+            rules: {
+                placeName:[{required: true,message: '请输入测点名称'}],
+                placeCode:[{required: true,message: '请输入点位编码'}],
+                placeLng: [{required: true,message: '请输入测点经度',},],
+                placeLat: [{required: true,message: '请输入测点纬度',},],
+            },
+        };
+    },
+    mounted() {
+    },
+    methods: {
+        /* 刷新表格 */
+        reload() {
+
+            this.$refs.table.reload({
+                where: this.where,
+            });
+        },
+        /* 重置搜索 */
+        reset() {
+            this.where = {};
+            this.reload();
+        },
+        /* 打开编辑弹窗 */
+        openEdit(row) {
+            // cloneRecord.mi
+            this.form = Object.assign({}, row);
+            this.showEdit = true;
+            this.$nextTick(() => {
+                this.$refs.form.clearValidate(); // 清除表单验证信息
+            });
+        },
+        async save() {
+            await this.$refs.form.validate();
+            const hide = this.$message.loading('请求中..', 0);
+            const form = this.form;
+            if (form.zoneNoisePlaceId) {
+                updatePlace(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();
+                    });
+            } else {
+                savePlace(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);
+            removePlace(row.zoneNoisePlaceId).then((res) => {
+                hide();
+                if (res.data.code === 0) {
+                    this.$message.success(res.data.msg);
+                    this.reload();
+                } else {
+                    this.$message.error(res.data.msg);
+                }
+            }).catch(e => {
+                hide();
+                this.$message.error(e.message);
+            })
+        },
+        /* 批量删除 */
+        removeBatch() {
+            const hide = this.$message.loading('请求中..', 0);
+            const ids = this.selectionList.map((item) => item.zoneNoisePlaceId);
+            removeBatchPlace(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.message);
+            }).finally(() => {
+                hide();
+            })
+        }
+
+    },
+};
+</script>
+
+<style scoped lang="less">
+</style>
\ No newline at end of file
diff --git a/src/views/sound/function/collect/index.vue b/src/views/sound/function/collect/index.vue
index c237de2..c1fe460 100644
--- a/src/views/sound/function/collect/index.vue
+++ b/src/views/sound/function/collect/index.vue
@@ -76,7 +76,7 @@ export default {
           );
 
           // 解析成对象数组
-          const billName = aoa[0][0];
+          const billName = file.name;
           const billData = utils.toObjData(functionNoiseList);
         
           const billData2 = utils.toPlaceData(functionNoiseList2);
@@ -163,7 +163,7 @@ export default {
           });
   
           // 解析成对象数组
-          const billName = aoa[0][0];
+          const billName = file.name;
           const billData = utils.toAreaObjData(functionNoiseList);
 
           if (!billData || billData.length == 0) {
diff --git a/src/views/sound/function/collect/utils.js b/src/views/sound/function/collect/utils.js
index 365b3a6..9ff2113 100644
--- a/src/views/sound/function/collect/utils.js
+++ b/src/views/sound/function/collect/utils.js
@@ -49,7 +49,7 @@ export default {
             }
             if (row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90) {
 
-                throw new Error(row.place + "数值有误" + `${row.indexL10},${row.indexL10},${row.indexL50},${row.indexL90}`)
+                throw new Error(row.place + "数值有误" + `${row.indexLeq},${row.indexL10},${row.indexL50},${row.indexL90}`)
             }
             return row;
         })
@@ -81,12 +81,12 @@ export default {
         return excelData.map(item => {
             const monitorTime = new Date();
             monitorTime.setFullYear(item[1]);
-            monitorTime.setMonth(item[14] - 1);
-            monitorTime.setDate(item[15]);
-            monitorTime.setHours(item[16]);
-            monitorTime.setMinutes(item[17]);
+            monitorTime.setMonth(item[9] - 1);
+            monitorTime.setDate(item[10]);
+            monitorTime.setHours(item[11]);
+            monitorTime.setMinutes(item[23]);
             let quarter = 1;
-            const month = item[14]
+            const month = item[9]
             if (month < 4) {
                 quarter = 1
             } else if (month < 7) {
diff --git a/src/views/sound/function/statistic/base.vue b/src/views/sound/function/statistic/base.vue
index 6e7edbc..f2cdea8 100644
--- a/src/views/sound/function/statistic/base.vue
+++ b/src/views/sound/function/statistic/base.vue
@@ -1,500 +1,558 @@
 <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="8" :md="12" :sm="24" :xs="24">
-            <a-form-item label="区域等级:">
-              <a-select v-model:value="where.regionLevel" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in regionLevelOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="8" :md="12" :sm="24" :xs="24">
-            <a-form-item label="测点名称:">
-              <a-select v-model:value="where.place" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in palceOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="8" :md="12" :sm="24" :xs="24">
-            <a-form-item label="功能区类别:">
-              <a-select v-model:value="where.functionType" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in functionTypeOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :lg="8" :md="12" :sm="24" :xs="24">
-            <a-form-item label="城区">
-              <a-select v-model:value="where.area" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in areaOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col> -->
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-              <a-space>
-                <a-button type="primary" @click="reload">查询</a-button>
-                <a-button @click="reset">重置</a-button>
-                <a-button @click="exportFile">导出Excel</a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-      <!-- 表格 -->
-      <ele-pro-table
-        v-model:selection="selectionList"
-        ref="table"
-        row-key="functionNoiseId"
-        :datasource="url"
-        :columns="columns"
-        :where="where"
-        :scroll="{ x: 'max-content' }"
-        @done="(d) => (data = d.data)"
-      >
-        <template #Leq="{ text,record  }">
-          <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)" color="green">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)" color="blue">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)" color="red">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)" color="red">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)" color="red">{{text}}</a-tag>
-          <template v-else color="#FFF">{{text}}</template>
-        </template>
-      </ele-pro-table>
-    </a-card>
-  </div>
-  <!-- 编辑弹窗 -->
+    <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-select v-model:value="where.monitorYear" allowClear>
+                                <a-select-option
+                                    v-for="(item) in yearOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="季度:">
+                            <a-select v-model:value="where.quarter" allowClear>
+                                <a-select-option
+                                    v-for="(item) in quarterOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="区域等级:">
+                            <a-select v-model:value="where.regionLevel" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in regionLevelOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="测点名称:">
+                            <a-select v-model:value="where.place" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in palceOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="功能区类别:">
+                            <a-select v-model:value="where.functionType" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in functionTypeOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+                            <a-space>
+                                <a-button type="primary" @click="reload">查询</a-button>
+                                <a-button @click="reset">重置</a-button>
+                                <a-button @click="exportFile">导出Excel</a-button>
+                            </a-space>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+            <!-- 表格 -->
+            <ele-pro-table
+                v-model:selection="selectionList"
+                ref="table"
+                row-key="functionNoiseId"
+                :datasource="url"
+                :columns="columns"
+                :where="where"
+                :scroll="{ x: 'max-content' }"
+                @done="(d) => (data = d.data)"
+            >
+                <template #Leq="{ text,record  }">
+                    <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)"
+                           color="green">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)"
+                        color="blue">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)"
+                        color="red">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)"
+                        color="red">{{ text }}
+                    </a-tag>
+                    <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)"
+                           color="red">{{ text }}
+                    </a-tag>
+                    <template v-else color="#FFF">{{ text }}</template>
+                </template>
+            </ele-pro-table>
+        </a-card>
+    </div>
+    <!-- 编辑弹窗 -->
 </template>
 
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import { pageFunctionNoiseUrl, getColumnOptions } from "@/api/ecology/noise/function-sound";
+import {pageFunctionNoiseUrl, getColumnOptions,listAllFunctionNoise} from "@/api/ecology/noise/function-sound";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import moment from "moment";
 //   import utils from "./utils";
 export default {
-  name: "StatisticSoundFunctionBase",
-  components: {},
-  data() {
-    return {
-      data: [],
-      locale,
-      bill: {},
-      // 表格数据接口
-      url: pageFunctionNoiseUrl,
-      selection: [],
-      // 表格列配置
-      columns: [
-        {
-          title: "监测时间",
-          dataIndex: "monitorTime",
-          customRender:({text})=>{
-            return moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
-          },
-          sorter: true,
-        },
-        {
-          title: "点位编码",
-          dataIndex: "placeCode",
-          sorter: true,
-        },
-        {
-          title: "测点名称",
-          dataIndex: "place",
-          sorter: true,
-        },
-        {
-          title: "测点经度",
-          dataIndex: "placeLng",
-          sorter: true,
-        },
-        {
-          title: "测点纬度",
-          dataIndex: "placeLat",
-          sorter: true,
-        },
-         {
-          title: "测点高度",
-          dataIndex: "placeHeight",
-          sorter: true,
-        },
-        
-        {
-          title: "测点参照物",
-          dataIndex: "refObj",
-          sorter: true,
-        },
-        {
-          title: "功能区代码",
-          dataIndex: "functionCode",
-          sorter: true,
-        },
-        {
-          title: "功能区类别",
-          dataIndex: "functionType",
-          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",
-          slots: { customRender: "Leq" },
-          sorter: true,
-        },
-        {
-          title: "SDdB(A)",
-          dataIndex: "indexSd",
-          sorter: true,
-        },
-        {
-          title: "L10dB(A)",
-          dataIndex: "indexL10",
-          sorter: true,
-        },
-        {
-          title: "L50dB(A)",
-          dataIndex: "indexL50",
-          sorter: true,
-        },
-        {
-          title: "L90dB(A)",
-          dataIndex: "indexL90",
-          sorter: true,
-        },
-        {
-          title: "LmindB(A)",
-          dataIndex: "indexLmin",
-          sorter: true,
-        },
-        {
-          title: "LmaxdB(A)",
-          dataIndex: "indexLmax",
-          sorter: true,
-        },
-        {
-          title: "监测站名",
-          dataIndex: "station",
-          sorter: true,
-        },
-        {
-          title: "监测仪器型号",
-          dataIndex: "monitorInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "监测仪器编号",
-          dataIndex: "monitorInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "监测前校准值",
-          dataIndex: "beforeMonitorValue",
-          sorter: true,
-        },
-        {
-          title: "声校准器测量声压值",
-          dataIndex: "soundPressureValue",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器型号",
-          dataIndex: "soundInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器编号",
-          dataIndex: "soundInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "区域等级",
-          dataIndex: "regionLevel",
-          sorter: true,
-        },
-        {
-          title: "备注",
-          dataIndex: "remark",
-          sorter: true,
-        },
-        {
-          title: "创建人",
-          dataIndex: "username",
-          sorter: true,
-        },
-      ],
-      palceOptions: [],
-      areaOptions: [],
-      functionTypeOptions: [],
-      regionLevelOptions: [],
-      // 表格搜索条件
-      where: {
-        checked: 1,
-      },
-      // 表格选中数据
-      selectionList: [],
-    };
-  },
-  mounted() {
-    this.loadOptionData();
-  },
-  methods: {
-    /**获取下来框数据 */
-    loadOptionData() {
-      getColumnOptions("place").then((res) => {
-        this.palceOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-      getColumnOptions("area").then((res) => {
-        this.areaOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-      getColumnOptions("function_type").then((res) => {
-        this.functionTypeOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-      getColumnOptions("region_level").then((res) => {
-        this.regionLevelOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-    },
-    /* 刷新表格 */
-    reload() {
+    name: "StatisticSoundFunctionBase",
+    components: {},
+    data() {
+        return {
+            data: [],
+            locale,
+            bill: {},
+            // 表格数据接口
+            url: pageFunctionNoiseUrl,
+            selection: [],
+            // 表格列配置
+            columns: [
+                {
+                    title: "监测时间",
+                    dataIndex: "monitorTime",
+                    customRender: ({text}) => {
+                        return moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+                    },
+                    sorter: true,
+                },
+                {
+                    title: "点位编码",
+                    dataIndex: "placeCode",
+                    sorter: true,
+                },
+                {
+                    title: "测点名称",
+                    dataIndex: "place",
+                    sorter: true,
+                },
+                {
+                    title: "测点经度",
+                    dataIndex: "placeLng",
+                    sorter: true,
+                },
+                {
+                    title: "测点纬度",
+                    dataIndex: "placeLat",
+                    sorter: true,
+                },
+                {
+                    title: "测点高度",
+                    dataIndex: "placeHeight",
+                    sorter: true,
+                },
 
-      this.$refs.table.reload({
-        where: this.where,
-      });
+                {
+                    title: "测点参照物",
+                    dataIndex: "refObj",
+                    sorter: true,
+                },
+                {
+                    title: "功能区代码",
+                    dataIndex: "functionCode",
+                    sorter: true,
+                },
+                {
+                    title: "功能区类别",
+                    dataIndex: "functionType",
+                    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",
+                    slots: {customRender: "Leq"},
+                    sorter: true,
+                },
+                {
+                    title: "SDdB(A)",
+                    dataIndex: "indexSd",
+                    sorter: true,
+                },
+                {
+                    title: "L10dB(A)",
+                    dataIndex: "indexL10",
+                    sorter: true,
+                },
+                {
+                    title: "L50dB(A)",
+                    dataIndex: "indexL50",
+                    sorter: true,
+                },
+                {
+                    title: "L90dB(A)",
+                    dataIndex: "indexL90",
+                    sorter: true,
+                },
+                {
+                    title: "LmindB(A)",
+                    dataIndex: "indexLmin",
+                    sorter: true,
+                },
+                {
+                    title: "LmaxdB(A)",
+                    dataIndex: "indexLmax",
+                    sorter: true,
+                },
+                {
+                    title: "监测站名",
+                    dataIndex: "station",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器型号",
+                    dataIndex: "monitorInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器编号",
+                    dataIndex: "monitorInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "监测前校准值",
+                    dataIndex: "beforeMonitorValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准器测量声压值",
+                    dataIndex: "soundPressureValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器型号",
+                    dataIndex: "soundInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器编号",
+                    dataIndex: "soundInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "区域等级",
+                    dataIndex: "regionLevel",
+                    sorter: true,
+                },
+                {
+                    title: "备注",
+                    dataIndex: "remark",
+                    sorter: true,
+                },
+                {
+                    title: "创建人",
+                    dataIndex: "username",
+                    sorter: true,
+                },
+            ],
+            palceOptions: [],
+            areaOptions: [],
+            functionTypeOptions: [],
+            regionLevelOptions: [],
+            yearOptions:[],
+            quarterOptions:[
+                {label: "第一季度",value:1},
+                {label: "第二季度",value:2},
+                {label: "第三季度",value:3},
+                {label: "第四季度",value:4},
+            ],
+            // 表格搜索条件
+            where: {
+                checked: 1,
+            },
+            // 表格选中数据
+            selectionList: [],
+        };
     },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        checked: 1,
-      };
-      this.reload();
+    mounted() {
+        this.loadOptionData();
     },
-    exportFile() {
-      const columns = [
-         {
-          title: "行政区划代码",
-          dataIndex: "regionCode",
-          sorter: true,
+    methods: {
+        /**获取下来框数据 */
+        loadOptionData() {
+            getColumnOptions("place").then((res) => {
+                this.palceOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("area").then((res) => {
+                this.areaOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("function_type").then((res) => {
+                this.functionTypeOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("region_level").then((res) => {
+                this.regionLevelOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("monitor_year").then((res) => {
+                this.yearOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
         },
-        {
-          title: "监测年度",
-          dataIndex: "monitorYear",
-          sorter: true,
+        /* 刷新表格 */
+        reload() {
+
+            this.$refs.table.reload({
+                where: this.where,
+            });
         },
-        {
-          title: "点位编码",
-          dataIndex: "placeCode",
-          sorter: true,
+        /* 重置搜索 */
+        reset() {
+            this.where = {
+                checked: 1,
+            };
+            this.reload();
         },
-        {
-          title: "测点名称",
-          dataIndex: "place",
-          sorter: true,
+        exportFile() {
+            const columns = [
+                {
+                    title: "行政区划代码",
+                    dataIndex: "regionCode",
+                    sorter: true,
+                },
+                {
+                    title: "监测年度",
+                    dataIndex: "monitorYear",
+                    sorter: true,
+                },
+                {
+                    title: "点位编码",
+                    dataIndex: "placeCode",
+                    sorter: true,
+                },
+                {
+                    title: "测点名称",
+                    dataIndex: "place",
+                    sorter: true,
+                },
+                {
+                    title: "测点经度",
+                    dataIndex: "placeLng",
+                    sorter: true,
+                },
+                {
+                    title: "测点纬度",
+                    dataIndex: "placeLat",
+                    sorter: true,
+                },
+                {
+                    title: "测点高度",
+                    dataIndex: "placeHeight",
+                    sorter: true,
+                },
+                {
+                    title: "测点参照物",
+                    dataIndex: "refObj",
+                    sorter: true,
+                },
+                {
+                    title: "功能区代码",
+                    dataIndex: "functionCode",
+                    sorter: true,
+                },
+                {
+                    title: "月",
+                    dataIndex: "monitorMonth",
+                    sorter: true,
+                },
+                {
+                    title: "日",
+                    dataIndex: "monitorDay",
+                    sorter: true,
+                },
+                {
+                    title: "时",
+                    dataIndex: "monitorHour",
+                    sorter: true,
+                },
+                {
+                    title: "分",
+                    dataIndex: "monitorMinute",
+                    sorter: true,
+                },
+
+                {
+                    title: "Leq",
+                    dataIndex: "indexLeq",
+                    sorter: true,
+                },
+
+                {
+                    title: "L10",
+                    dataIndex: "indexL10",
+                    sorter: true,
+                },
+                {
+                    title: "L50",
+                    dataIndex: "indexL50",
+                    sorter: true,
+                },
+                {
+                    title: "L90",
+                    dataIndex: "indexL90",
+                    sorter: true,
+                },
+                {
+                    title: "最大值",
+                    dataIndex: "indexLmax",
+                    sorter: true,
+                },
+                {
+                    title: "最小值",
+                    dataIndex: "indexLmin",
+                    sorter: true,
+                },
+                {
+                    title: "标准差(SD)",
+                    dataIndex: "indexSd",
+                    sorter: true,
+                },
+                {
+                    title: "监测站名",
+                    dataIndex: "station",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器型号",
+                    dataIndex: "monitorInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器编号",
+                    dataIndex: "monitorInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "监测前校准值",
+                    dataIndex: "beforeMonitorValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准器测量声压值",
+                    dataIndex: "soundPressureValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器型号",
+                    dataIndex: "soundInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器编号",
+                    dataIndex: "soundInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "区域等级",
+                    dataIndex: "regionLevel",
+                    sorter: true,
+                },
+                {
+                    title: "备注",
+                    dataIndex: "remark",
+                    sorter: true,
+                },
+            ];
+            const arr = [];
+            const th = columns.map((item) => item.title);
+            arr.push(th);
+            listAllFunctionNoise(this.where).then(res=>{
+                if(res.data.code == 0){
+                    res.data.data.forEach((d) => {
+                        const td = columns.map((item) => {
+                            let val = d[item.dataIndex];
+                            if(["indexLeq","indexL10","indexL50","indexL90","indexLmax","indexLmin","indexSd"].includes(item.dataIndex)){
+                                val = Number(val).toFixed(1);
+                            }
+                            return val;
+                        });
+
+                        arr.push(td);
+                    });
+
+                    let sheet = XLSX.utils.aoa_to_sheet(arr);
+                    this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+                }
+            })
+
         },
-        {
-          title: "测点经度",
-          dataIndex: "placeLng",
-          sorter: true,
-        },
-        {
-          title: "测点纬度",
-          dataIndex: "placeLat",
-          sorter: true,
-        },
-        {
-          title: "测点高度",
-          dataIndex: "placeHeight",
-          sorter: true,
-        },
-        {
-          title: "测点参照物",
-          dataIndex: "refObj",
-          sorter: true,
-        },
-         {
-          title: "功能区代码",
-          dataIndex: "functionCode",
-          sorter: true,
-        },
-        {
-          title: "月",
-          dataIndex: "monitorMonth",
-          sorter: true,
-        },
-        {
-          title: "日",
-          dataIndex: "monitorDay",
-          sorter: true,
-        },
-        {
-          title: "时",
-          dataIndex: "monitorHour",
-          sorter: true,
-        },
-        {
-          title: "分",
-          dataIndex: "monitorMinute",
-          sorter: true,
-        },
-       
-        {
-          title: "Leq",
-          dataIndex: "indexLeq",
-          sorter: true,
-        },
-        
-        {
-          title: "L10",
-          dataIndex: "indexL10",
-          sorter: true,
-        },
-        {
-          title: "L50",
-          dataIndex: "indexL50",
-          sorter: true,
-        },
-        {
-          title: "L90",
-          dataIndex: "indexL90",
-          sorter: true,
-        },
-        {
-          title: "最大值",
-          dataIndex: "indexLmax",
-          sorter: true,
-        },
-         {
-          title: "最小值",
-          dataIndex: "indexLmin",
-          sorter: true,
-        },
-       {
-          title: "标准差(SD)",
-          dataIndex: "indexSd",
-          sorter: true,
-        },
-        {
-          title: "监测站名",
-          dataIndex: "station",
-          sorter: true,
-        },
-        {
-          title: "监测仪器型号",
-          dataIndex: "monitorInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "监测仪器编号",
-          dataIndex: "monitorInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "监测前校准值",
-          dataIndex: "beforeMonitorValue",
-          sorter: true,
-        },
-        {
-          title: "声校准器测量声压值",
-          dataIndex: "soundPressureValue",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器型号",
-          dataIndex: "soundInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器编号",
-          dataIndex: "soundInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "区域等级",
-          dataIndex: "regionLevel",
-          sorter: true,
-        },
-         {
-          title: "备注",
-          dataIndex: "remark",
-          sorter: true,
-        },
-      ];
-      const arr = [];
-      const th = columns.map((item) => item.title);
-      arr.push(th);
-      this.data.forEach((d) => {
-        const td = columns.map((item) => d[item.dataIndex]);
-        arr.push(td);
-      });
-      let sheet = XLSX.utils.aoa_to_sheet(arr);
-      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
     },
-  },
 };
 </script>
 
diff --git a/src/views/sound/function/statistic/index.vue b/src/views/sound/function/statistic/index.vue
index 9a01317..f72d488 100644
--- a/src/views/sound/function/statistic/index.vue
+++ b/src/views/sound/function/statistic/index.vue
@@ -11,9 +11,9 @@
         <!-- <a-tab-pane key="quarter" tab="季度报告">
          <quarter-statistic></quarter-statistic>
         </a-tab-pane> -->
-        <a-tab-pane key="year-compare" tab="同比">
-         <compare></compare>
-        </a-tab-pane>
+<!--        <a-tab-pane key="year-compare" tab="同比">-->
+<!--         <compare></compare>-->
+<!--        </a-tab-pane>-->
       </a-tabs>
     </a-card>
   </div>
@@ -27,7 +27,7 @@
    */
   import BaseStatistic from "./base.vue";
   // import QuarterStatistic from "./quarter.vue";
-  import Compare from "./compare.vue";
+  // import Compare from "./compare.vue";
   import AverageStatistic from "./average.vue";
 
   export default {
@@ -35,7 +35,7 @@
     components: {
       BaseStatistic,
       // QuarterStatistic,
-      Compare,
+      // Compare,
       AverageStatistic
     },
     data() {
diff --git a/src/views/sound/road/collect/index.vue b/src/views/sound/road/collect/index.vue
index 3d36771..48cc877 100644
--- a/src/views/sound/road/collect/index.vue
+++ b/src/views/sound/road/collect/index.vue
@@ -86,9 +86,9 @@ export default {
                     );
 
                     // 解析成对象数组
-                    const billName = aoa[0][0];
+                    const billName = file.name;
                     const billData = utils.toObjData(roadNoiseList);
-                    const billName2 = aoa2[0][0];
+                    const billName2 = file.name;
                     const billData2 = utils.toObjData(roadNoiseList2);
                     // 其他信息
                     const billData3 = utils.toPlaceData(roadNoiseList3);
@@ -199,7 +199,7 @@ export default {
                     );
 
                     // 解析成对象数组
-                    const billName = aoa[0][0];
+                    const billName = file.name;
                     const billData = utils.toAreaObjData(roadNoiseList);
 
                     if (!billData || billData.length == 0) {
diff --git a/src/views/sound/road/statistic/base.vue b/src/views/sound/road/statistic/base.vue
index c999cae..9e8cbb8 100644
--- a/src/views/sound/road/statistic/base.vue
+++ b/src/views/sound/road/statistic/base.vue
@@ -605,7 +605,13 @@ export default {
       listAll(this.where).then(res=>{
         if(res.data.code == 0){
           res.data.data.forEach((d) => {
-            const td = columns.map((item) => d[item.dataIndex]);
+            const td = columns.map((item) => {
+                let val = d[item.dataIndex];
+                if(["indexLeq","indexL10","indexL50","indexL90","indexLmax","indexLmin","indexSd"].includes(item.dataIndex)){
+                    val = Number(val).toFixed(1);
+                }
+                return val;
+            });
             arr.push(td);
           });
           let sheet = XLSX.utils.aoa_to_sheet(arr);
diff --git a/src/views/sound/zone/collect/index.vue b/src/views/sound/zone/collect/index.vue
index 663219a..e7ec7cf 100644
--- a/src/views/sound/zone/collect/index.vue
+++ b/src/views/sound/zone/collect/index.vue
@@ -1,242 +1,244 @@
 <template>
-  <div class="ele-body">
-    <a-card style="width: 100%" :bordered="false">
-      <template #title>
-        <a-space>
-          <a-upload
-            :before-upload="importFileCity"
-            :showUploadList="false"
-            accept=".xls,.xlsx,.csv"
-          >
-            <a-button>市级导入</a-button>
-          </a-upload>
-          <!-- <a-upload
-            :before-upload="importFileArea"
-            :showUploadList="false"
-            accept=".xls,.xlsx,.csv"
-          >
-            <a-button>县级导入</a-button>
-          </a-upload> -->
-        </a-space>
-      </template>
-      <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane tab="噪声信息" key="noise">
-          <noise-bill ref="noise"></noise-bill>
-        </a-tab-pane>
-      </a-tabs>
-    </a-card>
-  </div>
+    <div class="ele-body">
+        <a-card style="width: 100%" :bordered="false">
+            <template #title>
+                <a-space>
+                    <a-upload
+                        :before-upload="importFileCity"
+                        :showUploadList="false"
+                        accept=".xls,.xlsx,.csv"
+                    >
+                        <a-button>市级导入</a-button>
+                    </a-upload>
+                    <a-upload
+                        :before-upload="importFileArea"
+                        :showUploadList="false"
+                        accept=".xls,.xlsx,.csv"
+                    >
+                        <a-button>县级导入</a-button>
+                    </a-upload>
+                </a-space>
+            </template>
+            <a-tabs v-model:activeKey="activeKey">
+                <a-tab-pane tab="噪声信息" key="noise">
+                    <noise-bill ref="noise"></noise-bill>
+                </a-tab-pane>
+            </a-tabs>
+        </a-card>
+    </div>
 </template>
 
 <script>
 import XLSX from "xlsx";
 import utils from "./utils";
-import { Modal } from "ant-design-vue";
+import {Modal} from "ant-design-vue";
 import NoiseBill from "./noise-bill.vue";
-import { saveZoneNoiseBill } from "@/api/ecology/noise/zone-sound";
+import {saveZoneNoiseBill} from "@/api/ecology/noise/zone-sound";
+
 export default {
-  name: "ZoneCollectIndex",
-  components: {
-    NoiseBill,
-  },
-  data() {
-    return {
-      activeKey: "noise",
-    };
-  },
-  methods: {
-    /* 导入本地excel文件 */
-    importFileCity(file) {
-      const hide = this.$message.loading("导入中..", 0);
-
-      let reader = new FileReader();
-      reader.onload = (e) => {
-        try {
-          let data = new Uint8Array(e.target.result);
-          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,
-          });
-        
-          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
-          const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-");
-
-          const zoneNoiseList = aoa.filter(
-            (item) => {
-              return item.length >= 26 && typeof item[0] == "number"}
-          );
-          const zoneNoiseList2 = aoa2.filter(
-            (item) => item.length >= 26 && typeof item[0] == "number"
-          );
-         
-
-          // 解析成对象数组
-          const billName = aoa[0][0];
-          const billData = utils.toObjData(zoneNoiseList);
-          const billName2 = aoa2[0][0];
-          const billData2 = utils.toObjData(zoneNoiseList2);
-          if (
-            (!billData || billData.length == 0) &&
-            (!billData2 || billData2.length == 0)
-          ) {
-            hide()
-            Modal.error({
-              title: "导入失败",
-              content: "找不到数据",
-            });
-            return;
-          }
-
-          const tasks = [];
-          if (billData.length > 0) {
-            tasks.push(
-              saveZoneNoiseBill({
-                reportTime: new Date(reportDate).getTime(),
-                billName: billName,
-                regionLevel: "市级",
-                zoneNoiseList: billData,
-              })
-            );
-          }
-
-          if (billData2.length > 0) {
-            tasks.push(
-              saveZoneNoiseBill({
-                reportTime: new Date(reportDate2).getTime(),
-                billName: billName2,
-                regionLevel: "市级",
-                zoneNoiseList: billData2,
-              })
-            );
-          }
-
-          // 上传到服务器
-
-          Promise.all(tasks)
-            .then(() => {
-              Modal.success({
-                title: "导入成功",
-                content: `成功导入${billData.length + billData2.length}条数据`,
-              });
-              this.$refs.noise && this.$refs.noise.reload();
-            })
-            .catch(() => {
-              Modal.error({
-                title: "导入失败",
-                content: "数据上传出错",
-              });
-            })
-            .finally(() => {
-              hide();
-            });
-        } catch (error) {
-          hide();
-          Modal.error({
-            title: "导入失败",
-            content: error.message,
-          });
-        }
-        // console.log(billData);
-      };
-      reader.readAsArrayBuffer(file);
-
-      return false;
+    name: "ZoneCollectIndex",
+    components: {
+        NoiseBill,
     },
-    importFileArea(file) {
-      const hide = this.$message.loading("导入中..", 0);
+    data() {
+        return {
+            activeKey: "noise",
+        };
+    },
+    methods: {
+        /* 导入本地excel文件 */
+        importFileCity(file) {
+            const hide = this.$message.loading("导入中..", 0);
 
-      let reader = new FileReader();
+            let reader = new FileReader();
+            reader.onload = (e) => {
+                try {
+                    let data = new Uint8Array(e.target.result);
+                    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,
+                    });
 
-      reader.onload = (e) => {
-        try {
-          let data = new Uint8Array(e.target.result);
-          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,
-          });
+                    const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
+                    const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-");
 
-          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
-          const zoneNoiseList = aoa.filter(
-            (item) => {
+                    const zoneNoiseList = aoa.filter(
+                        (item) => {
+                            return item.length >= 26 && typeof item[0] == "number"
+                        }
+                    );
+                    const zoneNoiseList2 = aoa2.filter(
+                        (item) => item.length >= 26 && typeof item[0] == "number"
+                    );
 
-              return item.length >= 35 && item[0] != "行政区划代码"
-            }
-          );
 
-          // 解析成对象数组
-          const billName = aoa[0][0];
-          const billData = utils.toAreaObjData(zoneNoiseList);
+                    // 解析成对象数组
+                    const billName = file.name;
+                    const billData = utils.toObjData(zoneNoiseList);
+                    const billName2 = file.name;
+                    const billData2 = utils.toObjData(zoneNoiseList2);
+                    if (
+                        (!billData || billData.length == 0) &&
+                        (!billData2 || billData2.length == 0)
+                    ) {
+                        hide()
+                        Modal.error({
+                            title: "导入失败",
+                            content: "找不到数据",
+                        });
+                        return;
+                    }
 
-          if (!billData || billData.length == 0) {
-            hide();
-            Modal.error({
-              title: "导入失败",
-              content: "找不到可用数据",
-            });
+                    const tasks = [];
+                    if (billData.length > 0) {
+                        tasks.push(
+                            saveZoneNoiseBill({
+                                reportTime: new Date(reportDate).getTime(),
+                                billName: billName,
+                                regionLevel: "市级",
+                                zoneNoiseList: billData,
+                            })
+                        );
+                    }
 
-            return;
-          }
+                    if (billData2.length > 0) {
+                        tasks.push(
+                            saveZoneNoiseBill({
+                                reportTime: new Date(reportDate2).getTime(),
+                                billName: billName2,
+                                regionLevel: "市级",
+                                zoneNoiseList: billData2,
+                            })
+                        );
+                    }
 
-          if (billData.length > 0) {
-            // 上传到服务器
-            saveZoneNoiseBill({
-              reportTime: new Date(reportDate).getTime(),
-              billName: billName,
-              regionLevel: "县级",
-              zoneNoiseList: billData,
-            })
-              .then((res) => {
-                if (res.data.code == 0) {
-                  Modal.success({
-                    title: "导入成功",
-                    content: `成功导入${
-                      billData.length
-                    }条数据`,
-                  });
-                  this.$refs.noise && this.$refs.noise.reload();
-                } else {
-                  Modal.error({
-                    title: "导入失败",
-                    content: "数据上传出错",
-                  });
+                    // 上传到服务器
+
+                    Promise.all(tasks)
+                        .then(() => {
+                            Modal.success({
+                                title: "导入成功",
+                                content: `成功导入${billData.length + billData2.length}条数据`,
+                            });
+                            this.$refs.noise && this.$refs.noise.reload();
+                        })
+                        .catch(() => {
+                            Modal.error({
+                                title: "导入失败",
+                                content: "数据上传出错",
+                            });
+                        })
+                        .finally(() => {
+                            hide();
+                        });
+                } catch (error) {
+                    hide();
+                    Modal.error({
+                        title: "导入失败",
+                        content: error.message,
+                    });
                 }
-              })
-              .catch(() => {
-                Modal.error({
-                  title: "导入失败",
-                  content: "数据上传出错",
-                });
-              })
-              .finally(() => {
-                hide();
-              });
-          }
-        } catch (error) {
-          hide();
-          Modal.error({
-            title: "导入失败",
-            content: error.message,
-          });
-        }
-        // console.log(billData);
-      };
-      reader.readAsArrayBuffer(file);
-      return false;
+                // console.log(billData);
+            };
+            reader.readAsArrayBuffer(file);
+
+            return false;
+        },
+        importFileArea(file) {
+            const hide = this.$message.loading("导入中..", 0);
+
+            let reader = new FileReader();
+
+            reader.onload = (e) => {
+                try {
+                    let data = new Uint8Array(e.target.result);
+                    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,
+                    });
+
+                    const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
+                    const zoneNoiseList = aoa.filter(
+                        (item) => {
+
+                            return item.length >= 28 && item[0] && !item[0].toString().includes("行政区划代码")
+                        }
+                    );
+
+                    // 解析成对象数组
+                    const billName = file.name;
+                    const billData = utils.toAreaObjData(zoneNoiseList);
+
+                    if (!billData || billData.length == 0) {
+                        hide();
+                        Modal.error({
+                            title: "导入失败",
+                            content: "找不到可用数据",
+                        });
+
+                        return;
+                    }
+
+                    if (billData.length > 0) {
+                        // 上传到服务器
+                        saveZoneNoiseBill({
+                            reportTime: new Date(reportDate).getTime(),
+                            billName: billName,
+                            regionLevel: "县级",
+                            zoneNoiseList: billData,
+                        })
+                            .then((res) => {
+                                if (res.data.code == 0) {
+                                    Modal.success({
+                                        title: "导入成功",
+                                        content: `成功导入${
+                                            billData.length
+                                        }条数据`,
+                                    });
+                                    this.$refs.noise && this.$refs.noise.reload();
+                                } else {
+                                    Modal.error({
+                                        title: "导入失败",
+                                        content: "数据上传出错",
+                                    });
+                                }
+                            })
+                            .catch(() => {
+                                Modal.error({
+                                    title: "导入失败",
+                                    content: "数据上传出错",
+                                });
+                            })
+                            .finally(() => {
+                                hide();
+                            });
+                    }
+                } catch (error) {
+                    hide();
+                    Modal.error({
+                        title: "导入失败",
+                        content: error.message,
+                    });
+                }
+                // console.log(billData);
+            };
+            reader.readAsArrayBuffer(file);
+            return false;
+        },
     },
-  },
 };
 </script>
 
diff --git a/src/views/sound/zone/collect/noise.vue b/src/views/sound/zone/collect/noise.vue
index ef0b297..1c7e7f7 100644
--- a/src/views/sound/zone/collect/noise.vue
+++ b/src/views/sound/zone/collect/noise.vue
@@ -1,687 +1,724 @@
 <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-select v-model:value="where.place" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in palceOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
+    <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-select v-model:value="where.place" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in palceOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="城区">
+                            <a-select v-model:value="where.area" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in areaOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-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.zoneNoiseId !== undefined ? '修改记录' : '添加记录'"
+                :confirm-loading="loading"
+                :width="1000"
+                :body-style="{ paddingBottom: '8px' }"
+                @ok="save"
+            >
+                <a-form
+                    ref="form"
+                    :model="form"
+                    :rules="rules"
+                    :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+                    :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
                 >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="城区">
-              <a-select v-model:value="where.area" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in areaOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-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.zoneNoiseId !== undefined ? '修改记录' : '添加记录'"
-        :confirm-loading="loading"
-        :width="1000"
-        :body-style="{ paddingBottom: '8px' }"
-        @ok="save"
-      >
-        <a-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-          :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-        >
-          <a-row>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="日期" name="monitorDate">
-                <a-date-picker
-                  v-model:value="form.monitorDate"
-                  :locale="locale"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="时间" name="monitorTime">
-                <a-time-picker
-                  v-model:value="form.monitorTime"
-                  format="HH:mm"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点名称" name="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="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="zoneLength">
-                <a-input
-                  v-model:value="form.gridLength"
-                  placeholder="请输入网格长（米）"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="网格宽" name="zoneWidth">
-                <a-input
-                  v-model:value="form.gridWidth"
-                  placeholder="请输入网格宽（米）"
-                  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-col :md="12" :sm="24">
-              <a-form-item label="监测站名" name="station">
-                <a-input
-                  v-model:value="form.station"
-                  placeholder="请输入监测站名"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测仪器型号" name="monitorInstrumentModel">
-                <a-input
-                  v-model:value="form.monitorInstrumentModel"
-                  placeholder="请输入监测仪器型号"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测仪器编号" name="monitorInstrumentCode">
-                <a-input
-                  v-model:value="form.monitorInstrumentCode"
-                  placeholder="请输入监测仪器编号"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测前校准值" name="beforeMonitorValue">
-                <a-input
-                  v-model:value="form.beforeMonitorValue"
-                  placeholder="请输入监测前校准值"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测后校准值" name="afterMonitorValue">
-                <a-input
-                  v-model:value="form.afterMonitorValue"
-                  placeholder="请输入监测后校准值"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准器测量声压值" name="soundPressureValue">
-                <a-input
-                  v-model:value="form.soundPressureValue"
-                  placeholder="请输入声校准器测量声压值"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准仪器型号" name="soundInstrumentModel">
-                <a-input
-                  v-model:value="form.soundInstrumentModel"
-                  placeholder="请输入声校准仪器型号"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准仪器编号" name="soundInstrumentCode">
-                <a-input
-                  v-model:value="form.soundInstrumentCode"
-                  placeholder="请输入声校准仪器编号"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="备注" name="remark">
-                <a-input
-                  v-model:value="form.remark"
-                  placeholder="请输入备注"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-modal>
-      <!-- 表格 -->
-      <ele-pro-table
-        v-model:selection="selectionList"
-        ref="table"
-        row-key="zoneNoiseId"
-        :datasource="url"
-        :columns="columns"
-        :where="where"
-        :scroll="{ x: 'max-content' }"
-      >
-        <template v-if="bill.checked != 1" #toolbar>
-          <a-space>
-            <a-button @click="openEdit" type="primary">新增</a-button>
-            <a-popconfirm
-              :disabled="selectionList.length == 0"
-              :title="`确认删除${selectionList.length}条数据吗?`"
-              ok-text="Yes"
-              cancel-text="No"
-              @confirm="removeBatch"
-            >
-              <a-button
-                :disabled="selectionList.length == 0"
-                type="primary"
-                ghost
-                danger
-                >删除</a-button
-              >
-            </a-popconfirm>
-          </a-space>
-        </template>
+                    <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="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="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="zoneLength">
+                                <a-input
+                                    v-model:value="form.gridLength"
+                                    placeholder="请输入网格长（米）"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="网格宽" name="zoneWidth">
+                                <a-input
+                                    v-model:value="form.gridWidth"
+                                    placeholder="请输入网格宽（米）"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
 
-        <template #Leq="{ text,record  }">
-          <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)" color="green">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)" color="blue">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)" color="red">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)" color="red">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)" color="red">{{text}}</a-tag>
-          <template v-else color="#FFF">{{text}}</template>
-        </template>
+                        <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-col :md="12" :sm="24">
+                            <a-form-item label="测点参照物" name="reqObj">
+                                <a-input
+                                    v-model:value="form.station"
+                                    placeholder="请输入测点参照物"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="监测站名" name="station">
+                                <a-input
+                                    v-model:value="form.station"
+                                    placeholder="请输入监测站名"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="监测仪器型号" name="monitorInstrumentModel">
+                                <a-input
+                                    v-model:value="form.monitorInstrumentModel"
+                                    placeholder="请输入监测仪器型号"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="监测仪器编号" name="monitorInstrumentCode">
+                                <a-input
+                                    v-model:value="form.monitorInstrumentCode"
+                                    placeholder="请输入监测仪器编号"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="监测前校准值" name="beforeMonitorValue">
+                                <a-input
+                                    v-model:value="form.beforeMonitorValue"
+                                    placeholder="请输入监测前校准值"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="监测后校准值" name="afterMonitorValue">
+                                <a-input
+                                    v-model:value="form.afterMonitorValue"
+                                    placeholder="请输入监测后校准值"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="声校准器测量声压值" name="soundPressureValue">
+                                <a-input
+                                    v-model:value="form.soundPressureValue"
+                                    placeholder="请输入声校准器测量声压值"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="声校准仪器型号" name="soundInstrumentModel">
+                                <a-input
+                                    v-model:value="form.soundInstrumentModel"
+                                    placeholder="请输入声校准仪器型号"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="声校准仪器编号" name="soundInstrumentCode">
+                                <a-input
+                                    v-model:value="form.soundInstrumentCode"
+                                    placeholder="请输入声校准仪器编号"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="12" :sm="24">
+                            <a-form-item label="备注" name="remark">
+                                <a-input
+                                    v-model:value="form.remark"
+                                    placeholder="请输入备注"
+                                    allow-clear
+                                />
+                            </a-form-item>
+                        </a-col>
+                    </a-row>
+                </a-form>
+            </a-modal>
+            <!-- 表格 -->
+            <ele-pro-table
+                v-model:selection="selectionList"
+                ref="table"
+                row-key="zoneNoiseId"
+                :datasource="url"
+                :columns="columns"
+                :where="where"
+                :scroll="{ x: 'max-content' }"
+            >
+                <template v-if="bill.checked != 1" #toolbar>
+                    <a-space>
+                        <a-button @click="openEdit" type="primary">新增</a-button>
+                        <a-popconfirm
+                            :disabled="selectionList.length == 0"
+                            :title="`确认删除${selectionList.length}条数据吗?`"
+                            ok-text="Yes"
+                            cancel-text="No"
+                            @confirm="removeBatch"
+                        >
+                            <a-button
+                                :disabled="selectionList.length == 0"
+                                type="primary"
+                                ghost
+                                danger
+                            >删除
+                            </a-button
+                            >
+                        </a-popconfirm>
+                    </a-space>
+                </template>
 
-        <template #action="{ record }">
-          <a-space>
-            <a-button
-              @click="openEdit(record)"
-              type="primary"
-              shape="round"
-              size="small"
-              >修改</a-button
-            >
-            <a-popconfirm
-              :title="`确认删除这条数据吗?`"
-              ok-text="Yes"
-              cancel-text="No"
-              @confirm="remove(record)"
-            >
-              <a-button type="primary" danger shape="round" size="small"
-                >删除</a-button
-              >
-            </a-popconfirm>
-          </a-space>
-        </template>
-      </ele-pro-table>
-    </a-card>
-  </div>
-  <!-- 编辑弹窗 -->
+                <template #Leq="{ text,record  }">
+                    <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)"
+                           color="green">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)"
+                        color="blue">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)"
+                        color="red">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)"
+                        color="red">{{ text }}
+                    </a-tag>
+                    <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)"
+                           color="red">{{ text }}
+                    </a-tag>
+                    <template v-else color="#FFF">{{ text }}</template>
+                </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 {
-  pageZoneNoiseUrl,
-  saveZoneNoise,
-  removeZoneNoise,
-  removeBatchZoneNoise,
-  updateZoneNoise,
-  getZoneNoiseBill,
-  getColumnOptions,
+    pageZoneNoiseUrl,
+    saveZoneNoise,
+    removeZoneNoise,
+    removeBatchZoneNoise,
+    updateZoneNoise,
+    getZoneNoiseBill,
+    getColumnOptions,
 } from "@/api/ecology/noise/zone-sound";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import moment from "moment";
 //   import utils from "./utils";
 export default {
-  name: "ZoneCollectNoise",
-  components: {},
-  data() {
-    const { billId } = this.$route.params;
+    name: "ZoneCollectNoise",
+    components: {},
+    data() {
+        const {billId} = this.$route.params;
 
-    return {
-      locale,
-      bill: {},
-      // 表格数据接口
-      url: pageZoneNoiseUrl,
-      selection: [],
-      // 表格列配置
-      columns: [
-        {
-          title: "监测日期",
-          dataIndex: "monitorTime",
-          sorter: true,
-          customRender: ({text})=> moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
-        },
-        {
-          title: "测点名称",
-          dataIndex: "place",
-          sorter: true,
-        },
-        {
-          title: "所属城区",
-          dataIndex: "area",
-          sorter: true,
-        },
-        {
-          title: "网格长（米）",
-          dataIndex: "gridLength",
-          sorter: true,
-        },
-        {
-          title: "网格宽（米）",
-          dataIndex: "gridWidth",
-          sorter: true,
-        },
-         {
-          title: "网格点号",
-          dataIndex: "gridNo",
-          sorter: true,
-        },
-        {
-          title: "主要声源",
-          dataIndex: "source",
-          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",
-          slots: {customRender: "Leq"},
-          sorter: true,
-        },
-        {
-          title: "SDdB(A)",
-          dataIndex: "indexSd",
-          sorter: true,
-        },
-        {
-          title: "L10dB(A)",
-          dataIndex: "indexL10",
-          sorter: true,
-        },
-        {
-          title: "L50dB(A)",
-          dataIndex: "indexL50",
-          sorter: true,
-        },
-        {
-          title: "L90dB(A)",
-          dataIndex: "indexL90",
-          sorter: true,
-        },
-        {
-          title: "LmindB(A)",
-          dataIndex: "indexLmin",
-          sorter: true,
-        },
-        {
-          title: "LmaxdB(A)",
-          dataIndex: "indexLmax",
-          sorter: true,
-        },
-        {
-          title: "监测站名",
-          dataIndex: "station",
-          sorter: true,
-        },
-        {
-          title: "监测仪器型号",
-          dataIndex: "monitorInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "监测仪器编号",
-          dataIndex: "monitorInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "监测前校准值",
-          dataIndex: "beforeMonitorValue",
-          sorter: true,
-        },
-        {
-          title: "声校准器测量声压值",
-          dataIndex: "soundPressureValue",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器型号",
-          dataIndex: "soundInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器编号",
-          dataIndex: "soundInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "区域等级",
-          dataIndex: "regionLevel",
-          sorter: true,
-        },
-        {
-          title: "备注",
-          dataIndex: "remark",
-          sorter: true,
-        },
-        {
-          title: "创建人",
-          dataIndex: "username",
-          sorter: true,
-        },
-        {
-          title: "操作",
-          key: "action",
-          width: 150,
-          align: "center",
-          fixed: "right",
-          slots: {
-            customRender: "action",
-          },
-        },
-      ],
-      // 表格搜索条件
-      zoneNoiseBillId: billId,
-      palceOptions: [],
-      areaOptions: [],
-      where: {
-        zoneNoiseBillId: billId,
-      },
-      // 表格选中数据
-      selectionList: [],
-      // 是否显示编辑弹窗
-      showEdit: false,
-      // 表单数据
-      form: {},
-      loading: false,
-      rules: {},
-    };
-  },
-  mounted() {
-    const { billId } = this.$route.params;
-    getZoneNoiseBill(billId).then((res) => {
-      this.bill = res.data.data;
-      if (res.data.data.checked == 1) {
-        this.columns.splice(this.columns.length - 1, 1);
-      }
-    });
-    this.loadOptionData();
-  },
-  methods: {
-    /**获取下来框数据 */
-    loadOptionData() {
-      getColumnOptions("place").then((res) => {
-        this.palceOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-      getColumnOptions("area").then((res) => {
-        this.areaOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
+        return {
+            locale,
+            bill: {},
+            // 表格数据接口
+            url: pageZoneNoiseUrl,
+            selection: [],
+            // 表格列配置
+            columns: [
+                {
+                    title: "监测日期",
+                    dataIndex: "monitorTime",
+                    sorter: true,
+                    customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+                },
+                {
+                    title: "测点名称",
+                    dataIndex: "place",
+                    sorter: true,
+                },
+                {
+                    title: "所属城区",
+                    dataIndex: "area",
+                    sorter: true,
+                },
+                {
+                    title: "网格长（米）",
+                    dataIndex: "gridLength",
+                    sorter: true,
+                },
+                {
+                    title: "网格宽（米）",
+                    dataIndex: "gridWidth",
+                    sorter: true,
+                },
+                {
+                    title: "网格点号",
+                    dataIndex: "gridNo",
+                    sorter: true,
+                },
+                {
+                    title: "主要声源",
+                    dataIndex: "source",
+                    sorter: true,
+                },
+                {
+                    title: "声源代码",
+                    dataIndex: "sourceCode",
+                    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",
+                    slots: {customRender: "Leq"},
+                    sorter: true,
+                },
+                {
+                    title: "SDdB(A)",
+                    dataIndex: "indexSd",
+                    sorter: true,
+                },
+                {
+                    title: "L10dB(A)",
+                    dataIndex: "indexL10",
+                    sorter: true,
+                },
+                {
+                    title: "L50dB(A)",
+                    dataIndex: "indexL50",
+                    sorter: true,
+                },
+                {
+                    title: "L90dB(A)",
+                    dataIndex: "indexL90",
+                    sorter: true,
+                },
+                {
+                    title: "LmindB(A)",
+                    dataIndex: "indexLmin",
+                    sorter: true,
+                },
+                {
+                    title: "LmaxdB(A)",
+                    dataIndex: "indexLmax",
+                    sorter: true,
+                },
+                {
+                    title: "测点参照物",
+                    dataIndex: "reqObj",
+                    sorter: true,
+                },
+                {
+                    title: "监测站名",
+                    dataIndex: "station",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器型号",
+                    dataIndex: "monitorInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器编号",
+                    dataIndex: "monitorInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "监测前校准值",
+                    dataIndex: "beforeMonitorValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准器测量声压值",
+                    dataIndex: "soundPressureValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器型号",
+                    dataIndex: "soundInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器编号",
+                    dataIndex: "soundInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "区域等级",
+                    dataIndex: "regionLevel",
+                    sorter: true,
+                },
+                {
+                    title: "备注",
+                    dataIndex: "remark",
+                    sorter: true,
+                },
+                {
+                    title: "创建人",
+                    dataIndex: "username",
+                    sorter: true,
+                },
+                {
+                    title: "操作",
+                    key: "action",
+                    width: 150,
+                    align: "center",
+                    fixed: "right",
+                    slots: {
+                        customRender: "action",
+                    },
+                },
+            ],
+            // 表格搜索条件
+            zoneNoiseBillId: billId,
+            palceOptions: [],
+            areaOptions: [],
+            where: {
+                zoneNoiseBillId: billId,
+            },
+            // 表格选中数据
+            selectionList: [],
+            // 是否显示编辑弹窗
+            showEdit: false,
+            // 表单数据
+            form: {},
+            loading: false,
+            rules: {},
+        };
     },
-    /* 刷新表格 */
-    reload() {
-
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        zoneNoiseBillId: this.zoneNoiseBillId,
-      };
-      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.zoneNoiseId) {
-        updateZoneNoise(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);
+    mounted() {
+        const {billId} = this.$route.params;
+        getZoneNoiseBill(billId).then((res) => {
+            this.bill = res.data.data;
+            if (res.data.data.checked == 1) {
+                this.columns.splice(this.columns.length - 1, 1);
             }
-          })
-          .catch((error) => {
-            this.$message.error(error.message);
-          })
-          .finally(() => {
-            console.log("finallyfinallyfinallyfinally");
-            hide();
-          });
-      } else {
-        form.zoneNoiseBillId = this.zoneNoiseBillId;
-        saveZoneNoise(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);
+        });
+        this.loadOptionData();
+    },
+    methods: {
+        /**获取下来框数据 */
+        loadOptionData() {
+            getColumnOptions("place").then((res) => {
+                this.palceOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("area").then((res) => {
+                this.areaOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+        },
+        /* 刷新表格 */
+        reload() {
+
+            this.$refs.table.reload({
+                where: this.where,
+            });
+        },
+        /* 重置搜索 */
+        reset() {
+            this.where = {
+                zoneNoiseBillId: this.zoneNoiseBillId,
+            };
+            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);
             }
-          })
-          .catch((error) => {
-            this.$message.error(error.message);
-          })
-          .finally(() => {
-            hide();
-          });
-      }
+            // 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.zoneNoiseId) {
+                updateZoneNoise(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.zoneNoiseBillId = this.zoneNoiseBillId;
+                saveZoneNoise(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);
+            removeZoneNoise(row.zoneNoiseId)
+                .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.zoneNoiseId);
+            const hide = this.$message.loading("请求中..", 0);
+            removeBatchZoneNoise(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());
+        },
     },
-    /* 删除单个 */
-    remove(row) {
-      const hide = this.$message.loading("请求中..", 0);
-      removeZoneNoise(row.zoneNoiseId)
-        .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.zoneNoiseId);
-      const hide = this.$message.loading("请求中..", 0);
-      removeBatchZoneNoise(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>
 
diff --git a/src/views/sound/zone/collect/utils.js b/src/views/sound/zone/collect/utils.js
index 5759bab..2147ae0 100644
--- a/src/views/sound/zone/collect/utils.js
+++ b/src/views/sound/zone/collect/utils.js
@@ -60,6 +60,7 @@ export default {
             if (row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90) {
                 throw new Error(row.place + "数值有误")
             }
+            // console.log(monitorTime)
             return row;
         })
 
@@ -93,12 +94,12 @@ export default {
         return excelData.map(item => {
             const monitorTime = new Date();
             monitorTime.setFullYear(item[1]);
-            monitorTime.setMonth(item[14] - 1);
-            monitorTime.setDate(item[15]);
-            monitorTime.setHours(item[16]);
-            monitorTime.setMinutes(item[17]);
+            monitorTime.setMonth(item[10] - 1);
+            monitorTime.setDate(item[11]);
+            monitorTime.setHours(item[12]);
+            monitorTime.setMinutes(item[13]);
             let quarter = 1;
-            const month = item[14]
+            const month = item[10]
             if (month < 4) {
                 quarter = 1
             } else if (month < 7) {
@@ -108,55 +109,49 @@ export default {
             } else {
                 quarter = 4
             }
-            let timeSlot = "夜";
-            if (item[16] >= 6 && item[16] <= 22) {
-                timeSlot = "昼"
-            }
-            const row =  {
+            const row = {
                 regionCode: item[0],
-                regionLevel: "县级",
                 monitorYear: item[1],
                 placeCode: item[2],
                 place: item[3],
                 placeLng: item[4],
                 placeLat: item[5],
-                road: item[6],
-                roadLength: item[7],
-                roadWidth: item[8],
-                motorway: item[9],
-                motorwayType: item[10],
-                motorwayLevel: item[11],
-                refObj: item[12],
-                people: item[13],
-                monitorMonth: item[14],
-                monitorDay: item[15],
-                monitorHour: item[16],
-                monitorMinute: item[17],
-                smallTrafficFlow: item[18],
-                largeTrafficFlow: item[19],
-                indexLeq: item[20],
-                indexL10: item[21],
-                indexL50: item[22],
-                indexL90: item[23],
-                indexLmax: item[24],
-                indexLmin: item[25],
-                indexSd: item[26],
-                station: item[27],
-                monitorInstrumentModel: item[28],
-                monitorInstrumentCode: item[29],
-                beforeMonitorValue: item[30],
-                afterMonitorValue: item[31],
-                soundPressureValue: item[32],
-                soundInstrumentModel: item[33],
-                soundInstrumentCode: item[34],
-                remark: item[35],
+                reqObj: item[6],
+                gridLength: item[7],
+                people: item[8],
+                functionCode: item[9],
+                monitorMonth: item[10],
+                monitorDay: item[11],
+                monitorHour: item[12],
+                monitorMinute: item[13],
+                sourceCode: item[14],
+                indexLeq: item[15],
+                indexL10: item[16],
+                indexL50: item[17],
+                indexL90: item[18],
+                indexLmax: item[19],
+                indexLmin: item[20],
+                indexSd: item[21],
+                station: item[22],
+                monitorInstrumentModel: item[23],
+                monitorInstrumentCode: item[24],
+                beforeMonitorValue: item[25],
+                afterMonitorValue: item[26],
+                soundPressureValue: item[27],
+                soundInstrumentModel: item[28],
+                soundInstrumentCode: item[29],
                 city: '南宁',
-                timeSlot,
+                regionLevel: "县级",
                 monitorTime: monitorTime.getTime(),
                 quarter
-
             }
-            if(row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90){
+
+            if (row.monitorHour >= 6 && row.monitorHour < 22) {
+                row.timeSlot = "昼"
+            }else{
+                row.timeSlot = "夜"
+            }
+            if (row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90) {
                 throw new Error(row.place + "数值有误")
             }
             return row;
diff --git a/src/views/sound/zone/dict/leq-level.vue b/src/views/sound/zone/dict/leq-level.vue
index 740f614..0ea43ec 100644
--- a/src/views/sound/zone/dict/leq-level.vue
+++ b/src/views/sound/zone/dict/leq-level.vue
@@ -113,11 +113,11 @@ import {
     updateLeqLevel,
     removeLeqLevel,
     removeBatchLeqLevel
-} from "@/api/ecology/noise/road-noise-leq-level";
+} from "@/api/ecology/noise/zone-noise-leq-level";
 import { message } from 'ant-design-vue';
 // import moment from "moment";
 export default {
-    name: "RoadNoiseLeqLevel",
+    name: "ZoneNoiseLeqLevel",
     components: {},
     data() {
         return {
diff --git a/src/views/sound/zone/dict/place.vue b/src/views/sound/zone/dict/place.vue
index b2efb8e..4e3c05b 100644
--- a/src/views/sound/zone/dict/place.vue
+++ b/src/views/sound/zone/dict/place.vue
@@ -3,7 +3,7 @@
         <a-card :bordered="false">
             <a-modal
                 v-model:visible="showEdit"
-                :title="form.roadNoisePlaceId !== undefined ? '修改' : '添加'"
+                :title="form.zoneNoisePlaceId !== undefined ? '修改' : '添加'"
                 :confirm-loading="loading"
                 :width="800"
                 :body-style="{ paddingBottom: '8px' }"
@@ -19,27 +19,22 @@
                     <a-form-item label="测点名称" name="placeName">
                         <a-input v-model:value="form.placeName" placeholder="请输入测点名称" allow-clear />
                     </a-form-item>
+                    <a-form-item label="点位编码" name="placeCode">
+                        <a-input v-model:value="form.placeCode" placeholder="请输入点位编码" allow-clear />
+                    </a-form-item>
                     <a-form-item label="测点经度" name="placeLng">
                         <a-input v-model:value="form.placeLng" placeholder="请输入测点经度" allow-clear />
                     </a-form-item>
                     <a-form-item label="测点纬度" name="placeLat">
                         <a-input v-model:value="form.placeLat" placeholder="请输入测点纬度" allow-clear />
                     </a-form-item>
-                    <a-form-item label="机动车车道数" name="motorway">
-                        <a-input type="number" v-model:value="form.motorway" placeholder="请输入机动车车道数" allow-clear />
-                    </a-form-item>
-                    <a-form-item label="车道类别" name="motorwayType">
-                        <a-input v-model:value="form.motorwayType" placeholder="请输入车道类别" allow-clear />
-                    </a-form-item>
-                    <a-form-item label="道路等级" name="motorwayLevel">
-                        <a-input v-model:value="form.motorwayLevel" placeholder="请输入道路等级" allow-clear />
-                    </a-form-item>
+
                     <a-form-item label="测点参照物" name="refObj">
                         <a-input v-model:value="form.refObj" placeholder="请输入测点参照物" allow-clear />
                     </a-form-item>
-                    <a-form-item label="道路覆盖人口（万人）" name="people">
-                        <a-input v-model:value="form.people" placeholder="请输入道路覆盖人口（万人）" allow-clear />
-                    </a-form-item>
+<!--                    <a-form-item label="网格覆盖人口（万人）" name="people">-->
+<!--                        <a-input v-model:value="form.people" placeholder="请输入网格覆盖人口（万人）" allow-clear />-->
+<!--                    </a-form-item>-->
                     <a-form-item label="监测站名" name="station">
                         <a-input v-model:value="form.station" placeholder="请输入监测站名" allow-clear />
                     </a-form-item>
@@ -70,7 +65,7 @@
             <ele-pro-table
                 v-model:selection="selectionList"
                 ref="table"
-                row-key="roadNoisePlaceId"
+                row-key="zoneNoisePlaceId"
                 :datasource="url"
                 :columns="columns"
                 :where="where"
@@ -131,10 +126,10 @@ import {
     updatePlace,
     removePlace,
     removeBatchPlace
-} from "@/api/ecology/noise/road-noise-place";
+} from "@/api/ecology/noise/zone-noise-place";
 // import moment from "moment";
 export default {
-    name: "RoadNoisePlace",
+    name: "ZoneNoisePlace",
     components: {},
     data() {
         return {
@@ -148,6 +143,10 @@ export default {
                     title: "测点名称",
                     dataIndex: "placeName",
                     sorter: true,
+                }, {
+                    title: "点位编码",
+                    dataIndex: "placeCode",
+                    sorter: true,
                 },
                 {
                     title: "测点经度",
@@ -159,31 +158,12 @@ export default {
                     dataIndex: "placeLat",
                     sorter: true,
                 },
-                {
-                    title: "机动车车道数",
-                    dataIndex: "motorway",
-                    sorter: true,
-                },
-                {
-                    title: "车道类别",
-                    dataIndex: "motorwayType",
-                    sorter: true,
-                },
-                {
-                    title: "道路等级",
-                    dataIndex: "motorwayLevel",
-                    sorter: true,
-                },
                 {
                     title: "测点参照物",
                     dataIndex: "refObj",
                     sorter: true,
                 },
-                {
-                    title: "道路覆盖人口（万人）",
-                    dataIndex: "people",
-                    sorter: true,
-                },
+
                 {
                     title: "监测站名",
                     dataIndex: "station",
@@ -241,7 +221,8 @@ export default {
             form: {},
             loading: false,
             rules: {
-                placeName:[{required: true,message: '请选择测点名称'}],
+                placeName:[{required: true,message: '请输入测点名称'}],
+                placeCode:[{required: true,message: '请输入点位编码'}],
                 placeLng: [{required: true,message: '请输入测点经度',},],
                 placeLat: [{required: true,message: '请输入测点纬度',},],
             },
@@ -275,7 +256,7 @@ export default {
             await this.$refs.form.validate();
             const hide = this.$message.loading('请求中..', 0);
             const form = this.form;
-            if (form.roadNoisePlaceId) {
+            if (form.zoneNoisePlaceId) {
                 updatePlace(form)
                     .then((res) => {
                         if (res.data.code == 0) {
@@ -314,7 +295,7 @@ export default {
         /* 删除单个 */
         remove(row) {
             const hide = this.$message.loading('请求中..', 0);
-            removePlace(row.roadNoisePlaceId).then((res) => {
+            removePlace(row.zoneNoisePlaceId).then((res) => {
                 hide();
                 if (res.data.code === 0) {
                     this.$message.success(res.data.msg);
@@ -330,7 +311,7 @@ export default {
         /* 批量删除 */
         removeBatch() {
             const hide = this.$message.loading('请求中..', 0);
-            const ids = this.selectionList.map((item) => item.roadNoisePlaceId);
+            const ids = this.selectionList.map((item) => item.zoneNoisePlaceId);
             removeBatchPlace(ids).then((res) => {
                 if (res.data.code === 0) {
                     this.$message.success(res.data.msg);
diff --git a/src/views/sound/zone/statistic/average.vue b/src/views/sound/zone/statistic/average.vue
index a657b1e..69a4537 100644
--- a/src/views/sound/zone/statistic/average.vue
+++ b/src/views/sound/zone/statistic/average.vue
@@ -1,211 +1,214 @@
 <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-select v-model:value="where.year" allowClear showSearch>
-                <a-select-option
-                  v-for="item in yearOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-              <a-space>
-                <a-button type="primary" @click="reload">查询</a-button>
-                <!-- <a-button @click="reset">重置</a-button> -->
-                <a-button @click="exportFile">导出Excel</a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-      <!-- 表格 -->
-      <ele-pro-table
-        v-model:selection="selectionList"
-        ref="table"
-        row-key="area"
-        :datasource="url"
-        :columns="columns"
-        :where="where"
-        :needPage="false"
-        :initLoad="false"
-        :scroll="{ x: 'max-content' }"
-        @done="(d) => (data = d.data)"
-      >
-      </ele-pro-table>
-    </a-card>
-  </div>
-  <!-- 编辑弹窗 -->
+    <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-select v-model:value="where.year" allowClear showSearch>
+                                <a-select-option
+                                    v-for="item in yearOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+                            <a-space>
+                                <a-button type="primary" @click="reload">查询</a-button>
+                                <!-- <a-button @click="reset">重置</a-button> -->
+                                <a-button @click="exportFile">导出Excel</a-button>
+                            </a-space>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+            <!-- 表格 -->
+            <ele-pro-table
+                v-model:selection="selectionList"
+                ref="table"
+                row-key="area"
+                :datasource="url"
+                :columns="columns"
+                :where="where"
+                :needPage="false"
+                :initLoad="false"
+                :scroll="{ x: 'max-content' }"
+                @done="(d) => (data = d.data)"
+            >
+            </ele-pro-table>
+        </a-card>
+    </div>
+    <!-- 编辑弹窗 -->
 </template>
 
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import { pageZoneNoiseStatisticUrl, getColumnOptions } from "@/api/ecology/noise/zone-sound";
+import {pageZoneNoiseStatisticUrl, getColumnOptions} from "@/api/ecology/noise/zone-sound";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 //   import utils from "./utils";
 export default {
-  name: "StatisticSoundZoneAverage",
-  components: {},
-  data() {
-    return {
-      data: [],
-      locale,
-      bill: {},
-      // 表格数据接口
-      url: pageZoneNoiseStatisticUrl,
-      selection: [],
-      // 表格列配置
-      columns: [
-        {
-          title: "噪声源分类",
-          dataIndex: "source",
-        },
-        {
-          title: "测点数（个）",
-          dataIndex: "count",
-        },
-        {
-          title: "声源占比（%）",
-          dataIndex: "rate",
-        },
-        {
-          title: "时段",
-          dataIndex: "timeSlot",
-        },
-        {
-          title: "监测结果",
-          children: [
-            {
-              title: "Leq",
-              dataIndex: "leq",
-            },
-            {
-              title: "L10",
-              dataIndex: "l10",
-            },
-            {
-              title: "L50",
-              dataIndex: "l50",
-            },
-            {
-              title: "L90",
-              dataIndex: "l90",
-            },
-          ],
-        },
-      ],
-      // 表格搜索条件
-      where: {},
-      yearOptions: [],
-      // 表格选中数据
-      selectionList: [],
-    };
-  },
-  mounted() {
-    this.loadOptionData();
-  },
-  methods: {
-    /**获取下来框数据 */
-    loadOptionData() {
-      getColumnOptions("monitor_year").then((res) => {
-        this.yearOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-        this.reload();
-      });
+    name: "StatisticSoundZoneAverage",
+    components: {},
+    data() {
+        return {
+            data: [],
+            locale,
+            bill: {},
+            // 表格数据接口
+            url: pageZoneNoiseStatisticUrl,
+            selection: [],
+            // 表格列配置
+            columns: [
+                {
+                    title: "噪声源分类",
+                    dataIndex: "source",
+                },
+                {
+                    title: "测点数（个）",
+                    dataIndex: "count",
+                },
+                {
+                    title: "声源占比（%）",
+                    dataIndex: "rate",
+                },
+                {
+                    title: "时段",
+                    dataIndex: "timeSlot",
+                },
+                {
+                    title: "监测结果",
+                    children: [
+                        {
+                            title: "Leq",
+                            dataIndex: "leq",
+                        },
+                        {
+                            title: "L10",
+                            dataIndex: "l10",
+                        },
+                        {
+                            title: "L50",
+                            dataIndex: "l50",
+                        },
+                        {
+                            title: "L90",
+                            dataIndex: "l90",
+                        },
+                    ],
+                },
+            ],
+            // 表格搜索条件
+            where: {},
+            yearOptions: [],
+            // 表格选中数据
+            selectionList: [],
+        };
     },
-    /* 刷新表格 */
-    reload() {
-      const columns = [
-        {
-          title: "城区",
-          dataIndex: "area"
-        }
-      ]
-      this.yearOptions.forEach(item=>{
-        const {startYear,endYear} = this.where;
-        if((startYear&& Number(startYear)>Number(item.value))|| (endYear&&Number(endYear)<Number(item.value))){
-          console.log("");
-        }else{
-          columns.push({
-          title: item.value + "年噪声值",
-          dataIndex: item.value + "Leq"
-        })
-        }
-       
-      })
-      this.columns = columns;
-     
-      this.$refs.table.reload({
-        where: this.where,
-      });
+    mounted() {
+        this.loadOptionData();
     },
-    /* 重置搜索 */
-    reset() {
-      this.reload();
-    },
-    exportFile() {
-      const columns = [
-        {
-          title: "噪声源分类",
-          dataIndex: "source",
-        },
-        {
-          title: "测点数（个）",
-          dataIndex: "count",
-        },
-        {
-          title: "声源占比（%）",
-          dataIndex: "rate",
-        },
-        {
-          title: "时段",
-          dataIndex: "timeSlot",
+    methods: {
+        /**获取下来框数据 */
+        loadOptionData() {
+            getColumnOptions("monitor_year").then((res) => {
+                this.yearOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+                this.reload();
+            });
         },
+        /* 刷新表格 */
+        reload() {
+            const columns = [
+                {
+                    title: "城区",
+                    dataIndex: "area"
+                }
+            ]
+            this.yearOptions.forEach(item => {
+                const {startYear, endYear} = this.where;
+                if ((startYear && Number(startYear) > Number(item.value)) || (endYear && Number(endYear) < Number(item.value))) {
+                    console.log("");
+                } else {
+                    columns.push({
+                        title: item.value + "年噪声值",
+                        dataIndex: item.value + "Leq",
+                        customRender: ({text})=>{return Number(text).toFixed(1)}
 
-        {
-          title: "Leq",
-          dataIndex: "leq",
+                    })
+                }
+
+            })
+            this.columns = columns;
+
+            this.$refs.table.reload({
+                where: this.where,
+            });
         },
-        {
-          title: "L10",
-          dataIndex: "l10",
+        /* 重置搜索 */
+        reset() {
+            this.reload();
         },
-        {
-          title: "L50",
-          dataIndex: "l50",
+        exportFile() {
+            const columns = [
+                {
+                    title: "噪声源分类",
+                    dataIndex: "source",
+                },
+                {
+                    title: "测点数（个）",
+                    dataIndex: "count",
+                },
+                {
+                    title: "声源占比（%）",
+                    dataIndex: "rate",
+                },
+                {
+                    title: "时段",
+                    dataIndex: "timeSlot",
+                },
+
+                {
+                    title: "Leq",
+                    dataIndex: "leq",
+                },
+                {
+                    title: "L10",
+                    dataIndex: "l10",
+                },
+                {
+                    title: "L50",
+                    dataIndex: "l50",
+                },
+                {
+                    title: "L90",
+                    dataIndex: "l90",
+                },
+            ];
+            const arr = [];
+            const th = columns.map((item) => item.title);
+            arr.push(th);
+            this.data.forEach((d) => {
+                const td = columns.map((item) => d[item.dataIndex]);
+                arr.push(td);
+            });
+            let sheet = XLSX.utils.aoa_to_sheet(arr);
+            this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
         },
-        {
-          title: "L90",
-          dataIndex: "l90",
-        },
-      ];
-      const arr = [];
-      const th = columns.map((item) => item.title);
-      arr.push(th);
-      this.data.forEach((d) => {
-        const td = columns.map((item) => d[item.dataIndex]);
-        arr.push(td);
-      });
-      let sheet = XLSX.utils.aoa_to_sheet(arr);
-      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
     },
-  },
 };
 </script>
 
diff --git a/src/views/sound/zone/statistic/base.vue b/src/views/sound/zone/statistic/base.vue
index c9b780a..2c6fd14 100644
--- a/src/views/sound/zone/statistic/base.vue
+++ b/src/views/sound/zone/statistic/base.vue
@@ -1,474 +1,530 @@
 <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-select v-model:value="where.regionLevel" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in regionLevelOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="测点名称:">
-              <a-select v-model:value="where.place" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in palceOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-        
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="城区">
-              <a-select v-model:value="where.area" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in areaOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-              <a-space>
-                <a-button type="primary" @click="reload">查询</a-button>
-                <a-button @click="reset">重置</a-button>
-                <a-button @click="exportFile">导出Excel</a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-      <!-- 表格 -->
-      <ele-pro-table
-        v-model:selection="selectionList"
-        ref="table"
-        row-key="zoneNoiseId"
-        :datasource="url"
-        :columns="columns"
-        :where="where"
-        :scroll="{ x: 'max-content' }"
-        @done="(d) => (data = d.data)"
-      >
-        <template #Leq="{ text,record  }">
-          <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)" color="green">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)" color="blue">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)" color="red">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)" color="red">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)" color="red">{{text}}</a-tag>
-          <template v-else color="#FFF">{{text}}</template>
-        </template>
-      </ele-pro-table>
-    </a-card>
-  </div>
-  <!-- 编辑弹窗 -->
+    <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-select v-model:value="where.regionLevel" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in regionLevelOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="年份:">
+                            <a-select v-model:value="where.monitorYear" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in yearOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="季度:">
+                            <a-select v-model:value="where.quarter" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in quarterOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="城区">
+                            <a-select v-model:value="where.area" allowClear showSearch>
+                                <a-select-option
+                                    v-for="(item) in areaOptions"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+                            <a-space>
+                                <a-button type="primary" @click="reload">查询</a-button>
+                                <a-button @click="reset">重置</a-button>
+                                <a-button @click="exportFile">导出Excel</a-button>
+                            </a-space>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+            <!-- 表格 -->
+            <ele-pro-table
+                v-model:selection="selectionList"
+                ref="table"
+                row-key="zoneNoiseId"
+                :datasource="url"
+                :columns="columns"
+                :where="where"
+                :scroll="{ x: 'max-content' }"
+                @done="(d) => (data = d.data)"
+            >
+                <template #Leq="{ text,record  }">
+                    <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)"
+                           color="green">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)"
+                        color="blue">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)"
+                        color="red">{{ text }}
+                    </a-tag>
+                    <a-tag
+                        v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)"
+                        color="red">{{ text }}
+                    </a-tag>
+                    <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)"
+                           color="red">{{ text }}
+                    </a-tag>
+                    <template v-else color="#FFF">{{ text }}</template>
+                </template>
+            </ele-pro-table>
+        </a-card>
+    </div>
+    <!-- 编辑弹窗 -->
 </template>
 
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import { pageZoneNoiseUrl, getColumnOptions } from "@/api/ecology/noise/zone-sound";
+import {pageZoneNoiseUrl, getColumnOptions,listALlZoneNoise} from "@/api/ecology/noise/zone-sound";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import moment from "moment";
 //   import utils from "./utils";
 export default {
-  name: "StatisticSoundZoneBase",
-  components: {},
-  data() {
-    return {
-      data: [],
-      locale,
-      bill: {},
-      // 表格数据接口
-      url: pageZoneNoiseUrl,
-      selection: [],
-      // 表格列配置
-       columns: [
-        {
-          title: "监测日期",
-          dataIndex: "monitorTime",
-          sorter: true,
-          customRender: ({text})=> moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
-        },
-        {
-          title: "测点名称",
-          dataIndex: "place",
-          sorter: true,
-        },
-        {
-          title: "所属城区",
-          dataIndex: "area",
-          sorter: true,
-        },
-        {
-          title: "网格长（米）",
-          dataIndex: "gridLength",
-          sorter: true,
-        },
-        {
-          title: "网格宽（米）",
-          dataIndex: "gridWidth",
-          sorter: true,
-        },
-         {
-          title: "网格点号",
-          dataIndex: "gridNo",
-          sorter: true,
-        },
-        {
-          title: "主要声源",
-          dataIndex: "source",
-          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",
-          slots: {customRender: "Leq"},
-          sorter: true,
-        },
-        {
-          title: "SDdB(A)",
-          dataIndex: "indexSd",
-          sorter: true,
-        },
-        {
-          title: "L10dB(A)",
-          dataIndex: "indexL10",
-          sorter: true,
-        },
-        {
-          title: "L50dB(A)",
-          dataIndex: "indexL50",
-          sorter: true,
-        },
-        {
-          title: "L90dB(A)",
-          dataIndex: "indexL90",
-          sorter: true,
-        },
-        {
-          title: "LmindB(A)",
-          dataIndex: "indexLmin",
-          sorter: true,
-        },
-        {
-          title: "LmaxdB(A)",
-          dataIndex: "indexLmax",
-          sorter: true,
-        },
-        {
-          title: "监测站名",
-          dataIndex: "station",
-          sorter: true,
-        },
-        {
-          title: "监测仪器型号",
-          dataIndex: "monitorInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "监测仪器编号",
-          dataIndex: "monitorInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "监测前校准值",
-          dataIndex: "beforeMonitorValue",
-          sorter: true,
-        },
-        {
-          title: "声校准器测量声压值",
-          dataIndex: "soundPressureValue",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器型号",
-          dataIndex: "soundInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器编号",
-          dataIndex: "soundInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "区域等级",
-          dataIndex: "regionLevel",
-          sorter: true,
-        },
-        {
-          title: "备注",
-          dataIndex: "remark",
-          sorter: true,
-        },
-        {
-          title: "创建人",
-          dataIndex: "username",
-          sorter: true,
-        },
-      ],
-      palceOptions: [],
-      areaOptions: [],
-      regionLevelOptions: [],
-      // 表格搜索条件
-      where: {
-        checked: 1,
-      },
-      // 表格选中数据
-      selectionList: [],
-    };
-  },
-  mounted() {
-    this.loadOptionData();
-  },
-  methods: {
-    /**获取下来框数据 */
-    loadOptionData() {
-      getColumnOptions("place").then((res) => {
-        this.palceOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-      getColumnOptions("area").then((res) => {
-        this.areaOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-      getColumnOptions("region_level").then((res) => {
-        this.regionLevelOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
+    name: "StatisticSoundZoneBase",
+    components: {},
+    data() {
+        return {
+            data: [],
+            locale,
+            bill: {},
+            // 表格数据接口
+            url: pageZoneNoiseUrl,
+            selection: [],
+            // 表格列配置
+            columns: [
+                {
+                    title: "监测日期",
+                    dataIndex: "monitorTime",
+                    sorter: true,
+                    customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+                },
+                {
+                    title: "测点名称",
+                    dataIndex: "place",
+                    sorter: true,
+                },
+                {
+                    title: "所属城区",
+                    dataIndex: "area",
+                    sorter: true,
+                },
+                {
+                    title: "网格长（米）",
+                    dataIndex: "gridLength",
+                    sorter: true,
+                },
+                {
+                    title: "网格宽（米）",
+                    dataIndex: "gridWidth",
+                    sorter: true,
+                },
+                {
+                    title: "网格点号",
+                    dataIndex: "gridNo",
+                    sorter: true,
+                },
+                {
+                    title: "主要声源",
+                    dataIndex: "source",
+                    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",
+                    slots: {customRender: "Leq"},
+                    sorter: true,
+                },
+                {
+                    title: "SDdB(A)",
+                    dataIndex: "indexSd",
+                    sorter: true,
+                },
+                {
+                    title: "L10dB(A)",
+                    dataIndex: "indexL10",
+                    sorter: true,
+                },
+                {
+                    title: "L50dB(A)",
+                    dataIndex: "indexL50",
+                    sorter: true,
+                },
+                {
+                    title: "L90dB(A)",
+                    dataIndex: "indexL90",
+                    sorter: true,
+                },
+                {
+                    title: "LmindB(A)",
+                    dataIndex: "indexLmin",
+                    sorter: true,
+                },
+                {
+                    title: "LmaxdB(A)",
+                    dataIndex: "indexLmax",
+                    sorter: true,
+                },
+                {
+                    title: "监测站名",
+                    dataIndex: "station",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器型号",
+                    dataIndex: "monitorInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器编号",
+                    dataIndex: "monitorInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "监测前校准值",
+                    dataIndex: "beforeMonitorValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准器测量声压值",
+                    dataIndex: "soundPressureValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器型号",
+                    dataIndex: "soundInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器编号",
+                    dataIndex: "soundInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "区域等级",
+                    dataIndex: "regionLevel",
+                    sorter: true,
+                },
+                {
+                    title: "备注",
+                    dataIndex: "remark",
+                    sorter: true,
+                },
+                {
+                    title: "创建人",
+                    dataIndex: "username",
+                    sorter: true,
+                },
+            ],
+            palceOptions: [],
+            yearOptions:[],
+            quarterOptions:[],
+            areaOptions: [],
+            regionLevelOptions: [],
+            // 表格搜索条件
+            where: {
+                checked: 1,
+            },
+            // 表格选中数据
+            selectionList: [],
+        };
     },
-    /* 刷新表格 */
-    reload() {
+    mounted() {
+        this.loadOptionData();
+    },
+    methods: {
+        /**获取下来框数据 */
+        loadOptionData() {
+            getColumnOptions("place").then((res) => {
+                this.palceOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("area").then((res) => {
+                this.areaOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("region_level").then((res) => {
+                this.regionLevelOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("monitor_year").then((res) => {
+                this.yearOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+            getColumnOptions("quarter").then((res) => {
+                this.quarterOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+            });
+        },
+        /* 刷新表格 */
+        reload() {
 
-      this.$refs.table.reload({
-        where: this.where,
-      });
+            this.$refs.table.reload({
+                where: this.where,
+            });
+        },
+        /* 重置搜索 */
+        reset() {
+            this.where = {
+                checked: 1,
+            };
+            this.reload();
+        },
+        exportFile() {
+            const columns = [
+                {
+                    title: "行政区划代码",
+                    dataIndex: "regionCode",
+                    sorter: true,
+                },
+                {
+                    title: "监测年度",
+                    dataIndex: "monitorYear",
+                    sorter: true,
+                },
+                {
+                    title: "点位编码",
+                    dataIndex: "placeCode",
+                    sorter: true,
+                },
+                {
+                    title: "测点名称",
+                    dataIndex: "place",
+                    sorter: true,
+                },
+                {
+                    title: "测点经度",
+                    dataIndex: "placeLng",
+                    sorter: true,
+                },
+                {
+                    title: "测点纬度",
+                    dataIndex: "placeLat",
+                    sorter: true,
+                },
+
+                {
+                    title: "测点参照物",
+                    dataIndex: "refObj",
+                    sorter: true,
+                },
+                {
+                    title: "网格边长",
+                    dataIndex: "gridLength",
+                    sorter: true,
+                },
+                {
+                    title: "网格覆盖人口（万）",
+                    dataIndex: "people",
+                    sorter: true,
+                },
+                {
+                    title: "功能区代码",
+                    dataIndex: "functionCode",
+                    sorter: true,
+                },
+                {
+                    title: "月",
+                    dataIndex: "monitorMonth",
+                    sorter: true,
+                },
+                {
+                    title: "日",
+                    dataIndex: "monitorDay",
+                    sorter: true,
+                },
+                {
+                    title: "时",
+                    dataIndex: "monitorHour",
+                    sorter: true,
+                },
+                {
+                    title: "分",
+                    dataIndex: "monitorMinute",
+                    sorter: true,
+                },
+
+                {
+                    title: "Leq",
+                    dataIndex: "indexLeq",
+                    sorter: true,
+                },
+
+                {
+                    title: "L10",
+                    dataIndex: "indexL10",
+                    sorter: true,
+                },
+                {
+                    title: "L50",
+                    dataIndex: "indexL50",
+                    sorter: true,
+                },
+                {
+                    title: "L90",
+                    dataIndex: "indexL90",
+                    sorter: true,
+                },
+                {
+                    title: "最大值",
+                    dataIndex: "indexLmax",
+                    sorter: true,
+                },
+                {
+                    title: "最小值",
+                    dataIndex: "indexLmin",
+                    sorter: true,
+                },
+                {
+                    title: "标准差(SD)",
+                    dataIndex: "indexSd",
+                    sorter: true,
+                },
+                {
+                    title: "监测站名",
+                    dataIndex: "station",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器型号",
+                    dataIndex: "monitorInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "监测仪器编号",
+                    dataIndex: "monitorInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "监测前校准值",
+                    dataIndex: "beforeMonitorValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准器测量声压值",
+                    dataIndex: "soundPressureValue",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器型号",
+                    dataIndex: "soundInstrumentModel",
+                    sorter: true,
+                },
+                {
+                    title: "声校准仪器编号",
+                    dataIndex: "soundInstrumentCode",
+                    sorter: true,
+                },
+                {
+                    title: "区域等级",
+                    dataIndex: "regionLevel",
+                    sorter: true,
+                },
+                {
+                    title: "备注",
+                    dataIndex: "remark",
+                    sorter: true,
+                },
+            ];
+            const arr = [];
+            const th = columns.map((item) => item.title);
+            arr.push(th);
+            listALlZoneNoise(this.where).then(res=>{
+                res.data.data.forEach((d) => {
+                    const td = columns.map((item) => {
+                        let val = d[item.dataIndex];
+                        if(["indexLeq","indexL10","indexL50","indexL90","indexLmax","indexLmin","indexSd"].includes(item.dataIndex)){
+                            val = Number(val).toFixed(1);
+                        }
+                        return val;
+                    });
+
+                    arr.push(td);
+                });
+                let sheet = XLSX.utils.aoa_to_sheet(arr);
+                this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+            })
+
+
+        },
     },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        checked: 1,
-      };
-      this.reload();
-    },
-    exportFile() {
-     const columns = [
-         {
-          title: "行政区划代码",
-          dataIndex: "regionCode",
-          sorter: true,
-        },
-        {
-          title: "监测年度",
-          dataIndex: "monitorYear",
-          sorter: true,
-        },
-        {
-          title: "点位编码",
-          dataIndex: "placeCode",
-          sorter: true,
-        },
-        {
-          title: "测点名称",
-          dataIndex: "place",
-          sorter: true,
-        },
-        {
-          title: "测点经度",
-          dataIndex: "placeLng",
-          sorter: true,
-        },
-        {
-          title: "测点纬度",
-          dataIndex: "placeLat",
-          sorter: true,
-        },
-       
-        {
-          title: "测点参照物",
-          dataIndex: "refObj",
-          sorter: true,
-        },
-         {
-          title: "网格边长",
-          dataIndex: "gridLength",
-          sorter: true,
-        },
-        {
-          title: "网格覆盖人口（万）",
-          dataIndex: "people",
-          sorter: true,
-        },
-         {
-          title: "功能区代码",
-          dataIndex: "functionCode",
-          sorter: true,
-        },
-        {
-          title: "月",
-          dataIndex: "monitorMonth",
-          sorter: true,
-        },
-        {
-          title: "日",
-          dataIndex: "monitorDay",
-          sorter: true,
-        },
-        {
-          title: "时",
-          dataIndex: "monitorHour",
-          sorter: true,
-        },
-        {
-          title: "分",
-          dataIndex: "monitorMinute",
-          sorter: true,
-        },
-       
-        {
-          title: "Leq",
-          dataIndex: "indexLeq",
-          sorter: true,
-        },
-        
-        {
-          title: "L10",
-          dataIndex: "indexL10",
-          sorter: true,
-        },
-        {
-          title: "L50",
-          dataIndex: "indexL50",
-          sorter: true,
-        },
-        {
-          title: "L90",
-          dataIndex: "indexL90",
-          sorter: true,
-        },
-        {
-          title: "最大值",
-          dataIndex: "indexLmax",
-          sorter: true,
-        },
-         {
-          title: "最小值",
-          dataIndex: "indexLmin",
-          sorter: true,
-        },
-       {
-          title: "标准差(SD)",
-          dataIndex: "indexSd",
-          sorter: true,
-        },
-        {
-          title: "监测站名",
-          dataIndex: "station",
-          sorter: true,
-        },
-        {
-          title: "监测仪器型号",
-          dataIndex: "monitorInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "监测仪器编号",
-          dataIndex: "monitorInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "监测前校准值",
-          dataIndex: "beforeMonitorValue",
-          sorter: true,
-        },
-        {
-          title: "声校准器测量声压值",
-          dataIndex: "soundPressureValue",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器型号",
-          dataIndex: "soundInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器编号",
-          dataIndex: "soundInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "区域等级",
-          dataIndex: "regionLevel",
-          sorter: true,
-        },
-         {
-          title: "备注",
-          dataIndex: "remark",
-          sorter: true,
-        },
-      ];
-      const arr = [];
-      const th = columns.map((item) => item.title);
-      arr.push(th);
-      this.data.forEach((d) => {
-        const td = columns.map((item) => d[item.dataIndex]);
-        arr.push(td);
-      });
-      let sheet = XLSX.utils.aoa_to_sheet(arr);
-      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
-    },
-  },
 };
 </script>
 
diff --git a/src/views/sound/zone/statistic/year.vue b/src/views/sound/zone/statistic/year.vue
index 7b677e3..9510735 100644
--- a/src/views/sound/zone/statistic/year.vue
+++ b/src/views/sound/zone/statistic/year.vue
@@ -1,222 +1,236 @@
 <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-select v-model:value="where.startYear" allowClear showSearch>
-                <a-select-option
-                  v-for="item in yearOptions"
-                  :disabled="item.value > where.endYear"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="结束年份">
-              <a-select v-model:value="where.endYear" allowClear showSearch>
-                <a-select-option
-                  v-for="item in yearOptions"
-                  :disabled="item.value < where.startYear"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-              <a-space>
-                <a-button type="primary" @click="reload">查询</a-button>
-                <!-- <a-button @click="reset">重置</a-button> -->
-                <a-button @click="exportFile">导出Excel</a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-      <!-- 表格 -->
-      <ele-pro-table
-        v-model:selection="selectionList"
-        ref="table"
-        :row-key="(record) => record.source + record.timeSlot"
-        :datasource="url"
-        :columns="columns"
-        :where="where"
-        :needPage="false"
-        :initLoad="false"
-        :scroll="{ x: 'max-content' }"
-        @done="(d) => (data = d.data)"
-      >
-      </ele-pro-table>
-    </a-card>
-  </div>
-  <!-- 编辑弹窗 -->
+    <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-select v-model:value="where.startYear" allowClear showSearch>
+                                <a-select-option
+                                    v-for="item in yearOptions"
+                                    :disabled="item.value > where.endYear"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item label="结束年份">
+                            <a-select v-model:value="where.endYear" allowClear showSearch>
+                                <a-select-option
+                                    v-for="item in yearOptions"
+                                    :disabled="item.value < where.startYear"
+                                    :key="item.value"
+                                >{{ item.label }}
+                                </a-select-option
+                                >
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :lg="6" :md="12" :sm="24" :xs="24">
+                        <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+                            <a-space>
+                                <a-button type="primary" @click="reload">查询</a-button>
+                                <!-- <a-button @click="reset">重置</a-button> -->
+                                <a-button @click="exportFile">导出Excel</a-button>
+                            </a-space>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </a-form>
+            <!-- 表格 -->
+            <ele-pro-table
+                v-model:selection="selectionList"
+                ref="table"
+                :row-key="(record) => record.source + record.timeSlot"
+                :datasource="url"
+                :columns="columns"
+                :where="where"
+                :needPage="false"
+                :initLoad="false"
+                :scroll="{ x: 'max-content' }"
+                @done="(d) => (data = d.data)"
+            >
+            </ele-pro-table>
+        </a-card>
+    </div>
+    <!-- 编辑弹窗 -->
 </template>
 
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import { statisticYearUrl, getColumnOptions } from "@/api/ecology/noise/zone-sound";
+import {statisticYearUrl, getColumnOptions} from "@/api/ecology/noise/zone-sound";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 //   import utils from "./utils";
 export default {
-  name: "StatisticSoundZoneSource",
-  components: {},
-  data() {
-    return {
-      data: [],
-      locale,
-      bill: {},
-      // 表格数据接口
-      url: statisticYearUrl,
-      selection: [],
-      // 表格列配置
-      columns: [
-        {
-          title: "年份",
-          dataIndex: "year",
-        },
-        {
-          title: "网格长（米）",
-          dataIndex: "gridLength",
-        },
-        {
-          title: "网格宽（米）",
-          dataIndex: "gridWidth",
-        },
-        {
-          title: "网格总数",
-          dataIndex: "gridCount",
-        },
-        {
-          title: "时段",
-          dataIndex: "timeSlot",
-        },
-        {
-          title: "监测结果",
-          children: [
-            {
-              title: "Leq",
-              dataIndex: "leq",
-            },
-            {
-              title: "L10",
-              dataIndex: "l10",
-            },
-            {
-              title: "L50",
-              dataIndex: "l50",
-            },
-            {
-              title: "L90",
-              dataIndex: "l90",
-            },
-          ],
-        },
-        {
-          title: "质量等级",
-          dataIndex: "level",
-        },
-      ],
-      // 表格搜索条件
-      where: {},
-      yearOptions: [],
-      // 表格选中数据
-      selectionList: [],
-    };
-  },
-  mounted() {
-    this.loadOptionData();
-  },
-  methods: {
-    /**获取下来框数据 */
-    loadOptionData() {
-      getColumnOptions("monitor_year").then((res) => {
-        this.yearOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-        this.reload();
-      });
+    name: "StatisticSoundZoneSource",
+    components: {},
+    data() {
+        return {
+            data: [],
+            locale,
+            bill: {},
+            // 表格数据接口
+            url: statisticYearUrl,
+            selection: [],
+            // 表格列配置
+            columns: [
+                {
+                    title: "年份",
+                    dataIndex: "year",
+                },
+                {
+                    title: "网格长（米）",
+                    dataIndex: "gridLength",
+                },
+                {
+                    title: "网格宽（米）",
+                    dataIndex: "gridWidth",
+                },
+                {
+                    title: "网格总数",
+                    dataIndex: "gridCount",
+                },
+                {
+                    title: "时段",
+                    dataIndex: "timeSlot",
+                },
+                {
+                    title: "监测结果",
+                    children: [
+                        {
+                            title: "Leq",
+                            dataIndex: "leq",
+                            customRender: ({text}) => {
+                                return Number(text).toFixed(1)
+                            }
+                        },
+                        {
+                            title: "L10",
+                            dataIndex: "l10",
+                            customRender: ({text}) => {
+                                return Number(text).toFixed(1)
+                            }
+                        },
+                        {
+                            title: "L50",
+                            dataIndex: "l50",
+                            customRender: ({text}) => {
+                                return Number(text).toFixed(1)
+                            }
+                        },
+                        {
+                            title: "L90",
+                            dataIndex: "l90",
+                            customRender: ({text}) => {
+                                return Number(text).toFixed(1)
+                            }
+                        },
+                    ],
+                },
+                {
+                    title: "质量等级",
+                    dataIndex: "level",
+                },
+            ],
+            // 表格搜索条件
+            where: {},
+            yearOptions: [],
+            // 表格选中数据
+            selectionList: [],
+        };
     },
-    /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload({
-        where: this.where,
-      });
+    mounted() {
+        this.loadOptionData();
     },
-    /* 重置搜索 */
-    reset() {
-      this.reload();
-    },
-    exportFile() {
-      const columns = [
-        {
-          title: "年份",
-          dataIndex: "year",
+    methods: {
+        /**获取下来框数据 */
+        loadOptionData() {
+            getColumnOptions("monitor_year").then((res) => {
+                this.yearOptions = res.data.data.map((item) => {
+                    return {
+                        label: item,
+                        value: item,
+                    };
+                });
+                this.reload();
+            });
         },
-        {
-          title: "网格长（米）",
-          dataIndex: "gridLength",
+        /* 刷新表格 */
+        reload() {
+            this.$refs.table.reload({
+                where: this.where,
+            });
         },
-        {
-          title: "网格宽（米）",
-          dataIndex: "gridWidth",
-        },
-        {
-          title: "网格总数",
-          dataIndex: "gridCount",
-        },
-        {
-          title: "时段",
-          dataIndex: "timeSlot",
+        /* 重置搜索 */
+        reset() {
+            this.reload();
         },
+        exportFile() {
+            const columns = [
+                {
+                    title: "年份",
+                    dataIndex: "year",
+                },
+                {
+                    title: "网格长（米）",
+                    dataIndex: "gridLength",
+                },
+                {
+                    title: "网格宽（米）",
+                    dataIndex: "gridWidth",
+                },
+                {
+                    title: "网格总数",
+                    dataIndex: "gridCount",
+                },
+                {
+                    title: "时段",
+                    dataIndex: "timeSlot",
+                },
 
-        {
-          title: "Leq",
-          dataIndex: "leq",
-        },
-        {
-          title: "L10",
-          dataIndex: "l10",
-        },
-        {
-          title: "L50",
-          dataIndex: "l50",
-        },
-        {
-          title: "L90",
-          dataIndex: "l90",
-        },
+                {
+                    title: "Leq",
+                    dataIndex: "leq",
+                },
+                {
+                    title: "L10",
+                    dataIndex: "l10",
+                },
+                {
+                    title: "L50",
+                    dataIndex: "l50",
+                },
+                {
+                    title: "L90",
+                    dataIndex: "l90",
+                },
 
-        {
-          title: "质量等级",
-          dataIndex: "level",
-        },
-      ];
+                {
+                    title: "质量等级",
+                    dataIndex: "level",
+                },
+            ];
 
-      const arr = [];
-      const th = columns.map((item) => item.title);
-      arr.push(th);
-      this.data.forEach((d) => {
-        const td = columns.map((item) => d[item.dataIndex]);
-        arr.push(td);
-      });
-      let sheet = XLSX.utils.aoa_to_sheet(arr);
-      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+            const arr = [];
+            const th = columns.map((item) => item.title);
+            arr.push(th);
+            this.data.forEach((d) => {
+                const td = columns.map((item) => d[item.dataIndex]);
+                arr.push(td);
+            });
+            let sheet = XLSX.utils.aoa_to_sheet(arr);
+            this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+        },
     },
-  },
 };
 </script>