From 39b8b8c34bea9fa2fb84868c3f2bf55ed3d8aeff Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Tue, 7 Sep 2021 12:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=9F=E6=B2=B3=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/river.js                      |  80 +--
 .../drinking-water-village/statistic/base.vue |  34 +-
 src/views/water/lake/collect/index.vue        | 243 +++++++++
 .../{river => lake}/collect/noise-bill.vue    |   0
 .../water/{river => lake}/collect/noise.vue   |   0
 src/views/water/lake/collect/utils.js         | 165 ++++++
 src/views/water/lake/statistic/average.vue    | 213 ++++++++
 src/views/water/lake/statistic/base.vue       | 477 ++++++++++++++++++
 src/views/water/lake/statistic/index.vue      |  62 +++
 src/views/water/lake/statistic/source.vue     | 195 +++++++
 src/views/water/lake/statistic/year.vue       | 224 ++++++++
 src/views/water/river/collect/colums.js       |  50 ++
 src/views/water/river/collect/index.vue       | 163 ++----
 src/views/water/river/collect/utils.js        | 208 ++------
 src/views/water/river/collect/water-bill.vue  | 392 ++++++++++++++
 src/views/water/river/collect/water.vue       | 331 ++++++++++++
 .../water-function-area/collect/utils.js      |   8 +-
 17 files changed, 2489 insertions(+), 356 deletions(-)
 create mode 100644 src/views/water/lake/collect/index.vue
 rename src/views/water/{river => lake}/collect/noise-bill.vue (100%)
 rename src/views/water/{river => lake}/collect/noise.vue (100%)
 create mode 100644 src/views/water/lake/collect/utils.js
 create mode 100644 src/views/water/lake/statistic/average.vue
 create mode 100644 src/views/water/lake/statistic/base.vue
 create mode 100644 src/views/water/lake/statistic/index.vue
 create mode 100644 src/views/water/lake/statistic/source.vue
 create mode 100644 src/views/water/lake/statistic/year.vue
 create mode 100644 src/views/water/river/collect/colums.js
 create mode 100644 src/views/water/river/collect/water-bill.vue
 create mode 100644 src/views/water/river/collect/water.vue

diff --git a/src/api/ecology/river.js b/src/api/ecology/river.js
index 1b63912..9702483 100644
--- a/src/api/ecology/river.js
+++ b/src/api/ecology/river.js
@@ -1,80 +1,80 @@
 import axios from 'axios';
 // ----------------------列表-----------------------
-const pageBillUrl = '/sound/zone/noise/bill/page';
+const pageBillUrl = '/surfaceWaterSection/surfaceWaterSectionBill/page';
 // 添加
-const saveZoneNoiseBill = function (data) {
-    return axios.post("/sound/zone/noise/bill",data)
+const saveRiverBill = function (data) {
+    return axios.post("/surfaceWaterSection/surfaceWaterSectionBill/importBatch",data)
 }
 
 // 删除
-const removeZoneNoiseBill = function (id) {
-    return axios.delete(`/sound/zone/noise/bill/${id}`,)
+const removeRiverBill = function (id) {
+    return axios.delete(`/surfaceWaterSection/surfaceWaterSectionBill/${id}`,)
 }
 // 批量删除
-const removeBatchZoneNoiseBill = function (ids) {
-    return axios.delete("/sound/zone/noise/bill/batch",{data:ids})
+const removeBatchRiverBill = function (ids) {
+    return axios.delete("/surfaceWaterSection/surfaceWaterSectionBill/batch",{data:ids})
 }
 
 // 修改
-const updateZoneNoiseBill = function (data) {
-    return axios.put("/sound/zone/noise/bill",data)
+const updateRiverBill = function (data) {
+    return axios.put("/surfaceWaterSection/surfaceWaterSectionBill",data)
 }
 // 审核
-const verifyZoneNoiseBill = function (data) {
-    return axios.put("/sound/zone/noise/bill/verify",data);
+const verifyRiverBill = function (data) {
+    return axios.put("/surfaceWaterSection/surfaceWaterSectionBill/verify",data);
 }
-const getZoneNoiseBill = function (id) {
-    return axios.get(`/sound/zone/noise/bill/${id}`)
+const getRiverBill = function (id) {
+    return axios.get(`/surfaceWaterSection/surfaceWaterSectionBill/${id}`)
 }
 // -------------------------数据---------------------
-const pageZoneNoiseUrl = '/sound/zone/noise/page';
+const pageRiverUrl = '/surfaceWaterSection/surfaceWaterSection/page';
 // 添加
-const saveZoneNoise = function (data) {
-    return axios.post("/sound/zone/noise",data)
+const saveRiver = function (data) {
+    return axios.post("/surfaceWaterSection/surfaceWaterSection",data)
 }
 
 // 删除
-const removeZoneNoise = function (id) {
-    return axios.delete(`/sound/zone/noise/${id}`,)
+const removeRiver = function (id) {
+    return axios.delete(`/surfaceWaterSection/surfaceWaterSection/${id}`,)
 }
 // 批量删除
-const removeBatchZoneNoise = function (ids) {
-    return axios.delete("/sound/zone/noise/batch",{data:ids})
+const removeBatchRiver = function (ids) {
+    return axios.delete("/surfaceWaterSection/surfaceWaterSection/batch",{data:ids})
 }
 
 // 修改
-const updateZoneNoise = function (data) {
-        return axios.put("/sound/zone/noise",data)
+const updateRiver = function (data) {
+        return axios.put("/surfaceWaterSection/surfaceWaterSection",data)
 }
 
 // -------------------------统计---------------------
-const pageZoneNoiseStatisticUrl = '/sound/zone/noise/statistic';
-const statisticSourceUrl = '/sound/zone/noise/statistic/source';
-const statisticYearUrl = '/sound/zone/noise/statistic/year';
+const pageRiverStatisticUrl = '/surfaceWaterSection/surfaceWaterSection/statistic';
+const statisticSourceUrl = '/surfaceWaterSection/surfaceWaterSection/statistic/source';
+const statisticYearUrl = '/surfaceWaterSection/surfaceWaterSection/statistic/year';
 const getHistoryyears = function () {
-    return axios.get("/sound/zone/noise/history-year")
+    return axios.get("/surfaceWaterSection/surfaceWaterSection/history-year")
 }
 const getColumnOptions = function(column){
-    return axios.get("/sound/zone/noise/options",{params:{column}})
+    return axios.get("/surfaceWaterSection/surfaceWaterSection/options",{params:{column}})
 }
 
 export {
     pageBillUrl,
-    saveZoneNoiseBill,
-    removeZoneNoiseBill,
-    updateZoneNoiseBill,
-    removeBatchZoneNoiseBill,
-    verifyZoneNoiseBill,
-    getZoneNoiseBill,
-    pageZoneNoiseUrl,
-    saveZoneNoise,
-    removeZoneNoise,
-    updateZoneNoise,
-    removeBatchZoneNoise,
-    pageZoneNoiseStatisticUrl,
+    saveRiverBill,
+    removeRiverBill,
+    updateRiverBill,
+    removeBatchRiverBill,
+    verifyRiverBill,
+    getRiverBill,
+    pageRiverUrl,
+    saveRiver,
+    removeRiver,
+    updateRiver,
+    removeBatchRiver,
+    pageRiverStatisticUrl,
     getHistoryyears,
     getColumnOptions,
     statisticSourceUrl,
     statisticYearUrl
-  
+
 }
diff --git a/src/views/water/drinking-water-village/statistic/base.vue b/src/views/water/drinking-water-village/statistic/base.vue
index 75e6a60..d05f764 100644
--- a/src/views/water/drinking-water-village/statistic/base.vue
+++ b/src/views/water/drinking-water-village/statistic/base.vue
@@ -30,28 +30,8 @@
               </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.road" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in roadOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="城区">
-              <a-select v-model:value="where.area" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in areaOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
+
+
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -183,7 +163,7 @@ export default {
           dataIndex: "indexLeq",
           slots: {customRender: "Leq"},
           sorter: true,
-          
+
         },
         {
           title: "SDdB(A)",
@@ -459,8 +439,8 @@ export default {
           dataIndex: "monitorMinute",
           sorter: true,
         },
-       
-       
+
+
         {
           title: "中小型车20min车流量",
           dataIndex: "smallTrafficFlow",
@@ -476,7 +456,7 @@ export default {
           dataIndex: "indexLeq",
           sorter: true,
         },
-        
+
         {
           title: "L10",
           dataIndex: "indexL10",
@@ -568,4 +548,4 @@ export default {
 </script>
 
 <style scoped lang="less">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/water/lake/collect/index.vue b/src/views/water/lake/collect/index.vue
new file mode 100644
index 0000000..501b184
--- /dev/null
+++ b/src/views/water/lake/collect/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <div class="ele-body">
+    <a-card style="width: 100%" :bordered="false">
+      <template #title>
+        <a-space>
+          <a-upload
+            :before-upload="importFileCity"
+            :showUploadList="false"
+            accept=".xls,.xlsx,.csv"
+          >
+            <a-button>市级导入</a-button>
+          </a-upload>
+          <!-- <a-upload
+            :before-upload="importFileArea"
+            :showUploadList="false"
+            accept=".xls,.xlsx,.csv"
+          >
+            <a-button>县级导入</a-button>
+          </a-upload> -->
+        </a-space>
+      </template>
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane tab="噪声信息" key="noise">
+          <noise-bill ref="noise"></noise-bill>
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XLSX from "xlsx";
+import utils from "./utils";
+import { Modal } from "ant-design-vue";
+import NoiseBill from "./noise-bill.vue";
+import { saveZoneNoiseBill } from "@/api/ecology/zone-sound";
+export default {
+  name: "ZoneCollectIndex",
+  components: {
+    NoiseBill,
+  },
+  data() {
+    return {
+      activeKey: "noise",
+    };
+  },
+  methods: {
+    /* 导入本地excel文件 */
+    importFileCity(file) {
+      const hide = this.$message.loading("导入中..", 0);
+
+      let reader = new FileReader();
+      reader.onload = (e) => {
+        try {
+          let data = new Uint8Array(e.target.result);
+          let workbook = XLSX.read(data, {
+            type: "array",
+          });
+          //0.昼间数据 1.夜间数据 2.其他信息
+          let sheetNames = workbook.SheetNames;
+          // 解析成二维数组
+          let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
+            header: 1,
+          });
+          let aoa2 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[1]], {
+            header: 1,
+          });
+        
+          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
+          const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-");
+
+          const zoneNoiseList = aoa.filter(
+            (item) => {
+              return item.length >= 26 && typeof item[0] == "number"}
+          );
+          const zoneNoiseList2 = aoa2.filter(
+            (item) => item.length >= 26 && typeof item[0] == "number"
+          );
+         
+
+          // 解析成对象数组
+          const billName = aoa[0][0];
+          const billData = utils.toObjData(zoneNoiseList);
+          const billName2 = aoa2[0][0];
+          const billData2 = utils.toObjData(zoneNoiseList2);
+          if (
+            (!billData || billData.length == 0) &&
+            (!billData2 || billData2.length == 0)
+          ) {
+            hide()
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
+          const tasks = [];
+          if (billData.length > 0) {
+            tasks.push(
+              saveZoneNoiseBill({
+                reportTime: new Date(reportDate).getTime(),
+                billName: billName,
+                regionLevel: "市级",
+                zoneNoiseList: billData,
+              })
+            );
+          }
+
+          if (billData2.length > 0) {
+            tasks.push(
+              saveZoneNoiseBill({
+                reportTime: new Date(reportDate2).getTime(),
+                billName: billName2,
+                regionLevel: "市级",
+                zoneNoiseList: billData2,
+              })
+            );
+          }
+
+          // 上传到服务器
+
+          Promise.all(tasks)
+            .then(() => {
+              Modal.success({
+                title: "导入成功",
+                content: `成功导入${billData.length + billData2.length}条数据`,
+              });
+              this.$refs.noise && this.$refs.noise.reload();
+            })
+            .catch(() => {
+              Modal.error({
+                title: "导入失败",
+                content: "数据上传出错",
+              });
+            })
+            .finally(() => {
+              hide();
+            });
+        } catch (error) {
+          hide();
+          Modal.error({
+            title: "导入失败",
+            content: error.message,
+          });
+        }
+        // console.log(billData);
+      };
+      reader.readAsArrayBuffer(file);
+
+      return false;
+    },
+    importFileArea(file) {
+      const hide = this.$message.loading("导入中..", 0);
+
+      let reader = new FileReader();
+
+      reader.onload = (e) => {
+        try {
+          let data = new Uint8Array(e.target.result);
+          let workbook = XLSX.read(data, {
+            type: "array",
+          });
+          //0.昼间数据 1.夜间数据 2.其他信息
+          let sheetNames = workbook.SheetNames;
+          // 解析成二维数组
+          let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
+            header: 1,
+          });
+
+          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
+          const zoneNoiseList = aoa.filter(
+            (item) => {
+
+              return item.length >= 35 && item[0] != "行政区划代码"
+            }
+          );
+
+          // 解析成对象数组
+          const billName = aoa[0][0];
+          const billData = utils.toAreaObjData(zoneNoiseList);
+
+          if (!billData || billData.length == 0) {
+            hide();
+            Modal.error({
+              title: "导入失败",
+              content: "找不到可用数据",
+            });
+
+            return;
+          }
+
+          if (billData.length > 0) {
+            // 上传到服务器
+            saveZoneNoiseBill({
+              reportTime: new Date(reportDate).getTime(),
+              billName: billName,
+              regionLevel: "县级",
+              zoneNoiseList: billData,
+            })
+              .then((res) => {
+                if (res.data.code == 0) {
+                  Modal.success({
+                    title: "导入成功",
+                    content: `成功导入${
+                      billData.length
+                    }条数据`,
+                  });
+                  this.$refs.noise && this.$refs.noise.reload();
+                } else {
+                  Modal.error({
+                    title: "导入失败",
+                    content: "数据上传出错",
+                  });
+                }
+              })
+              .catch(() => {
+                Modal.error({
+                  title: "导入失败",
+                  content: "数据上传出错",
+                });
+              })
+              .finally(() => {
+                hide();
+              });
+          }
+        } catch (error) {
+          hide();
+          Modal.error({
+            title: "导入失败",
+            content: error.message,
+          });
+        }
+        // console.log(billData);
+      };
+      reader.readAsArrayBuffer(file);
+      return false;
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>
\ No newline at end of file
diff --git a/src/views/water/river/collect/noise-bill.vue b/src/views/water/lake/collect/noise-bill.vue
similarity index 100%
rename from src/views/water/river/collect/noise-bill.vue
rename to src/views/water/lake/collect/noise-bill.vue
diff --git a/src/views/water/river/collect/noise.vue b/src/views/water/lake/collect/noise.vue
similarity index 100%
rename from src/views/water/river/collect/noise.vue
rename to src/views/water/lake/collect/noise.vue
diff --git a/src/views/water/lake/collect/utils.js b/src/views/water/lake/collect/utils.js
new file mode 100644
index 0000000..5759bab
--- /dev/null
+++ b/src/views/water/lake/collect/utils.js
@@ -0,0 +1,165 @@
+export default {
+    toObjData(excelData) {
+        return excelData.map(item => {
+            const monitorTime = new Date();
+            monitorTime.setFullYear(item[0]);
+            monitorTime.setMonth(item[7] - 1);
+            monitorTime.setDate(item[8]);
+            monitorTime.setHours(item[9]);
+            monitorTime.setMinutes(item[10]);
+            let quarter = 1;
+            const month = item[7]
+            if (month < 4) {
+                quarter = 1
+            } else if (month < 7) {
+                quarter = 2
+            } else if (month < 10) {
+                quarter = 3
+            } else {
+                quarter = 4
+            }
+            const row = {
+                regionCode: "450100",
+                monitorYear: item[0],
+                gridLength: item[1],
+                gridWidth: item[2],
+                place: item[3],
+                gridNo: item[4],
+                area: item[5],
+                source: item[6],
+                monitorMonth: item[7],
+                monitorDay: item[8],
+                monitorHour: item[9],
+                monitorMinute: item[10],
+                indexLeq: item[11],
+                indexSd: item[12],
+                indexL10: item[13],
+                indexL50: item[14],
+                indexL90: item[15],
+                indexLmax: item[16],
+                indexLmin: item[17],
+                station: item[18],
+                monitorInstrumentModel: item[19],
+                monitorInstrumentCode: item[20],
+                beforeMonitorValue: item[21],
+                afterMonitorValue: item[22],
+                soundPressureValue: item[23],
+                soundInstrumentModel: item[24],
+                soundInstrumentCode: item[25],
+                city: '南宁',
+                regionLevel: "市级",
+                monitorTime: monitorTime.getTime(),
+                quarter
+            }
+
+            if (row.monitorHour >= 6 && row.monitorHour < 22) {
+                row.timeSlot = "昼"
+            }else{
+                row.timeSlot = "夜"
+            }
+            if (row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90) {
+                throw new Error(row.place + "数值有误")
+            }
+            return row;
+        })
+
+    },
+    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 monitorTime = new Date();
+            monitorTime.setFullYear(item[1]);
+            monitorTime.setMonth(item[14] - 1);
+            monitorTime.setDate(item[15]);
+            monitorTime.setHours(item[16]);
+            monitorTime.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,
+                monitorTime: monitorTime.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/water/lake/statistic/average.vue b/src/views/water/lake/statistic/average.vue
new file mode 100644
index 0000000..3abe54f
--- /dev/null
+++ b/src/views/water/lake/statistic/average.vue
@@ -0,0 +1,213 @@
+<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/lake/statistic/base.vue b/src/views/water/lake/statistic/base.vue
new file mode 100644
index 0000000..a97c692
--- /dev/null
+++ b/src/views/water/lake/statistic/base.vue
@@ -0,0 +1,477 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+      <a-form
+        :model="where"
+        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
+      >
+        <a-row>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item label="区域等级:">
+              <a-select v-model:value="where.regionLevel" allowClear showSearch>
+                <a-select-option
+                  v-for="(item) in regionLevelOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item label="测点名称:">
+              <a-select v-model:value="where.place" allowClear showSearch>
+                <a-select-option
+                  v-for="(item) in palceOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
+            </a-form-item>
+          </a-col>
+        
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item label="城区">
+              <a-select v-model:value="where.area" allowClear showSearch>
+                <a-select-option
+                  v-for="(item) in areaOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+              <a-space>
+                <a-button type="primary" @click="reload">查询</a-button>
+                <a-button @click="reset">重置</a-button>
+                <a-button @click="exportFile">导出Excel</a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="zoneNoiseId"
+        :datasource="url"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
+        <template #Leq="{ text,record  }">
+          <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)" color="green">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)" color="blue">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)" color="red">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)" color="red">{{text}}</a-tag>
+          <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)" color="red">{{text}}</a-tag>
+          <template v-else color="#FFF">{{text}}</template>
+        </template>
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+// import _ from "lodash";
+import XLSX from "xlsx";
+import { pageZoneNoiseUrl, getColumnOptions } from "@/api/ecology/zone-sound";
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+import moment from "moment";
+//   import utils from "./utils";
+export default {
+  name: "StatisticSoundZoneBase",
+  components: {},
+  data() {
+    return {
+      data: [],
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageZoneNoiseUrl,
+      selection: [],
+      // 表格列配置
+       columns: [
+        {
+          title: "监测日期",
+          dataIndex: "monitorTime",
+          sorter: true,
+          customRender: ({text})=> moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+        },
+        {
+          title: "测点名称",
+          dataIndex: "place",
+          sorter: true,
+        },
+        {
+          title: "所属城区",
+          dataIndex: "area",
+          sorter: true,
+        },
+        {
+          title: "网格长（米）",
+          dataIndex: "gridLength",
+          sorter: true,
+        },
+        {
+          title: "网格宽（米）",
+          dataIndex: "gridWidth",
+          sorter: true,
+        },
+         {
+          title: "网格点号",
+          dataIndex: "gridNo",
+          sorter: true,
+        },
+        {
+          title: "主要声源",
+          dataIndex: "source",
+          sorter: true,
+        },
+        {
+          title: "时段",
+          dataIndex: "timeSlot",
+          sorter: true,
+        },
+        //   {
+        //     title: '月',
+        //     dataIndex: 'monitorMonth',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '日',
+        //     dataIndex: 'monitorDay',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '时',
+        //     dataIndex: 'monitorHour',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '分',
+        //     dataIndex: 'monitorMinute',
+        //     sorter: true
+        //   },
+        {
+          title: "LeqdB(A)",
+          dataIndex: "indexLeq",
+          slots: {customRender: "Leq"},
+          sorter: true,
+        },
+        {
+          title: "SDdB(A)",
+          dataIndex: "indexSd",
+          sorter: true,
+        },
+        {
+          title: "L10dB(A)",
+          dataIndex: "indexL10",
+          sorter: true,
+        },
+        {
+          title: "L50dB(A)",
+          dataIndex: "indexL50",
+          sorter: true,
+        },
+        {
+          title: "L90dB(A)",
+          dataIndex: "indexL90",
+          sorter: true,
+        },
+        {
+          title: "LmindB(A)",
+          dataIndex: "indexLmin",
+          sorter: true,
+        },
+        {
+          title: "LmaxdB(A)",
+          dataIndex: "indexLmax",
+          sorter: true,
+        },
+        {
+          title: "监测站名",
+          dataIndex: "station",
+          sorter: true,
+        },
+        {
+          title: "监测仪器型号",
+          dataIndex: "monitorInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "监测仪器编号",
+          dataIndex: "monitorInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "监测前校准值",
+          dataIndex: "beforeMonitorValue",
+          sorter: true,
+        },
+        {
+          title: "声校准器测量声压值",
+          dataIndex: "soundPressureValue",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器型号",
+          dataIndex: "soundInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器编号",
+          dataIndex: "soundInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "区域等级",
+          dataIndex: "regionLevel",
+          sorter: true,
+        },
+        {
+          title: "备注",
+          dataIndex: "remark",
+          sorter: true,
+        },
+        {
+          title: "创建人",
+          dataIndex: "username",
+          sorter: true,
+        },
+      ],
+      palceOptions: [],
+      areaOptions: [],
+      regionLevelOptions: [],
+      // 表格搜索条件
+      where: {
+        checked: 1,
+      },
+      // 表格选中数据
+      selectionList: [],
+    };
+  },
+  mounted() {
+    this.loadOptionData();
+  },
+  methods: {
+    /**获取下来框数据 */
+    loadOptionData() {
+      getColumnOptions("place").then((res) => {
+        this.palceOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("area").then((res) => {
+        this.areaOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("region_level").then((res) => {
+        this.regionLevelOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+    },
+    /* 刷新表格 */
+    reload() {
+      console.log(this.$route);
+      console.log(this.$router);
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        checked: 1,
+      };
+      this.reload();
+    },
+    exportFile() {
+     const columns = [
+         {
+          title: "行政区划代码",
+          dataIndex: "regionCode",
+          sorter: true,
+        },
+        {
+          title: "监测年度",
+          dataIndex: "monitorYear",
+          sorter: true,
+        },
+        {
+          title: "点位编码",
+          dataIndex: "placeCode",
+          sorter: true,
+        },
+        {
+          title: "测点名称",
+          dataIndex: "place",
+          sorter: true,
+        },
+        {
+          title: "测点经度",
+          dataIndex: "placeLng",
+          sorter: true,
+        },
+        {
+          title: "测点纬度",
+          dataIndex: "placeLat",
+          sorter: true,
+        },
+       
+        {
+          title: "测点参照物",
+          dataIndex: "refObj",
+          sorter: true,
+        },
+         {
+          title: "网格边长",
+          dataIndex: "gridLength",
+          sorter: true,
+        },
+        {
+          title: "网格覆盖人口（万）",
+          dataIndex: "people",
+          sorter: true,
+        },
+         {
+          title: "功能区代码",
+          dataIndex: "functionCode",
+          sorter: true,
+        },
+        {
+          title: "月",
+          dataIndex: "monitorMonth",
+          sorter: true,
+        },
+        {
+          title: "日",
+          dataIndex: "monitorDay",
+          sorter: true,
+        },
+        {
+          title: "时",
+          dataIndex: "monitorHour",
+          sorter: true,
+        },
+        {
+          title: "分",
+          dataIndex: "monitorMinute",
+          sorter: true,
+        },
+       
+        {
+          title: "Leq",
+          dataIndex: "indexLeq",
+          sorter: true,
+        },
+        
+        {
+          title: "L10",
+          dataIndex: "indexL10",
+          sorter: true,
+        },
+        {
+          title: "L50",
+          dataIndex: "indexL50",
+          sorter: true,
+        },
+        {
+          title: "L90",
+          dataIndex: "indexL90",
+          sorter: true,
+        },
+        {
+          title: "最大值",
+          dataIndex: "indexLmax",
+          sorter: true,
+        },
+         {
+          title: "最小值",
+          dataIndex: "indexLmin",
+          sorter: true,
+        },
+       {
+          title: "标准差(SD)",
+          dataIndex: "indexSd",
+          sorter: true,
+        },
+        {
+          title: "监测站名",
+          dataIndex: "station",
+          sorter: true,
+        },
+        {
+          title: "监测仪器型号",
+          dataIndex: "monitorInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "监测仪器编号",
+          dataIndex: "monitorInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "监测前校准值",
+          dataIndex: "beforeMonitorValue",
+          sorter: true,
+        },
+        {
+          title: "声校准器测量声压值",
+          dataIndex: "soundPressureValue",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器型号",
+          dataIndex: "soundInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器编号",
+          dataIndex: "soundInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "区域等级",
+          dataIndex: "regionLevel",
+          sorter: true,
+        },
+         {
+          title: "备注",
+          dataIndex: "remark",
+          sorter: true,
+        },
+      ];
+      const arr = [];
+      const th = columns.map((item) => item.title);
+      arr.push(th);
+      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/lake/statistic/index.vue b/src/views/water/lake/statistic/index.vue
new file mode 100644
index 0000000..a7a8b60
--- /dev/null
+++ b/src/views/water/lake/statistic/index.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane key="base" tab="总览">
+          <base-statistic></base-statistic>
+        </a-tab-pane>
+        <a-tab-pane key="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>
+</template>
+
+<script>
+  /**
+   * 
+   * 
+   * 
+   */
+  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 {
+        activeKey: 'base'
+      };
+        
+    },
+    methods: {
+     
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/water/lake/statistic/source.vue b/src/views/water/lake/statistic/source.vue
new file mode 100644
index 0000000..e974462
--- /dev/null
+++ b/src/views/water/lake/statistic/source.vue
@@ -0,0 +1,195 @@
+<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/lake/statistic/year.vue b/src/views/water/lake/statistic/year.vue
new file mode 100644
index 0000000..2d4b011
--- /dev/null
+++ b/src/views/water/lake/statistic/year.vue
@@ -0,0 +1,224 @@
+<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/river/collect/colums.js b/src/views/water/river/collect/colums.js
new file mode 100644
index 0000000..4c287cd
--- /dev/null
+++ b/src/views/water/river/collect/colums.js
@@ -0,0 +1,50 @@
+const tableColumns = [
+        {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 {tableColumns}
diff --git a/src/views/water/river/collect/index.vue b/src/views/water/river/collect/index.vue
index 501b184..09c9f5a 100644
--- a/src/views/water/river/collect/index.vue
+++ b/src/views/water/river/collect/index.vue
@@ -21,7 +21,7 @@
       </template>
       <a-tabs v-model:activeKey="activeKey">
         <a-tab-pane tab="噪声信息" key="noise">
-          <noise-bill ref="noise"></noise-bill>
+          <water-bill ref="noise"></water-bill>
         </a-tab-pane>
       </a-tabs>
     </a-card>
@@ -31,13 +31,14 @@
 <script>
 import XLSX from "xlsx";
 import utils from "./utils";
-import { Modal } from "ant-design-vue";
-import NoiseBill from "./noise-bill.vue";
-import { saveZoneNoiseBill } from "@/api/ecology/zone-sound";
+import {Modal} from "ant-design-vue";
+import WaterBill from "./water-bill.vue";
+import {saveRiverBill} from "@/api/ecology/river";
+
 export default {
-  name: "ZoneCollectIndex",
+  name: "RiverCollectIndex",
   components: {
-    NoiseBill,
+    WaterBill,
   },
   data() {
     return {
@@ -62,31 +63,20 @@ export default {
           let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
             header: 1,
           });
-          let aoa2 = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[1]], {
-            header: 1,
-          });
-        
-          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
-          const reportDate2 = aoa2[1][0].replace(/[^\d]+/g, "-");
 
-          const zoneNoiseList = aoa.filter(
+          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
+
+          const riverList = aoa.filter(
             (item) => {
-              return item.length >= 26 && typeof item[0] == "number"}
+              return item.length >= 30 && item[0] && item[0] != "断面编码"
+            }
           );
-          const zoneNoiseList2 = aoa2.filter(
-            (item) => item.length >= 26 && typeof item[0] == "number"
-          );
-         
+
 
           // 解析成对象数组
-          const billName = aoa[0][0];
-          const billData = utils.toObjData(zoneNoiseList);
-          const billName2 = aoa2[0][0];
-          const billData2 = utils.toObjData(zoneNoiseList2);
-          if (
-            (!billData || billData.length == 0) &&
-            (!billData2 || billData2.length == 0)
-          ) {
+          const billName = file.name;
+          const billData = utils.toObjData(riverList);
+          if (!billData || billData.length == 0) {
             hide()
             Modal.error({
               title: "导入失败",
@@ -97,35 +87,33 @@ export default {
           const tasks = [];
           if (billData.length > 0) {
             tasks.push(
-              saveZoneNoiseBill({
+              saveRiverBill({
                 reportTime: new Date(reportDate).getTime(),
                 billName: billName,
                 regionLevel: "市级",
-                zoneNoiseList: billData,
+                surfaceWaterSectionList: billData,
               })
             );
           }
 
-          if (billData2.length > 0) {
-            tasks.push(
-              saveZoneNoiseBill({
-                reportTime: new Date(reportDate2).getTime(),
-                billName: billName2,
-                regionLevel: "市级",
-                zoneNoiseList: billData2,
-              })
-            );
-          }
 
           // 上传到服务器
 
           Promise.all(tasks)
-            .then(() => {
-              Modal.success({
-                title: "导入成功",
-                content: `成功导入${billData.length + billData2.length}条数据`,
-              });
-              this.$refs.noise && this.$refs.noise.reload();
+            .then((res) => {
+              if (res[0].data.code == 0) {
+                Modal.success({
+                  title: "导入成功",
+                  content: `成功导入${billData.length}条数据`,
+                });
+                this.$refs.noise && this.$refs.noise.reload();
+              } else {
+                Modal.error({
+                  title: "导入失败",
+                  content: "数据上传出错",
+                });
+              }
+
             })
             .catch(() => {
               Modal.error({
@@ -149,95 +137,10 @@ export default {
 
       return false;
     },
-    importFileArea(file) {
-      const hide = this.$message.loading("导入中..", 0);
 
-      let reader = new FileReader();
-
-      reader.onload = (e) => {
-        try {
-          let data = new Uint8Array(e.target.result);
-          let workbook = XLSX.read(data, {
-            type: "array",
-          });
-          //0.昼间数据 1.夜间数据 2.其他信息
-          let sheetNames = workbook.SheetNames;
-          // 解析成二维数组
-          let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
-            header: 1,
-          });
-
-          const reportDate = aoa[1][0].replace(/[^\d]+/g, "-");
-          const zoneNoiseList = aoa.filter(
-            (item) => {
-
-              return item.length >= 35 && item[0] != "行政区划代码"
-            }
-          );
-
-          // 解析成对象数组
-          const billName = aoa[0][0];
-          const billData = utils.toAreaObjData(zoneNoiseList);
-
-          if (!billData || billData.length == 0) {
-            hide();
-            Modal.error({
-              title: "导入失败",
-              content: "找不到可用数据",
-            });
-
-            return;
-          }
-
-          if (billData.length > 0) {
-            // 上传到服务器
-            saveZoneNoiseBill({
-              reportTime: new Date(reportDate).getTime(),
-              billName: billName,
-              regionLevel: "县级",
-              zoneNoiseList: billData,
-            })
-              .then((res) => {
-                if (res.data.code == 0) {
-                  Modal.success({
-                    title: "导入成功",
-                    content: `成功导入${
-                      billData.length
-                    }条数据`,
-                  });
-                  this.$refs.noise && this.$refs.noise.reload();
-                } else {
-                  Modal.error({
-                    title: "导入失败",
-                    content: "数据上传出错",
-                  });
-                }
-              })
-              .catch(() => {
-                Modal.error({
-                  title: "导入失败",
-                  content: "数据上传出错",
-                });
-              })
-              .finally(() => {
-                hide();
-              });
-          }
-        } catch (error) {
-          hide();
-          Modal.error({
-            title: "导入失败",
-            content: error.message,
-          });
-        }
-        // console.log(billData);
-      };
-      reader.readAsArrayBuffer(file);
-      return false;
-    },
   },
 };
 </script>
 
 <style scoped lang="less">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js
index 5759bab..004cbd5 100644
--- a/src/views/water/river/collect/utils.js
+++ b/src/views/water/river/collect/utils.js
@@ -1,165 +1,63 @@
 export default {
     toObjData(excelData) {
+
         return excelData.map(item => {
-            const monitorTime = new Date();
-            monitorTime.setFullYear(item[0]);
-            monitorTime.setMonth(item[7] - 1);
-            monitorTime.setDate(item[8]);
-            monitorTime.setHours(item[9]);
-            monitorTime.setMinutes(item[10]);
-            let quarter = 1;
-            const month = item[7]
-            if (month < 4) {
-                quarter = 1
-            } else if (month < 7) {
-                quarter = 2
-            } else if (month < 10) {
-                quarter = 3
-            } else {
-                quarter = 4
-            }
+          const monitorTime = new Date();
+          monitorTime.setFullYear(item[12]);
+          monitorTime.setMonth(item[13] - 1);
             const row = {
-                regionCode: "450100",
-                monitorYear: item[0],
-                gridLength: item[1],
-                gridWidth: item[2],
-                place: item[3],
-                gridNo: item[4],
-                area: item[5],
-                source: item[6],
-                monitorMonth: item[7],
-                monitorDay: item[8],
-                monitorHour: item[9],
-                monitorMinute: item[10],
-                indexLeq: item[11],
-                indexSd: item[12],
-                indexL10: item[13],
-                indexL50: item[14],
-                indexL90: item[15],
-                indexLmax: item[16],
-                indexLmin: item[17],
-                station: item[18],
-                monitorInstrumentModel: item[19],
-                monitorInstrumentCode: item[20],
-                beforeMonitorValue: item[21],
-                afterMonitorValue: item[22],
-                soundPressureValue: item[23],
-                soundInstrumentModel: item[24],
-                soundInstrumentCode: item[25],
-                city: '南宁',
-                regionLevel: "市级",
-                monitorTime: monitorTime.getTime(),
-                quarter
-            }
-
-            if (row.monitorHour >= 6 && row.monitorHour < 22) {
-                row.timeSlot = "昼"
-            }else{
-                row.timeSlot = "夜"
-            }
-            if (row.indexL10 < row.indexL50 || row.indexL50 < row.indexL90) {
-                throw new Error(row.place + "数值有误")
+              monitorTime: monitorTime.getTime(),
+              sectionCode: item[0],
+              sectionName: item[1],
+              province: item[2],
+              city: item[3],
+              evaluationProvince: item[4],
+              sectionType: item[5],
+              sectionAttributes: item[6],
+              watershed: item[7],
+              waterSystem: item[8],
+              waterBody: item[9],
+              intoWaterBody: item[10],
+              riverLevel: item[11],
+              monitoringYear: item[12],
+              monitoringMonth: item[13],
+              waterQualityCategory : item[14],
+              conductivity: item[15],
+              waterTemperature: item[16],
+              ph: item[17],
+              dissolvedOxygen: item[18],
+              transparency: item[19],
+              salinity: item[20],
+              codMn: item[21],
+              codCr: item[22],
+              nh3N: item[23],
+              tP: item[24],
+              tN: item[25],
+              cu: item[26],
+              zn: item[27],
+              pb: item[28],
+              cd: item[29],
+              bod5: item[30],
+              tAs: item[31],
+              tSe: item[32],
+              tHg: item[33],
+              cr6: item[34],
+              f: item[35],
+              cn: item[36],
+              volatilePhenol: item[37],
+              petro: item[38],
+              las: item[39],
+              s2: item[40],
+              chla: item[41],
+              no3: item[42],
+              no2: item[43],
+              flow: item[44],
+              waterLevel: item[45],
+              remark: item[46],
             }
             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 monitorTime = new Date();
-            monitorTime.setFullYear(item[1]);
-            monitorTime.setMonth(item[14] - 1);
-            monitorTime.setDate(item[15]);
-            monitorTime.setHours(item[16]);
-            monitorTime.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,
-                monitorTime: monitorTime.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/water/river/collect/water-bill.vue b/src/views/water/river/collect/water-bill.vue
new file mode 100644
index 0000000..dca440f
--- /dev/null
+++ b/src/views/water/river/collect/water-bill.vue
@@ -0,0 +1,392 @@
+<template>
+  <div>
+            <!-- 表格 -->
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="surfaceWaterSectionBillId" :datasource="url"
+        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
+        <template #toolbar>
+
+          <!-- 搜索表单 -->
+          <a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
+            <a-form-item label="区域等级:">
+              <a-select v-model:value="where.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>
+                <a-select-option :value="0">未审核</a-select-option>
+              </a-select>
+            </a-form-item>
+
+            <a-form-item label="表格名称:">
+              <a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
+            </a-form-item>
+
+            <a-form-item label="上报时间:">
+              <a-range-picker separator="~" v-model:value="reportTimeScope" />
+            </a-form-item>
+
+            <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
+              <a-space>
+                <a-button type="primary" @click="reload">查询</a-button>
+                <a-button @click="reset">重置</a-button>
+              </a-space>
+            </a-form-item>
+          </a-form>
+        </template>
+        <template #toolkit>
+          <a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`" ok-text="Yes"
+            cancel-text="No" @confirm="removeBatch">
+            <a-button :disabled="selectionList.length == 0" type="primary" ghost danger>批量删除</a-button>
+          </a-popconfirm>
+        </template>
+        <template #billName="{ text, record }">
+          <div class="editable-cell">
+            <div v-if="editableData[record.surfaceWaterSectionBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.surfaceWaterSectionBillId].billName" @pressEnter="save(record)" />
+              <check-outlined class="editable-cell-icon-check" @click="save(record)" />
+            </div>
+            <div v-else class="editable-cell-text-wrapper">
+              {{ text || ' ' }}
+              <edit-outlined class="editable-cell-icon" @click="edit(record)" />
+            </div>
+          </div>
+        </template>
+        <template #reportTime="{ text, record }">
+          <div class="editable-cell">
+            <div v-if="editableData[record.surfaceWaterSectionBillId]" class="editable-cell-input-wrapper">
+              <a-date-picker v-model:value="editableData[record.surfaceWaterSectionBillId].reportTime"></a-date-picker>
+              <!-- <a-input v-model:value="editableData[record.surfaceWaterSectionBillId].reportTime" @pressEnter="save(record)" /> -->
+              <check-outlined class="editable-cell-icon-check" @click="save(record)" />
+            </div>
+            <div v-else class="editable-cell-text-wrapper">
+              {{ $util.toDateString(text,'yyyy-MM-dd') || ' ' }}
+              <edit-outlined class="editable-cell-icon" @click="edit(record)" />
+            </div>
+          </div>
+        </template>
+        <template #checked="{text}">
+          <span>
+            <a-tag v-if="text" color="green">已审核</a-tag>
+            <a-tag v-else color="orange">未审核</a-tag>
+          </span>
+        </template>
+
+        <template #action="{ record }">
+          <a-space>
+            <a-button @click="detail(record)" shape="round" size="small">查看</a-button>
+            <span v-hasPermi="['ecology:sound:verify']">
+              <a-popconfirm  v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
+                @confirm="verify(record,1)">
+                <a-button type="primary" shape="round" size="small">审核</a-button>
+              </a-popconfirm>
+              <a-popconfirm v-else :title="`撤回重新编辑，确认？`" ok-text="Yes" cancel-text="No"
+                @confirm="verify(record,0)">
+                <a-button type="dashed" shape="round" size="small">撤回</a-button>
+              </a-popconfirm>
+            </span>
+            <a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
+              <a-button type="primary" danger shape="round" size="small">删除</a-button>
+            </a-popconfirm>
+          </a-space>
+        </template>
+      </ele-pro-table>
+  </div>
+</template>
+
+<script>
+
+  import _ from "lodash"
+  import {
+    CheckOutlined,
+    EditOutlined
+  } from '@ant-design/icons-vue';
+  import { Modal } from 'ant-design-vue';
+  import {
+    pageBillUrl,
+    // saveRiverBill,
+    removeRiverBill,
+    removeBatchRiverBill,
+    updateRiverBill,
+    verifyRiverBill
+  } from "@/api/ecology/river";
+  import moment from "moment";
+  export default {
+    name: 'RiverCollectNoiseBill',
+    components: {
+      CheckOutlined,
+      EditOutlined
+    },
+    data() {
+
+      return {
+        // 表格数据接口
+        url: pageBillUrl,
+        selection: [],
+        // 表格列配置
+        columns: [{
+            key: 'index',
+            dataIndex: 'index',
+            width: 48,
+            align: 'center',
+            customRender: ({
+              index
+            }) => index + 1
+          },
+          {
+            title: '表格名称',
+            dataIndex: 'billName',
+            sorter: true,
+            slots: {
+              customRender: 'billName',
+            },
+
+          },
+          {
+            title: '区域等级',
+            dataIndex: 'regionLevel',
+            sorter: true,
+          },
+          {
+            title: '条目',
+            dataIndex: 'recordSize',
+            sorter: true,
+
+          },
+          // {
+          //   title: '菜单名称',
+          //   dataIndex: 'title',
+          //   sorter: true
+          // },
+          // {
+          //   title: '上报时间',
+          //   dataIndex: 'reportTime',
+          //   sorter: true,
+          //   slots: {
+          //     customRender: 'reportTime',
+          //   },
+          //   // customRender: ({
+          //   //   text
+          //   // }) => this.$util.toDateString(text)
+          // },
+          {
+            title: '导入时间',
+            dataIndex: 'createTime',
+            sorter: true,
+            customRender: ({
+              text
+            }) => this.$util.toDateString(text)
+          },
+          {
+            title: '审核状态',
+            dataIndex: 'checked',
+            sorter: true,
+            slots: {
+              customRender: 'checked',
+            },
+
+          },
+          {
+            title: '创建人',
+            dataIndex: 'userName',
+            sorter: true,
+
+          },
+          // {
+          //   title: '更新时间',
+          //   dataIndex: 'updateTime',
+          //   sorter: true,
+          //   customRender: ({
+          //     text
+          //   }) => this.$util.toDateString(text)
+          // },
+          {
+            title: '操作',
+            key: 'action',
+            width: 150,
+            align: 'center',
+            slots: {
+              customRender: 'action'
+            }
+          }
+        ],
+        // 表格搜索条件
+        where: {},
+        reportTimeScope: [],
+        // 表格选中数据
+        selectionList: [],
+        editableData: {},
+        // 当前编辑数据
+        current: null,
+      };
+    },
+    methods: {
+
+
+      /* 刷新表格 */
+      reload() {
+        this.where.reportTimeStart = null;
+        this.where.reportTimeEnd = null;
+        if (this.reportTimeScope && this.reportTimeScope.length == 2) {
+          this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
+          this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
+        }
+        this.$refs.table.reload({
+          where: this.where
+        });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {};
+        this.reportTimeScope = [];
+        this.reload();
+      },
+      detail(record) {
+        this.$router.replace({
+          path: "/water/river/collect/water/" + record.surfaceWaterSectionBillId
+        })
+      },
+      edit(record) {
+        this.editableData[record.surfaceWaterSectionBillId] = _.cloneDeep(record);
+        this.editableData[record.surfaceWaterSectionBillId].reportTime = moment(this.editableData[record.surfaceWaterSectionBillId]
+          .reportTime)
+      },
+      verify(record,checked) {
+        const hide = this.$message.loading('请求中..', 0);
+        verifyRiverBill({
+          surfaceWaterSectionBillId: record.surfaceWaterSectionBillId,
+          checked
+        }).then(res => {
+          if (res.data.code == 0) {
+            record.checked = checked
+            Modal.success({
+              title: "提示",
+              content: checked?"审核成功":"撤回成功"
+            });
+          } else {
+            Modal.error({
+              title: "提示",
+              content: res.data.msg
+            });
+          }
+        }).catch((e) => {
+          this.$message.error(e.message);
+        }).finally(() => {
+          hide();
+        })
+      },
+      save(record) {
+
+        let {
+          surfaceWaterSectionBillId,
+          billName,
+          reportTime
+        } = this.editableData[record.surfaceWaterSectionBillId];
+        if (!surfaceWaterSectionBillId || !reportTime) {
+          this.$message.error('请填写完整信息再提交')
+          return
+        }
+        const hide = this.$message.loading('请求中..', 0);
+        reportTime = reportTime.format("x")
+        reportTime = Number(reportTime)
+        updateRiverBill({
+          surfaceWaterSectionBillId,
+          billName,
+          reportTime
+        }).then(res => {
+          if (res.data.code == 0) {
+            this.$message.success(res.data.msg);
+            record.billName = billName;
+            record.reportTime = reportTime
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+          console.log(e);
+          this.$message.error(e.message);
+        }).finally(() => {
+          delete this.editableData[record.surfaceWaterSectionBillId]
+          hide()
+        })
+
+      },
+      /* 删除单个 */
+      remove(row) {
+        const hide = this.$message.loading('请求中..', 0);
+        removeRiverBill(row.surfaceWaterSectionBillId).then(res => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+          this.$message.error(e.msg);
+        }).finally(() => hide());
+      },
+      removeBatch() {
+        const ids = this.selectionList.map(item => item.surfaceWaterSectionBillId);
+        const hide = this.$message.loading('请求中..', 0);
+        removeBatchRiverBill(ids).then(res => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+
+          this.$message.error(e.msg);
+        }).finally(() => hide());
+      },
+
+    }
+  }
+</script>
+
+<style lang="less">
+  .editable-cell {
+    position: relative;
+
+    .editable-cell-input-wrapper,
+    .editable-cell-text-wrapper {
+      padding-right: 24px;
+    }
+
+    .editable-cell-text-wrapper {
+      padding: 5px 24px 5px 5px;
+    }
+
+    .editable-cell-icon,
+    .editable-cell-icon-check {
+      position: absolute;
+      right: 0;
+      width: 20px;
+      cursor: pointer;
+    }
+
+    .editable-cell-icon {
+      margin-top: 4px;
+      display: none;
+    }
+
+    .editable-cell-icon-check {
+      line-height: 28px;
+    }
+
+    .editable-cell-icon:hover,
+    .editable-cell-icon-check:hover {
+      color: #108ee9;
+    }
+
+    .editable-add-btn {
+      margin-bottom: 8px;
+    }
+  }
+
+  .editable-cell:hover .editable-cell-icon {
+    display: inline-block;
+  }
+</style>
diff --git a/src/views/water/river/collect/water.vue b/src/views/water/river/collect/water.vue
new file mode 100644
index 0000000..9d6e336
--- /dev/null
+++ b/src/views/water/river/collect/water.vue
@@ -0,0 +1,331 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+      <a-form
+        :model="where"
+        :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
+        :wrapper-col="{ md: { span: 16 }, 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.area" allowClear showSearch>
+                <a-select-option
+                  v-for="item in areaOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
+            </a-form-item>
+          </a-col> -->
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+              <a-space>
+                <a-button type="primary" @click="reload">查询</a-button>
+                <a-button @click="reset">重置</a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+      <a-modal
+        v-model:visible="showEdit"
+        :title="form.drinkingWaterVillageId !== undefined ? '修改记录' : '添加记录'"
+        :confirm-loading="loading"
+        :width="1000"
+        :body-style="{ paddingBottom: '8px' }"
+        @ok="save"
+      >
+        <a-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+          :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
+        >
+          <a-row>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="日期" name="monitorDate">
+                <a-date-picker
+                  v-model:value="form.monitorDate"
+                  :locale="locale"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="时间" name="monitorTime">
+                <a-time-picker
+                  v-model:value="form.monitorTime"
+                  format="HH:mm"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col 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[item.dataIndex]"
+                  :placeholder="'请输入' + item.title"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-modal>
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="drinkingWaterVillageId"
+        :datasource="url"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+      >
+        <template v-if="bill.checked != 1" #toolbar>
+          <a-space>
+            <a-button @click="openEdit" type="primary">新增</a-button>
+            <a-popconfirm
+              :disabled="selectionList.length == 0"
+              :title="`确认删除${selectionList.length}条数据吗?`"
+              ok-text="Yes"
+              cancel-text="No"
+              @confirm="removeBatch"
+            >
+              <a-button
+                :disabled="selectionList.length == 0"
+                type="primary"
+                ghost
+                danger
+                >删除</a-button
+              >
+            </a-popconfirm>
+          </a-space>
+        </template>
+        <template #action="{ record }">
+          <a-space>
+            <a-button
+              @click="openEdit(record)"
+              type="primary"
+              shape="round"
+              size="small"
+              >修改</a-button
+            >
+            <a-popconfirm
+              :title="`确认删除这条数据吗?`"
+              ok-text="Yes"
+              cancel-text="No"
+              @confirm="remove(record)"
+            >
+              <a-button type="primary" danger shape="round" size="small"
+                >删除</a-button
+              >
+            </a-popconfirm>
+          </a-space>
+        </template>
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+import _ from "lodash";
+import {
+  pageRiverUrl,
+  saveRiver,
+  removeRiver,
+  removeBatchRiver,
+  updateRiver,
+  getRiverBill,
+  // getColumnOptions,
+} from "@/api/ecology/river";
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+import moment from "moment";
+import { tableColumns } from "./colums";
+//   import utils from "./utils";
+export default {
+  name: "RiverCollectWater",
+  components: {},
+  data() {
+    const { billId } = this.$route.params;
+    return {
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageRiverUrl,
+      selection: [],
+      tableColumns,
+      // 表格列配置
+      columns: [
+        ...tableColumns,
+        {
+          title: "创建人",
+          dataIndex: "username",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+          slots: {
+            customRender: "action",
+          },
+        },
+      ],
+      // 表格搜索条件
+      surfaceWaterSectionBillId: billId,
+      where: {
+        surfaceWaterSectionBillId: billId,
+      },
+      // 表格选中数据
+      selectionList: [],
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 表单数据
+      form: {},
+      loading: false,
+      rules: {},
+    };
+  },
+  mounted() {
+    const { billId } = this.$route.params;
+    getRiverBill(billId).then((res) => {
+      this.bill = res.data.data;
+      if (res.data.data.checked == 1) {
+        this.columns.splice(this.columns.length - 1, 1);
+      }
+    });
+    this.loadOptionData();
+  },
+  methods: {
+    /**获取下来框数据 */
+    loadOptionData() {},
+    /* 刷新表格 */
+    reload() {
+      console.log(this.$route);
+      console.log(this.$router);
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        surfaceWaterSectionId: this.surfaceWaterSectionId,
+      };
+      this.reload();
+    },
+    /* 显示编辑 */
+    openEdit(record) {
+      const cloneRecord = _.cloneDeep(record);
+      if (record && cloneRecord.monitorTime) {
+        console.log(moment(cloneRecord.monitorTime).format("YYYY MM DD"));
+        cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
+        cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
+      }
+      // cloneRecord.mi
+      this.form = Object.assign({}, cloneRecord);
+      this.showEdit = true;
+      this.$nextTick(() => {
+        this.$refs.form.clearValidate(); // 清除表单验证信息
+      });
+    },
+
+    save() {
+      const hide = this.$message.loading("请求中..", 0);
+      const form = _.cloneDeep(this.form);
+      const date = new Date();
+      date.setFullYear(form.monitorDate.year());
+      date.setMonth(form.monitorDate.month());
+      date.setDate(form.monitorDate.date());
+      date.setHours(form.monitorTime.hour());
+      date.setMinutes(form.monitorTime.minutes());
+      form.monitorTime = date.getTime();
+      form.monitorYear = date.getFullYear();
+      form.monitorMonth = date.getMonth() + 1;
+      form.monitorDay = date.getDate();
+      form.monitorHour = date.getHours();
+      form.monitorMinute = date.getMinutes();
+      delete form["monitorDate"];
+      if (form.drinkingWaterVillageId) {
+        updateRiver(form)
+          .then((res) => {
+            if (res.data.code == 0) {
+              this.showEdit = false;
+              this.$message.success(res.data.msg);
+              this.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          })
+          .catch((error) => {
+            this.$message.error(error.message);
+          })
+          .finally(() => {
+            console.log("finallyfinallyfinallyfinally");
+            hide();
+          });
+      } else {
+        form.surfaceWaterSectionBillId = this.surfaceWaterSectionId;
+        saveRiver(form)
+          .then((res) => {
+            if (res.data.code == 0) {
+              this.showEdit = false;
+              this.$message.success(res.data.msg);
+              this.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          })
+          .catch((error) => {
+            this.$message.error(error.message);
+          })
+          .finally(() => {
+            hide();
+          });
+      }
+    },
+    /* 删除单个 */
+    remove(row) {
+      const hide = this.$message.loading("请求中..", 0);
+      removeRiver(row.drinkingWaterVillageId)
+        .then((res) => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        })
+        .catch((e) => {
+          this.$message.error(e.msg);
+        })
+        .finally(() => hide());
+    },
+    removeBatch() {
+      const ids = this.selectionList.map((item) => item.drinkingWaterVillageId);
+      const hide = this.$message.loading("请求中..", 0);
+      removeBatchRiver(ids)
+        .then((res) => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        })
+        .catch((e) => {
+          this.$message.error(e.msg);
+        })
+        .finally(() => hide());
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>
diff --git a/src/views/water/water-function-area/collect/utils.js b/src/views/water/water-function-area/collect/utils.js
index d59e42a..7189b25 100644
--- a/src/views/water/water-function-area/collect/utils.js
+++ b/src/views/water/water-function-area/collect/utils.js
@@ -20,7 +20,7 @@ export default {
                 totalNitrogen: item[13],
                 mainPollutionIndicators: item[14],
                 remark: item[15],
-                dissolvedOxygen: item[16],
+                // dissolvedOxygen: item[16],
             }
             return row;
         })
@@ -44,14 +44,14 @@ export default {
                 ffeCompliantEvaluationConclusion: item[11],
                 ffeMajorOverStandardItemsMultiples: item[12],
                 lprlWaterFunctionAreaWaterQualityCategory: item[13],
-                lprlCompliantEvaluationConclusion: item[14],
+                // lprlCompliantEvaluationConclusion: item[14],
                 lprlMajorOverStandardItemsMultiples: item[15],
                 remark: item[16],
                 systemCode: item[17],
-               
+
             }
             return row;
         })
 
     },
-}
\ No newline at end of file
+}