diff --git a/src/api/ecology/acid.js b/src/api/ecology/acid.js
index f74b7df..7072f3a 100644
--- a/src/api/ecology/acid.js
+++ b/src/api/ecology/acid.js
@@ -3,7 +3,7 @@ import axios from 'axios';
 const pageBillUrl = '/acidRain/acidRainBill/page';
 // 添加
 const saveAcidRainBill = function (data) {
-    return axios.post("/acidRain/acidRainBill/batch",data)
+    return axios.post("/acidRain/acidRainBill/importBatch",data)
 }
 
 // 删除
diff --git a/src/api/ecology/air.js b/src/api/ecology/air.js
index ff486ba..03d2f6e 100644
--- a/src/api/ecology/air.js
+++ b/src/api/ecology/air.js
@@ -27,7 +27,12 @@ const getAirBill = function (id) {
     return axios.get(`/ambientAir/ambientAirBill/${id}`)
 }
 // -------------------------数据---------------------
+// 分页
 const pageAirUrl = '/ambientAir/ambientAir/page';
+// 全部
+const listAllAir = function (params){
+    return axios .get("/ambientAir/ambientAir",{params})
+}
 // 添加
 const saveAir = function (data) {
     return axios.post("/ambientAir/ambientAir",data)
@@ -62,6 +67,7 @@ export {
     verifyAirBill,
     getAirBill,
     pageAirUrl,
+    listAllAir,
     saveAir,
     removeAir,
     updateAir,
diff --git a/src/api/ecology/river.js b/src/api/ecology/river.js
index 9702483..a8794f5 100644
--- a/src/api/ecology/river.js
+++ b/src/api/ecology/river.js
@@ -28,6 +28,9 @@ const getRiverBill = function (id) {
 }
 // -------------------------数据---------------------
 const pageRiverUrl = '/surfaceWaterSection/surfaceWaterSection/page';
+const listAllRiver = function (params) {
+    return axios.get("/surfaceWaterSection/surfaceWaterSection",{params})
+}
 // 添加
 const saveRiver = function (data) {
     return axios.post("/surfaceWaterSection/surfaceWaterSection",data)
@@ -75,6 +78,7 @@ export {
     getHistoryyears,
     getColumnOptions,
     statisticSourceUrl,
-    statisticYearUrl
+    statisticYearUrl,
+    listAllRiver
 
 }
diff --git a/src/views/atmosphere/acid-rain/collect/colums.js b/src/views/atmosphere/acid-rain/collect/colums.js
new file mode 100644
index 0000000..3fa95f6
--- /dev/null
+++ b/src/views/atmosphere/acid-rain/collect/colums.js
@@ -0,0 +1,18 @@
+const tableColumns = [
+        {title: "编号",dataIndex: "code",sorter: true,},
+        {title: "降水类型",dataIndex: "precipitationType",sorter: true,},
+        {title: "降雨量(mm)",dataIndex: "precipitation",sorter: true,},
+        {title: "pH值（无量纲）",dataIndex: "ph",sorter: true,},
+        {title: "电导率(mS/m)",dataIndex: "conductivity",sorter: true,},
+        {title: "氟离子",dataIndex: "fluorine",sorter: true,},
+        {title: "氯离子",dataIndex: "chlorine",sorter: true,},
+        {title: "硫酸根离子",dataIndex: "sulfateRadical",sorter: true,},
+        {title: "硝酸根离子",dataIndex: "nitrate",sorter: true,},
+        {title: "钠离子",dataIndex: "na",sorter: true,},
+        {title: "铵根离子",dataIndex: "ammoniumRadical",sorter: true,},
+        {title: "钾离子",dataIndex: "k",sorter: true,},
+        {title: "镁离子",dataIndex: "ng",sorter: true,},
+        {title: "钙离子",dataIndex: "ca",sorter: true,},
+        {title: "备注",dataIndex: "remark",sorter: true,},
+    ];
+    export {tableColumns}
\ No newline at end of file
diff --git a/src/views/atmosphere/acid-rain/collect/index.vue b/src/views/atmosphere/acid-rain/collect/index.vue
index dfd0c01..ad7cf45 100644
--- a/src/views/atmosphere/acid-rain/collect/index.vue
+++ b/src/views/atmosphere/acid-rain/collect/index.vue
@@ -4,19 +4,13 @@
       <template #title>
         <a-space>
           <a-upload
-            :before-upload="importFileCity"
-            :showUploadList="false"
-            accept=".xls,.xlsx,.csv"
+              :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">
@@ -31,9 +25,10 @@
 <script>
 import XLSX from "xlsx";
 import utils from "./utils";
-import { Modal } from "ant-design-vue";
+import {Modal} from "ant-design-vue";
 import RainBill from "./rain-bill.vue";
-import { saveAcidRainBill } from "@/api/ecology/acid";
+import {saveAcidRainBill} from "@/api/ecology/acid";
+
 export default {
   name: "RainCollectIndex",
   components: {
@@ -56,35 +51,25 @@ export default {
           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[2][0].replace(/[^\d]+/g, "-");
-          // const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-");
+          const reportDate = aoa[2][0].replace(/[^\d]+/g, "-");
 
           const acidList = aoa.filter((item) => {
-            return item.length >= 23 && typeof item[0] == "number";
+            return item.length >= 23 && item[0] && !item[0].includes("编号");
           });
-          // const acidList2 = aoa2.filter(
-          //   (item) => item.length >= 26 && typeof item[0] == "number"
-          // );
-
           // 解析成对象数组
           const billName = aoa[0][0] + aoa[1][0];
-          const billData = utils.toObjData(acidList);
-          // const billName2 = aoa2[0][0];
-          // const billData2 = utils.toObjData(acidList2);
+          const billData = utils.toObjData(acidList, new Date(reportDate).getFullYear());
+
           if (
-            !billData ||
-            billData.length == 0
-            // (!billData2 || billData2.length == 0)
+              !billData ||
+              billData.length == 0
+              // (!billData2 || billData2.length == 0)
           ) {
             hide();
             Modal.error({
@@ -97,112 +82,19 @@ export default {
           const tasks = [];
           if (billData.length > 0) {
             tasks.push(
-              saveAcidRainBill({
-                // reportTime: new Date(reportDate).getTime(),
-                billName: billName,
-                regionLevel: "市级",
-                acidRainList: billData,
-              })
+                saveAcidRainBill({
+                  // reportTime: new Date(reportDate).getTime(),
+                  billName: billName,
+                  regionLevel: "市级",
+                  acidRainList: billData,
+                })
             );
           }
 
-          // if (billData2.length > 0) {
-          //   tasks.push(
-          //     saveAcidRainBill({
-          //       reportTime: new Date(reportDate2).getTime(),
-          //       billName: billName2,
-          //       regionLevel: "市级",
-          //       acidList: billData2,
-          //     })
-          //   );
-          // }
-
           // 上传到服务器
-
           Promise.all(tasks)
-            .then((res) => {
-              if (res[0].data.code == 0) {
-                Modal.success({
-                  title: "导入成功",
-                  content: `成功导入${billData.length}条数据`,
-                });
-                this.$refs.rain && this.$refs.rain.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;
-    },
-    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 acidList = aoa.filter((item) => {
-            return item.length >= 35 && item[0] != "行政区划代码";
-          });
-
-          // 解析成对象数组
-          const billName = aoa[0][0];
-          const billData = utils.toAreaObjData(acidList);
-
-          if (!billData || billData.length == 0) {
-            hide();
-            Modal.error({
-              title: "导入失败",
-              content: "找不到可用数据",
-            });
-
-            return;
-          }
-
-          if (billData.length > 0) {
-            // 上传到服务器
-            saveAcidRainBill({
-              reportTime: new Date(reportDate).getTime(),
-              billName: billName,
-              regionLevel: "县级",
-              acidList: billData,
-            })
               .then((res) => {
-                if (res.data.code == 0) {
+                if (res[0].data.code == 0) {
                   Modal.success({
                     title: "导入成功",
                     content: `成功导入${billData.length}条数据`,
@@ -224,7 +116,6 @@ export default {
               .finally(() => {
                 hide();
               });
-          }
         } catch (error) {
           hide();
           Modal.error({
@@ -235,6 +126,7 @@ export default {
         // console.log(billData);
       };
       reader.readAsArrayBuffer(file);
+
       return false;
     },
   },
diff --git a/src/views/atmosphere/acid-rain/collect/rain.vue b/src/views/atmosphere/acid-rain/collect/rain.vue
index c59e403..fdc9d30 100644
--- a/src/views/atmosphere/acid-rain/collect/rain.vue
+++ b/src/views/atmosphere/acid-rain/collect/rain.vue
@@ -72,21 +72,13 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点名称" name="place">
+
+            <a-col v-for="(item,index) in tableColumns" :key="index" :md="12" :sm="24">
+              <a-form-item :label="item.title" :name="item.dataIndex">
                 <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="remark">
-                <a-input
-                  v-model:value="form.remark"
-                  placeholder="请输入备注"
-                  allow-clear
+                    v-model:value="form[item.dataIndex]"
+                    :placeholder="'请输入' + item.title"
+                    allow-clear
                 />
               </a-form-item>
             </a-col>
@@ -168,7 +160,7 @@ import {
 } from "@/api/ecology/acid";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import moment from "moment";
-//   import utils from "./utils";
+import { tableColumns } from "./colums";
 export default {
   name: "ZoneCollectNoise",
   components: {},
@@ -195,104 +187,10 @@ export default {
           sorter: true,
           customRender: ({text})=> moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
         },
-         {
-          title: "行政代码",
-          dataIndex: "regionCode",
-          sorter: true,
-        },
-        {
-          title: "市(县，区)",
-          slots: {customRender: "Address"},
-        },
-         {
-          title: "采样点",
-          dataIndex: "place",
-          sorter: true,
-        },
-         {
-          title: "点位类型",
-          dataIndex: "placeType",
-          sorter: true,
-        },
-         {
-          title: "降水类型",
-          dataIndex: "precipitationType",
-          sorter: true,
-        },
-         {
-          title: "降水量",
-          dataIndex: "precipitation",
-          sorter: true,
-        },
-         {
-          title: "pH",
-          dataIndex: "ph",
-          sorter: true,
-        },
-         {
-          title: "电导率",
-          dataIndex: "conductivity",
-          sorter: true,
-        },
-         {
-          title: "SO42",
-          dataIndex: "so42",
-          sorter: true,
-        },
-         {
-          title: "NO3",
-          dataIndex: "no3",
-          sorter: true,
-        },
-         {
-          title: "F",
-          dataIndex: "f",
-          sorter: true,
-        },
-         {
-          title: "CL",
-          dataIndex: "cl",
-          sorter: true,
-        },
-         {
-          title: "NH4",
-          dataIndex: "nh4",
-          sorter: true,
-        },
-         {
-          title: "Ca2",
-          dataIndex: "ca2",
-          sorter: true,
-        },
-         {
-          title: "Mg2",
-          dataIndex: "mg2",
-          sorter: true,
-        },
-         {
-          title: "Na",
-          dataIndex: "na",
-          sorter: true,
-        },
-         {
-          title: "K",
-          dataIndex: "k",
-          sorter: true,
-        },
-         {
-          title: "系统编码",
-          dataIndex: "systemCode",
-          sorter: true,
-        },
-
-        {
-          title: "备注",
-          dataIndex: "remark",
-          sorter: true,
-        },
+        ...tableColumns,
         {
           title: "创建人",
-          dataIndex: "username",
+          dataIndex: "userName",
           sorter: true,
         },
         {
@@ -355,8 +253,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/atmosphere/acid-rain/collect/utils.js b/src/views/atmosphere/acid-rain/collect/utils.js
index 6d891c1..3847089 100644
--- a/src/views/atmosphere/acid-rain/collect/utils.js
+++ b/src/views/atmosphere/acid-rain/collect/utils.js
@@ -1,158 +1,34 @@
+import moment from "moment";
 export default {
-    toObjData(excelData) {
+    toObjData(excelData,monitorYear) {
         return excelData.map(item => {
-            const monitorStartTime = new Date();
-            monitorStartTime.setFullYear(item[4]);
-            monitorStartTime.setMonth(item[5] - 1);
-            monitorStartTime.setDate(item[6]);
-            monitorStartTime.setHours(item[7]);
-            monitorStartTime.setMinutes(item[8]);
-
-            const monitorEndTime = new Date();
-            monitorEndTime.setFullYear(item[9]);
-            monitorEndTime.setMonth(item[10] - 1);
-            monitorEndTime.setDate(item[11]);
-            monitorEndTime.setHours(item[12]);
-            monitorEndTime.setMinutes(item[13]);
-            let quarter = 1;
-            const month = item[10]
-            if (month < 4) {
-                quarter = 1
-            } else if (month < 7) {
-                quarter = 2
-            } else if (month < 10) {
-                quarter = 3
-            } else {
-                quarter = 4
-            }
+            const monitorTime = moment(monitorYear + "."+item[1],"Y.M.D");
+            const monitorStartTime  = moment(`${monitorYear}.${item[2]}.${item[3]} ${item[4]}:${item[5]}`,"Y.M.D H:m");
+            const monitorEndTime  = moment(`${monitorYear}.${item[6]}.${item[7]} ${item[8]}:${item[9]}`,"Y.M.D H:m");
             console.log(item);
             const row = {
-                regionCode: item[0],
-                city: item[1].includes("市")?item[1]:"南宁市",
-                area: item[1].includes("区")?item[1]:"",
-                county: item[1].includes("县")?item[1]:"",
-                place: item[2],
-                placeType: item[3],
-                precipitationType: item[14],
-                precipitation: item[15],
-                ph: item[16],
-                conductivity: item[17],
-                so42: item[18],
-                no3: item[19],
-                f: Number(item[20])?Number(item[20]):null,
-                cl: item[21],
-                nh4: item[22],
-                ca2: item[23],
-                mg2: item[24],
-                na: item[25],
-                k: Number(item[26])?Number(item[26]):null,
-                systemCode: item[27],
-                regionLevel: "市级",
-                monitorStartTime: monitorStartTime.getTime(),
-                monitorEndTime: monitorEndTime.getTime(),
-                monitorTime: monitorEndTime.getTime(),
-                quarter
+                city: "南宁市",
+                code: item[0],
+                precipitationType:item[10],
+                precipitation:item[11],
+                ph:item[12],
+                conductivity:item[13],
+                fluorine:item[14],
+                chlorine:item[15],
+                sulfateRadical:item[16],
+                nitrate:item[17],
+                na:item[18],
+                ammoniumRadical:item[19],
+                k:item[20],
+                mg:item[21],
+                ca:item[22],
+                monitorStartTime: monitorStartTime.valueOf(),
+                monitorEndTime: monitorEndTime.valueOf(),
+                monitorTime: monitorTime.valueOf(),
             }
             return row;
         })
 
     },
-    toPlaceData(excelData) {
-        return excelData.map(item => {
-            return {
-                place: item[0],
-                placeLng: item[1],
-                placeLat: item[2],
-                motorway: item[3],
-                motorwayType: item[4],
-                motorwayLevel: item[5],
-                refObj: item[6],
-                people: item[7],
-                station: item[8],
-                monitorInstrumentModel: item[9],
-                monitorInstrumentCode: item[10],
-                beforeMonitorValue: item[11],
-                afterMonitorValue: item[12],
-                soundPressureValue: item[13],
-                soundInstrumentModel: item[14],
-                soundInstrumentCode: item[15],
 
-            }
-        })
-
-    },
-    // 解析县级数据
-    toAreaObjData(excelData) {
-        return excelData.map(item => {
-            const monitorStartTime = new Date();
-            monitorStartTime.setFullYear(item[1]);
-            monitorStartTime.setMonth(item[14] - 1);
-            monitorStartTime.setDate(item[15]);
-            monitorStartTime.setHours(item[16]);
-            monitorStartTime.setMinutes(item[17]);
-            let quarter = 1;
-            const month = item[14]
-            if (month < 4) {
-                quarter = 1
-            } else if (month < 7) {
-                quarter = 2
-            } else if (month < 10) {
-                quarter = 3
-            } else {
-                quarter = 4
-            }
-            let timeSlot = "夜";
-            if (item[16] >= 6 && item[16] <= 22) {
-                timeSlot = "昼"
-            }
-            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],
-                city: '南宁',
-                timeSlot,
-                monitorStartTime: monitorStartTime.getTime(),
-                quarter
-
-            }
-            if(row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90){
-                throw new Error(row.place + "数值有误")
-            }
-            return row;
-        })
-    }
-}
\ No newline at end of file
+}
diff --git a/src/views/atmosphere/acid-rain/statistic/base.vue b/src/views/atmosphere/acid-rain/statistic/base.vue
index c657d25..d6375fb 100644
--- a/src/views/atmosphere/acid-rain/statistic/base.vue
+++ b/src/views/atmosphere/acid-rain/statistic/base.vue
@@ -250,8 +250,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/atmosphere/acid-rain/statistic/index.vue b/src/views/atmosphere/acid-rain/statistic/index.vue
index 4418ad7..7591a18 100644
--- a/src/views/atmosphere/acid-rain/statistic/index.vue
+++ b/src/views/atmosphere/acid-rain/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
        
diff --git a/src/views/atmosphere/air/collect/air.vue b/src/views/atmosphere/air/collect/air.vue
index c2e4f78..0a4fb0f 100644
--- a/src/views/atmosphere/air/collect/air.vue
+++ b/src/views/atmosphere/air/collect/air.vue
@@ -404,8 +404,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/atmosphere/air/statistic/average.vue b/src/views/atmosphere/air/statistic/average.vue
deleted file mode 100644
index 3abe54f..0000000
--- a/src/views/atmosphere/air/statistic/average.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form
-        :model="where"
-        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-      >
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="年份">
-              <a-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/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();
-      });
-    },
-    /* 刷新表格 */
-    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,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.reload();
-    },
-    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());
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-</style>
\ No newline at end of file
diff --git a/src/views/atmosphere/air/statistic/base.vue b/src/views/atmosphere/air/statistic/base.vue
index 8e76401..d849746 100644
--- a/src/views/atmosphere/air/statistic/base.vue
+++ b/src/views/atmosphere/air/statistic/base.vue
@@ -4,6 +4,7 @@
       <!-- 搜索表单 -->
       <a-form
         :model="where"
+        layout="vertical"
         :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
         :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
       >
@@ -19,37 +20,14 @@
               </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-row>
+        <a-row>
+          <a-col :lg="24" :md="24" :sm="24" :xs="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>
@@ -57,7 +35,7 @@
       <ele-pro-table
         v-model:selection="selectionList"
         ref="table"
-        row-key="airId"
+        row-key="ambientAirId"
         :datasource="url"
         :columns="columns"
         :where="where"
@@ -74,7 +52,7 @@
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import { pageAirUrl, getColumnOptions } from "@/api/ecology/air";
+import { pageAirUrl, getColumnOptions,listAllAir } from "@/api/ecology/air";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import moment from "moment";
 //   import utils from "./utils";
@@ -168,8 +146,6 @@ export default {
           sorter: true,
         }
       ],
-      palceOptions: [],
-      areaOptions: [],
       regionLevelOptions: [],
       // 表格搜索条件
       where: {
@@ -185,22 +161,6 @@ export default {
   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 {
@@ -212,8 +172,6 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
       this.$refs.table.reload({
         where: this.where,
       });
@@ -226,6 +184,7 @@ export default {
       this.reload();
     },
     exportFile() {
+
      const columns = [
         {
           title: "监测日期",
@@ -307,12 +266,17 @@ export default {
       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());
+      listAllAir(this.where).then(res=>{
+        if(res.data.code == 0){
+          res.data.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());
+        }
+      })
+
     },
   },
 };
diff --git a/src/views/atmosphere/air/statistic/index.vue b/src/views/atmosphere/air/statistic/index.vue
index a7a8b60..1ad7a84 100644
--- a/src/views/atmosphere/air/statistic/index.vue
+++ b/src/views/atmosphere/air/statistic/index.vue
@@ -2,21 +2,10 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
-        <a-tab-pane key="source-statistic" tab="声源">
-          <source-statistic></source-statistic>
-        </a-tab-pane>
-        <a-tab-pane key="average" tab="城区">
-          <average-statistic></average-statistic>
-        </a-tab-pane>
-        <!-- <a-tab-pane key="quarter" tab="季度报告">
-         <quarter-statistic></quarter-statistic>
-        </a-tab-pane> -->
-        <a-tab-pane key="year-compare" tab="市">
-         <year-statistic></year-statistic>
-        </a-tab-pane>
+
       </a-tabs>
     </a-card>
   </div>
@@ -29,20 +18,11 @@
    * 
    */
   import BaseStatistic from "./base.vue";
-  // import QuarterStatistic from "./quarter.vue";
-  // import Compare from "./compare.vue";
-  import AverageStatistic from "./average.vue";
-  import SourceStatistic from "./source.vue";
-  import YearStatistic from "./year.vue";
-
   export default {
-    name: 'StatisticSoundZone',
+    name: 'StatisticAirIndex',
     components: {
       BaseStatistic,
-      SourceStatistic,
-      // Compare,
-      AverageStatistic,
-      YearStatistic
+
     },
     data() {
       return {
diff --git a/src/views/atmosphere/air/statistic/source.vue b/src/views/atmosphere/air/statistic/source.vue
deleted file mode 100644
index e974462..0000000
--- a/src/views/atmosphere/air/statistic/source.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form
-        :model="where"
-        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-      >
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="年份">
-              <a-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="(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 { statisticSourceUrl, getColumnOptions } from "@/api/ecology/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: statisticSourceUrl,
-      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.where.year = this.yearOptions[0].value;
-        this.reload();
-      });
-    },
-    /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.reload();
-    },
-    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());
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-</style>
\ No newline at end of file
diff --git a/src/views/atmosphere/air/statistic/year.vue b/src/views/atmosphere/air/statistic/year.vue
deleted file mode 100644
index 2d4b011..0000000
--- a/src/views/atmosphere/air/statistic/year.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form
-        :model="where"
-        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-      >
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="起始年份">
-              <a-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/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();
-      });
-    },
-    /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    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: "质量等级",
-          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());
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-</style>
\ No newline at end of file
diff --git a/src/views/sound/function/collect/noise.vue b/src/views/sound/function/collect/noise.vue
index 7266e8e..abfefde 100644
--- a/src/views/sound/function/collect/noise.vue
+++ b/src/views/sound/function/collect/noise.vue
@@ -625,8 +625,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/sound/function/statistic/base.vue b/src/views/sound/function/statistic/base.vue
index 2db3c26..0006b77 100644
--- a/src/views/sound/function/statistic/base.vue
+++ b/src/views/sound/function/statistic/base.vue
@@ -322,8 +322,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/sound/function/statistic/index.vue b/src/views/sound/function/statistic/index.vue
index a5a0927..9a01317 100644
--- a/src/views/sound/function/statistic/index.vue
+++ b/src/views/sound/function/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
         <a-tab-pane key="average" tab="市达标率">
diff --git a/src/views/sound/road/collect/noise.vue b/src/views/sound/road/collect/noise.vue
index fa8847d..3c414bc 100644
--- a/src/views/sound/road/collect/noise.vue
+++ b/src/views/sound/road/collect/noise.vue
@@ -743,8 +743,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/sound/road/statistic/base.vue b/src/views/sound/road/statistic/base.vue
index 75e6a60..2e596bc 100644
--- a/src/views/sound/road/statistic/base.vue
+++ b/src/views/sound/road/statistic/base.vue
@@ -354,8 +354,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/sound/road/statistic/index.vue b/src/views/sound/road/statistic/index.vue
index c9fb001..7b7f135 100644
--- a/src/views/sound/road/statistic/index.vue
+++ b/src/views/sound/road/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
         <a-tab-pane key="average" tab="平均">
diff --git a/src/views/sound/zone/collect/noise.vue b/src/views/sound/zone/collect/noise.vue
index d04785a..37c2d30 100644
--- a/src/views/sound/zone/collect/noise.vue
+++ b/src/views/sound/zone/collect/noise.vue
@@ -565,8 +565,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/sound/zone/statistic/base.vue b/src/views/sound/zone/statistic/base.vue
index a97c692..0bf66c9 100644
--- a/src/views/sound/zone/statistic/base.vue
+++ b/src/views/sound/zone/statistic/base.vue
@@ -290,8 +290,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/sound/zone/statistic/index.vue b/src/views/sound/zone/statistic/index.vue
index a7a8b60..c981c4b 100644
--- a/src/views/sound/zone/statistic/index.vue
+++ b/src/views/sound/zone/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
         <a-tab-pane key="source-statistic" tab="声源">
diff --git a/src/views/water/drinking-water-village/collect/index.vue b/src/views/water/drinking-water-village/collect/index.vue
index dda6cad..871979f 100644
--- a/src/views/water/drinking-water-village/collect/index.vue
+++ b/src/views/water/drinking-water-village/collect/index.vue
@@ -20,7 +20,7 @@
         </a-space>
       </template>
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane tab="噪声信息" key="water">
+        <a-tab-pane tab="农村引用水" key="water">
           <water-bill ref="water"></water-bill>
         </a-tab-pane>
       </a-tabs>
@@ -211,4 +211,4 @@ export default {
 </script>
 
 <style scoped lang="less">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/water/drinking-water-village/collect/water.vue b/src/views/water/drinking-water-village/collect/water.vue
index 80de60f..f7c0706 100644
--- a/src/views/water/drinking-water-village/collect/water.vue
+++ b/src/views/water/drinking-water-village/collect/water.vue
@@ -223,8 +223,7 @@ export default {
     loadOptionData() {},
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/drinking-water-village/statistic/base.vue b/src/views/water/drinking-water-village/statistic/base.vue
index d05f764..e0046df 100644
--- a/src/views/water/drinking-water-village/statistic/base.vue
+++ b/src/views/water/drinking-water-village/statistic/base.vue
@@ -334,8 +334,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/drinking-water-village/statistic/index.vue b/src/views/water/drinking-water-village/statistic/index.vue
index c9fb001..7b7f135 100644
--- a/src/views/water/drinking-water-village/statistic/index.vue
+++ b/src/views/water/drinking-water-village/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
         <a-tab-pane key="average" tab="平均">
diff --git a/src/views/water/drinking-water/collect/index.vue b/src/views/water/drinking-water/collect/index.vue
index beb9218..553cd7a 100644
--- a/src/views/water/drinking-water/collect/index.vue
+++ b/src/views/water/drinking-water/collect/index.vue
@@ -27,7 +27,7 @@
         </a-space>
       </template>
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane tab="噪声信息" key="water">
+        <a-tab-pane tab="饮用水" key="water">
           <water-bill ref="water"></water-bill>
         </a-tab-pane>
       </a-tabs>
@@ -348,4 +348,4 @@ export default {
 </script>
 
 <style scoped lang="less">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/water/drinking-water/collect/water.vue b/src/views/water/drinking-water/collect/water.vue
index 70d1f20..13824cf 100644
--- a/src/views/water/drinking-water/collect/water.vue
+++ b/src/views/water/drinking-water/collect/water.vue
@@ -223,8 +223,7 @@ export default {
     loadOptionData() {},
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/drinking-water/statistic/base.vue b/src/views/water/drinking-water/statistic/base.vue
index 75e6a60..2e596bc 100644
--- a/src/views/water/drinking-water/statistic/base.vue
+++ b/src/views/water/drinking-water/statistic/base.vue
@@ -354,8 +354,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/drinking-water/statistic/index.vue b/src/views/water/drinking-water/statistic/index.vue
index c9fb001..7b7f135 100644
--- a/src/views/water/drinking-water/statistic/index.vue
+++ b/src/views/water/drinking-water/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
         <a-tab-pane key="average" tab="平均">
diff --git a/src/views/water/lake/collect/special-water.vue b/src/views/water/lake/collect/special-water.vue
index ca29a37..036a9ae 100644
--- a/src/views/water/lake/collect/special-water.vue
+++ b/src/views/water/lake/collect/special-water.vue
@@ -206,8 +206,7 @@ export default {
     loadOptionData() {},
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/lake/collect/water.vue b/src/views/water/lake/collect/water.vue
index cafe2b3..08267f5 100644
--- a/src/views/water/lake/collect/water.vue
+++ b/src/views/water/lake/collect/water.vue
@@ -206,8 +206,7 @@ export default {
     loadOptionData() {},
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/lake/statistic/base.vue b/src/views/water/lake/statistic/base.vue
index a97c692..0bf66c9 100644
--- a/src/views/water/lake/statistic/base.vue
+++ b/src/views/water/lake/statistic/base.vue
@@ -290,8 +290,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/lake/statistic/index.vue b/src/views/water/lake/statistic/index.vue
index a7a8b60..c981c4b 100644
--- a/src/views/water/lake/statistic/index.vue
+++ b/src/views/water/lake/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
         <a-tab-pane key="source-statistic" tab="声源">
diff --git a/src/views/water/river-station/statistic/base.vue b/src/views/water/river-station/statistic/base.vue
index 75e6a60..2e596bc 100644
--- a/src/views/water/river-station/statistic/base.vue
+++ b/src/views/water/river-station/statistic/base.vue
@@ -354,8 +354,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/river-station/statistic/index.vue b/src/views/water/river-station/statistic/index.vue
index c9fb001..7b7f135 100644
--- a/src/views/water/river-station/statistic/index.vue
+++ b/src/views/water/river-station/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
         <a-tab-pane key="average" tab="平均">
diff --git a/src/views/water/river/collect/water.vue b/src/views/water/river/collect/water.vue
index 9d6e336..4e6c1e5 100644
--- a/src/views/water/river/collect/water.vue
+++ b/src/views/water/river/collect/water.vue
@@ -206,8 +206,7 @@ export default {
     loadOptionData() {},
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/river/statistic/average.vue b/src/views/water/river/statistic/average.vue
deleted file mode 100644
index 3abe54f..0000000
--- a/src/views/water/river/statistic/average.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form
-        :model="where"
-        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-      >
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="年份">
-              <a-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/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();
-      });
-    },
-    /* 刷新表格 */
-    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,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.reload();
-    },
-    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());
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-</style>
\ No newline at end of file
diff --git a/src/views/water/river/statistic/base.vue b/src/views/water/river/statistic/base.vue
index a97c692..0f6a50f 100644
--- a/src/views/water/river/statistic/base.vue
+++ b/src/views/water/river/statistic/base.vue
@@ -8,17 +8,6 @@
         :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>
@@ -30,18 +19,6 @@
               </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>
@@ -64,14 +41,7 @@
         :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>
@@ -81,12 +51,12 @@
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import { pageZoneNoiseUrl, getColumnOptions } from "@/api/ecology/zone-sound";
+import { pageZoneNoiseUrl, getColumnOptions ,listAllRiver} from "@/api/ecology/river";
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
 import moment from "moment";
 //   import utils from "./utils";
 export default {
-  name: "StatisticSoundZoneBase",
+  name: "StatisticRiverIndex",
   components: {},
   data() {
     return {
@@ -98,157 +68,9 @@ export default {
       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,
@@ -271,27 +93,9 @@ export default {
           };
         });
       });
-      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,
-          };
-        });
-      });
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
       this.$refs.table.reload({
         where: this.where,
       });
@@ -304,161 +108,8 @@ export default {
       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 columns = [];
+
       const arr = [];
       const th = columns.map((item) => item.title);
       arr.push(th);
diff --git a/src/views/water/river/statistic/colums.js b/src/views/water/river/statistic/colums.js
new file mode 100644
index 0000000..9969cf1
--- /dev/null
+++ b/src/views/water/river/statistic/colums.js
@@ -0,0 +1,50 @@
+const exportColumns = [
+        {title: "断面编码",dataIndex: "sectionCode",sorter: true,},
+        {title: "断面名称",dataIndex: "sectionName",sorter: true,},
+        {title: "考核省份",dataIndex: "evaluationProvince",sorter: true,},
+        {title: "断面类型",dataIndex: "sectionType",sorter: true,},
+        {title: "断面属性",dataIndex: "sectionAttributes",sorter: true,},
+        {title: "流域",dataIndex: "watershed",sorter: true,},
+        {title: "水系",dataIndex: "waterSystem",sorter: true,},
+        // {title: "监测时间",dataIndex: "monitorTime",sorter: true,},
+        {title: "所在水体",dataIndex: "waterBody",sorter: true,},
+        {title: "汇入水体 ",dataIndex: "intoWaterBody",sorter: true,},
+        {title: "河流级别",dataIndex: "riverLevel",sorter: true,},
+        {title: "监测年份",dataIndex: "monitoringYear",sorter: true,},
+        {title: "监测月份",dataIndex: "monitoringMonth",sorter: true,},
+        {title: "水质类别",dataIndex: "waterQualityCategory",sorter: true,},
+        {title: "电导率(ms/m)",dataIndex: "conductivity",sorter: true,},
+        {title: "水温(℃)",dataIndex: "waterTemperature",sorter: true,},
+        {title: "pH值",dataIndex: "ph",sorter: true,},
+        {title: "溶解氧(mg/L)",dataIndex: "dissolvedOxygen",sorter: true,},
+        {title: "透明度(cm)",dataIndex: "transparency",sorter: true,},
+        {title: "盐度(‰)",dataIndex: "salinity",sorter: true,},
+        {title: "COD Mn(mg/L)",dataIndex: "codMn",sorter: true,},
+        {title: "COD Cr(mg/L)",dataIndex: "codCr",sorter: true,},
+        {title: "NH₃-N(mg/L)",dataIndex: "nh3N",sorter: true,},
+        {title: "T-P(mg/L)",dataIndex: "tP",sorter: true,},
+        {title: "T-N(mg/L)",dataIndex: "tN",sorter: true,},
+        {title: "Cu(mg/L)",dataIndex: "cu",sorter: true,},
+        {title: "Zn(mg/L)",dataIndex: "zn",sorter: true,},
+        {title: "Pb(mg/L)",dataIndex: "pb",sorter: true,},
+        {title: "Cd(mg/L)",dataIndex: "cd",sorter: true,},
+        {title: "BOD5(mg/L)",dataIndex: "bod5",sorter: true,},
+        {title: "T-As(mg/L)",dataIndex: "tAs",sorter: true,},
+        {title: "T-Se(mg/L)",dataIndex: "tSe",sorter: true,},
+        {title: "T-Hg(mg/L)",dataIndex: "tHg",sorter: true,},
+        {title: "Cr6+(mg/L)",dataIndex: "cr6",sorter: true,},
+        {title: "F-(mg/L)",dataIndex: "f",sorter: true,},
+        {title: "CN-(mg/L)",dataIndex: "cn",sorter: true,},
+        {title: "挥发酚(mg/L)",dataIndex: "volatilePhenol",sorter: true,},
+        {title: "石油类(mg/L)",dataIndex: "petro",sorter: true,},
+        {title: "LAS(mg/L)",dataIndex: "las",sorter: true,},
+        {title: "S2-(mg/L)",dataIndex: "s2",sorter: true,},
+        {title: "Chla(mg/L)",dataIndex: "chla",sorter: true,},
+        {title: "NO₃-(mg/L)",dataIndex: "no3",sorter: true,},
+        {title: "NO₂-(mg/L)",dataIndex: "no2",sorter: true,},
+        {title: "流量(m³/s)",dataIndex: "flow",sorter: true,},
+        {title: "水位",dataIndex: "waterLevel",sorter: true,},
+        {title: "备注",dataIndex: "remark",sorter: true,},
+    ];
+
+    export {exportColumns}
diff --git a/src/views/water/river/statistic/index.vue b/src/views/water/river/statistic/index.vue
index a7a8b60..a207c59 100644
--- a/src/views/water/river/statistic/index.vue
+++ b/src/views/water/river/statistic/index.vue
@@ -2,21 +2,9 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
-        <a-tab-pane key="source-statistic" tab="声源">
-          <source-statistic></source-statistic>
-        </a-tab-pane>
-        <a-tab-pane key="average" tab="城区">
-          <average-statistic></average-statistic>
-        </a-tab-pane>
-        <!-- <a-tab-pane key="quarter" tab="季度报告">
-         <quarter-statistic></quarter-statistic>
-        </a-tab-pane> -->
-        <a-tab-pane key="year-compare" tab="市">
-         <year-statistic></year-statistic>
-        </a-tab-pane>
       </a-tabs>
     </a-card>
   </div>
@@ -29,20 +17,13 @@
    * 
    */
   import BaseStatistic from "./base.vue";
-  // import QuarterStatistic from "./quarter.vue";
-  // import Compare from "./compare.vue";
-  import AverageStatistic from "./average.vue";
-  import SourceStatistic from "./source.vue";
-  import YearStatistic from "./year.vue";
+
+
 
   export default {
     name: 'StatisticSoundZone',
     components: {
       BaseStatistic,
-      SourceStatistic,
-      // Compare,
-      AverageStatistic,
-      YearStatistic
     },
     data() {
       return {
diff --git a/src/views/water/river/statistic/source.vue b/src/views/water/river/statistic/source.vue
deleted file mode 100644
index e974462..0000000
--- a/src/views/water/river/statistic/source.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form
-        :model="where"
-        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-      >
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="年份">
-              <a-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="(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 { statisticSourceUrl, getColumnOptions } from "@/api/ecology/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: statisticSourceUrl,
-      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.where.year = this.yearOptions[0].value;
-        this.reload();
-      });
-    },
-    /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.reload();
-    },
-    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());
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-</style>
\ No newline at end of file
diff --git a/src/views/water/river/statistic/year.vue b/src/views/water/river/statistic/year.vue
deleted file mode 100644
index 2d4b011..0000000
--- a/src/views/water/river/statistic/year.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form
-        :model="where"
-        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-      >
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="起始年份">
-              <a-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/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();
-      });
-    },
-    /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    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: "质量等级",
-          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());
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-</style>
\ No newline at end of file
diff --git a/src/views/water/sewage/collect/city-river.vue b/src/views/water/sewage/collect/city-river.vue
index 0d5cbb0..2a313c4 100644
--- a/src/views/water/sewage/collect/city-river.vue
+++ b/src/views/water/sewage/collect/city-river.vue
@@ -206,8 +206,7 @@ export default {
     loadOptionData() {},
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/sewage/statistic/base.vue b/src/views/water/sewage/statistic/base.vue
index a97c692..0bf66c9 100644
--- a/src/views/water/sewage/statistic/base.vue
+++ b/src/views/water/sewage/statistic/base.vue
@@ -290,8 +290,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/sewage/statistic/index.vue b/src/views/water/sewage/statistic/index.vue
index a7a8b60..c981c4b 100644
--- a/src/views/water/sewage/statistic/index.vue
+++ b/src/views/water/sewage/statistic/index.vue
@@ -2,7 +2,7 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
         <a-tab-pane key="source-statistic" tab="声源">
diff --git a/src/views/water/water-function-area/collect/water-bill.vue b/src/views/water/water-function-area/collect/water-bill.vue
index efaae11..f2e2289 100644
--- a/src/views/water/water-function-area/collect/water-bill.vue
+++ b/src/views/water/water-function-area/collect/water-bill.vue
@@ -7,12 +7,6 @@
 
           <!-- 搜索表单 -->
           <a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
-            <a-form-item label="区域等级:">
-              <a-select v-model:value="where.regionLevel" allowClear placeholder="未选择">
-                <a-select-option :value="'市级'">市级</a-select-option>
-                <a-select-option :value="'县级'">县级</a-select-option>
-              </a-select>
-            </a-form-item>
             <a-form-item label="审核状态:">
               <a-select v-model:value="where.checked" allowClear placeholder="未选择">
                 <a-select-option :value="1">已审核</a-select-option>
@@ -24,10 +18,6 @@
               <a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
             </a-form-item>
 
-            <a-form-item label="上报时间:">
-              <a-range-picker separator="~" v-model:value="reportTimeScope" />
-            </a-form-item>
-
             <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
               <a-space>
                 <a-button type="primary" @click="reload">查询</a-button>
@@ -150,22 +140,6 @@
             sorter: true,
 
           },
-          // {
-          //   title: '菜单名称',
-          //   dataIndex: 'title',
-          //   sorter: true
-          // },
-          {
-            title: '监测时间',
-            dataIndex: 'reportTime',
-            sorter: true,
-            slots: {
-              customRender: 'reportTime',
-            },
-            // customRender: ({
-            //   text
-            // }) => this.$util.toDateString(text)
-          },
           {
             title: '导入时间',
             dataIndex: 'createTime',
diff --git a/src/views/water/water-function-area/statistic/average.vue b/src/views/water/water-function-area/statistic/average.vue
deleted file mode 100644
index fb5825a..0000000
--- a/src/views/water/water-function-area/statistic/average.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<template>
-  <div class="">
-    <ele-pro-table
-      ref="table"
-      row-key="id"
-      :datasource="url"
-      :columns="columns"
-      :where="where"
-      :needPage="false"
-      @done="(d) => (data = d.data)"
-      :scroll="{ x: 'max-content' }"
-    >
-      <template #toolbar>
-        <!-- 搜索表单 -->
-        <a-form :model="where" layout="inline" :labelCol="{ offset: 1 }">
-          <a-row>
-            <a-col :lg="6" :md="12" :sm="24" :xs="24">
-              <a-form-item label="昼夜:">
-                <a-select
-                  :options="timeSlotOptions"
-                  v-model:value="where.timeSlot"
-                  placeholder="昼夜"
-                >
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="8" :md="12" :sm="24" :xs="24">
-              <a-form-item label="时间范围:">
-                <!-- <a-month-picker v-model:value="timeScope" placeholder="起始" /> -->
-                <a-range-picker v-model:value="timeScope" format="YYYY-MM-DD" />
-              </a-form-item>
-            </a-col>
-
-            <a-col :lg="4" :md="12" :sm="24" :xs="24">
-              <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-                <a-space>
-                  <a-button type="primary" @click="reload">查询</a-button>
-                  <a-button @click="reset">重置</a-button>
-                  <a-button @click="exportFile">导出excel</a-button>
-                </a-space>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-        <!-- <a-space>
-            
-          </a-space> -->
-      </template>
-      <template #Leq="{ text, record }">
-        <a-tag
-          v-if="
-            (where.timeSlot == '昼' && text <= 68) ||
-            (where.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>
-  </div>
-</template>
-
-<script>
-import _ from "lodash";
-import XLSX from "xlsx";
-import { pageRoadNoiseStatisticUrl } from "@/api/ecology/road-sound";
-const columns = [
-  {
-    title: "城区",
-    dataIndex: "area",
-  },
-
-  {
-    title: "市",
-    dataIndex: "city",
-  },
-  {
-    title: "路长",
-    dataIndex: "roadLength",
-  },
-  {
-    title: "路宽",
-    dataIndex: "roadWidth",
-  },
-  {
-    title: "LeqdB(A)",
-    dataIndex: "avgLeq",
-    slots: { customRender: "Leq" },
-    sorter: true,
-  },
-  {
-    title: "SDdB(A)",
-    dataIndex: "avgSD",
-  },
-  {
-    title: "L10dB(A)",
-    dataIndex: "avgL10",
-  },
-  {
-    title: "L50dB(A)",
-    dataIndex: "avgL50",
-  },
-  {
-    title: "L90dB(A)",
-    dataIndex: "avgL90",
-  },
-];
-export default {
-  name: "StatisticSoundRoadAverage",
-  components: {},
-  data() {
-    return {
-      url: pageRoadNoiseStatisticUrl,
-      data: [],
-      where: {
-        model: "area",
-        timeSlot: "昼"
-      },
-      timeScope: [],
-      columns,
-      modelOptions: [
-        {
-          value: "place",
-          label: "测点",
-        },
-        {
-          value: "road",
-          label: "路段",
-        },
-        {
-          value: "area",
-          label: "城区",
-        },
-        {
-          value: "city",
-          label: "市",
-        },
-      ],
-      timeSlotOptions: [
-        {
-          value: "昼",
-          label: "昼",
-        },
-        {
-          value: "夜",
-          label: "夜",
-        },
-      ],
-    };
-  },
-  methods: {
-    /* 刷新表格 */
-    reload() {
-      this.$refs.table.reload({
-        where: {
-          model: this.where.model,
-          timeStart:
-            this.timeScope.length == 2
-              ? this.timeScope[0].format("Y-M-D")
-              : null,
-          timeEnd:
-            this.timeScope.length == 2
-              ? this.timeScope[1].format("Y-M-D")
-              : null,
-          timeSlot: this.where.timeSlot,
-        },
-      });
-      let cloneColumns = _.cloneDeep(columns);
-      if (this.where.model == "area") {
-        this.columns = cloneColumns.filter((item) => {
-          return item.dataIndex != "place" && item.dataIndex != "road";
-        });
-      } else if (this.where.model == "road") {
-        this.columns = cloneColumns.filter((item) => {
-          return item.dataIndex != "place";
-        });
-      } else if (this.where.model == "city") {
-        this.columns = cloneColumns.filter((item) => {
-          return (
-            item.dataIndex != "place" &&
-            item.dataIndex != "road" &&
-            item.dataIndex != "area"
-          );
-        });
-      }
-    },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        model: "area",
-        timeSlot: "昼",
-      };
-      this.this.timeScope = [];
-
-      this.reload();
-    },
-    exportFile() {
-      let array = [
-        ["测点", "路段", "城区", "路长", "路宽", "平均Leq", "平均SD"],
-      ];
-      this.data.forEach((d) => {
-        array.push([
-          d.place,
-          d.road,
-          d.area,
-          d.roadLength,
-          d.roadWidth,
-          d.avgLeq,
-          d.avgSD,
-        ]);
-      });
-      let sheet = XLSX.utils.aoa_to_sheet(array);
-      // sheet['!merges'] = [
-      //   {s: {r: 0, c: 1}, e: {r: 0, c: 5}},  // 合并第0行第1列到第0行第5列
-      //   {s: {r: 0, c: 0}, e: {r: 1, c: 0}},  // 合并第0行第0列到第1行第0列
-      //   {s: {r: 0, c: 6}, e: {r: 1, c: 6}}  // 合并第0行第6列到第1行第6列
-      // ];
-      this.$util.exportSheet(XLSX, sheet, "道路交通噪声统计表");
-    },
-  },
-};
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/water/water-function-area/statistic/base.vue b/src/views/water/water-function-area/statistic/base.vue
index 75e6a60..2e596bc 100644
--- a/src/views/water/water-function-area/statistic/base.vue
+++ b/src/views/water/water-function-area/statistic/base.vue
@@ -354,8 +354,7 @@ export default {
     },
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+
       this.$refs.table.reload({
         where: this.where,
       });
diff --git a/src/views/water/water-function-area/statistic/colums.js b/src/views/water/water-function-area/statistic/colums.js
new file mode 100644
index 0000000..094a206
--- /dev/null
+++ b/src/views/water/water-function-area/statistic/colums.js
@@ -0,0 +1,27 @@
+const tableColumns = [
+    {title: "水体类型", dataIndex: "waterBodyType", sorter: true,},
+    {title: "水资源一级区名称", dataIndex: "waterResourcesFirstLevelZoneName", sorter: true,},
+    {title: "水质目标", dataIndex: "waterQualityGoal", sorter: true,},
+    {title: "数据来源", dataIndex: "dataSources", sorter: true,},
+    {title: "断面名称", dataIndex: "sectionName", sorter: true,},
+    // {title: "采样时间", dataIndex: "samplingTime", sorter: true,},
+    {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,},
+    {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,},
+    {title: "化学需氧量", dataIndex: "cod", sorter: true,},
+    {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,},
+    {title: "氨氮", dataIndex: "ammonia", sorter: true,},
+    {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,},
+
+    {title: "水功能区水质类别", dataIndex: "ffeWaterFunctionAreaWaterQualityCategory"},
+    {title: "达标评价结论", dataIndex: "ffeCompliantEvaluationConclusion"},
+    {title: "主要超标项目及其超标倍数", dataIndex: "ffeMajorOverStandardItemsMultiples"},
+
+    {title: "水功能区水质类别", dataIndex: "lprlWaterFunctionAreaWaterQualityCategory"},
+    {title: "达标评价结论", dataIndex: "lprlCompliantEvaluationConclusion"},
+    {title: "主要超标项目及其超标倍数", dataIndex: "lprlMajorOverStandardItemsMultiples"},
+    {title: "系统编码", dataIndex: "systemCode", sorter: true,},
+    {title: "备注", dataIndex: "remark", sorter: true,},
+
+];
+
+export {tableColumns}
diff --git a/src/views/water/water-function-area/statistic/compare.vue b/src/views/water/water-function-area/statistic/compare.vue
deleted file mode 100644
index 733daea..0000000
--- a/src/views/water/water-function-area/statistic/compare.vue
+++ /dev/null
@@ -1,508 +0,0 @@
-<template>
-  <div class="">
-    <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
-      <a-row>
-        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="统计模块:">
-            <a-select
-              :options="groupModelOptions"
-              v-model:value="where.groupModel"
-              placeholder="统计模块"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col> -->
-        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="时间细度:">
-            <a-select
-              :options="groupTimeLengthOptions"
-              v-model:value="where.groupTimeLength"
-              placeholder=""
-            >
-            </a-select>
-          </a-form-item>
-        </a-col> -->
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item name="timeRange" label="时间范围:">
-            <a-range-picker
-              @panelChange="timeRangePanelChange"
-              v-model:value="timeRange"
-              format="YYYY"
-              :mode="['year', 'year']"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="昼夜:">
-            <a-select
-              :options="timeSlotOptions"
-              v-model:value="where.timeSlot"
-              placeholder="昼夜"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-
-        <a-col :lg="12" :md="12" :sm="24" :xs="24">
-          <a-form-item label="类型:">
-            <a-select
-              v-model:value="where.valueType"
-              :options="valueTypeOptions"
-              mode="multiple"
-              placeholder="至少选择一项"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
-              <a-form-item label="时间范围:">
-                <a-range-picker @change="reportTimeScopeChange" :mode="['year','year']" separator="~" v-model:value="where.reportTimeScope" ><a-range-picker>
-                   <template #renderExtraFooter>
-                      extra footer
-                    </template>
-                </a-range-picker>
-              </a-form-item>
-            </a-col> -->
-
-        <a-col :lg="12" :md="12" :sm="24" :xs="24">
-          <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-            <a-space>
-              <a-button type="primary" @click="reload">查询</a-button>
-              <a-button @click="reset">重置</a-button>
-              <a-button @click="exportFile">导出Excel</a-button>
-            </a-space>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-    <ele-pro-table
-      v-if="hisYears.length > 0"
-      ref="table"
-      row-key="id"
-      :datasource="url"
-      :columns="columns"
-      :where="where"
-      :needPage="false"
-      :initLoad="false"
-      :scroll="{ x: 'max-content' }"
-      :method="'POST'"
-      @done="(d) => (data = d.data)"
-    >
-      <template #toolbar>
-        <!-- 搜索表单 -->
-
-        <!-- <a-space>
-            
-        </a-space> -->
-      </template>
-    </ele-pro-table>
-  </div>
-</template>
-
-<script>
-// import _ from "lodash";
-import { ref } from "vue";
-import XLSX from "xlsx";
-import {
-  pageRoadNoiseCompare,
-  getHistoryyears,
-} from "@/api/ecology/road-sound";
-export default {
-  name: "StatisticSoundRoadCompare",
-  components: {},
-  data() {
-    const groupModelOptions = [
-      { label: "测点", value: "place" },
-      { label: "城区", value: "area" },
-      { label: "市", value: "city" },
-    ];
-    const groupTimeLengthOptions = [
-      {
-        label: "年",
-        value: "monitor_year",
-      },
-      {
-        label: "季度",
-        value: "quarter",
-      },
-    ];
-
-    // const valueTypeOptions = ['Leq','SD','L10','L50','L90','Lmin','Lmax'];
-    const valueTypeOptions = [
-      {
-        label: "Leq",
-        value: "index_Leq",
-      },
-      {
-        label: "SD",
-        value: "index_SD",
-      },
-      {
-        label: "L10",
-        value: "index_L10",
-      },
-      {
-        label: "L50",
-        value: "index_L50",
-      },
-      {
-        label: "L90",
-        value: "index_L90",
-      },
-      {
-        label: "Lmin",
-        value: "index_Lmin",
-      },
-      {
-        label: "Lmax",
-        value: "index_Lmax",
-      },
-    ];
-
-    const whereRules = {};
-    return {
-      url: pageRoadNoiseCompare,
-      data: [],
-      where: {
-        groupModel: "area",
-        groupTimeLength: "monitor_year",
-        reportTimeScope: [],
-        valueType: ["index_Leq"],
-        timeRange: [],
-        regionLevel: "市级"
-      },
-      timeRange: [],
-      whereRules,
-      hisYears: [],
-      timeScope: [],
-      columns: [{ title: "年", dataIndex: "year" }],
-      groupModelOptions,
-      groupTimeLengthOptions,
-      valueTypeOptions: ref(valueTypeOptions),
-      timeSlotOptions: [
-        {
-          value: "昼",
-          label: "昼",
-        },
-        {
-          value: "夜",
-          label: "夜",
-        },
-      ],
-    };
-  },
-  mounted() {
-    getHistoryyears().then((res) => {
-      this.hisYears = res.data.data;
-      this.$nextTick(() => {
-        this.reload();
-      });
-    });
-  },
-  methods: {
-    /* 刷新表格 */
-    reload() {
-      if (this.where.valueType.length == 0) {
-        this.$message.error("请至少选择一个类型");
-        return;
-      }
-
-      // 结束时间必须大于开始时间
-      if (this.where.timeRange && this.where.timeRange.length == 2) {
-        if (this.where.timeRange[0] > this.where.timeRange[1]) {
-          this.$message.error("结束时间必须大于起始时间");
-          return;
-        }
-        this.where.startYear = this.where.timeRange[0];
-        this.where.endYear = this.where.timeRange[1];
-      }
-      this.stableDone();
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        groupModel: "area",
-        groupTimeLength: "monitor_year",
-        reportTimeScope: [],
-        valueType: ["index_Leq"],
-        timeRange: [],
-        regionLevel: "市级"
-      };
-      this.this.timeScope = [];
-      this.reload();
-    },
-    reportTimeScopeChange(d, dstr) {
-      console.log(d, dstr);
-    },
-    timeRangePanelChange(val) {
-      val[0] && (this.where.timeRange[0] = val[0].year());
-      val[1] && (this.where.timeRange[1] = val[1].year());
-      this.timeRange = val;
-    },
-    // 数据加载完成
-    stableDone() {
-      const columns = [];
-      if (this.where.groupModel == "area") {
-        columns.push({
-          title: "城区",
-          dataIndex: "area",
-          sorter: true,
-        });
-      } else if (this.where.groupModel == "place") {
-        columns.push({
-          title: "测点",
-          dataIndex: "area",
-          sorter: true,
-        });
-      } else if (this.where.groupModel == "city") {
-        columns.push({
-          title: "城市",
-          dataIndex: "area",
-          sorter: true,
-        });
-      }
-
-      this.hisYears.forEach((item) => {
-        if (
-          (!this.where.timeRange[0] || this.where.timeRange[0] <= item) &&
-          (!this.where.timeRange[1] || this.where.timeRange[1] >= item)
-        ) {
-          if (this.where.groupTimeLength == "quarter") {
-            columns.push({
-              title: item + "年第一季度Leq",
-              dataIndex: item + "1" + "Leq",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度Leq",
-              dataIndex: item + "2" + "Leq",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度Leq",
-              dataIndex: item + "3" + "Leq",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度Leq",
-              dataIndex: item + "4" + "Leq",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度SD",
-              dataIndex: item + "1" + "Sd",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度SD",
-              dataIndex: item + "2" + "Sd",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度SD",
-              dataIndex: item + "3" + "Sd",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度SD",
-              dataIndex: item + "4" + "Sd",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度L10",
-              dataIndex: item + "1" + "L10",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度L10",
-              dataIndex: item + "2" + "L10",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度L10",
-              dataIndex: item + "3" + "L10",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度L10",
-              dataIndex: item + "4" + "L10",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度L50",
-              dataIndex: item + "1" + "L50",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度L50",
-              dataIndex: item + "2" + "L50",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度L50",
-              dataIndex: item + "3" + "L50",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度L50",
-              dataIndex: item + "4" + "L50",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度L90",
-              dataIndex: item + "1" + "L90",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度L90",
-              dataIndex: item + "2" + "L90",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度L90",
-              dataIndex: item + "3" + "L90",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度L90",
-              dataIndex: item + "4" + "L90",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度Lmin",
-              dataIndex: item + "1" + "Lmin",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度Lmin",
-              dataIndex: item + "2" + "Lmin",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度Lmin",
-              dataIndex: item + "3" + "Lmin",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度Lmin",
-              dataIndex: item + "4" + "Lmin",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第一季度Lmax",
-              dataIndex: item + "1" + "Lmax",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第二季度Lmax",
-              dataIndex: item + "2" + "Lmax",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第三季度Lmax",
-              dataIndex: item + "3" + "Lmax",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-            columns.push({
-              title: item + "年第四季度Lmax",
-              dataIndex: item + "4" + "Lmax",
-              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
-            });
-          } else {
-            if (this.where.valueType.includes("index_Leq")) {
-              columns.push({
-                title: item + "年Leq",
-                dataIndex: item + "Leq",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(1) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_SD")) {
-              columns.push({
-                title: item + "年SD",
-                dataIndex: item + "Sd",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(1) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_L10")) {
-              columns.push({
-                title: item + "年L10",
-                dataIndex: item + "L10",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(1) : "";
-                  return val;
-                },
-              });
-            }
-
-            if (this.where.valueType.includes("index_L50")) {
-              columns.push({
-                title: item + "年L50",
-                dataIndex: item + "L50",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(1) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_L90")) {
-              columns.push({
-                title: item + "年L90",
-                dataIndex: item + "L90",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(1) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_Lmin")) {
-              columns.push({
-                title: item + "年Lmin",
-                dataIndex: item + "Lmin",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(1) : "";
-                  return val;
-                },
-              });
-            }
-            if (this.where.valueType.includes("index_Lmax")) {
-              columns.push({
-                title: item + "年Lmax",
-                dataIndex: item + "Lmax",
-                customRender: ({ text }) => {
-                  const val = text ? Number(text).toFixed(1) : "";
-                  return val;
-                },
-              });
-            }
-          }
-        }
-      });
-      //
-      this.columns = columns;
-    },
-    exportFile() {
-      const arr = [];
-      const th = this.columns.map((item) => item.title);
-      arr.push(th);
-      this.data.forEach((d) => {
-        const td = this.columns.map((item) => d[item.dataIndex]);
-        arr.push(td);
-      });
-      let sheet = XLSX.utils.aoa_to_sheet(arr);
-      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
-    },
-  },
-};
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/water/water-function-area/statistic/index.vue b/src/views/water/water-function-area/statistic/index.vue
index c9fb001..f04a754 100644
--- a/src/views/water/water-function-area/statistic/index.vue
+++ b/src/views/water/water-function-area/statistic/index.vue
@@ -2,18 +2,9 @@
   <div class="ele-body">
     <a-card :bordered="false">
       <a-tabs v-model:activeKey="activeKey">
-        <a-tab-pane key="base" tab="总览">
+        <a-tab-pane key="base" tab="数据总览">
           <base-statistic></base-statistic>
         </a-tab-pane>
-        <a-tab-pane key="average" tab="平均">
-          <average-statistic></average-statistic>
-        </a-tab-pane>
-        <!-- <a-tab-pane key="quarter" tab="季度报告">
-         <quarter-statistic></quarter-statistic>
-        </a-tab-pane> -->
-        <a-tab-pane key="year-compare" tab="同比">
-         <compare></compare>
-        </a-tab-pane>
       </a-tabs>
     </a-card>
   </div>
@@ -26,17 +17,10 @@
    * 
    */
   import BaseStatistic from "./base.vue";
-  // import QuarterStatistic from "./quarter.vue";
-  import Compare from "./compare.vue"
-  import AverageStatistic from "./average.vue"
-
   export default {
     name: 'StatisticSoundRoad',
     components: {
       BaseStatistic,
-      // QuarterStatistic,
-      Compare,
-      AverageStatistic
     },
     data() {
       return {