diff --git a/src/api/ecology/lake.js b/src/api/ecology/lake.js
new file mode 100644
index 0000000..1134e78
--- /dev/null
+++ b/src/api/ecology/lake.js
@@ -0,0 +1,80 @@
+import axios from 'axios';
+// ----------------------列表-----------------------
+const pageBillUrl = '/lakeLibrary/lakeLibraryInnerCityBill/page';
+// 添加
+const saveLakeBill = function (data) {
+    return axios.post("/lakeLibrary/lakeLibraryInnerCityBill/importBatch",data)
+}
+
+// 删除
+const removeLakeBill = function (id) {
+    return axios.delete(`/lakeLibrary/lakeLibraryInnerCityBill/${id}`,)
+}
+// 批量删除
+const removeBatchLakeBill = function (ids) {
+    return axios.delete("/lakeLibrary/lakeLibraryInnerCityBill/batch",{data:ids})
+}
+
+// 修改
+const updateLakeBill = function (data) {
+    return axios.put("/lakeLibrary/lakeLibraryInnerCityBill",data)
+}
+// 审核
+const verifyLakeBill = function (data) {
+    return axios.put("/lakeLibrary/lakeLibraryInnerCityBill/verify",data);
+}
+const getLakeBill = function (id) {
+    return axios.get(`/lakeLibrary/lakeLibraryInnerCityBill/${id}`)
+}
+// -------------------------数据---------------------
+const pageLakeUrl = '/lakeLibrary/lakeLibraryInnerCity/page';
+// 添加
+const saveLake = function (data) {
+    return axios.post("/lakeLibrary/lakeLibraryInnerCity",data)
+}
+
+// 删除
+const removeLake = function (id) {
+    return axios.delete(`/lakeLibrary/lakeLibraryInnerCity/${id}`,)
+}
+// 批量删除
+const removeBatchLake = function (ids) {
+    return axios.delete("/lakeLibrary/lakeLibraryInnerCity/batch",{data:ids})
+}
+
+// 修改
+const updateLake = function (data) {
+        return axios.put("/lakeLibrary/lakeLibraryInnerCity",data)
+}
+
+// -------------------------统计---------------------
+const pageLakeStatisticUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic';
+const statisticSourceUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic/source';
+const statisticYearUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic/year';
+const getHistoryyears = function () {
+    return axios.get("/lakeLibrary/lakeLibraryInnerCity/history-year")
+}
+const getColumnOptions = function(column){
+    return axios.get("/lakeLibrary/lakeLibraryInnerCity/options",{params:{column}})
+}
+
+export {
+    pageBillUrl,
+    saveLakeBill,
+    removeLakeBill,
+    updateLakeBill,
+    removeBatchLakeBill,
+    verifyLakeBill,
+    getLakeBill,
+    pageLakeUrl,
+    saveLake,
+    removeLake,
+    updateLake,
+    removeBatchLake,
+    pageLakeStatisticUrl,
+    getHistoryyears,
+    getColumnOptions,
+    statisticSourceUrl,
+    statisticYearUrl
+
+}
diff --git a/src/api/ecology/river-station.js b/src/api/ecology/river-station.js
new file mode 100644
index 0000000..403baf9
--- /dev/null
+++ b/src/api/ecology/river-station.js
@@ -0,0 +1,94 @@
+import axios from 'axios';
+// ----------------------列表-----------------------
+const pageBillUrl = '/waterFunctionArea/waterStationWaterFunctionAreaBill/page';
+// 添加
+const saveRiverStationBill = function (data) {
+    return axios.post("/waterFunctionArea/waterStationWaterFunctionAreaBill/batch",data)
+}
+
+// 删除
+const removeRiverStationBill = function (id) {
+    return axios.delete(`/waterFunctionArea/waterStationWaterFunctionAreaBill/${id}`,)
+}
+// 批量删除
+const removeBatchRiverStationBill = function (ids) {
+    return axios.delete("/waterFunctionArea/waterStationWaterFunctionAreaBill/batch",{data:ids})
+}
+
+// 修改
+const updateRiverStationBill = function (data) {
+    return axios.put("/waterFunctionArea/waterStationWaterFunctionAreaBill",data)
+}
+// 审核
+const verifyRiverStationBill = function (data) {
+    return axios.put("/waterFunctionArea/waterStationWaterFunctionAreaBill/verify",data);
+}
+const getRiverStationBill = function (id) {
+    return axios.get(`/waterFunctionArea/waterStationWaterFunctionAreaBill/${id}`)
+}
+// -------------------------数据---------------------
+const pageRiverStationUrl = '/waterFunctionArea/waterStationWaterFunctionArea/page';
+
+const listAll = function(data){
+    return axios.get("/waterFunctionArea/waterStationWaterFunctionArea",{params:data})
+}
+// 添加
+const saveRiverStation = function (data) {
+    return axios.post("/waterFunctionArea/waterStationWaterFunctionArea",data)
+}
+
+// 删除
+const removeRiverStation = function (id) {
+    return axios.delete(`/waterFunctionArea/waterStationWaterFunctionArea/${id}`,)
+}
+// 批量删除
+const removeBatchRiverStation = function (ids) {
+    return axios.delete("/waterFunctionArea/waterStationWaterFunctionArea/batch",{data:ids})
+}
+
+// 修改
+const updateRiverStation = function (data) {
+        return axios.put("/waterFunctionArea/waterStationWaterFunctionArea",data)
+}
+
+
+
+// -------------------------统计---------------------
+const pageRiverStationStatisticUrl = '/waterFunctionArea/waterStationWaterFunctionArea/statistic';
+const pageRiverStationCompare = '/waterFunctionArea/waterStationWaterFunctionArea/statistic/compare';
+const getHistoryyears = function () {
+    return axios.get("/waterFunctionArea/waterStationWaterFunctionArea/history-year")
+}
+const getColumnOptions = function(column){
+    return axios.get("/waterFunctionArea/waterStationWaterFunctionArea/options",{params:{column}})
+}
+
+const getGisBase = function(data){
+    return axios.get("/waterFunctionArea/waterStationWaterFunctionArea/gis",{params:data})
+}
+
+const getGisArea = function(data){
+    return axios.get("/waterFunctionArea/waterStationWaterFunctionArea/gis/area",{params:data})
+}
+export {
+    pageBillUrl,
+    saveRiverStationBill,
+    removeRiverStationBill,
+    updateRiverStationBill,
+    removeBatchRiverStationBill,
+    verifyRiverStationBill,
+    getRiverStationBill,
+    pageRiverStationUrl,
+    saveRiverStation,
+    removeRiverStation,
+    updateRiverStation,
+    removeBatchRiverStation,
+    pageRiverStationStatisticUrl,
+    getHistoryyears,
+    pageRiverStationCompare,
+    getColumnOptions,
+    listAll,
+    getGisBase,
+    getGisArea
+
+}
diff --git a/src/api/ecology/sewage-city-river.js b/src/api/ecology/sewage-city-river.js
new file mode 100644
index 0000000..544409e
--- /dev/null
+++ b/src/api/ecology/sewage-city-river.js
@@ -0,0 +1,80 @@
+import axios from 'axios';
+// ----------------------列表-----------------------
+const pageBillUrl = '/blackSmellyWater/blackSmellyWaterCityRiverBill/page';
+// 添加
+const saveSewageBill = function (data) {
+    return axios.post("/blackSmellyWater/blackSmellyWaterCityRiverBill/importBatch",data)
+}
+
+// 删除
+const removeSewageBill = function (id) {
+    return axios.delete(`/blackSmellyWater/blackSmellyWaterCityRiverBill/${id}`,)
+}
+// 批量删除
+const removeBatchSewageBill = function (ids) {
+    return axios.delete("/blackSmellyWater/blackSmellyWaterCityRiverBill/batch",{data:ids})
+}
+
+// 修改
+const updateSewageBill = function (data) {
+    return axios.put("/blackSmellyWater/blackSmellyWaterCityRiverBill",data)
+}
+// 审核
+const verifySewageBill = function (data) {
+    return axios.put("/blackSmellyWater/blackSmellyWaterCityRiverBill/verify",data);
+}
+const getSewageBill = function (id) {
+    return axios.get(`/blackSmellyWater/blackSmellyWaterCityRiverBill/${id}`)
+}
+// -------------------------数据---------------------
+const pageSewageUrl = '/blackSmellyWater/blackSmellyWaterCityRiver/page';
+// 添加
+const saveSewage = function (data) {
+    return axios.post("/blackSmellyWater/blackSmellyWaterCityRiver",data)
+}
+
+// 删除
+const removeSewage = function (id) {
+    return axios.delete(`/blackSmellyWater/blackSmellyWaterCityRiver/${id}`,)
+}
+// 批量删除
+const removeBatchSewage = function (ids) {
+    return axios.delete("/blackSmellyWater/blackSmellyWaterCityRiver/batch",{data:ids})
+}
+
+// 修改
+const updateSewage = function (data) {
+        return axios.put("/blackSmellyWater/blackSmellyWaterCityRiver",data)
+}
+
+// -------------------------统计---------------------
+const pageSewageStatisticUrl = '/blackSmellyWater/blackSmellyWaterCityRiver/statistic';
+const statisticSourceUrl = '/blackSmellyWater/blackSmellyWaterCityRiver/statistic/source';
+const statisticYearUrl = '/blackSmellyWater/blackSmellyWaterCityRiver/statistic/year';
+const getHistoryyears = function () {
+    return axios.get("/blackSmellyWater/blackSmellyWaterCityRiver/history-year")
+}
+const getColumnOptions = function(column){
+    return axios.get("/blackSmellyWater/blackSmellyWaterCityRiver/options",{params:{column}})
+}
+
+export {
+    pageBillUrl,
+    saveSewageBill,
+    removeSewageBill,
+    updateSewageBill,
+    removeBatchSewageBill,
+    verifySewageBill,
+    getSewageBill,
+    pageSewageUrl,
+    saveSewage,
+    removeSewage,
+    updateSewage,
+    removeBatchSewage,
+    pageSewageStatisticUrl,
+    getHistoryyears,
+    getColumnOptions,
+    statisticSourceUrl,
+    statisticYearUrl
+
+}
diff --git a/src/api/ecology/sewage.js b/src/api/ecology/sewage.js
new file mode 100644
index 0000000..8b2e7ec
--- /dev/null
+++ b/src/api/ecology/sewage.js
@@ -0,0 +1,80 @@
+import axios from 'axios';
+// ----------------------列表-----------------------
+const pageBillUrl = '/blackSmellyWater/blackSmellyWaterBill/page';
+// 添加
+const saveSewageBill = function (data) {
+    return axios.post("/blackSmellyWater/blackSmellyWaterBill/importBatch",data)
+}
+
+// 删除
+const removeSewageBill = function (id) {
+    return axios.delete(`/blackSmellyWater/blackSmellyWaterBill/${id}`,)
+}
+// 批量删除
+const removeBatchSewageBill = function (ids) {
+    return axios.delete("/blackSmellyWater/blackSmellyWaterBill/batch",{data:ids})
+}
+
+// 修改
+const updateSewageBill = function (data) {
+    return axios.put("/blackSmellyWater/blackSmellyWaterBill",data)
+}
+// 审核
+const verifySewageBill = function (data) {
+    return axios.put("/blackSmellyWater/blackSmellyWaterBill/verify",data);
+}
+const getSewageBill = function (id) {
+    return axios.get(`/blackSmellyWater/blackSmellyWaterBill/${id}`)
+}
+// -------------------------数据---------------------
+const pageSewageUrl = '/blackSmellyWater/blackSmellyWater/page';
+// 添加
+const saveSewage = function (data) {
+    return axios.post("/blackSmellyWater/blackSmellyWater",data)
+}
+
+// 删除
+const removeSewage = function (id) {
+    return axios.delete(`/blackSmellyWater/blackSmellyWater/${id}`,)
+}
+// 批量删除
+const removeBatchSewage = function (ids) {
+    return axios.delete("/blackSmellyWater/blackSmellyWater/batch",{data:ids})
+}
+
+// 修改
+const updateSewage = function (data) {
+        return axios.put("/blackSmellyWater/blackSmellyWater",data)
+}
+
+// -------------------------统计---------------------
+const pageSewageStatisticUrl = '/blackSmellyWater/blackSmellyWater/statistic';
+const statisticSourceUrl = '/blackSmellyWater/blackSmellyWater/statistic/source';
+const statisticYearUrl = '/blackSmellyWater/blackSmellyWater/statistic/year';
+const getHistoryyears = function () {
+    return axios.get("/blackSmellyWater/blackSmellyWater/history-year")
+}
+const getColumnOptions = function(column){
+    return axios.get("/blackSmellyWater/blackSmellyWater/options",{params:{column}})
+}
+
+export {
+    pageBillUrl,
+    saveSewageBill,
+    removeSewageBill,
+    updateSewageBill,
+    removeBatchSewageBill,
+    verifySewageBill,
+    getSewageBill,
+    pageSewageUrl,
+    saveSewage,
+    removeSewage,
+    updateSewage,
+    removeBatchSewage,
+    pageSewageStatisticUrl,
+    getHistoryyears,
+    getColumnOptions,
+    statisticSourceUrl,
+    statisticYearUrl
+
+}
diff --git a/src/api/ecology/special-lake.js b/src/api/ecology/special-lake.js
new file mode 100644
index 0000000..000898a
--- /dev/null
+++ b/src/api/ecology/special-lake.js
@@ -0,0 +1,80 @@
+import axios from 'axios';
+// ----------------------列表-----------------------
+const pageBillUrl = '/lakeLibrary/lakeLibrarySpecialBill/page';
+// 添加
+const saveLakeBill = function (data) {
+    return axios.post("/lakeLibrary/lakeLibrarySpecialBill/importBatch",data)
+}
+
+// 删除
+const removeLakeBill = function (id) {
+    return axios.delete(`/lakeLibrary/lakeLibrarySpecialBill/${id}`,)
+}
+// 批量删除
+const removeBatchLakeBill = function (ids) {
+    return axios.delete("/lakeLibrary/lakeLibrarySpecialBill/batch",{data:ids})
+}
+
+// 修改
+const updateLakeBill = function (data) {
+    return axios.put("/lakeLibrary/lakeLibrarySpecialBill",data)
+}
+// 审核
+const verifyLakeBill = function (data) {
+    return axios.put("/lakeLibrary/lakeLibrarySpecialBill/verify",data);
+}
+const getLakeBill = function (id) {
+    return axios.get(`/lakeLibrary/lakeLibrarySpecialBill/${id}`)
+}
+// -------------------------数据---------------------
+const pageLakeUrl = '/lakeLibrary/lakeLibrarySpecial/page';
+// 添加
+const saveLake = function (data) {
+    return axios.post("/lakeLibrary/lakeLibrarySpecial",data)
+}
+
+// 删除
+const removeLake = function (id) {
+    return axios.delete(`/lakeLibrary/lakeLibrarySpecial/${id}`,)
+}
+// 批量删除
+const removeBatchLake = function (ids) {
+    return axios.delete("/lakeLibrary/lakeLibrarySpecial/batch",{data:ids})
+}
+
+// 修改
+const updateLake = function (data) {
+        return axios.put("/lakeLibrary/lakeLibrarySpecial",data)
+}
+
+// -------------------------统计---------------------
+const pageLakeStatisticUrl = '/lakeLibrary/lakeLibrarySpecial/statistic';
+const statisticSourceUrl = '/lakeLibrary/lakeLibrarySpecial/statistic/source';
+const statisticYearUrl = '/lakeLibrary/lakeLibrarySpecial/statistic/year';
+const getHistoryyears = function () {
+    return axios.get("/lakeLibrary/lakeLibrarySpecial/history-year")
+}
+const getColumnOptions = function(column){
+    return axios.get("/lakeLibrary/lakeLibrarySpecial/options",{params:{column}})
+}
+
+export {
+    pageBillUrl,
+    saveLakeBill,
+    removeLakeBill,
+    updateLakeBill,
+    removeBatchLakeBill,
+    verifyLakeBill,
+    getLakeBill,
+    pageLakeUrl,
+    saveLake,
+    removeLake,
+    updateLake,
+    removeBatchLake,
+    pageLakeStatisticUrl,
+    getHistoryyears,
+    getColumnOptions,
+    statisticSourceUrl,
+    statisticYearUrl
+
+}
diff --git a/src/api/ecology/water-function-area.js b/src/api/ecology/water-function-area.js
index eb6e0c7..eb173a7 100644
--- a/src/api/ecology/water-function-area.js
+++ b/src/api/ecology/water-function-area.js
@@ -1,74 +1,74 @@
 import axios from 'axios';
 // ----------------------列表-----------------------
-const pageBillUrl = '/waterFunctionArea/waterFunctionAreaBill/page';
+const pageBillUrl = '/waterFunctionArea/nationalLevelWaterFunctionAreaBill/page';
 // 添加
 const saveWaterFunctionAreaBill = function (data) {
-    return axios.post("/waterFunctionArea/waterFunctionAreaBill/importBatch",data)
+    return axios.post("/waterFunctionArea/nationalLevelWaterFunctionAreaBill/importBatch",data)
 }
 
 // 删除
 const removeWaterFunctionAreaBill = function (id) {
-    return axios.delete(`/waterFunctionArea/waterFunctionAreaBill/${id}`,)
+    return axios.delete(`/waterFunctionArea/nationalLevelWaterFunctionAreaBill/${id}`,)
 }
 // 批量删除
 const removeBatchWaterFunctionAreaBill = function (ids) {
-    return axios.delete("/waterFunctionArea/waterFunctionAreaBill/batch",{data:ids})
+    return axios.delete("/waterFunctionArea/nationalLevelWaterFunctionAreaBill/batch",{data:ids})
 }
 
 // 修改
 const updateWaterFunctionAreaBill = function (data) {
-    return axios.put("/waterFunctionArea/waterFunctionAreaBill",data)
+    return axios.put("/waterFunctionArea/nationalLevelWaterFunctionAreaBill",data)
 }
 // 审核
 const verifyWaterFunctionAreaBill = function (data) {
-    return axios.put("/waterFunctionArea/waterFunctionAreaBill/verify",data);
+    return axios.put("/waterFunctionArea/nationalLevelWaterFunctionAreaBill/verify",data);
 }
 const getWaterFunctionAreaBill = function (id) {
-    return axios.get(`/waterFunctionArea/waterFunctionAreaBill/${id}`)
+    return axios.get(`/waterFunctionArea/nationalLevelWaterFunctionAreaBill/${id}`)
 }
 // -------------------------数据---------------------
-const pageWaterFunctionAreaUrl = '/waterFunctionArea/waterFunctionArea/page';
+const pageWaterFunctionAreaUrl = '/waterFunctionArea/nationalLevelWaterFunctionArea/page';
 
 const listAll = function(data){
-    return axios.get("/waterFunctionArea/waterFunctionArea",{params:data})
+    return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea",{params:data})
 }
 // 添加
 const saveWaterFunctionArea = function (data) {
-    return axios.post("/waterFunctionArea/waterFunctionArea",data)
+    return axios.post("/waterFunctionArea/nationalLevelWaterFunctionArea",data)
 }
 
 // 删除
 const removeWaterFunctionArea = function (id) {
-    return axios.delete(`/waterFunctionArea/waterFunctionArea/${id}`,)
+    return axios.delete(`/waterFunctionArea/nationalLevelWaterFunctionArea/${id}`,)
 }
 // 批量删除
 const removeBatchWaterFunctionArea = function (ids) {
-    return axios.delete("/waterFunctionArea/waterFunctionArea/batch",{data:ids})
+    return axios.delete("/waterFunctionArea/nationalLevelWaterFunctionArea/batch",{data:ids})
 }
 
 // 修改
 const updateWaterFunctionArea = function (data) {
-        return axios.put("/waterFunctionArea/waterFunctionArea",data)
+        return axios.put("/waterFunctionArea/nationalLevelWaterFunctionArea",data)
 }
 
 
 
 // -------------------------统计---------------------
-const pageWaterFunctionAreaStatisticUrl = '/waterFunctionArea/waterFunctionArea/statistic';
-const pageWaterFunctionAreaCompare = '/waterFunctionArea/waterFunctionArea/statistic/compare';
+const pageWaterFunctionAreaStatisticUrl = '/waterFunctionArea/nationalLevelWaterFunctionArea/statistic';
+const pageWaterFunctionAreaCompare = '/waterFunctionArea/nationalLevelWaterFunctionArea/statistic/compare';
 const getHistoryyears = function () {
-    return axios.get("/waterFunctionArea/waterFunctionArea/history-year")
+    return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea/history-year")
 }
 const getColumnOptions = function(column){
-    return axios.get("/waterFunctionArea/waterFunctionArea/options",{params:{column}})
+    return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea/options",{params:{column}})
 }
 
 const getGisBase = function(data){
-    return axios.get("/waterFunctionArea/waterFunctionArea/gis",{params:data})
+    return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea/gis",{params:data})
 }
 
 const getGisArea = function(data){
-    return axios.get("/waterFunctionArea/waterFunctionArea/gis/area",{params:data})
+    return axios.get("/waterFunctionArea/nationalLevelWaterFunctionArea/gis/area",{params:data})
 }
 export {
     pageBillUrl,
@@ -90,5 +90,5 @@ export {
     listAll,
     getGisBase,
     getGisArea
-  
+
 }
diff --git a/src/views/water/lake/collect/colums.js b/src/views/water/lake/collect/colums.js
new file mode 100644
index 0000000..b7a5040
--- /dev/null
+++ b/src/views/water/lake/collect/colums.js
@@ -0,0 +1,31 @@
+const tableColumns = [
+        {title: "监测时间",dataIndex: "monitorTime",sorter: true,},
+        {title: "点位名称",dataIndex: "pointName",sorter: true,},
+        {title: "水温(℃)",dataIndex: "waterTemperature",sorter: true,},
+        {title: "pH值（无量纲）",dataIndex: "ph",sorter: true,},
+        {title: "透明度（cm）",dataIndex: "transparency",sorter: true,},
+        {title: "溶解氧饱和度（﹪）",dataIndex: "dissolvedOxygenSaturation",sorter: true,},
+        {title: "溶解氧",dataIndex: "dissolvedOxygen",sorter: true,},
+        {title: "高锰酸盐指数",dataIndex: "permanganateIndex",sorter: true,},
+        // {title: "监测时间",dataIndex: "monitorTime",sorter: true,},
+        {title: "五日生化需氧量",dataIndex: "fiveDayBod",sorter: true,},
+        {title: "总氮 ",dataIndex: "totalNitrogen",sorter: true,},
+        {title: "氨氮",dataIndex: "ammonia",sorter: true,},
+        {title: "挥发酚",dataIndex: "volatilePhenol",sorter: true,},
+        {title: "砷",dataIndex: "as",sorter: true,},
+        {title: "汞",dataIndex: "hg",sorter: true,},
+        {title: "六价铬",dataIndex: "cr6",sorter: true,},
+        {title: "铅(℃)",dataIndex: "pb",sorter: true,},
+        {title: "镉",dataIndex: "cd",sorter: true,},
+        {title: "总磷",dataIndex: "totalPhosphorus",sorter: true,},
+        {title: "石油类",dataIndex: "petro",sorter: true,},
+        {title: "粪大肠菌群（MPN/L）",dataIndex: "fecalColiforms",sorter: true,},
+        {title: "化学需氧量",dataIndex: "cod",sorter: true,},
+        {title: "叶绿素a（mg/m3）",dataIndex: "chlA",sorter: true,},
+        {title: "阴离子表面活性剂",dataIndex: "anSaa",sorter: true,},
+        {title: "硫化物",dataIndex: "s",sorter: true,},
+        {title: "氧化还原电位（mV）",dataIndex: "oxidationReductionPotential",sorter: true,},
+        {title: "备注",dataIndex: "remark",sorter: true,},
+    ];
+
+    export {tableColumns}
diff --git a/src/views/water/lake/collect/index.vue b/src/views/water/lake/collect/index.vue
index 501b184..8271d8a 100644
--- a/src/views/water/lake/collect/index.vue
+++ b/src/views/water/lake/collect/index.vue
@@ -4,24 +4,35 @@
       <template #title>
         <a-space>
           <a-upload
-            :before-upload="importFileCity"
+            :before-upload="importFileInnerCity"
             :showUploadList="false"
             accept=".xls,.xlsx,.csv"
           >
-            <a-button>市级导入</a-button>
+            <a-button>城市内湖导入</a-button>
           </a-upload>
-          <!-- <a-upload
-            :before-upload="importFileArea"
+          <a-upload
+            :before-upload="importFileWuxiang"
             :showUploadList="false"
             accept=".xls,.xlsx,.csv"
           >
-            <a-button>县级导入</a-button>
-          </a-upload> -->
+            <a-button>五象湖导入</a-button>
+          </a-upload>
+
+          <a-upload
+            :before-upload="importFileSpecial"
+            :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 tab="城市内湖" key="water">
+          <water-bill ref="water"></water-bill>
+        </a-tab-pane>
+        <a-tab-pane tab="专项湖库" key="special">
+          <special-bill ref="special"></special-bill>
         </a-tab-pane>
       </a-tabs>
     </a-card>
@@ -31,22 +42,26 @@
 <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 SpecialBill from "./special-bill.vue";
+import {saveLakeBill} from "@/api/ecology/lake";
+import {saveLakeBill as saveSpecialLake} from "@/api/ecology/special-lake";
+
 export default {
-  name: "ZoneCollectIndex",
+  name: "LakeCollectIndex",
   components: {
-    NoiseBill,
+    WaterBill,
+    SpecialBill
   },
   data() {
     return {
-      activeKey: "noise",
+      activeKey: "water",
     };
   },
   methods: {
     /* 导入本地excel文件 */
-    importFileCity(file) {
+    importFileInnerCity(file) {
       const hide = this.$message.loading("导入中..", 0);
 
       let reader = new FileReader();
@@ -62,31 +77,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[2][0].replace(/[^\d]+/g, "-");
+
+          const lakeList = aoa.filter(
             (item) => {
-              return item.length >= 26 && typeof item[0] == "number"}
+              return item.length >= 24 && item[0] && !item[0].includes("点位名称");
+            }
           );
-          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.toInnerCityLakeObjData(lakeList,reportDate);
+          if (!billData || billData.length == 0) {
             hide()
             Modal.error({
               title: "导入失败",
@@ -97,35 +101,33 @@ export default {
           const tasks = [];
           if (billData.length > 0) {
             tasks.push(
-              saveZoneNoiseBill({
+              saveLakeBill({
                 reportTime: new Date(reportDate).getTime(),
                 billName: billName,
                 regionLevel: "市级",
-                zoneNoiseList: billData,
+                lakeLibraryInnerCityList: 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.water && this.$refs.water.reload();
+              } else {
+                Modal.error({
+                  title: "导入失败",
+                  content: "数据上传出错",
+                });
+              }
+
             })
             .catch(() => {
               Modal.error({
@@ -149,80 +151,75 @@ export default {
 
       return false;
     },
-    importFileArea(file) {
+    importFileWuxiang(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(
+          const lakeList = aoa.filter(
             (item) => {
-
-              return item.length >= 35 && item[0] != "行政区划代码"
+              return item.length >= 24 && item[0] && !item[0].includes("点位名称");
             }
           );
-
           // 解析成对象数组
-          const billName = aoa[0][0];
-          const billData = utils.toAreaObjData(zoneNoiseList);
-
+          const billName = file.name;
+          const billData = utils.toWuxiangLakeObjData(lakeList);
           if (!billData || billData.length == 0) {
-            hide();
+            hide()
             Modal.error({
               title: "导入失败",
-              content: "找不到可用数据",
+              content: "找不到数据",
             });
-
             return;
           }
-
+          const tasks = [];
           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: "数据上传出错",
-                  });
-                }
+            tasks.push(
+              saveLakeBill({
+                billName: billName,
+                lakeLibraryInnerCityList: billData,
               })
-              .catch(() => {
+            );
+          }
+
+
+          // 上传到服务器
+
+          Promise.all(tasks)
+            .then((res) => {
+              if (res[0].data.code == 0) {
+                Modal.success({
+                  title: "导入成功",
+                  content: `成功导入${billData.length}条数据`,
+                });
+                this.$refs.water && this.$refs.water.reload();
+              } else {
                 Modal.error({
                   title: "导入失败",
                   content: "数据上传出错",
                 });
-              })
-              .finally(() => {
-                hide();
+              }
+
+            })
+            .catch(() => {
+              Modal.error({
+                title: "导入失败",
+                content: "数据上传出错",
               });
-          }
+            })
+            .finally(() => {
+              hide();
+            });
         } catch (error) {
           hide();
           Modal.error({
@@ -233,11 +230,95 @@ export default {
         // console.log(billData);
       };
       reader.readAsArrayBuffer(file);
+
       return false;
     },
+    importFileSpecial(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",
+          });
+          let sheetNames = workbook.SheetNames;
+          // 解析成二维数组
+          let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
+            header: 1,
+          });
+          const lakeList = aoa.filter(
+            (item) => {
+              return item.length >= 24 && item[1] && !item[1].includes("测站名称");
+            }
+          );
+          // 解析成对象数组
+          const billName = file.name;
+          const billData = utils.toSpecialLakeData(lakeList);
+          if (!billData || billData.length == 0) {
+            hide()
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
+          const tasks = [];
+          if (billData.length > 0) {
+            tasks.push(
+              saveSpecialLake({
+                billName: billName,
+                lakeLibrarySpecialList: billData,
+              })
+            );
+          }
+
+
+          // 上传到服务器
+
+          Promise.all(tasks)
+            .then((res) => {
+              if (res[0].data.code == 0) {
+                Modal.success({
+                  title: "导入成功",
+                  content: `成功导入${billData.length}条数据`,
+                });
+                this.$refs.special && this.$refs.special.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/lake/collect/noise.vue b/src/views/water/lake/collect/noise.vue
deleted file mode 100644
index d04785a..0000000
--- a/src/views/water/lake/collect/noise.vue
+++ /dev/null
@@ -1,690 +0,0 @@
-<template>
-  <div class="ele-body">
-    <a-card :bordered="false">
-      <!-- 搜索表单 -->
-      <a-form
-        :model="where"
-        :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-        :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-      >
-        <a-row>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="测点名称:">
-              <a-select v-model:value="where.place" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in palceOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item label="城区">
-              <a-select v-model:value="where.area" allowClear showSearch>
-                <a-select-option
-                  v-for="(item) in areaOptions"
-                  :key="item.value"
-                  >{{ item.label }}</a-select-option
-                >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24" :xs="24">
-            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-              <a-space>
-                <a-button type="primary" @click="reload">查询</a-button>
-                <a-button @click="reset">重置</a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-      <a-modal
-        v-model:visible="showEdit"
-        :title="form.zoneNoiseId !== undefined ? '修改记录' : '添加记录'"
-        :confirm-loading="loading"
-        :width="1000"
-        :body-style="{ paddingBottom: '8px' }"
-        @ok="save"
-      >
-        <a-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-          :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
-        >
-          <a-row>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="日期" name="monitorDate">
-                <a-date-picker
-                  v-model:value="form.monitorDate"
-                  :locale="locale"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="时间" name="monitorTime">
-                <a-time-picker
-                  v-model:value="form.monitorTime"
-                  format="HH:mm"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="测点名称" name="place">
-                <a-input
-                  v-model:value="form.place"
-                  placeholder="请输入测点名称"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="所属城区" name="area">
-                <a-input
-                  v-model:value="form.area"
-                  placeholder="请输入城区"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="网格长" name="zoneLength">
-                <a-input
-                  v-model:value="form.gridLength"
-                  placeholder="请输入网格长（米）"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="网格宽" name="zoneWidth">
-                <a-input
-                  v-model:value="form.gridWidth"
-                  placeholder="请输入网格宽（米）"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LeqdB(A)" name="indexLeq">
-                <a-input
-                  type="number"
-                  v-model:value="form.indexLeq"
-                  placeholder="请输入LeqdB(A)"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="SDdB(A)" name="indexSd">
-                <a-input
-                  type="number"
-                  v-model:value="form.indexSd"
-                  placeholder="请输入大SDdB(A)"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L10dB(A)" name="indexL10">
-                <a-input
-                  type="number"
-                  v-model:value="form.indexL10"
-                  placeholder="请输入L10dB(A)"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L50dB(A)" name="indexL50">
-                <a-input
-                  type="number"
-                  v-model:value="form.indexL50"
-                  placeholder="请输入L50dB(A)"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="L90dB(A)" name="indexL90">
-                <a-input
-                  type="number"
-                  v-model:value="form.indexL90"
-                  placeholder="请输入L90dB(A)"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LmindB(A)" name="indexLmin">
-                <a-input
-                  type="number"
-                  v-model:value="form.indexLmin"
-                  placeholder="请输入LmindB(A)"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="LmaxdB(A)" name="indexLmax">
-                <a-input
-                  type="number"
-                  v-model:value="form.indexLmax"
-                  placeholder="请输入LmaxdB(A)"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测站名" name="station">
-                <a-input
-                  v-model:value="form.station"
-                  placeholder="请输入监测站名"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测仪器型号" name="monitorInstrumentModel">
-                <a-input
-                  v-model:value="form.monitorInstrumentModel"
-                  placeholder="请输入监测仪器型号"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测仪器编号" name="monitorInstrumentCode">
-                <a-input
-                  v-model:value="form.monitorInstrumentCode"
-                  placeholder="请输入监测仪器编号"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测前校准值" name="beforeMonitorValue">
-                <a-input
-                  v-model:value="form.beforeMonitorValue"
-                  placeholder="请输入监测前校准值"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="监测后校准值" name="afterMonitorValue">
-                <a-input
-                  v-model:value="form.afterMonitorValue"
-                  placeholder="请输入监测后校准值"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准器测量声压值" name="soundPressureValue">
-                <a-input
-                  v-model:value="form.soundPressureValue"
-                  placeholder="请输入声校准器测量声压值"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准仪器型号" name="soundInstrumentModel">
-                <a-input
-                  v-model:value="form.soundInstrumentModel"
-                  placeholder="请输入声校准仪器型号"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="声校准仪器编号" name="soundInstrumentCode">
-                <a-input
-                  v-model:value="form.soundInstrumentCode"
-                  placeholder="请输入声校准仪器编号"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-              <a-form-item label="备注" name="remark">
-                <a-input
-                  v-model:value="form.remark"
-                  placeholder="请输入备注"
-                  allow-clear
-                />
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-      </a-modal>
-      <!-- 表格 -->
-      <ele-pro-table
-        v-model:selection="selectionList"
-        ref="table"
-        row-key="zoneNoiseId"
-        :datasource="url"
-        :columns="columns"
-        :where="where"
-        :scroll="{ x: 'max-content' }"
-      >
-        <template v-if="bill.checked != 1" #toolbar>
-          <a-space>
-            <a-button @click="openEdit" type="primary">新增</a-button>
-            <a-popconfirm
-              :disabled="selectionList.length == 0"
-              :title="`确认删除${selectionList.length}条数据吗?`"
-              ok-text="Yes"
-              cancel-text="No"
-              @confirm="removeBatch"
-            >
-              <a-button
-                :disabled="selectionList.length == 0"
-                type="primary"
-                ghost
-                danger
-                >删除</a-button
-              >
-            </a-popconfirm>
-          </a-space>
-        </template>
-
-        <template #Leq="{ text,record  }">
-          <a-tag v-if="(record.timeSlot == '昼' && text <= 68) || (record.timeSlot == '夜' && text <= 58)" color="green">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 68 && text <=70) || (record.timeSlot == '夜' && text > 58 && text <=60)" color="blue">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 70 && text <=72) || (record.timeSlot == '夜' && text > 60 && text <=62)" color="red">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 62 && text <=74) || (record.timeSlot == '夜' && text > 62 && text <=64)" color="red">{{text}}</a-tag>
-          <a-tag v-else-if="(record.timeSlot == '昼' && text > 74 ) || (record.timeSlot == '夜' && text > 64)" color="red">{{text}}</a-tag>
-          <template v-else color="#FFF">{{text}}</template>
-        </template>
-
-        <template #action="{ record }">
-          <a-space>
-            <a-button
-              @click="openEdit(record)"
-              type="primary"
-              shape="round"
-              size="small"
-              >修改</a-button
-            >
-            <a-popconfirm
-              :title="`确认删除这条数据吗?`"
-              ok-text="Yes"
-              cancel-text="No"
-              @confirm="remove(record)"
-            >
-              <a-button type="primary" danger shape="round" size="small"
-                >删除</a-button
-              >
-            </a-popconfirm>
-          </a-space>
-        </template>
-      </ele-pro-table>
-    </a-card>
-  </div>
-  <!-- 编辑弹窗 -->
-</template>
-
-<script>
-import _ from "lodash";
-import {
-  pageZoneNoiseUrl,
-  saveZoneNoise,
-  removeZoneNoise,
-  removeBatchZoneNoise,
-  updateZoneNoise,
-  getZoneNoiseBill,
-  getColumnOptions,
-} 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: "ZoneCollectNoise",
-  components: {},
-  data() {
-    const { billId } = this.$route.params;
-
-    return {
-      locale,
-      bill: {},
-      // 表格数据接口
-      url: pageZoneNoiseUrl,
-      selection: [],
-      // 表格列配置
-      columns: [
-        {
-          title: "监测日期",
-          dataIndex: "monitorTime",
-          sorter: true,
-          customRender: ({text})=> moment(text,"YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
-        },
-        {
-          title: "测点名称",
-          dataIndex: "place",
-          sorter: true,
-        },
-        {
-          title: "所属城区",
-          dataIndex: "area",
-          sorter: true,
-        },
-        {
-          title: "网格长（米）",
-          dataIndex: "gridLength",
-          sorter: true,
-        },
-        {
-          title: "网格宽（米）",
-          dataIndex: "gridWidth",
-          sorter: true,
-        },
-         {
-          title: "网格点号",
-          dataIndex: "gridNo",
-          sorter: true,
-        },
-        {
-          title: "主要声源",
-          dataIndex: "source",
-          sorter: true,
-        },
-        {
-          title: "时段",
-          dataIndex: "timeSlot",
-          sorter: true,
-        },
-        //   {
-        //     title: '月',
-        //     dataIndex: 'monitorMonth',
-        //     sorter: true
-        //   },
-        //   {
-        //     title: '日',
-        //     dataIndex: 'monitorDay',
-        //     sorter: true
-        //   },
-        //   {
-        //     title: '时',
-        //     dataIndex: 'monitorHour',
-        //     sorter: true
-        //   },
-        //   {
-        //     title: '分',
-        //     dataIndex: 'monitorMinute',
-        //     sorter: true
-        //   },
-        {
-          title: "LeqdB(A)",
-          dataIndex: "indexLeq",
-          slots: {customRender: "Leq"},
-          sorter: true,
-        },
-        {
-          title: "SDdB(A)",
-          dataIndex: "indexSd",
-          sorter: true,
-        },
-        {
-          title: "L10dB(A)",
-          dataIndex: "indexL10",
-          sorter: true,
-        },
-        {
-          title: "L50dB(A)",
-          dataIndex: "indexL50",
-          sorter: true,
-        },
-        {
-          title: "L90dB(A)",
-          dataIndex: "indexL90",
-          sorter: true,
-        },
-        {
-          title: "LmindB(A)",
-          dataIndex: "indexLmin",
-          sorter: true,
-        },
-        {
-          title: "LmaxdB(A)",
-          dataIndex: "indexLmax",
-          sorter: true,
-        },
-        {
-          title: "监测站名",
-          dataIndex: "station",
-          sorter: true,
-        },
-        {
-          title: "监测仪器型号",
-          dataIndex: "monitorInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "监测仪器编号",
-          dataIndex: "monitorInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "监测前校准值",
-          dataIndex: "beforeMonitorValue",
-          sorter: true,
-        },
-        {
-          title: "声校准器测量声压值",
-          dataIndex: "soundPressureValue",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器型号",
-          dataIndex: "soundInstrumentModel",
-          sorter: true,
-        },
-        {
-          title: "声校准仪器编号",
-          dataIndex: "soundInstrumentCode",
-          sorter: true,
-        },
-        {
-          title: "区域等级",
-          dataIndex: "regionLevel",
-          sorter: true,
-        },
-        {
-          title: "备注",
-          dataIndex: "remark",
-          sorter: true,
-        },
-        {
-          title: "创建人",
-          dataIndex: "username",
-          sorter: true,
-        },
-        {
-          title: "操作",
-          key: "action",
-          width: 150,
-          align: "center",
-          fixed: "right",
-          slots: {
-            customRender: "action",
-          },
-        },
-      ],
-      // 表格搜索条件
-      zoneNoiseBillId: billId,
-      palceOptions: [],
-      areaOptions: [],
-      where: {
-        zoneNoiseBillId: billId,
-      },
-      // 表格选中数据
-      selectionList: [],
-      // 是否显示编辑弹窗
-      showEdit: false,
-      // 表单数据
-      form: {},
-      loading: false,
-      rules: {},
-    };
-  },
-  mounted() {
-    const { billId } = this.$route.params;
-    getZoneNoiseBill(billId).then((res) => {
-      this.bill = res.data.data;
-      if (res.data.data.checked == 1) {
-        this.columns.splice(this.columns.length - 1, 1);
-      }
-    });
-    this.loadOptionData();
-  },
-  methods: {
-    /**获取下来框数据 */
-    loadOptionData() {
-      getColumnOptions("place").then((res) => {
-        this.palceOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-      getColumnOptions("area").then((res) => {
-        this.areaOptions = res.data.data.map((item) => {
-          return {
-            label: item,
-            value: item,
-          };
-        });
-      });
-    },
-    /* 刷新表格 */
-    reload() {
-      console.log(this.$route);
-      console.log(this.$router);
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        zoneNoiseBillId: this.zoneNoiseBillId,
-      };
-      this.reload();
-    },
-    /* 显示编辑 */
-    openEdit(record) {
-      const cloneRecord = _.cloneDeep(record);
-      if (record && cloneRecord.monitorTime) {
-        console.log(moment(cloneRecord.monitorTime).format("YYYY MM DD"));
-        cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
-        cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
-      }
-      // cloneRecord.mi
-      this.form = Object.assign({}, cloneRecord);
-      this.showEdit = true;
-      this.$nextTick(() => {
-        this.$refs.form.clearValidate(); // 清除表单验证信息
-      });
-    },
-
-    save() {
-      const hide = this.$message.loading("请求中..", 0);
-      const form = _.cloneDeep(this.form);
-      const date = new Date();
-      date.setFullYear(form.monitorDate.year());
-      date.setMonth(form.monitorDate.month());
-      date.setDate(form.monitorDate.date());
-      date.setHours(form.monitorTime.hour());
-      date.setMinutes(form.monitorTime.minutes());
-      form.monitorTime = date.getTime();
-      form.monitorYear = date.getFullYear();
-      form.monitorMonth = date.getMonth() + 1;
-      form.monitorDay = date.getDate();
-      form.monitorHour = date.getHours();
-      form.monitorMinute = date.getMinutes();
-      delete form["monitorDate"];
-      if (form.zoneNoiseId) {
-        updateZoneNoise(form)
-          .then((res) => {
-            if (res.data.code == 0) {
-              this.showEdit = false;
-              this.$message.success(res.data.msg);
-              this.reload();
-            } else {
-              this.$message.error(res.data.msg);
-            }
-          })
-          .catch((error) => {
-            this.$message.error(error.message);
-          })
-          .finally(() => {
-            console.log("finallyfinallyfinallyfinally");
-            hide();
-          });
-      } else {
-        form.zoneNoiseBillId = this.zoneNoiseBillId;
-        saveZoneNoise(form)
-          .then((res) => {
-            if (res.data.code == 0) {
-              this.showEdit = false;
-              this.$message.success(res.data.msg);
-              this.reload();
-            } else {
-              this.$message.error(res.data.msg);
-            }
-          })
-          .catch((error) => {
-            this.$message.error(error.message);
-          })
-          .finally(() => {
-            hide();
-          });
-      }
-    },
-    /* 删除单个 */
-    remove(row) {
-      const hide = this.$message.loading("请求中..", 0);
-      removeZoneNoise(row.zoneNoiseId)
-        .then((res) => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        })
-        .catch((e) => {
-          this.$message.error(e.msg);
-        })
-        .finally(() => hide());
-    },
-    removeBatch() {
-      const ids = this.selectionList.map((item) => item.zoneNoiseId);
-      const hide = this.$message.loading("请求中..", 0);
-      removeBatchZoneNoise(ids)
-        .then((res) => {
-          if (res.data.code === 0) {
-            this.$message.success(res.data.msg);
-            this.reload();
-          } else {
-            this.$message.error(res.data.msg);
-          }
-        })
-        .catch((e) => {
-          this.$message.error(e.msg);
-        })
-        .finally(() => hide());
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-</style>
\ No newline at end of file
diff --git a/src/views/water/lake/collect/noise-bill.vue b/src/views/water/lake/collect/special-bill.vue
similarity index 83%
rename from src/views/water/lake/collect/noise-bill.vue
rename to src/views/water/lake/collect/special-bill.vue
index fe2c34e..9d9811d 100644
--- a/src/views/water/lake/collect/noise-bill.vue
+++ b/src/views/water/lake/collect/special-bill.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
             <!-- 表格 -->
-      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="zoneNoiseBillId" :datasource="url"
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="lakeLibrarySpecialBillId" :datasource="url"
         :columns="columns" :where="where" :scroll="{x: 'max-content'}">
         <template #toolbar>
 
@@ -44,8 +44,8 @@
         </template>
         <template #billName="{ text, record }">
           <div class="editable-cell">
-            <div v-if="editableData[record.zoneNoiseBillId]" class="editable-cell-input-wrapper">
-              <a-input v-model:value="editableData[record.zoneNoiseBillId].billName" @pressEnter="save(record)" />
+            <div v-if="editableData[record.lakeLibrarySpecialBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.lakeLibrarySpecialBillId].billName" @pressEnter="save(record)" />
               <check-outlined class="editable-cell-icon-check" @click="save(record)" />
             </div>
             <div v-else class="editable-cell-text-wrapper">
@@ -56,9 +56,9 @@
         </template>
         <template #reportTime="{ text, record }">
           <div class="editable-cell">
-            <div v-if="editableData[record.zoneNoiseBillId]" class="editable-cell-input-wrapper">
-              <a-date-picker v-model:value="editableData[record.zoneNoiseBillId].reportTime"></a-date-picker>
-              <!-- <a-input v-model:value="editableData[record.zoneNoiseBillId].reportTime" @pressEnter="save(record)" /> -->
+            <div v-if="editableData[record.lakeLibrarySpecialBillId]" class="editable-cell-input-wrapper">
+              <a-date-picker v-model:value="editableData[record.lakeLibrarySpecialBillId].reportTime"></a-date-picker>
+              <!-- <a-input v-model:value="editableData[record.lakeLibrarySpecialBillId].reportTime" @pressEnter="save(record)" /> -->
               <check-outlined class="editable-cell-icon-check" @click="save(record)" />
             </div>
             <div v-else class="editable-cell-text-wrapper">
@@ -106,15 +106,15 @@
   import { Modal } from 'ant-design-vue';
   import {
     pageBillUrl,
-    // saveZoneNoiseBill,
-    removeZoneNoiseBill,
-    removeBatchZoneNoiseBill,
-    updateZoneNoiseBill,
-    verifyZoneNoiseBill
-  } from "@/api/ecology/zone-sound";
+    // saveLakeBill,
+    removeLakeBill,
+    removeBatchLakeBill,
+    updateLakeBill,
+    verifyLakeBill
+  } from "@/api/ecology/special-lake";
   import moment from "moment";
   export default {
-    name: 'ZoneCollectNoiseBill',
+    name: 'SpecialLakeCollectNoiseBill',
     components: {
       CheckOutlined,
       EditOutlined
@@ -144,11 +144,6 @@
             },
 
           },
-          {
-            title: '区域等级',
-            dataIndex: 'regionLevel',
-            sorter: true,
-          },
           {
             title: '条目',
             dataIndex: 'recordSize',
@@ -160,17 +155,17 @@
           //   dataIndex: 'title',
           //   sorter: true
           // },
-          {
-            title: '上报时间',
-            dataIndex: 'reportTime',
-            sorter: true,
-            slots: {
-              customRender: 'reportTime',
-            },
-            // customRender: ({
-            //   text
-            // }) => this.$util.toDateString(text)
-          },
+          // {
+          //   title: '上报时间',
+          //   dataIndex: 'reportTime',
+          //   sorter: true,
+          //   slots: {
+          //     customRender: 'reportTime',
+          //   },
+          //   // customRender: ({
+          //   //   text
+          //   // }) => this.$util.toDateString(text)
+          // },
           {
             title: '导入时间',
             dataIndex: 'createTime',
@@ -190,7 +185,7 @@
           },
           {
             title: '创建人',
-            dataIndex: 'username',
+            dataIndex: 'userName',
             sorter: true,
 
           },
@@ -245,18 +240,18 @@
       },
       detail(record) {
         this.$router.replace({
-          path: "/sound/zone/collect/noise/" + record.zoneNoiseBillId
+          path: "/water/lake/collect/special-water/" + record.lakeLibrarySpecialBillId
         })
       },
       edit(record) {
-        this.editableData[record.zoneNoiseBillId] = _.cloneDeep(record);
-        this.editableData[record.zoneNoiseBillId].reportTime = moment(this.editableData[record.zoneNoiseBillId]
+        this.editableData[record.lakeLibrarySpecialBillId] = _.cloneDeep(record);
+        this.editableData[record.lakeLibrarySpecialBillId].reportTime = moment(this.editableData[record.lakeLibrarySpecialBillId]
           .reportTime)
       },
       verify(record,checked) {
         const hide = this.$message.loading('请求中..', 0);
-        verifyZoneNoiseBill({
-          zoneNoiseBillId: record.zoneNoiseBillId,
+        verifyLakeBill({
+          lakeLibrarySpecialBillId: record.lakeLibrarySpecialBillId,
           checked
         }).then(res => {
           if (res.data.code == 0) {
@@ -280,19 +275,19 @@
       save(record) {
 
         let {
-          zoneNoiseBillId,
+          lakeLibrarySpecialBillId,
           billName,
           reportTime
-        } = this.editableData[record.zoneNoiseBillId];
-        if (!zoneNoiseBillId || !reportTime) {
+        } = this.editableData[record.lakeLibrarySpecialBillId];
+        if (!lakeLibrarySpecialBillId || !reportTime) {
           this.$message.error('请填写完整信息再提交')
           return
         }
         const hide = this.$message.loading('请求中..', 0);
         reportTime = reportTime.format("x")
         reportTime = Number(reportTime)
-        updateZoneNoiseBill({
-          zoneNoiseBillId,
+        updateLakeBill({
+          lakeLibrarySpecialBillId,
           billName,
           reportTime
         }).then(res => {
@@ -307,7 +302,7 @@
           console.log(e);
           this.$message.error(e.message);
         }).finally(() => {
-          delete this.editableData[record.zoneNoiseBillId]
+          delete this.editableData[record.lakeLibrarySpecialBillId]
           hide()
         })
 
@@ -315,7 +310,7 @@
       /* 删除单个 */
       remove(row) {
         const hide = this.$message.loading('请求中..', 0);
-        removeZoneNoiseBill(row.zoneNoiseBillId).then(res => {
+        removeLakeBill(row.lakeLibrarySpecialBillId).then(res => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();
@@ -327,9 +322,9 @@
         }).finally(() => hide());
       },
       removeBatch() {
-        const ids = this.selectionList.map(item => item.zoneNoiseBillId);
+        const ids = this.selectionList.map(item => item.lakeLibrarySpecialBillId);
         const hide = this.$message.loading('请求中..', 0);
-        removeBatchZoneNoiseBill(ids).then(res => {
+        removeBatchLakeBill(ids).then(res => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();
@@ -341,7 +336,7 @@
           this.$message.error(e.msg);
         }).finally(() => hide());
       },
-    
+
     }
   }
 </script>
@@ -389,4 +384,4 @@
   .editable-cell:hover .editable-cell-icon {
     display: inline-block;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/water/lake/collect/special-water.vue b/src/views/water/lake/collect/special-water.vue
new file mode 100644
index 0000000..ca29a37
--- /dev/null
+++ b/src/views/water/lake/collect/special-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.lakeLibrarySpecialId !== 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="lakeLibrarySpecialId"
+        :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 {
+  pageLakeUrl,
+  saveLake,
+  removeLake,
+  removeBatchLake,
+  updateLake,
+  getLakeBill,
+  // getColumnOptions,
+} from "@/api/ecology/special-lake";
+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: "LakeCollectWater",
+  components: {},
+  data() {
+    const { billId } = this.$route.params;
+    return {
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageLakeUrl,
+      selection: [],
+      tableColumns,
+      // 表格列配置
+      columns: [
+        ...tableColumns,
+        {
+          title: "创建人",
+          dataIndex: "userName",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+          slots: {
+            customRender: "action",
+          },
+        },
+      ],
+      // 表格搜索条件
+      lakeLibrarySpecialBillId: billId,
+      where: {
+        lakeLibrarySpecialBillId: billId,
+      },
+      // 表格选中数据
+      selectionList: [],
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 表单数据
+      form: {},
+      loading: false,
+      rules: {},
+    };
+  },
+  mounted() {
+    const { billId } = this.$route.params;
+    getLakeBill(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 = {
+        lakeLibrarySpecialBillId: this.lakeLibrarySpecialBillId,
+      };
+      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.lakeLibrarySpecialId) {
+        updateLake(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.lakeLibrarySpecialBillId = this.lakeLibrarySpecialBillId;
+        saveLake(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);
+      removeLake(row.lakeLibrarySpecialId)
+        .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.lakeLibrarySpecialId);
+      const hide = this.$message.loading("请求中..", 0);
+      removeBatchLake(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/lake/collect/utils.js b/src/views/water/lake/collect/utils.js
index 5759bab..ae2bb3b 100644
--- a/src/views/water/lake/collect/utils.js
+++ b/src/views/water/lake/collect/utils.js
@@ -1,165 +1,140 @@
+import moment from "moment";
 export default {
-    toObjData(excelData) {
+    // 城市内湖导入
+  toInnerCityLakeObjData(excelData,reportDate) {
+
         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(reportDate);
             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
-            }
+              monitorTime: monitorTime.getTime(),
+              province: "广西壮族自治区",
+              city: "南宁",
+              pointName: item[0],
+              waterTemperature: item[1],
+              ph: item[2],
+              transparency:item [3],
+              dissolvedOxygenSaturation:item [4],
+              dissolvedOxygen:item [5],
+              permanganateIndex:item [6],
+              fiveDayBod:item [7],
+              totalNitrogen:item [8],
+              ammonia:item [9],
+              volatilePhenol:item [10],
+              as:item [11],
+              hg:item [12],
+              cr6:item [13],
+              pb:item [14],
+              cd:item [15],
+              totalPhosphorus:item [16],
+              petro:item [17],
+              fecalColiforms:item [18],
+              cod:item [19],
+              chlA:item [20],
+              anSaa:item [21],
+              s:item [22],
+              oxidationReductionPotential:item [23],
+              remark:item [23],
 
-            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],
+// 五象湖
+  toWuxiangLakeObjData(excelData) {
+    return excelData.map(item => {
+      const row = {
+        province: "广西壮族自治区",
+        city: "南宁",
+        pointName: item[0],
+        monitorTime: moment(item[1],"YYYY年M月D日").valueOf(),
+        waterTemperature: item[2],
+        dissolvedOxygen:item [3],
+        dissolvedOxygenSaturation:item [4],
+        transparency:item [5],
+        ph:item [6],
+        fiveDayBod:item [7],
+        permanganateIndex:item [8],
+        cod:item [9],
+        ammonia:item [10],
+        chlA:item [11],
+        oxidationReductionPotential:item [12],
+        cr6:item [13],
+        hg:item [14],
+        pb:item [15],
+        as:item [16],
+        cd:item [17],
+        totalPhosphorus:item [18],
+        s:item [19],
+        petro:item [20],
+        totalNitrogen:item [21],
+        fecalColiforms:item [22],
+        anSaa:item [23],
+        remark:item [24],
 
-            }
-        })
+      }
+      return row;
+    })
 
-    },
-    // 解析县级数据
-    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
+  },
+  // 专项湖库
+  toSpecialLakeData(excelData) {
+    return excelData.map(item => {
+      const row = {
+        province: "广西壮族自治区",
+        city: "南宁",
+        // nothing: item[0],
+        stationName: item[1],
+        stationCode: item[2],
+        lakeLibraryName:item [3],
+        lakeLibraryCode:item [4],
+        sectionName:item [5],
+        sectionCode:item [6],
+        controlAttributes:item [7],
+        watershed:item [8],
+        monitorTime:item [9],
+        waterPeriodCode:item [10],
+        turbidity:item [11],
+        wTemp:item [12],
+        wd:item [13],
+        ph:item [14],
+        wCond:item [15],
+        transp:item [16],
+        dissolvedOxygen:item [17],
+        codmn:item [18],
+        bod5:item [19],
+        nh4N:item [20],
+        oils:item [21],
+        nTotal:item [22],
+        pTotal:item [23],
+        chlA:item [24],
+        vPhen:item [25],
+        wHg:item [26],
+        wPb:item [27],
+        codcr:item [28],
+        wCu:item [29],
+        wZn:item [30],
+        f:item [31],
+        se:item [32],
+        as:item [33],
+        cd:item [34],
+        cr6:item [35],
+        cnTotal:item [36],
+        anSaa:item [37],
+        s:item [38],
+        coloOrg:item [39],
+        so4:item [40],
+        cl:item [41],
+        no3N:item [42],
+        wFe:item [43],
+        wMn:item [44],
+        waterQualityCategory:item [45],
+        remark:item [49],
+        systemCode:item[47],
+      }
+      return row;
+    })
 
-            }
-            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/collect/water-bill.vue b/src/views/water/lake/collect/water-bill.vue
new file mode 100644
index 0000000..e4e407f
--- /dev/null
+++ b/src/views/water/lake/collect/water-bill.vue
@@ -0,0 +1,387 @@
+<template>
+  <div>
+            <!-- 表格 -->
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="lakeLibraryInnerCityBillId" :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.lakeLibraryInnerCityBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.lakeLibraryInnerCityBillId].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.lakeLibraryInnerCityBillId]" class="editable-cell-input-wrapper">
+              <a-date-picker v-model:value="editableData[record.lakeLibraryInnerCityBillId].reportTime"></a-date-picker>
+              <!-- <a-input v-model:value="editableData[record.lakeLibraryInnerCityBillId].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,
+    // saveLakeBill,
+    removeLakeBill,
+    removeBatchLakeBill,
+    updateLakeBill,
+    verifyLakeBill
+  } from "@/api/ecology/lake";
+  import moment from "moment";
+  export default {
+    name: 'LakeCollectNoiseBill',
+    components: {
+      CheckOutlined,
+      EditOutlined
+    },
+    data() {
+
+      return {
+        // 表格数据接口
+        url: pageBillUrl,
+        selection: [],
+        // 表格列配置
+        columns: [{
+            key: 'index',
+            dataIndex: 'index',
+            width: 48,
+            align: 'center',
+            customRender: ({
+              index
+            }) => index + 1
+          },
+          {
+            title: '表格名称',
+            dataIndex: 'billName',
+            sorter: true,
+            slots: {
+              customRender: 'billName',
+            },
+
+          },
+          {
+            title: '条目',
+            dataIndex: 'recordSize',
+            sorter: true,
+
+          },
+          // {
+          //   title: '菜单名称',
+          //   dataIndex: 'title',
+          //   sorter: true
+          // },
+          // {
+          //   title: '上报时间',
+          //   dataIndex: 'reportTime',
+          //   sorter: true,
+          //   slots: {
+          //     customRender: 'reportTime',
+          //   },
+          //   // customRender: ({
+          //   //   text
+          //   // }) => this.$util.toDateString(text)
+          // },
+          {
+            title: '导入时间',
+            dataIndex: 'createTime',
+            sorter: true,
+            customRender: ({
+              text
+            }) => this.$util.toDateString(text)
+          },
+          {
+            title: '审核状态',
+            dataIndex: 'checked',
+            sorter: true,
+            slots: {
+              customRender: 'checked',
+            },
+
+          },
+          {
+            title: '创建人',
+            dataIndex: 'userName',
+            sorter: true,
+
+          },
+          // {
+          //   title: '更新时间',
+          //   dataIndex: 'updateTime',
+          //   sorter: true,
+          //   customRender: ({
+          //     text
+          //   }) => this.$util.toDateString(text)
+          // },
+          {
+            title: '操作',
+            key: 'action',
+            width: 150,
+            align: 'center',
+            slots: {
+              customRender: 'action'
+            }
+          }
+        ],
+        // 表格搜索条件
+        where: {},
+        reportTimeScope: [],
+        // 表格选中数据
+        selectionList: [],
+        editableData: {},
+        // 当前编辑数据
+        current: null,
+      };
+    },
+    methods: {
+
+
+      /* 刷新表格 */
+      reload() {
+        this.where.reportTimeStart = null;
+        this.where.reportTimeEnd = null;
+        if (this.reportTimeScope && this.reportTimeScope.length == 2) {
+          this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
+          this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
+        }
+        this.$refs.table.reload({
+          where: this.where
+        });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {};
+        this.reportTimeScope = [];
+        this.reload();
+      },
+      detail(record) {
+        this.$router.replace({
+          path: "/water/lake/collect/water/" + record.lakeLibraryInnerCityBillId
+        })
+      },
+      edit(record) {
+        this.editableData[record.lakeLibraryInnerCityBillId] = _.cloneDeep(record);
+        this.editableData[record.lakeLibraryInnerCityBillId].reportTime = moment(this.editableData[record.lakeLibraryInnerCityBillId]
+          .reportTime)
+      },
+      verify(record,checked) {
+        const hide = this.$message.loading('请求中..', 0);
+        verifyLakeBill({
+          lakeLibraryInnerCityBillId: record.lakeLibraryInnerCityBillId,
+          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 {
+          lakeLibraryInnerCityBillId,
+          billName,
+          reportTime
+        } = this.editableData[record.lakeLibraryInnerCityBillId];
+        if (!lakeLibraryInnerCityBillId || !reportTime) {
+          this.$message.error('请填写完整信息再提交')
+          return
+        }
+        const hide = this.$message.loading('请求中..', 0);
+        reportTime = reportTime.format("x")
+        reportTime = Number(reportTime)
+        updateLakeBill({
+          lakeLibraryInnerCityBillId,
+          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.lakeLibraryInnerCityBillId]
+          hide()
+        })
+
+      },
+      /* 删除单个 */
+      remove(row) {
+        const hide = this.$message.loading('请求中..', 0);
+        removeLakeBill(row.lakeLibraryInnerCityBillId).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.lakeLibraryInnerCityBillId);
+        const hide = this.$message.loading('请求中..', 0);
+        removeBatchLakeBill(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/lake/collect/water.vue b/src/views/water/lake/collect/water.vue
new file mode 100644
index 0000000..cafe2b3
--- /dev/null
+++ b/src/views/water/lake/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.lakeLibrarySpecialId !== 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="lakeLibrarySpecialId"
+        :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 {
+  pageLakeUrl,
+  saveLake,
+  removeLake,
+  removeBatchLake,
+  updateLake,
+  getLakeBill,
+  // getColumnOptions,
+} from "@/api/ecology/lake";
+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: "SpecialLakeCollectWater",
+  components: {},
+  data() {
+    const { billId } = this.$route.params;
+    return {
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageLakeUrl,
+      selection: [],
+      tableColumns,
+      // 表格列配置
+      columns: [
+        ...tableColumns,
+        {
+          title: "创建人",
+          dataIndex: "userName",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+          slots: {
+            customRender: "action",
+          },
+        },
+      ],
+      // 表格搜索条件
+      lakeLibraryInnerCityBillId: billId,
+      where: {
+        lakeLibraryInnerCityBillId: billId,
+      },
+      // 表格选中数据
+      selectionList: [],
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 表单数据
+      form: {},
+      loading: false,
+      rules: {},
+    };
+  },
+  mounted() {
+    const { billId } = this.$route.params;
+    getLakeBill(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 = {
+        lakeLibraryInnerCityBillId: this.lakeLibraryInnerCityBillId,
+      };
+      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.lakeLibrarySpecialId) {
+        updateLake(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.lakeLibraryInnerCityBillId = this.lakeLibraryInnerCityBillId;
+        saveLake(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);
+      removeLake(row.lakeLibrarySpecialId)
+        .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.lakeLibrarySpecialId);
+      const hide = this.$message.loading("请求中..", 0);
+      removeBatchLake(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/river-station/collect/colums.js b/src/views/water/river-station/collect/colums.js
new file mode 100644
index 0000000..9b77e15
--- /dev/null
+++ b/src/views/water/river-station/collect/colums.js
@@ -0,0 +1,21 @@
+const tableColumns = [
+  {title: "城区", dataIndex: "area", sorter: true,},
+  {title: "县", dataIndex: "county", sorter: true,},
+  {title: "所在流域", dataIndex: "watershed", sorter: true,},
+  {title: "所在河流", dataIndex: "river", sorter: true,},
+  {title: "站点名称", dataIndex: "place", sorter: true,},
+  {title: "本期水质", dataIndex: "periodWaterQuality", sorter: true,},
+  {title: "水温", dataIndex: "waterTemperature", sorter: true,},
+  {title: "pH值", dataIndex: "ph", sorter: true,},
+  {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,},
+  {title: "电导率", dataIndex: "conductivity", sorter: true,},
+  {title: "浊度", dataIndex: "turbidity", sorter: true,},
+  {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,},
+  {title: "氨氮", dataIndex: "ammonia", sorter: true,},
+  {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,},
+  {title: "总氮", dataIndex: "totalNitrogen", sorter: true,},
+  {title: "主要污染指标（超标倍数）", dataIndex: "mainPollutionIndicators", sorter: true,},
+  {title: "备注", dataIndex: "remark", sorter: true,},
+];
+
+export {tableColumns}
diff --git a/src/views/water/river-station/collect/index.vue b/src/views/water/river-station/collect/index.vue
new file mode 100644
index 0000000..fb90153
--- /dev/null
+++ b/src/views/water/river-station/collect/index.vue
@@ -0,0 +1,351 @@
+<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="importFileCountyTop"
+            :showUploadList="false"
+            accept=".xls,.xlsx,.csv"
+          >
+            <a-button>县级地表水导入</a-button>
+          </a-upload>
+          <a-upload
+            :before-upload="importFileCountyBottom"
+            :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="water">
+          <water-bill ref="water"></water-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 WaterBill from "./water-bill.vue";
+import { saveRiverStationBill } from "@/api/ecology/river-station";
+export default {
+  name: "RiverStationCollectIndex",
+  components: {
+    WaterBill,
+  },
+  data() {
+    return {
+      activeKey: "water",
+    };
+  },
+  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 aoa1 = XLSX.utils.sheet_to_json(
+            workbook.Sheets["地表水数据录入表"],
+            {
+              header: 1,
+            }
+          );
+          let aoa2 = XLSX.utils.sheet_to_json(
+            workbook.Sheets["备用水源数据录入表"],
+            {
+              header: 1,
+            }
+          );
+          console.log(sheetNames);
+          const reportDate1 = aoa1[2][0].replace(/[^\d]+/g, "-");
+          const reportDate2 = aoa2[2][0].replace(/[^\d]+/g, "-");
+
+          const waterFunctionAreaList = aoa1.filter((item) => {
+            return (
+              item.length >= 100 && item[0] && !item[0].includes("点位名称")
+            );
+          });
+          const waterFunctionAreaList2 = aoa2.filter((item) => {
+            return (
+              item.length >= 100 && item[0] && !item[0].includes("点位名称")
+            );
+          });
+
+          // 解析成对象数组
+          const billName1 = aoa1[0][0] + aoa1[1][0];
+          const billData1 = utils.toCityUseTopWaterObjData(waterFunctionAreaList);
+          const billName2 = aoa2[0][0] + aoa2[1][0];
+          const billData2 =
+            utils.toCitySpareTopWaterObjData(waterFunctionAreaList2);
+
+          if (
+            (!billData1 || billData1.length == 0) &&
+            (!billData2 || billData2.length == 0)
+          ) {
+            hide();
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
+
+          const tasks = [];
+          if (billData1.length > 0) {
+            tasks.push(
+              saveRiverStationBill({
+                reportTime: new Date(reportDate1).getTime(),
+                billName: billName1,
+                regionLevel: "市级",
+                waterSourceType: 1,
+                waterFunctionAreaType: 1,
+                waterFunctionAreaList: billData1,
+              })
+            );
+          }
+
+          if (billData2.length > 0) {
+            tasks.push(
+              saveRiverStationBill({
+                reportTime: new Date(reportDate2).getTime(),
+                billName: billName2,
+                regionLevel: "市级",
+                waterSourceType: 1,
+                waterFunctionAreaType: 2,
+                waterFunctionAreaList: billData2,
+              })
+            );
+          }
+
+          // 上传到服务器
+
+          Promise.all(tasks)
+            .then((res) => {
+              // const sum = res
+              if (res[0].data.code == 0) {
+                Modal.success({
+                  title: "导入成功",
+                  content: `成功导入${
+                    billData1.length + billData2.length
+                  }条数据`,
+                });
+                this.$refs.water && this.$refs.water.reload();
+                this.$refs.place && this.$refs.place.reload();
+              }
+            })
+            .catch(() => {
+              Modal.error({
+                title: "导入失败",
+                content: "数据上传出错",
+              });
+            })
+            .finally(() => {
+              hide();
+            });
+        } catch (error) {
+          console.log(error);
+          hide();
+          Modal.error({
+            title: "导入失败",
+            content: error.message,
+          });
+        }
+        // console.log(billData1);
+      };
+      reader.readAsArrayBuffer(file);
+
+      return false;
+    },
+    importFileCountyTop(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 aoa1 = XLSX.utils.sheet_to_json(workbook.Sheets["地表水数据录入表"], {
+            header: 1,
+          });
+
+          const reportDate = aoa1[1][0].replace(/[^\d]+/g, "-");
+          const waterFunctionAreaList = aoa1.filter((item) => {
+            return item.length >= 100 && item[0] && item[0] != "点位名称";
+          });
+
+          // 解析成对象数组
+          const billName1 = aoa1[0][0];
+          const billData1 = utils.toCountyUseTopWaterObjData(waterFunctionAreaList);
+
+          if (!billData1 || billData1.length == 0) {
+            hide();
+            Modal.error({
+              title: "导入失败",
+              content: "找不到可用数据",
+            });
+
+            return;
+          }
+
+          if (billData1.length > 0) {
+            // 上传到服务器
+            saveRiverStationBill({
+              reportTime: new Date(reportDate).getTime(),
+              billName: billName1,
+              regionLevel: "县级",
+              waterSourceType: 1,
+              waterFunctionAreaType: 2,
+              waterFunctionAreaList: billData1,
+            })
+              .then((res) => {
+                if (res.data.code == 0) {
+                  Modal.success({
+                    title: "导入成功",
+                    content: `成功导入${billData1.length}条数据`,
+                  });
+                  this.$refs.water && this.$refs.water.reload();
+                } else {
+                  Modal.error({
+                    title: "导入失败",
+                    content: "数据上传出错",
+                  });
+                }
+              })
+              .catch(() => {
+                Modal.error({
+                  title: "导入失败",
+                  content: "数据上传出错",
+                });
+              })
+              .finally(() => {
+                hide();
+              });
+          }
+        } catch (error) {
+          hide();
+          Modal.error({
+            title: "导入失败",
+            content: error.message,
+          });
+        }
+        // console.log(billData1);
+      };
+      reader.readAsArrayBuffer(file);
+      return false;
+    },
+    importFileCountyBottom(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 aoa1 = XLSX.utils.sheet_to_json(workbook.Sheets["县级地下水录入版"], {
+            header: 1,
+          });
+
+          const waterFunctionAreaList = aoa1.filter((item) => {
+            return item.length >= 80 && item[0] && !item[0].includes("县域名称");
+          });
+
+          // 解析成对象数组
+          const billName1 = aoa1[0][1];
+          const billData1 = utils.toCountyUseBottomWaterObjData(waterFunctionAreaList);
+
+          if (!billData1 || billData1.length == 0) {
+            hide();
+            Modal.error({
+              title: "导入失败",
+              content: "找不到可用数据",
+            });
+
+            return;
+          }
+
+          if (billData1.length > 0) {
+            // 上传到服务器
+            saveRiverStationBill({
+              billName: billName1,
+              regionLevel: "县级",
+              waterSourceType: 2,
+              waterFunctionAreaType: 2,
+              waterFunctionAreaList: billData1,
+            })
+              .then((res) => {
+                if (res.data.code == 0) {
+                  Modal.success({
+                    title: "导入成功",
+                    content: `成功导入${billData1.length}条数据`,
+                  });
+                  this.$refs.water && this.$refs.water.reload();
+                } else {
+                  Modal.error({
+                    title: "导入失败",
+                    content: "数据上传出错",
+                  });
+                }
+              })
+              .catch(() => {
+                Modal.error({
+                  title: "导入失败",
+                  content: "数据上传出错",
+                });
+              })
+              .finally(() => {
+                hide();
+              });
+          }
+        } catch (error) {
+          hide();
+          Modal.error({
+            title: "导入失败",
+            content: error.message,
+          });
+          console.log(error);
+
+        }
+      };
+      reader.readAsArrayBuffer(file);
+      return false;
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>
diff --git a/src/views/water/river-station/collect/utils.js b/src/views/water/river-station/collect/utils.js
new file mode 100644
index 0000000..0304802
--- /dev/null
+++ b/src/views/water/river-station/collect/utils.js
@@ -0,0 +1,3 @@
+export default {
+
+}
diff --git a/src/views/water/river-station/collect/water-bill.vue b/src/views/water/river-station/collect/water-bill.vue
new file mode 100644
index 0000000..7618027
--- /dev/null
+++ b/src/views/water/river-station/collect/water-bill.vue
@@ -0,0 +1,389 @@
+<template>
+  <div>
+            <!-- 表格 -->
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="waterStationWaterFunctionAreaBillId" :datasource="url"
+        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
+        <template #toolbar>
+
+          <!-- 搜索表单 -->
+          <a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
+            <a-form-item label="审核状态:">
+              <a-select v-model:value="where.checked" allowClear placeholder="未选择">
+                <a-select-option :value="1">已审核</a-select-option>
+                <a-select-option :value="0">未审核</a-select-option>
+              </a-select>
+            </a-form-item>
+
+            <a-form-item label="表格名称:">
+              <a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
+            </a-form-item>
+
+            <a-form-item label="上报时间:">
+              <a-range-picker separator="~" v-model:value="reportTimeScope" />
+            </a-form-item>
+
+            <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
+              <a-space>
+                <a-button type="primary" @click="reload">查询</a-button>
+                <a-button @click="reset">重置</a-button>
+              </a-space>
+            </a-form-item>
+          </a-form>
+        </template>
+        <template #toolkit>
+          <a-popconfirm :disabled="selectionList.length == 0" :title="`确认删除${selectionList.length}条数据吗?`" ok-text="Yes"
+            cancel-text="No" @confirm="removeBatch">
+            <a-button :disabled="selectionList.length == 0" type="primary" ghost danger>批量删除</a-button>
+          </a-popconfirm>
+        </template>
+        <template #billName="{ text, record }">
+          <div class="editable-cell">
+            <div v-if="editableData[record.waterStationWaterFunctionAreaBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.waterStationWaterFunctionAreaBillId].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.waterStationWaterFunctionAreaBillId]" class="editable-cell-input-wrapper">
+              <a-date-picker v-model:value="editableData[record.waterStationWaterFunctionAreaBillId].reportTime"></a-date-picker>
+              <!-- <a-input v-model:value="editableData[record.waterStationWaterFunctionAreaBillId].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,
+    // saveRiverStationBill,
+    removeRiverStationBill,
+    removeBatchRiverStationBill,
+    updateRiverStationBill,
+    verifyRiverStationBill
+  } from "@/api/ecology/river-station";
+  import moment from "moment";
+  export default {
+    name: 'DrinkingCollectWaterBill',
+    components: {
+      CheckOutlined,
+      EditOutlined
+    },
+    data() {
+
+      return {
+        // 表格数据接口
+        url: pageBillUrl,
+        selection: [],
+        // 表格列配置
+        columns: [{
+            key: 'index',
+            dataIndex: 'index',
+            width: 48,
+            align: 'center',
+            customRender: ({
+              index
+            }) => index + 1
+          },
+          {
+            title: '表格名称',
+            dataIndex: 'billName',
+            sorter: true,
+            slots: {
+              customRender: 'billName',
+            },
+
+          },
+          {
+            title: '条目',
+            dataIndex: 'recordSize',
+            sorter: true,
+
+          },
+          // {
+          //   title: '菜单名称',
+          //   dataIndex: 'title',
+          //   sorter: true
+          // },
+          // {
+          //   title: '监测时间',
+          //   dataIndex: 'reportTime',
+          //   sorter: true,
+          //   slots: {
+          //     customRender: 'reportTime',
+          //   },
+          //   // customRender: ({
+          //   //   text
+          //   // }) => this.$util.toDateString(text)
+          // },
+          // {
+          //   title: '导入时间',
+          //   dataIndex: 'createTime',
+          //   sorter: true,
+          //   customRender: ({
+          //     text
+          //   }) => this.$util.toDateString(text)
+          // },
+           {
+            title: '导入时间',
+            dataIndex: '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/station/collect/water/" + record.waterStationWaterFunctionAreaBillId
+        })
+      },
+      edit(record) {
+        this.editableData[record.waterStationWaterFunctionAreaBillId] = _.cloneDeep(record);
+        this.editableData[record.waterStationWaterFunctionAreaBillId].reportTime = moment(this.editableData[record.waterStationWaterFunctionAreaBillId]
+          .reportTime)
+      },
+      verify(record,checked) {
+        const hide = this.$message.loading('请求中..', 0);
+        verifyRiverStationBill({
+          waterStationWaterFunctionAreaBillId: record.waterStationWaterFunctionAreaBillId,
+          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 {
+          waterStationWaterFunctionAreaBillId,
+          billName,
+          reportTime
+        } = this.editableData[record.waterStationWaterFunctionAreaBillId];
+        if (!waterStationWaterFunctionAreaBillId || !reportTime) {
+          this.$message.error('请填写完整信息再提交')
+          return
+        }
+        const hide = this.$message.loading('请求中..', 0);
+        reportTime = reportTime.format("x")
+        reportTime = Number(reportTime)
+        updateRiverStationBill({
+          waterStationWaterFunctionAreaBillId,
+          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.waterStationWaterFunctionAreaBillId]
+          hide()
+        })
+
+      },
+      /* 删除单个 */
+      remove(row) {
+        const hide = this.$message.loading('请求中..', 0);
+        removeRiverStationBill(row.waterStationWaterFunctionAreaBillId).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.waterStationWaterFunctionAreaBillId);
+        const hide = this.$message.loading('请求中..', 0);
+        removeBatchRiverStationBill(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-station/collect/water.vue b/src/views/water/river-station/collect/water.vue
new file mode 100644
index 0000000..0c8b92c
--- /dev/null
+++ b/src/views/water/river-station/collect/water.vue
@@ -0,0 +1,351 @@
+<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.waterStationRiverStationId !== undefined ? '修改记录' : '添加记录'"
+        :confirm-loading="loading"
+        :width="1000"
+        :body-style="{ paddingBottom: '8px' }"
+        @ok="save"
+      >
+        <a-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          :label-col="{ md: { span: 24 }, sm: { span: 24 } }"
+          :wrapper-col="{ md: { span: 24 }, sm: { span: 24 } }"
+          layout="vertical"
+          labelAlign="left"
+        >
+          <a-row gutter="12"	>
+            <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>
+            <template  v-for="(item,index) in tableColumns" :key="index">
+              <template v-if="item.children">
+                <a-col  v-for="(citem,cindex) in item.children" :key="cindex"  :md="12" :sm="24">
+                  <a-form-item :label="item.title + '-' + citem.title" :name="citem.dataIndex">
+                    <a-input
+                      v-model:value="form[citem.dataIndex]"
+                      :placeholder="'请输入' +item.title + '-' + citem.title"
+                      allow-clear
+                    />
+                  </a-form-item>
+                </a-col>
+              </template>
+              <template v-else>
+                <a-col :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>
+              </template>
+            </template>
+
+          </a-row>
+        </a-form>
+      </a-modal>
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="waterStationRiverStationId"
+        :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 {
+  pageRiverStationUrl,
+  saveRiverStation,
+  removeRiverStation,
+  removeBatchRiverStation,
+  updateRiverStation,
+  getRiverStationBill,
+  // getColumnOptions,
+} from "@/api/ecology/river-station";
+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: "RiverStationCollectWater",
+  components: {},
+  data() {
+    const { billId } = this.$route.params;
+    return {
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageRiverStationUrl,
+      selection: [],
+      tableColumns,
+      // 表格列配置
+      columns: [
+        ...tableColumns,
+
+        {
+          title: "创建人",
+          dataIndex: "userName",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+          slots: {
+            customRender: "action",
+          },
+        },
+      ],
+      // 表格搜索条件
+      nationalLevelRiverStationBillId: billId,
+      where: {
+        nationalLevelRiverStationBillId: billId,
+      },
+      // 表格选中数据
+      selectionList: [],
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 表单数据
+      form: {},
+      loading: false,
+      rules: {},
+    };
+  },
+  mounted() {
+    const { billId } = this.$route.params;
+    getRiverStationBill(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("--------------------------")
+      console.log(this.url);
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        nationalLevelRiverStationBillId: this.nationalLevelRiverStationBillId,
+      };
+      this.reload();
+    },
+    /* 显示编辑 */
+    openEdit(record) {
+      const cloneRecord = _.cloneDeep(record);
+      if (record && cloneRecord.samplingTime) {
+        console.log(moment(cloneRecord.monitorTime).format("YYYY MM DD"));
+        cloneRecord.monitorDate = moment(cloneRecord.samplingTime);
+        cloneRecord.monitorTime = moment(cloneRecord.samplingTime);
+      }
+      // 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.samplingTime = 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"];
+      delete form["monitorTime"];
+      if (form.waterStationRiverStationId) {
+        updateRiverStation(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.nationalLevelRiverStationBillId = this.nationalLevelRiverStationBillId;
+        saveRiverStation(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);
+      removeRiverStation(row.waterStationRiverStationId)
+        .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.waterStationRiverStationId);
+      const hide = this.$message.loading("请求中..", 0);
+      removeBatchRiverStation(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/river-station/statistic/average.vue b/src/views/water/river-station/statistic/average.vue
new file mode 100644
index 0000000..fb5825a
--- /dev/null
+++ b/src/views/water/river-station/statistic/average.vue
@@ -0,0 +1,258 @@
+<template>
+  <div class="">
+    <ele-pro-table
+      ref="table"
+      row-key="id"
+      :datasource="url"
+      :columns="columns"
+      :where="where"
+      :needPage="false"
+      @done="(d) => (data = d.data)"
+      :scroll="{ x: 'max-content' }"
+    >
+      <template #toolbar>
+        <!-- 搜索表单 -->
+        <a-form :model="where" layout="inline" :labelCol="{ offset: 1 }">
+          <a-row>
+            <a-col :lg="6" :md="12" :sm="24" :xs="24">
+              <a-form-item label="昼夜:">
+                <a-select
+                  :options="timeSlotOptions"
+                  v-model:value="where.timeSlot"
+                  placeholder="昼夜"
+                >
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8" :md="12" :sm="24" :xs="24">
+              <a-form-item label="时间范围:">
+                <!-- <a-month-picker v-model:value="timeScope" placeholder="起始" /> -->
+                <a-range-picker v-model:value="timeScope" format="YYYY-MM-DD" />
+              </a-form-item>
+            </a-col>
+
+            <a-col :lg="4" :md="12" :sm="24" :xs="24">
+              <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+                <a-space>
+                  <a-button type="primary" @click="reload">查询</a-button>
+                  <a-button @click="reset">重置</a-button>
+                  <a-button @click="exportFile">导出excel</a-button>
+                </a-space>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+        <!-- <a-space>
+            
+          </a-space> -->
+      </template>
+      <template #Leq="{ text, record }">
+        <a-tag
+          v-if="
+            (where.timeSlot == '昼' && text <= 68) ||
+            (where.timeSlot == '夜' && text <= 58)
+          "
+          color="green"
+          >{{ text }}</a-tag
+        >
+        <a-tag
+          v-else-if="
+            (record.timeSlot == '昼' && text > 68 && text <= 70) ||
+            (record.timeSlot == '夜' && text > 58 && text <= 60)
+          "
+          color="blue"
+          >{{ text }}</a-tag
+        >
+        <a-tag
+          v-else-if="
+            (record.timeSlot == '昼' && text > 70 && text <= 72) ||
+            (record.timeSlot == '夜' && text > 60 && text <= 62)
+          "
+          color="red"
+          >{{ text }}</a-tag
+        >
+        <a-tag
+          v-else-if="
+            (record.timeSlot == '昼' && text > 62 && text <= 74) ||
+            (record.timeSlot == '夜' && text > 62 && text <= 64)
+          "
+          color="red"
+          >{{ text }}</a-tag
+        >
+        <a-tag
+          v-else-if="
+            (record.timeSlot == '昼' && text > 74) ||
+            (record.timeSlot == '夜' && text > 64)
+          "
+          color="red"
+          >{{ text }}</a-tag
+        >
+        <template v-else color="#FFF">{{ text }}</template>
+      </template>
+    </ele-pro-table>
+  </div>
+</template>
+
+<script>
+import _ from "lodash";
+import XLSX from "xlsx";
+import { pageRoadNoiseStatisticUrl } from "@/api/ecology/road-sound";
+const columns = [
+  {
+    title: "城区",
+    dataIndex: "area",
+  },
+
+  {
+    title: "市",
+    dataIndex: "city",
+  },
+  {
+    title: "路长",
+    dataIndex: "roadLength",
+  },
+  {
+    title: "路宽",
+    dataIndex: "roadWidth",
+  },
+  {
+    title: "LeqdB(A)",
+    dataIndex: "avgLeq",
+    slots: { customRender: "Leq" },
+    sorter: true,
+  },
+  {
+    title: "SDdB(A)",
+    dataIndex: "avgSD",
+  },
+  {
+    title: "L10dB(A)",
+    dataIndex: "avgL10",
+  },
+  {
+    title: "L50dB(A)",
+    dataIndex: "avgL50",
+  },
+  {
+    title: "L90dB(A)",
+    dataIndex: "avgL90",
+  },
+];
+export default {
+  name: "StatisticSoundRoadAverage",
+  components: {},
+  data() {
+    return {
+      url: pageRoadNoiseStatisticUrl,
+      data: [],
+      where: {
+        model: "area",
+        timeSlot: "昼"
+      },
+      timeScope: [],
+      columns,
+      modelOptions: [
+        {
+          value: "place",
+          label: "测点",
+        },
+        {
+          value: "road",
+          label: "路段",
+        },
+        {
+          value: "area",
+          label: "城区",
+        },
+        {
+          value: "city",
+          label: "市",
+        },
+      ],
+      timeSlotOptions: [
+        {
+          value: "昼",
+          label: "昼",
+        },
+        {
+          value: "夜",
+          label: "夜",
+        },
+      ],
+    };
+  },
+  methods: {
+    /* 刷新表格 */
+    reload() {
+      this.$refs.table.reload({
+        where: {
+          model: this.where.model,
+          timeStart:
+            this.timeScope.length == 2
+              ? this.timeScope[0].format("Y-M-D")
+              : null,
+          timeEnd:
+            this.timeScope.length == 2
+              ? this.timeScope[1].format("Y-M-D")
+              : null,
+          timeSlot: this.where.timeSlot,
+        },
+      });
+      let cloneColumns = _.cloneDeep(columns);
+      if (this.where.model == "area") {
+        this.columns = cloneColumns.filter((item) => {
+          return item.dataIndex != "place" && item.dataIndex != "road";
+        });
+      } else if (this.where.model == "road") {
+        this.columns = cloneColumns.filter((item) => {
+          return item.dataIndex != "place";
+        });
+      } else if (this.where.model == "city") {
+        this.columns = cloneColumns.filter((item) => {
+          return (
+            item.dataIndex != "place" &&
+            item.dataIndex != "road" &&
+            item.dataIndex != "area"
+          );
+        });
+      }
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        model: "area",
+        timeSlot: "昼",
+      };
+      this.this.timeScope = [];
+
+      this.reload();
+    },
+    exportFile() {
+      let array = [
+        ["测点", "路段", "城区", "路长", "路宽", "平均Leq", "平均SD"],
+      ];
+      this.data.forEach((d) => {
+        array.push([
+          d.place,
+          d.road,
+          d.area,
+          d.roadLength,
+          d.roadWidth,
+          d.avgLeq,
+          d.avgSD,
+        ]);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(array);
+      // sheet['!merges'] = [
+      //   {s: {r: 0, c: 1}, e: {r: 0, c: 5}},  // 合并第0行第1列到第0行第5列
+      //   {s: {r: 0, c: 0}, e: {r: 1, c: 0}},  // 合并第0行第0列到第1行第0列
+      //   {s: {r: 0, c: 6}, e: {r: 1, c: 6}}  // 合并第0行第6列到第1行第6列
+      // ];
+      this.$util.exportSheet(XLSX, sheet, "道路交通噪声统计表");
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/water/river-station/statistic/base.vue b/src/views/water/river-station/statistic/base.vue
new file mode 100644
index 0000000..75e6a60
--- /dev/null
+++ b/src/views/water/river-station/statistic/base.vue
@@ -0,0 +1,571 @@
+<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.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>
+                <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="roadNoiseId"
+        :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 { pageRoadNoiseUrl, getColumnOptions } from "@/api/ecology/road-sound";
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+// import moment from "moment";
+//   import utils from "./utils";
+export default {
+  name: "StatisticSoundRoadBase",
+  components: {},
+  data() {
+    return {
+      data: [],
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageRoadNoiseUrl,
+      selection: [],
+      // 表格列配置
+      columns: [
+        {
+          title: "监测日期",
+          dataIndex: "monitorTime",
+          sorter: true,
+        },
+        {
+          title: "测点名称",
+          dataIndex: "place",
+          sorter: true,
+        },
+        {
+          title: "点号",
+          dataIndex: "placeCode",
+          sorter: true,
+        },
+        {
+          title: "所属路段",
+          dataIndex: "road",
+          sorter: true,
+        },
+        {
+          title: "所属城区",
+          dataIndex: "area",
+          sorter: true,
+        },
+        {
+          title: "路长",
+          dataIndex: "roadLength",
+          sorter: true,
+        },
+        {
+          title: "路宽",
+          dataIndex: "roadWidth",
+          sorter: true,
+        },
+        {
+          title: "中小型车流量（辆/20分钟）",
+          dataIndex: "smallTrafficFlow",
+          sorter: true,
+        },
+        {
+          title: "大型车流量（辆/20分钟）",
+          dataIndex: "largeTrafficFlow",
+          sorter: true,
+        },
+        {
+          title: "时段",
+          dataIndex: "timeSlot",
+          sorter: true,
+        },
+        //   {
+        //     title: '月',
+        //     dataIndex: 'monitorMonth',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '日',
+        //     dataIndex: 'monitorDay',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '时',
+        //     dataIndex: 'monitorHour',
+        //     sorter: true
+        //   },
+        //   {
+        //     title: '分',
+        //     dataIndex: 'monitorMinute',
+        //     sorter: true
+        //   },
+        {
+          title: "LeqdB(A)",
+          dataIndex: "indexLeq",
+          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: "placeLng",
+          sorter: true,
+        },
+        {
+          title: "测点纬度",
+          dataIndex: "placeLat",
+          sorter: true,
+        },
+        {
+          title: "机动车车道数",
+          dataIndex: "motorway",
+          sorter: true,
+        },
+        {
+          title: "车道类别",
+          dataIndex: "motorwayType",
+          sorter: true,
+        },
+        {
+          title: "道路等级",
+          dataIndex: "motorwayLevel",
+          sorter: true,
+        },
+        {
+          title: "测点参照物",
+          dataIndex: "refObj",
+          sorter: true,
+        },
+        {
+          title: "道路覆盖人口（万人）",
+          dataIndex: "people",
+          sorter: true,
+        },
+        {
+          title: "监测站名",
+          dataIndex: "station",
+          sorter: true,
+        },
+        {
+          title: "监测仪器型号",
+          dataIndex: "monitorInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "监测仪器编号",
+          dataIndex: "monitorInstrumentCode",
+          sorter: true,
+        },
+        {
+          title: "监测前校准值",
+          dataIndex: "beforeMonitorValue",
+          sorter: true,
+        },
+        {
+          title: "声校准器测量声压值",
+          dataIndex: "soundPressureValue",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器型号",
+          dataIndex: "soundInstrumentModel",
+          sorter: true,
+        },
+        {
+          title: "声校准仪器编号",
+          dataIndex: "soundInstrumentCode",
+          sorter: true,
+        },
+         {
+          title: "区域等级",
+          dataIndex: "regionLevel",
+          sorter: true,
+        },
+        {
+          title: "备注",
+          dataIndex: "remark",
+          sorter: true,
+        },
+        {
+          title: "创建人",
+          dataIndex: "username",
+          sorter: true,
+        },
+      ],
+      palceOptions: [],
+      areaOptions: [],
+      roadOptions: [],
+      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("road").then((res) => {
+        this.roadOptions = 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: "road",
+          sorter: true,
+        },
+         {
+          title: "路段长度（m）",
+          dataIndex: "roadLength",
+          sorter: true,
+        },
+        {
+          title: "道路总宽度（m）",
+          dataIndex: "roadWidth",
+          sorter: true,
+        },
+         {
+          title: "机动车车道数",
+          dataIndex: "motorway",
+          sorter: true,
+        },
+        {
+          title: "车道类别",
+          dataIndex: "motorwayType",
+          sorter: true,
+        },
+        {
+          title: "道路等级",
+          dataIndex: "motorwayLevel",
+          sorter: true,
+        },
+        {
+          title: "测点参照物",
+          dataIndex: "refObj",
+          sorter: true,
+        },
+         {
+          title: "路段覆盖人口（万人）",
+          dataIndex: "people",
+          sorter: true,
+        },
+        {
+          title: "月",
+          dataIndex: "monitorMonth",
+          sorter: true,
+        },
+        {
+          title: "日",
+          dataIndex: "monitorDay",
+          sorter: true,
+        },
+        {
+          title: "时",
+          dataIndex: "monitorHour",
+          sorter: true,
+        },
+        {
+          title: "分",
+          dataIndex: "monitorMinute",
+          sorter: true,
+        },
+       
+       
+        {
+          title: "中小型车20min车流量",
+          dataIndex: "smallTrafficFlow",
+          sorter: true,
+        },
+        {
+          title: "大型车20min车流量",
+          dataIndex: "largeTrafficFlow",
+          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/river-station/statistic/compare.vue b/src/views/water/river-station/statistic/compare.vue
new file mode 100644
index 0000000..733daea
--- /dev/null
+++ b/src/views/water/river-station/statistic/compare.vue
@@ -0,0 +1,508 @@
+<template>
+  <div class="">
+    <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
+      <a-row>
+        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="统计模块:">
+            <a-select
+              :options="groupModelOptions"
+              v-model:value="where.groupModel"
+              placeholder="统计模块"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col> -->
+        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="时间细度:">
+            <a-select
+              :options="groupTimeLengthOptions"
+              v-model:value="where.groupTimeLength"
+              placeholder=""
+            >
+            </a-select>
+          </a-form-item>
+        </a-col> -->
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item name="timeRange" label="时间范围:">
+            <a-range-picker
+              @panelChange="timeRangePanelChange"
+              v-model:value="timeRange"
+              format="YYYY"
+              :mode="['year', 'year']"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col :lg="6" :md="12" :sm="24" :xs="24">
+          <a-form-item label="昼夜:">
+            <a-select
+              :options="timeSlotOptions"
+              v-model:value="where.timeSlot"
+              placeholder="昼夜"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+
+        <a-col :lg="12" :md="12" :sm="24" :xs="24">
+          <a-form-item label="类型:">
+            <a-select
+              v-model:value="where.valueType"
+              :options="valueTypeOptions"
+              mode="multiple"
+              placeholder="至少选择一项"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
+              <a-form-item label="时间范围:">
+                <a-range-picker @change="reportTimeScopeChange" :mode="['year','year']" separator="~" v-model:value="where.reportTimeScope" ><a-range-picker>
+                   <template #renderExtraFooter>
+                      extra footer
+                    </template>
+                </a-range-picker>
+              </a-form-item>
+            </a-col> -->
+
+        <a-col :lg="12" :md="12" :sm="24" :xs="24">
+          <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+            <a-space>
+              <a-button type="primary" @click="reload">查询</a-button>
+              <a-button @click="reset">重置</a-button>
+              <a-button @click="exportFile">导出Excel</a-button>
+            </a-space>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+    <ele-pro-table
+      v-if="hisYears.length > 0"
+      ref="table"
+      row-key="id"
+      :datasource="url"
+      :columns="columns"
+      :where="where"
+      :needPage="false"
+      :initLoad="false"
+      :scroll="{ x: 'max-content' }"
+      :method="'POST'"
+      @done="(d) => (data = d.data)"
+    >
+      <template #toolbar>
+        <!-- 搜索表单 -->
+
+        <!-- <a-space>
+            
+        </a-space> -->
+      </template>
+    </ele-pro-table>
+  </div>
+</template>
+
+<script>
+// import _ from "lodash";
+import { ref } from "vue";
+import XLSX from "xlsx";
+import {
+  pageRoadNoiseCompare,
+  getHistoryyears,
+} from "@/api/ecology/road-sound";
+export default {
+  name: "StatisticSoundRoadCompare",
+  components: {},
+  data() {
+    const groupModelOptions = [
+      { label: "测点", value: "place" },
+      { label: "城区", value: "area" },
+      { label: "市", value: "city" },
+    ];
+    const groupTimeLengthOptions = [
+      {
+        label: "年",
+        value: "monitor_year",
+      },
+      {
+        label: "季度",
+        value: "quarter",
+      },
+    ];
+
+    // const valueTypeOptions = ['Leq','SD','L10','L50','L90','Lmin','Lmax'];
+    const valueTypeOptions = [
+      {
+        label: "Leq",
+        value: "index_Leq",
+      },
+      {
+        label: "SD",
+        value: "index_SD",
+      },
+      {
+        label: "L10",
+        value: "index_L10",
+      },
+      {
+        label: "L50",
+        value: "index_L50",
+      },
+      {
+        label: "L90",
+        value: "index_L90",
+      },
+      {
+        label: "Lmin",
+        value: "index_Lmin",
+      },
+      {
+        label: "Lmax",
+        value: "index_Lmax",
+      },
+    ];
+
+    const whereRules = {};
+    return {
+      url: pageRoadNoiseCompare,
+      data: [],
+      where: {
+        groupModel: "area",
+        groupTimeLength: "monitor_year",
+        reportTimeScope: [],
+        valueType: ["index_Leq"],
+        timeRange: [],
+        regionLevel: "市级"
+      },
+      timeRange: [],
+      whereRules,
+      hisYears: [],
+      timeScope: [],
+      columns: [{ title: "年", dataIndex: "year" }],
+      groupModelOptions,
+      groupTimeLengthOptions,
+      valueTypeOptions: ref(valueTypeOptions),
+      timeSlotOptions: [
+        {
+          value: "昼",
+          label: "昼",
+        },
+        {
+          value: "夜",
+          label: "夜",
+        },
+      ],
+    };
+  },
+  mounted() {
+    getHistoryyears().then((res) => {
+      this.hisYears = res.data.data;
+      this.$nextTick(() => {
+        this.reload();
+      });
+    });
+  },
+  methods: {
+    /* 刷新表格 */
+    reload() {
+      if (this.where.valueType.length == 0) {
+        this.$message.error("请至少选择一个类型");
+        return;
+      }
+
+      // 结束时间必须大于开始时间
+      if (this.where.timeRange && this.where.timeRange.length == 2) {
+        if (this.where.timeRange[0] > this.where.timeRange[1]) {
+          this.$message.error("结束时间必须大于起始时间");
+          return;
+        }
+        this.where.startYear = this.where.timeRange[0];
+        this.where.endYear = this.where.timeRange[1];
+      }
+      this.stableDone();
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        groupModel: "area",
+        groupTimeLength: "monitor_year",
+        reportTimeScope: [],
+        valueType: ["index_Leq"],
+        timeRange: [],
+        regionLevel: "市级"
+      };
+      this.this.timeScope = [];
+      this.reload();
+    },
+    reportTimeScopeChange(d, dstr) {
+      console.log(d, dstr);
+    },
+    timeRangePanelChange(val) {
+      val[0] && (this.where.timeRange[0] = val[0].year());
+      val[1] && (this.where.timeRange[1] = val[1].year());
+      this.timeRange = val;
+    },
+    // 数据加载完成
+    stableDone() {
+      const columns = [];
+      if (this.where.groupModel == "area") {
+        columns.push({
+          title: "城区",
+          dataIndex: "area",
+          sorter: true,
+        });
+      } else if (this.where.groupModel == "place") {
+        columns.push({
+          title: "测点",
+          dataIndex: "area",
+          sorter: true,
+        });
+      } else if (this.where.groupModel == "city") {
+        columns.push({
+          title: "城市",
+          dataIndex: "area",
+          sorter: true,
+        });
+      }
+
+      this.hisYears.forEach((item) => {
+        if (
+          (!this.where.timeRange[0] || this.where.timeRange[0] <= item) &&
+          (!this.where.timeRange[1] || this.where.timeRange[1] >= item)
+        ) {
+          if (this.where.groupTimeLength == "quarter") {
+            columns.push({
+              title: item + "年第一季度Leq",
+              dataIndex: item + "1" + "Leq",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第二季度Leq",
+              dataIndex: item + "2" + "Leq",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第三季度Leq",
+              dataIndex: item + "3" + "Leq",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第四季度Leq",
+              dataIndex: item + "4" + "Leq",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第一季度SD",
+              dataIndex: item + "1" + "Sd",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第二季度SD",
+              dataIndex: item + "2" + "Sd",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第三季度SD",
+              dataIndex: item + "3" + "Sd",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第四季度SD",
+              dataIndex: item + "4" + "Sd",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第一季度L10",
+              dataIndex: item + "1" + "L10",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第二季度L10",
+              dataIndex: item + "2" + "L10",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第三季度L10",
+              dataIndex: item + "3" + "L10",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第四季度L10",
+              dataIndex: item + "4" + "L10",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第一季度L50",
+              dataIndex: item + "1" + "L50",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第二季度L50",
+              dataIndex: item + "2" + "L50",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第三季度L50",
+              dataIndex: item + "3" + "L50",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第四季度L50",
+              dataIndex: item + "4" + "L50",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第一季度L90",
+              dataIndex: item + "1" + "L90",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第二季度L90",
+              dataIndex: item + "2" + "L90",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第三季度L90",
+              dataIndex: item + "3" + "L90",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第四季度L90",
+              dataIndex: item + "4" + "L90",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第一季度Lmin",
+              dataIndex: item + "1" + "Lmin",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第二季度Lmin",
+              dataIndex: item + "2" + "Lmin",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第三季度Lmin",
+              dataIndex: item + "3" + "Lmin",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第四季度Lmin",
+              dataIndex: item + "4" + "Lmin",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第一季度Lmax",
+              dataIndex: item + "1" + "Lmax",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第二季度Lmax",
+              dataIndex: item + "2" + "Lmax",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第三季度Lmax",
+              dataIndex: item + "3" + "Lmax",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+            columns.push({
+              title: item + "年第四季度Lmax",
+              dataIndex: item + "4" + "Lmax",
+              customRender: ({ text }) =>text? Number(text).toFixed(1):"",
+            });
+          } else {
+            if (this.where.valueType.includes("index_Leq")) {
+              columns.push({
+                title: item + "年Leq",
+                dataIndex: item + "Leq",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(1) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_SD")) {
+              columns.push({
+                title: item + "年SD",
+                dataIndex: item + "Sd",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(1) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_L10")) {
+              columns.push({
+                title: item + "年L10",
+                dataIndex: item + "L10",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(1) : "";
+                  return val;
+                },
+              });
+            }
+
+            if (this.where.valueType.includes("index_L50")) {
+              columns.push({
+                title: item + "年L50",
+                dataIndex: item + "L50",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(1) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_L90")) {
+              columns.push({
+                title: item + "年L90",
+                dataIndex: item + "L90",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(1) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_Lmin")) {
+              columns.push({
+                title: item + "年Lmin",
+                dataIndex: item + "Lmin",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(1) : "";
+                  return val;
+                },
+              });
+            }
+            if (this.where.valueType.includes("index_Lmax")) {
+              columns.push({
+                title: item + "年Lmax",
+                dataIndex: item + "Lmax",
+                customRender: ({ text }) => {
+                  const val = text ? Number(text).toFixed(1) : "";
+                  return val;
+                },
+              });
+            }
+          }
+        }
+      });
+      //
+      this.columns = columns;
+    },
+    exportFile() {
+      const arr = [];
+      const th = this.columns.map((item) => item.title);
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = this.columns.map((item) => d[item.dataIndex]);
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/water/river-station/statistic/index.vue b/src/views/water/river-station/statistic/index.vue
new file mode 100644
index 0000000..c9fb001
--- /dev/null
+++ b/src/views/water/river-station/statistic/index.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane key="base" tab="总览">
+          <base-statistic></base-statistic>
+        </a-tab-pane>
+        <a-tab-pane key="average" tab="平均">
+          <average-statistic></average-statistic>
+        </a-tab-pane>
+        <!-- <a-tab-pane key="quarter" tab="季度报告">
+         <quarter-statistic></quarter-statistic>
+        </a-tab-pane> -->
+        <a-tab-pane key="year-compare" tab="同比">
+         <compare></compare>
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  /**
+   * 
+   * 
+   * 
+   */
+  import BaseStatistic from "./base.vue";
+  // import QuarterStatistic from "./quarter.vue";
+  import Compare from "./compare.vue"
+  import AverageStatistic from "./average.vue"
+
+  export default {
+    name: 'StatisticSoundRoad',
+    components: {
+      BaseStatistic,
+      // QuarterStatistic,
+      Compare,
+      AverageStatistic
+    },
+    data() {
+      return {
+        activeKey: 'base'
+      };
+        
+    },
+    methods: {
+     
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/water/river/collect/index.vue b/src/views/water/river/collect/index.vue
index 09c9f5a..687ae40 100644
--- a/src/views/water/river/collect/index.vue
+++ b/src/views/water/river/collect/index.vue
@@ -8,20 +8,33 @@
             :showUploadList="false"
             accept=".xls,.xlsx,.csv"
           >
-            <a-button>市级导入</a-button>
+            <a-button>江河导入</a-button>
           </a-upload>
-          <!-- <a-upload
-            :before-upload="importFileArea"
+          <a-upload
+            :before-upload="importFileFunctionArea"
             :showUploadList="false"
             accept=".xls,.xlsx,.csv"
           >
-            <a-button>县级导入</a-button>
-          </a-upload> -->
+            <a-button>水功能区导入</a-button>
+          </a-upload>
+          <a-upload
+            :before-upload="importFileStation"
+            :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">
-          <water-bill ref="noise"></water-bill>
+        <a-tab-pane tab="江河信息" key="water">
+          <water-bill ref="water"></water-bill>
+        </a-tab-pane>
+        <a-tab-pane tab="水功能区" key="functionWater">
+          <function-bill ref="functionWater"></function-bill>
+        </a-tab-pane>
+        <a-tab-pane tab="水站" key="station">
+          <station-bill ref="station"></station-bill>
         </a-tab-pane>
       </a-tabs>
     </a-card>
@@ -33,16 +46,22 @@ import XLSX from "xlsx";
 import utils from "./utils";
 import {Modal} from "ant-design-vue";
 import WaterBill from "./water-bill.vue";
+import FunctionBill from "../../water-function-area/collect/water-bill"
+import StationBill from "../../river-station/collect/water-bill"
+import {saveWaterFunctionAreaBill} from "@/api/ecology/water-function-area"
 import {saveRiverBill} from "@/api/ecology/river";
+import {saveRiverStationBill} from "@/api/ecology/river-station";
 
 export default {
   name: "RiverCollectIndex",
   components: {
     WaterBill,
+    FunctionBill,
+    StationBill
   },
   data() {
     return {
-      activeKey: "noise",
+      activeKey: "functionWater",
     };
   },
   methods: {
@@ -106,7 +125,7 @@ export default {
                   title: "导入成功",
                   content: `成功导入${billData.length}条数据`,
                 });
-                this.$refs.noise && this.$refs.noise.reload();
+                this.$refs.water && this.$refs.water.reload();
               } else {
                 Modal.error({
                   title: "导入失败",
@@ -137,7 +156,168 @@ export default {
 
       return false;
     },
+    importFileFunctionArea(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 riverList = aoa.filter(
+            (item) => {
+              console.log(item[8])
+              return item.length >= 30 && item[8] && item[8] != "水体类型"
+            }
+          );
+          // 解析成对象数组
+          const billName = file.name;
+          const billData = utils.toNationalLevelDataObj(riverList);
+          if (!billData || billData.length == 0) {
+            hide()
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
+          const tasks = [];
+          if (billData.length > 0) {
+            tasks.push(
+              saveWaterFunctionAreaBill({
+                billName: billName,
+                nationalLevelWaterFunctionAreaList: billData,
+              })
+            );
+          }
+          // 上传到服务器
+
+          Promise.all(tasks)
+            .then((res) => {
+              if (res[0].data.code == 0) {
+                Modal.success({
+                  title: "导入成功",
+                  content: `成功导入${billData.length}条数据`,
+                });
+                this.$refs.functionWater && this.$refs.functionWater.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;
+    },
+    importFileStation(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",
+          });
+          let sheetNames = workbook.SheetNames;
+          // 解析成二维数组
+          let aoa = XLSX.utils.sheet_to_json(workbook.Sheets[sheetNames[0]], {
+            header: 1,
+          });
+          const riverList = aoa.filter(
+            (item) => {
+              return item.length >= 15 && item[0] && item[0] != "序号"
+            }
+          );
+          // 解析成对象数组
+          const billName = file.name;
+          const billData = utils.toRiverStationObjData(riverList);
+          if (!billData || billData.length == 0) {
+            hide()
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
+          const tasks = [];
+          if (billData.length > 0) {
+            tasks.push(
+              saveRiverStationBill({
+                billName: billName,
+                waterStationWaterFunctionAreaList: billData,
+              })
+            );
+          }
+          // 上传到服务器
+
+          Promise.all(tasks)
+            .then((res) => {
+              if (res[0].data.code == 0) {
+                Modal.success({
+                  title: "导入成功",
+                  content: `成功导入${billData.length}条数据`,
+                });
+                this.$refs.station && this.$refs.station.reload();
+              } else {
+                Modal.error({
+                  title: "导入失败",
+                  content: "数据上传出错",
+                });
+              }
+
+            })
+            .catch(() => {
+              Modal.error({
+                title: "导入失败",
+                content: "数据上传出错",
+              });
+            })
+            .finally(() => {
+              hide();
+            });
+        } catch (error) {
+          hide();
+          Modal.error({
+            title: "导入失败",
+            content: error.message,
+          });
+        }
+        // console.log(billData);
+      };
+      reader.readAsArrayBuffer(file);
+
+      return false;
+    },
   },
 };
 </script>
diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js
index 004cbd5..2760e1f 100644
--- a/src/views/water/river/collect/utils.js
+++ b/src/views/water/river/collect/utils.js
@@ -1,6 +1,7 @@
+import moment from "moment";
+
 export default {
     toObjData(excelData) {
-
         return excelData.map(item => {
           const monitorTime = new Date();
           monitorTime.setFullYear(item[12]);
@@ -59,5 +60,61 @@ export default {
         })
 
     },
+  // 水站均值数据 水功能区
+  toRiverStationObjData(excelData) {
+    return excelData.map(item => {
+      const row = {
+        area: item[1].includes("区") ? item[1] : null,
+        county: item[1].includes("县") ? item[1] : null,
+        watershed: item[2],
+        river: item[3],
+        place: item[4],
+        periodWaterQuality: item[5],
+        waterTemperature: item[6],
+        ph: item[7],
+        dissolvedOxygen: item[8],
+        conductivity: item[9],
+        turbidity: item[10],
+        permanganateIndex: item[11],
+        ammonia: item[12],
+        totalPhosphorus: item[13],
+        totalNitrogen: item[14],
+        mainPollutionIndicators: item[15],
+        remark: item[15],
+        // dissolvedOxygen: item[16],
+      }
+      return row;
+    })
+
+  },
+  // 国家级水功能区上报数据
+  toNationalLevelDataObj(excelData) {
+    return excelData.map(item => {
+      const row = {
+        waterBodyType: item[8],
+        provinceRegionCode: item[0],
+        waterResourcesFirstLevelZoneName: item[10],
+        waterQualityGoal: item[11],
+        dataSources: item[12],
+        sectionName: item[13],
+        samplingTime:item[14]? moment(item[14],"M月D日").valueOf():new Date().getTime(),
+        permanganateIndex: item[15],
+        ammonia: item[15],
+        totalPhosphorus: item[17],
+        ffeWaterFunctionAreaWaterQualityCategory: item[18],
+        lprlCompliantEvaluationConclusion: item[19],
+        ffeCompliantEvaluationConclusion: item[20],
+        ffeMajorOverStandardItemsMultiples: item[21],
+        lprlWaterFunctionAreaWaterQualityCategory: item[22],
+        // lprlCompliantEvaluationConclusion: item[14],
+        lprlMajorOverStandardItemsMultiples: item[23],
+        remark: item[24],
+        systemCode: item[25],
+
+      }
+      return row;
+    })
+
+  },
 
 }
diff --git a/src/views/water/sewage/collect/city-river-bill.vue b/src/views/water/sewage/collect/city-river-bill.vue
new file mode 100644
index 0000000..3e95dfe
--- /dev/null
+++ b/src/views/water/sewage/collect/city-river-bill.vue
@@ -0,0 +1,387 @@
+<template>
+  <div>
+            <!-- 表格 -->
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="blackSmellyWaterCityRiverBillId" :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.blackSmellyWaterCityRiverBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.blackSmellyWaterCityRiverBillId].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.blackSmellyWaterCityRiverBillId]" class="editable-cell-input-wrapper">
+              <a-date-picker v-model:value="editableData[record.blackSmellyWaterCityRiverBillId].reportTime"></a-date-picker>
+              <!-- <a-input v-model:value="editableData[record.blackSmellyWaterCityRiverBillId].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,
+    // saveSewageBill,
+    removeSewageBill,
+    removeBatchSewageBill,
+    updateSewageBill,
+    verifySewageBill
+  } from "@/api/ecology/sewage-city-river";
+  import moment from "moment";
+  export default {
+    name: 'CityRiverSewageCollectNoiseBill',
+    components: {
+      CheckOutlined,
+      EditOutlined
+    },
+    data() {
+
+      return {
+        // 表格数据接口
+        url: pageBillUrl,
+        selection: [],
+        // 表格列配置
+        columns: [{
+            key: 'index',
+            dataIndex: 'index',
+            width: 48,
+            align: 'center',
+            customRender: ({
+              index
+            }) => index + 1
+          },
+          {
+            title: '表格名称',
+            dataIndex: 'billName',
+            sorter: true,
+            slots: {
+              customRender: 'billName',
+            },
+
+          },
+          {
+            title: '条目',
+            dataIndex: 'recordSize',
+            sorter: true,
+
+          },
+          // {
+          //   title: '菜单名称',
+          //   dataIndex: 'title',
+          //   sorter: true
+          // },
+          // {
+          //   title: '上报时间',
+          //   dataIndex: 'reportTime',
+          //   sorter: true,
+          //   slots: {
+          //     customRender: 'reportTime',
+          //   },
+          //   // customRender: ({
+          //   //   text
+          //   // }) => this.$util.toDateString(text)
+          // },
+          {
+            title: '导入时间',
+            dataIndex: 'createTime',
+            sorter: true,
+            customRender: ({
+              text
+            }) => this.$util.toDateString(text)
+          },
+          {
+            title: '审核状态',
+            dataIndex: 'checked',
+            sorter: true,
+            slots: {
+              customRender: 'checked',
+            },
+
+          },
+          {
+            title: '创建人',
+            dataIndex: 'userName',
+            sorter: true,
+
+          },
+          // {
+          //   title: '更新时间',
+          //   dataIndex: 'updateTime',
+          //   sorter: true,
+          //   customRender: ({
+          //     text
+          //   }) => this.$util.toDateString(text)
+          // },
+          {
+            title: '操作',
+            key: 'action',
+            width: 150,
+            align: 'center',
+            slots: {
+              customRender: 'action'
+            }
+          }
+        ],
+        // 表格搜索条件
+        where: {},
+        reportTimeScope: [],
+        // 表格选中数据
+        selectionList: [],
+        editableData: {},
+        // 当前编辑数据
+        current: null,
+      };
+    },
+    methods: {
+
+
+      /* 刷新表格 */
+      reload() {
+        this.where.reportTimeStart = null;
+        this.where.reportTimeEnd = null;
+        if (this.reportTimeScope && this.reportTimeScope.length == 2) {
+          this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
+          this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
+        }
+        this.$refs.table.reload({
+          where: this.where
+        });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {};
+        this.reportTimeScope = [];
+        this.reload();
+      },
+      detail(record) {
+        this.$router.replace({
+          path: "/water/sewage/collect/city-river/" + record.blackSmellyWaterCityRiverBillId
+        })
+      },
+      edit(record) {
+        this.editableData[record.blackSmellyWaterCityRiverBillId] = _.cloneDeep(record);
+        this.editableData[record.blackSmellyWaterCityRiverBillId].reportTime = moment(this.editableData[record.blackSmellyWaterCityRiverBillId]
+          .reportTime)
+      },
+      verify(record,checked) {
+        const hide = this.$message.loading('请求中..', 0);
+        verifySewageBill({
+          blackSmellyWaterCityRiverBillId: record.blackSmellyWaterCityRiverBillId,
+          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 {
+          blackSmellyWaterCityRiverBillId,
+          billName,
+          reportTime
+        } = this.editableData[record.blackSmellyWaterCityRiverBillId];
+        if (!blackSmellyWaterCityRiverBillId || !reportTime) {
+          this.$message.error('请填写完整信息再提交')
+          return
+        }
+        const hide = this.$message.loading('请求中..', 0);
+        reportTime = reportTime.format("x")
+        reportTime = Number(reportTime)
+        updateSewageBill({
+          blackSmellyWaterCityRiverBillId,
+          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.blackSmellyWaterCityRiverBillId]
+          hide()
+        })
+
+      },
+      /* 删除单个 */
+      remove(row) {
+        const hide = this.$message.loading('请求中..', 0);
+        removeSewageBill(row.blackSmellyWaterCityRiverBillId).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.blackSmellyWaterCityRiverBillId);
+        const hide = this.$message.loading('请求中..', 0);
+        removeBatchSewageBill(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/sewage/collect/city-river.vue b/src/views/water/sewage/collect/city-river.vue
new file mode 100644
index 0000000..0d5cbb0
--- /dev/null
+++ b/src/views/water/sewage/collect/city-river.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.blackSmellyWaterCityRiverId !== 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="blackSmellyWaterCityRiverId"
+        :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 {
+  pageSewageUrl,
+  saveSewage,
+  removeSewage,
+  removeBatchSewage,
+  updateSewage,
+  getSewageBill,
+  // getColumnOptions,
+} from "@/api/ecology/sewage-city-river";
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+import moment from "moment";
+import { cityRiverColumns as tableColumns } from "./colums";
+//   import utils from "./utils";
+export default {
+  name: "SewageCollectWater",
+  components: {},
+  data() {
+    const { billId } = this.$route.params;
+    return {
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageSewageUrl,
+      selection: [],
+      tableColumns,
+      // 表格列配置
+      columns: [
+        ...tableColumns,
+        {
+          title: "创建人",
+          dataIndex: "userName",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+          slots: {
+            customRender: "action",
+          },
+        },
+      ],
+      // 表格搜索条件
+      blackSmellyWaterCityRiverBillId: billId,
+      where: {
+        blackSmellyWaterCityRiverBillId: billId,
+      },
+      // 表格选中数据
+      selectionList: [],
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 表单数据
+      form: {},
+      loading: false,
+      rules: {},
+    };
+  },
+  mounted() {
+    const { billId } = this.$route.params;
+    getSewageBill(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 = {
+        blackSmellyWaterCityRiverBillId: this.blackSmellyWaterCityRiverBillId,
+      };
+      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.blackSmellyWaterCityRiverId) {
+        updateSewage(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.blackSmellyWaterCityRiverBillId = this.blackSmellyWaterCityRiverBillId;
+        saveSewage(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);
+      removeSewage(row.blackSmellyWaterCityRiverId)
+        .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.blackSmellyWaterCityRiverId);
+      const hide = this.$message.loading("请求中..", 0);
+      removeBatchSewage(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/sewage/collect/colums.js b/src/views/water/sewage/collect/colums.js
new file mode 100644
index 0000000..c6d4379
--- /dev/null
+++ b/src/views/water/sewage/collect/colums.js
@@ -0,0 +1,52 @@
+const tableColumns = [
+  {title: "名称", dataIndex: "name", sorter: true,},
+  {title: "评价结果", dataIndex: "evaluationResults", sorter: true,},
+  {title: "透明度（cm）", dataIndex: "transparency", sorter: true,},
+  {title: "溶解氧 (mg/L)", dataIndex: "dissolvedOxygen", sorter: true,},
+  {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,},
+  {title: "氨氮(mg/L)", dataIndex: "ammonia", sorter: true,},
+  {title: "备注", dataIndex: "remark", sorter: true,},
+];
+const cityRiverColumns = [
+  {title: "点位名称", dataIndex: "pointName", sorter: true,},
+  {title: "水深（m）", dataIndex: "waterDepth", sorter: true,},
+  {title: "沟宽（m）", dataIndex: "grooveWidth", sorter: true,},
+  {title: "流速(m/s)", dataIndex: "flowRate", sorter: true,},
+  {title: "水温（℃）", dataIndex: "waterTemperature", sorter: true,},
+  {title: "pH", dataIndex: "ph", sorter: true,},
+  {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,},
+  {title: "透明度（cm）", dataIndex: "transparency", sorter: true,},
+  {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,},
+  {title: "悬浮物", dataIndex: "suspendedMatter", sorter: true,},
+  {title: "总硬度(以CaCO3计)", dataIndex: "totalHardnessCaco3", sorter: true,},
+  {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,},
+  {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,},
+  {title: "化学需氧量", dataIndex: "cod", sorter: true,},
+  {title: "氨氮", dataIndex: "ammonia", sorter: true,},
+  {title: "总氮", dataIndex: "totalNitrogen", sorter: true,},
+  {title: "硝酸盐氮  (mg/L)", dataIndex: "nitrateNitrogen", sorter: true,},
+  {title: "挥发酚", dataIndex: "volatilePhenol", sorter: true,},
+  {title: "氰化物(mg/L)", dataIndex: "cyanide", sorter: true,},
+  {title: "砷(mg/L)", dataIndex: "as", sorter: true,},
+  {title: "汞 (mg/L)", dataIndex: "hg", sorter: true,},
+  {title: "六价铬 (mg/L)", dataIndex: "cr6", sorter: true,},
+  {title: "铅 (mg/L)", dataIndex: "pb", sorter: true,},
+  {title: "镉 (mg/L)", dataIndex: "cd", sorter: true,},
+  {title: "石油类", dataIndex: "petro", sorter: true,},
+  {title: "电导率(µS/cm)", dataIndex: "conductivity", sorter: true,},
+  {title: "铜 (mg/L)", dataIndex: "cu", sorter: true,},
+  {title: "锌 (mg/L)", dataIndex: "zn", sorter: true,},
+  {title: "氟化物(mg/L)", dataIndex: "fluoride", sorter: true,},
+  {title: "硫化物(mg/L)", dataIndex: "s", sorter: true,},
+  {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,},
+  {title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
+  {title: "硒 (mg/L)", dataIndex: "se", sorter: true,},
+  {title: "粪大肠菌群(个/L)", dataIndex: "fecalColiforms", sorter: true,},
+  {title: "氯化物 (mg/L)", dataIndex: "chloride", sorter: true,},
+  {title: "总铬", dataIndex: "totalCr", sorter: true,},
+  {title: "经度", dataIndex: "longitude", sorter: true,},
+  {title: "纬度", dataIndex: "latitude", sorter: true,},
+  {title: "磷酸盐", dataIndex: "phosphate", sorter: true,},
+  {title: "备注", dataIndex: "remark", sorter: true,},
+]
+export {tableColumns,cityRiverColumns}
diff --git a/src/views/water/sewage/collect/index.vue b/src/views/water/sewage/collect/index.vue
new file mode 100644
index 0000000..8fe1b96
--- /dev/null
+++ b/src/views/water/sewage/collect/index.vue
@@ -0,0 +1,241 @@
+<template>
+  <div class="ele-body">
+    <a-card style="width: 100%" :bordered="false">
+      <template #title>
+        <a-space>
+          <a-upload
+            :before-upload="importFileSewage"
+            :showUploadList="false"
+            accept=".xls,.xlsx,.csv"
+          >
+            <a-button>黑臭水体导入</a-button>
+          </a-upload>
+          <a-upload
+            :before-upload="importFileCityRiver"
+            :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="water">
+          <water-bill ref="water"></water-bill>
+        </a-tab-pane>
+        <a-tab-pane tab="城市内河" key="special">
+          <city-river-bill ref="cityRiver"></city-river-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 WaterBill from "./water-bill.vue";
+import CityRiverBill from "./city-river-bill.vue";
+import {saveSewageBill as saveCityRiverBill} from "@/api/ecology/sewage-city-river";
+import {saveSewageBill} from "@/api/ecology/sewage";
+
+export default {
+  name: "BlackSmellyWaterCollectIndex",
+  components: {
+    WaterBill,
+    CityRiverBill
+  },
+  data() {
+    return {
+      activeKey: "water",
+    };
+  },
+  methods: {
+    /* 导入本地excel文件 */
+    importFileSewage(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 reportDateStr = aoa[0][0].replace(/[^\d]+/g, "-");
+          console.log(reportDate)
+          const reportDate = new Date();
+          reportDate.setFullYear(reportDateStr.split("-")[0]);
+          reportDate.setMonth(reportDateStr.split("-")[1]);
+          const blackSmellyWaterList = aoa.filter(
+            (item) => {
+              return item.length >= 7 && item[0] && typeof item[0] == "number";
+            }
+          );
+
+
+          // 解析成对象数组
+          const billName = aoa[0][0];
+          const billData = utils.toBlackSmellyWaterObjData(blackSmellyWaterList,reportDate.getTime());
+          if (!billData || billData.length == 0) {
+            hide()
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
+          const tasks = [];
+          if (billData.length > 0) {
+            tasks.push(
+              saveSewageBill({
+                billName: billName,
+                blackSmellyWaterList: billData,
+              })
+            );
+          }
+
+
+          // 上传到服务器
+
+          Promise.all(tasks)
+            .then((res) => {
+              if (res[0].data.code == 0) {
+                Modal.success({
+                  title: "导入成功",
+                  content: `成功导入${billData.length}条数据`,
+                });
+                this.$refs.water && this.$refs.water.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;
+    },
+    importFileCityRiver(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[2][0].replace(/[^\d]+/g, "-");
+
+          const cityRiverList = aoa.filter(
+            (item) => {
+              return item.length >= 37 && item[0] && !item[0].includes("点位名称");
+            }
+          );
+          // 解析成对象数组
+          const billName = file.name;
+
+          const billData = utils.toCityInnerRiverObjData(cityRiverList,new Date(reportDate).getTime());
+          if (!billData || billData.length == 0) {
+            hide()
+            Modal.error({
+              title: "导入失败",
+              content: "找不到数据",
+            });
+            return;
+          }
+          const tasks = [];
+          if (billData.length > 0) {
+            tasks.push(
+              saveCityRiverBill({
+                billName: billName,
+                blackSmellyWaterCityRiverList: billData,
+              })
+            );
+          }
+
+
+          // 上传到服务器
+
+          Promise.all(tasks)
+            .then((res) => {
+              if (res[0].data.code == 0) {
+                Modal.success({
+                  title: "导入成功",
+                  content: `成功导入${billData.length}条数据`,
+                });
+                this.$refs.water && this.$refs.water.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>
diff --git a/src/views/water/sewage/collect/utils.js b/src/views/water/sewage/collect/utils.js
new file mode 100644
index 0000000..6f1df47
--- /dev/null
+++ b/src/views/water/sewage/collect/utils.js
@@ -0,0 +1,73 @@
+export default {
+
+
+  // 黑臭水体
+  toBlackSmellyWaterObjData(excelData,monitorTime){
+    return excelData.map(item=>{
+      const row = {
+        monitorTime,
+        name: item[1],
+        evaluationResults: item[2],
+        transparency: item[3],
+        dissolvedOxygen: item[4],
+        oxidationReductionPotential: item[5],
+        ammonia: item[6],
+        remark: item[7],
+      };
+      return row;
+    })
+  },
+  // 城市内河
+  toCityInnerRiverObjData(excelData,monitorTime){
+    return excelData.map(item=>{
+      const row = {
+        monitorTime,
+        pointName: item[0],
+        waterDepth: item[1],
+        grooveWidth: item[2],
+        flowRate: item[3],
+        flow: item[4],
+        waterTemperature: item[5],
+        ph: item[6],
+        dissolvedOxygen: item[7],
+        transparency: item[8],
+        oxidationReductionPotential: item[9],
+        suspendedMatter: item[10],
+        totalHardnessCaco3: item[11],
+        permanganateIndex: item[12],
+        fiveDayBod: item[13],
+        cod: item[14],
+        ammonia: item[15],
+
+        totalNitrogen: item[16],
+        nitrateNitrogen: item[17],
+        volatilePhenol: item[18],
+        cyanide: item[19],
+        as: item[20],
+        hg: item[21],
+        cr6: item[22],
+        pb: item[23],
+        cd: item[24],
+        petro: item[25],
+        conductivity: item[26],
+        cu: item[27],
+        zn: item[28],
+        fluoride: item[29],
+        s: item[30],
+        totalPhosphorus: item[31],
+        anSaa: item[32],
+        se: item[33],
+        fecalColiforms: item[34],
+        chloride: item[35],
+        totalCr: item[36],
+        longitude: item[37],
+        latitude: item[38],
+        phosphate: item[39],
+        remark: item[40],
+      };
+      return row;
+    })
+  },
+
+
+}
diff --git a/src/views/water/sewage/collect/water-bill.vue b/src/views/water/sewage/collect/water-bill.vue
new file mode 100644
index 0000000..9ee4d32
--- /dev/null
+++ b/src/views/water/sewage/collect/water-bill.vue
@@ -0,0 +1,377 @@
+<template>
+  <div>
+            <!-- 表格 -->
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="blackSmellyWaterBillId" :datasource="url"
+        :columns="columns" :where="where" :scroll="{x: 'max-content'}">
+        <template #toolbar>
+
+          <!-- 搜索表单 -->
+          <a-form layout="inline" :model="where" :labelCol="{ offset: 1}">
+
+            <a-form-item label="审核状态:">
+              <a-select v-model:value="where.checked" allowClear placeholder="未选择">
+                <a-select-option :value="1">已审核</a-select-option>
+                <a-select-option :value="0">未审核</a-select-option>
+              </a-select>
+            </a-form-item>
+
+            <a-form-item label="表格名称:">
+              <a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
+            </a-form-item>
+            <a-form-item 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.blackSmellyWaterBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.blackSmellyWaterBillId].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.blackSmellyWaterBillId]" class="editable-cell-input-wrapper">
+              <a-date-picker v-model:value="editableData[record.blackSmellyWaterBillId].reportTime"></a-date-picker>
+              <!-- <a-input v-model:value="editableData[record.blackSmellyWaterBillId].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,
+    // saveSewageBill,
+    removeSewageBill,
+    removeBatchSewageBill,
+    updateSewageBill,
+    verifySewageBill
+  } from "@/api/ecology/sewage";
+  import moment from "moment";
+  export default {
+    name: 'SewageCollectNoiseBill',
+    components: {
+      CheckOutlined,
+      EditOutlined
+    },
+    data() {
+
+      return {
+        // 表格数据接口
+        url: pageBillUrl,
+        selection: [],
+        // 表格列配置
+        columns: [{
+            key: 'index',
+            dataIndex: 'index',
+            width: 48,
+            align: 'center',
+            customRender: ({
+              index
+            }) => index + 1
+          },
+          {
+            title: '表格名称',
+            dataIndex: 'billName',
+            sorter: true,
+            slots: {
+              customRender: 'billName',
+            },
+
+          },
+          {
+            title: '条目',
+            dataIndex: 'recordSize',
+            sorter: true,
+
+          },
+          // {
+          //   title: '菜单名称',
+          //   dataIndex: 'title',
+          //   sorter: true
+          // },
+          // {
+          //   title: '上报时间',
+          //   dataIndex: 'reportTime',
+          //   sorter: true,
+          //   slots: {
+          //     customRender: 'reportTime',
+          //   },
+          //   // customRender: ({
+          //   //   text
+          //   // }) => this.$util.toDateString(text)
+          // },
+          {
+            title: '导入时间',
+            dataIndex: 'createTime',
+            sorter: true,
+            customRender: ({
+              text
+            }) => this.$util.toDateString(text)
+          },
+          {
+            title: '审核状态',
+            dataIndex: 'checked',
+            sorter: true,
+            slots: {
+              customRender: 'checked',
+            },
+
+          },
+          {
+            title: '创建人',
+            dataIndex: 'userName',
+            sorter: true,
+
+          },
+          // {
+          //   title: '更新时间',
+          //   dataIndex: 'updateTime',
+          //   sorter: true,
+          //   customRender: ({
+          //     text
+          //   }) => this.$util.toDateString(text)
+          // },
+          {
+            title: '操作',
+            key: 'action',
+            width: 150,
+            align: 'center',
+            slots: {
+              customRender: 'action'
+            }
+          }
+        ],
+        // 表格搜索条件
+        where: {},
+        reportTimeScope: [],
+        // 表格选中数据
+        selectionList: [],
+        editableData: {},
+        // 当前编辑数据
+        current: null,
+      };
+    },
+    methods: {
+
+
+      /* 刷新表格 */
+      reload() {
+        this.where.reportTimeStart = null;
+        this.where.reportTimeEnd = null;
+        if (this.reportTimeScope && this.reportTimeScope.length == 2) {
+          this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
+          this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
+        }
+        this.$refs.table.reload({
+          where: this.where
+        });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {};
+        this.reportTimeScope = [];
+        this.reload();
+      },
+      detail(record) {
+        this.$router.replace({
+          path: "/water/sewage/collect/water/" + record.blackSmellyWaterBillId
+        })
+      },
+      edit(record) {
+        this.editableData[record.blackSmellyWaterBillId] = _.cloneDeep(record);
+        this.editableData[record.blackSmellyWaterBillId].reportTime = moment(this.editableData[record.blackSmellyWaterBillId]
+          .reportTime)
+      },
+      verify(record,checked) {
+        const hide = this.$message.loading('请求中..', 0);
+        verifySewageBill({
+          blackSmellyWaterBillId: record.blackSmellyWaterBillId,
+          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 {
+          blackSmellyWaterBillId,
+          billName,
+          reportTime
+        } = this.editableData[record.blackSmellyWaterBillId];
+        if (!blackSmellyWaterBillId || !reportTime) {
+          this.$message.error('请填写完整信息再提交')
+          return
+        }
+        const hide = this.$message.loading('请求中..', 0);
+        reportTime = reportTime.format("x")
+        reportTime = Number(reportTime)
+        updateSewageBill({
+          blackSmellyWaterBillId,
+          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.blackSmellyWaterBillId]
+          hide()
+        })
+
+      },
+      /* 删除单个 */
+      remove(row) {
+        const hide = this.$message.loading('请求中..', 0);
+        removeSewageBill(row.blackSmellyWaterBillId).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.blackSmellyWaterBillId);
+        const hide = this.$message.loading('请求中..', 0);
+        removeBatchSewageBill(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/sewage/collect/water.vue b/src/views/water/sewage/collect/water.vue
new file mode 100644
index 0000000..fec17c4
--- /dev/null
+++ b/src/views/water/sewage/collect/water.vue
@@ -0,0 +1,330 @@
+<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.blackSmellyWaterId !== 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="blackSmellyWaterId"
+        :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 {
+  pageSewageUrl,
+  saveSewage,
+  removeSewage,
+  removeBatchSewage,
+  updateSewage,
+  getSewageBill,
+  // getColumnOptions,
+} from "@/api/ecology/sewage";
+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: "SewageCollectWater",
+  components: {},
+  data() {
+    const { billId } = this.$route.params;
+    return {
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageSewageUrl,
+      selection: [],
+      tableColumns,
+      // 表格列配置
+      columns: [
+        ...tableColumns,
+        {
+          title: "创建人",
+          dataIndex: "userName",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+          slots: {
+            customRender: "action",
+          },
+        },
+      ],
+      // 表格搜索条件
+      blackSmellyWaterBillId: billId,
+      where: {
+        blackSmellyWaterBillId: billId,
+      },
+      // 表格选中数据
+      selectionList: [],
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 表单数据
+      form: {},
+      loading: false,
+      rules: {},
+    };
+  },
+  mounted() {
+    const { billId } = this.$route.params;
+    getSewageBill(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() {
+
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        blackSmellyWaterBillId: this.blackSmellyWaterBillId,
+      };
+      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.blackSmellyWaterId) {
+        updateSewage(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.blackSmellyWaterBillId = this.blackSmellyWaterBillId;
+        saveSewage(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);
+      removeSewage(row.blackSmellyWaterId)
+        .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.blackSmellyWaterId);
+      const hide = this.$message.loading("请求中..", 0);
+      removeBatchSewage(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/sewage/statistic/average.vue b/src/views/water/sewage/statistic/average.vue
new file mode 100644
index 0000000..3abe54f
--- /dev/null
+++ b/src/views/water/sewage/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/sewage/statistic/base.vue b/src/views/water/sewage/statistic/base.vue
new file mode 100644
index 0000000..a97c692
--- /dev/null
+++ b/src/views/water/sewage/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/sewage/statistic/index.vue b/src/views/water/sewage/statistic/index.vue
new file mode 100644
index 0000000..a7a8b60
--- /dev/null
+++ b/src/views/water/sewage/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/sewage/statistic/source.vue b/src/views/water/sewage/statistic/source.vue
new file mode 100644
index 0000000..e974462
--- /dev/null
+++ b/src/views/water/sewage/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/sewage/statistic/year.vue b/src/views/water/sewage/statistic/year.vue
new file mode 100644
index 0000000..2d4b011
--- /dev/null
+++ b/src/views/water/sewage/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/water-function-area/collect/colums.js b/src/views/water/water-function-area/collect/colums.js
index d801d8d..839f2ea 100644
--- a/src/views/water/water-function-area/collect/colums.js
+++ b/src/views/water/water-function-area/collect/colums.js
@@ -1,128 +1,33 @@
 const tableColumns = [
-        {title: "点位名称",dataIndex: "place",sorter: true,},
-        {title: "'水温（℃）",dataIndex: "waterTemperature",sorter: true,},
-        {title: "pH(无量纲)",dataIndex: "ph",sorter: true,},
-        {title: "溶解氧",dataIndex: "dissolvedOxygen",sorter: true,},
-        {title: "高锰酸盐指数",dataIndex: "permanganateIndex",sorter: true,},
-        {title: "化学需氧量",dataIndex: "cod",sorter: true,},
-        {title: "五日生化需氧量",dataIndex: "fiveDayBod",sorter: true,},
-        {title: "氨氮",dataIndex: "ammonia",sorter: true,},
-        {title: "总磷",dataIndex: "totalPhosphorus",sorter: true,},
-        {title: "总氮",dataIndex: "totalNitrogen",sorter: true,},
-        {title: "铜",dataIndex: "cu",sorter: true,},
-        {title: "锌",dataIndex: "zn",sorter: true,},
-        {title: "氟化物",dataIndex: "fluoride",sorter: true,},
-        {title: "硒",dataIndex: "se",sorter: true,},
-        {title: "砷",dataIndex: "as",sorter: true,},
-        {title: "汞",dataIndex: "hg",sorter: true,},
-        {title: "镉",dataIndex: "cd",sorter: true,},
-        {title: "铬（六价）",dataIndex: "cr",sorter: true,},
-        {title: "铅",dataIndex: "pb",sorter: true,},
-        {title: "氰化物",dataIndex: "cyanide",sorter: true,},
-        {title: "挥发酚",dataIndex: "volatilePhenol",sorter: true,},
-        {title: "石油类",dataIndex: "petro",sorter: true,},
-        {title: "阴离子表面活性剂",dataIndex: "anionicSurfactant",sorter: true,},
-        {title: "硫化物",dataIndex: "sulfide",sorter: true,},
-        {title: "粪大肠菌群(MPN/L)",dataIndex: "fecalColiforms",sorter: true,},
-        {title: "硫酸盐",dataIndex: "sulfate",sorter: true,},
-        {title: "氯化物",dataIndex: "chloride",sorter: true,},
-        {title: "硝酸盐氮",dataIndex: "nitrateNitrogen",sorter: true,},
-        {title: "铁",dataIndex: "fe",sorter: true,},
-        {title: "锰",dataIndex: "mn",sorter: true,},
-        {title: "三氯甲烷",dataIndex: "chcl3",sorter: true,},
-        {title: "四氯化碳",dataIndex: "ccl4",sorter: true,},
-        {title: "三溴甲烷",dataIndex: "chbr3",sorter: true,},
-        {title: "二氯甲烷",dataIndex: "ch2cl2",sorter: true,},
-        {title: "1，2-二氯乙烷",dataIndex: "c2h4cl2",sorter: true,},
-        {title: "环氧氯丙烷",dataIndex: "c3h5clO",sorter: true,},
-        {title: "氯乙烯",dataIndex: "c2h3cl",sorter: true,},
-        {title: "1，1-二氯乙烯",dataIndex: "c2h2cl211",sorter: true,},
-        {title: "1，2-二氯乙烯",dataIndex: "c2h2cl212",sorter: true,},
-        {title: "三氯乙烯",dataIndex: "c2hcl3",sorter: true,},
-        {title: "四氯乙烯",dataIndex: "c2cl4",sorter: true,},
-        {title: "氯丁二烯",dataIndex: "c4h5cl",sorter: true,},
-        {title: "六氯丁二烯",dataIndex: "c4cl6",sorter: true,},
-        {title: "苯乙烯",dataIndex: "c8h8",sorter: true,},
-        {title: "甲醛",dataIndex: "ch2o",sorter: true,},
-        {title: "乙醛",dataIndex: "c2h4o",sorter: true,},
-        {title: "丙烯醛",dataIndex: "c3h4o",sorter: true,},
-        {title: "三氯乙醛",dataIndex: "c2hcl3o",sorter: true,},
-        {title: "苯",dataIndex: "c6h6",sorter: true,},
-        {title: "甲苯",dataIndex: "c7h8",sorter: true,},
-        {title: "乙苯",dataIndex: "c8h10Ethylbenzene",sorter: true,},
-        {title: "二甲苯",dataIndex: "c8h10Dimethylbenzene",sorter: true,},
-        {title: "异丙苯",dataIndex: "c9h12",sorter: true,},
-        {title: "氯苯",dataIndex: "c6h5cl",sorter: true,},
-        {title: "1，2-二氯苯",dataIndex: "c6h4cl212",sorter: true,},
-        {title: "1，4-二氯苯",dataIndex: "c6h4cl214",sorter: true,},
-        {title: "三氯苯",dataIndex: "c6h3cl3",sorter: true,},
-        {title: "四氯苯",dataIndex: "c6h2cl4",sorter: true,},
-        {title: "六氯苯",dataIndex: "c6cl6",sorter: true,},
-        {title: "硝基苯",dataIndex: "c6h5no2",sorter: true,},
-        {title: "二硝基苯",dataIndex: "c6h4n2o4",sorter: true,},
-        {title: "2，4-二硝基甲苯",dataIndex: "c7h6n2o4",sorter: true,},
-        {title: "2，4，6-三硝基甲苯",dataIndex: "c7h5o6n3",sorter: true,},
-        {title: "硝基氯苯",dataIndex: "c6h4clno2",sorter: true,},
-        {title: "2，4-二硝基氯苯 ",dataIndex: "c6h3cln2o4",sorter: true,},
-        {title: "2，4-二氯苯酚",dataIndex: "c6h4cl2o",sorter: true,},
-        {title: "2，4，6-三氯苯酚",dataIndex: "c6h3cl3o",sorter: true,},
-        {title: "五氯酚",dataIndex: "c6hcl5o",sorter: true,},
-        {title: "苯胺",dataIndex: "c6h7n",sorter: true,},
-        {title: "联苯胺",dataIndex: "c6h4nh22",sorter: true,},
-        {title: "丙烯酰胺",dataIndex: "c3h5no",sorter: true,},
-        {title: "丙烯腈",dataIndex: "c3h3n",sorter: true,},
-        {title: "邻苯二甲酸二丁酯",dataIndex: "c16h22o4",sorter: true,},
-        {title: "邻苯二甲酸二（2-乙基已基）酯",dataIndex: "c16h35o4p",sorter: true,},
-        {title: "水合肼",dataIndex: "n2h4h2o",sorter: true,},
-        {title: "四乙基铅",dataIndex: "c8h20pd",sorter: true,},
-        {title: "吡啶",dataIndex: "c5h5n",sorter: true,},
-        {title: "松节油",dataIndex: "turpentine",sorter: true,},
-        {title: "苦味酸",dataIndex: "c6h3n3o7",sorter: true,},
-        {title: "丁基黄原酸",dataIndex: "butylXanthogenAcid",sorter: true,},
-        {title: "活性氯",dataIndex: "activeChlorine",sorter: true,},
-        {title: "滴滴涕",dataIndex: "c14h9cl5",sorter: true,},
-        {title: "林丹",dataIndex: "c6h6cl6",sorter: true,},
-        {title: "环氧七氯",dataIndex: "c10h5cl7O",sorter: true,},
-        {title: "对硫磷",dataIndex: "c10h14no5ps",sorter: true,},
-        {title: "甲基对硫磷",dataIndex: "c8h10o5nps",sorter: true,},
-        {title: "马拉硫磷",dataIndex: "c10h19o6ps2",sorter: true,},
-        {title: "乐果",dataIndex: "c5h12no3ps2",sorter: true,},
-        {title: "敌敌畏",dataIndex: "c4h7cl2o4p",sorter: true,},
-        {title: "敌百虫",dataIndex: "c4h8cl3o4p",sorter: true,},
-        {title: "内吸磷",dataIndex: "c8h19o3ps2",sorter: true,},
-        {title: "百菌清",dataIndex: "c8cl4n2",sorter: true,},
-        {title: "甲萘威",dataIndex: "c12h11no2",sorter: true,},
-        {title: "溴氰菊酯",dataIndex: "c22h19br2no3",sorter: true,},
-        {title: "阿特拉津",dataIndex: "c8h14cln5",sorter: true,},
-        {title: "苯并(a)芘 ",dataIndex: "c20h12",sorter: true,},
-        {title: "甲基汞",dataIndex: "ch3hg",sorter: true,},
-        {title: "多氯联苯",dataIndex: "c12h10Xclx",sorter: true,},
-        {title: "微囊藻毒素-LR",dataIndex: "微囊藻毒素-LR",sorter: true,},
-        {title: "黄磷",dataIndex: "p4",sorter: true,},
-        {title: "钼",dataIndex: "mo",sorter: true,},
-        {title: "钴",dataIndex: "co",sorter: true,},
-        {title: "铍",dataIndex: "be",sorter: true,},
-        {title: "硼",dataIndex: "b",sorter: true,},
-        {title: "锑",dataIndex: "sb",sorter: true,},
-        {title: "镍",dataIndex: "ni",sorter: true,},
-        {title: "钡",dataIndex: "ba",sorter: true,},
-        {title: "钒",dataIndex: "v",sorter: true,},
-        {title: "钛",dataIndex: "ti",sorter: true,},
-        {title: "铊",dataIndex: "tl",sorter: true,},
+  {title: "水体类型", dataIndex: "waterBodyType", sorter: true,},
+  {title: "水资源一级区名称", dataIndex: "waterResourcesFirstLevelZoneName", sorter: true,},
+  {title: "水质目标", dataIndex: "waterQualityGoal", sorter: true,},
+  {title: "数据来源", dataIndex: "dataSources", sorter: true,},
+  {title: "断面名称", dataIndex: "sectionName", sorter: true,},
+  // {title: "采样时间", dataIndex: "samplingTime", sorter: true,},
+  {title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,},
+  {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,},
+  {title: "化学需氧量", dataIndex: "cod", sorter: true,},
+  {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,},
+  {title: "氨氮", dataIndex: "ammonia", sorter: true,},
+  {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,},
+  {
+    title: "全因子评价", children: [
+      {title: "水功能区水质类别", dataIndex: "ffeWaterFunctionAreaWaterQualityCategory"},
+      {title: "达标评价结论", dataIndex: "ffeCompliantEvaluationConclusion"},
+      {title: "主要超标项目及其超标倍数", dataIndex: "ffeMajorOverStandardItemsMultiples"},
+    ]
+  },
+  {
+    title: "水功能区限值纳污红线主要控制项目达标评价", children: [
+      {title: "水功能区水质类别", dataIndex: "lprlWaterFunctionAreaWaterQualityCategory"},
+      {title: "达标评价结论", dataIndex: "lprlCompliantEvaluationConclusion"},
+      {title: "主要超标项目及其超标倍数", dataIndex: "lprlMajorOverStandardItemsMultiples"},
+    ]
+  },
+  {title: "系统编码", dataIndex: "systemCode", sorter: true,},
+  {title: "备注", dataIndex: "remark", sorter: true,},
 
-        {title: "六价铬",dataIndex: "cr6",sorter: true,},
-        {title: "邻二氯苯",dataIndex: "odcb",sorter: true,},
-        {title: "对二氯苯",dataIndex: "pdcp",sorter: true,},
+];
 
-        {title: "苯并(a)芘",dataIndex: "bap",sorter: true,},
-        {title: "苯并(b)荧蒽",dataIndex: "bbfa",sorter: true,},
-        {title: "磷酸盐",dataIndex: "phosphate",sorter: true,},
-        {title: "急性毒性",dataIndex: "acuteToxicity",sorter: true,},
-        {title: "余氯",dataIndex: "residualChlorine",sorter: true,},
-        {title: "六六六",dataIndex: "c6h6cl6666",sorter: true,},
-        {title: "2,4,6-三氯酚",dataIndex: "c6h3cl3o246",sorter: true,},
-
-       
-    ];
-
-    export {tableColumns}
\ No newline at end of file
+export {tableColumns}
diff --git a/src/views/water/water-function-area/collect/index.vue b/src/views/water/water-function-area/collect/index.vue
index a0c3b90..18d78c7 100644
--- a/src/views/water/water-function-area/collect/index.vue
+++ b/src/views/water/water-function-area/collect/index.vue
@@ -42,7 +42,7 @@ import { Modal } from "ant-design-vue";
 import WaterBill from "./water-bill.vue";
 import { saveWaterFunctionAreaBill } from "@/api/ecology/water-function-area";
 export default {
-  name: "DrinkWaterCollectIndex",
+  name: "RiverFunctionCollectIndex",
   components: {
     WaterBill,
   },
@@ -348,4 +348,4 @@ export default {
 </script>
 
 <style scoped lang="less">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/water/water-function-area/collect/utils.js b/src/views/water/water-function-area/collect/utils.js
index 7189b25..0304802 100644
--- a/src/views/water/water-function-area/collect/utils.js
+++ b/src/views/water/water-function-area/collect/utils.js
@@ -1,57 +1,3 @@
-import moment from "moment";
 export default {
-    // 水站均值数据 水功能区
-    toStationAvgObjData(excelData) {
-        return excelData.map(item => {
-            const row = {
-                area: item[1].includes("区") ? item[1] : null,
-                county: !item[1].includes("县") ? item[1] : null,
-                watershed: item[2],
-                place: item[3],
-                periodWaterQuality: item[4],
-                waterTemperature: item[5],
-                ph: item[6],
-                dissolvedOxygen: item[7],
-                conductivity: item[8],
-                turbidity: item[9],
-                permanganateIndex: item[10],
-                ammonia: item[11],
-                totalPhosphorus: item[12],
-                totalNitrogen: item[13],
-                mainPollutionIndicators: item[14],
-                remark: item[15],
-                // dissolvedOxygen: item[16],
-            }
-            return row;
-        })
 
-    },
-    // 国家级水功能区上报数据
-    toNationalLevelDataObj(excelData) {
-        return excelData.map(item => {
-            const row = {
-                waterBodyType: item[0],
-                provinceRegionCode: item[1],
-                waterResourcesFirstLevelZoneName: item[2],
-                dataSources: item[3],
-                sectionName: item[4],
-                samplingTime: moment(item[5],"M月D日").valueOf(),
-                permanganateIndex: item[6],
-                ammonia: item[7],
-                totalPhosphorus: item[8],
-                ffeWaterFunctionAreaWaterQualityCategory: item[9],
-                lprlCompliantEvaluationConclusion: item[10],
-                ffeCompliantEvaluationConclusion: item[11],
-                ffeMajorOverStandardItemsMultiples: item[12],
-                lprlWaterFunctionAreaWaterQualityCategory: item[13],
-                // lprlCompliantEvaluationConclusion: item[14],
-                lprlMajorOverStandardItemsMultiples: item[15],
-                remark: item[16],
-                systemCode: item[17],
-
-            }
-            return row;
-        })
-
-    },
 }
diff --git a/src/views/water/water-function-area/collect/water-bill.vue b/src/views/water/water-function-area/collect/water-bill.vue
index 854936f..efaae11 100644
--- a/src/views/water/water-function-area/collect/water-bill.vue
+++ b/src/views/water/water-function-area/collect/water-bill.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
             <!-- 表格 -->
-      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="waterFunctionAreaBillId" :datasource="url"
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="nationalLevelWaterFunctionAreaBillId" :datasource="url"
         :columns="columns" :where="where" :scroll="{x: 'max-content'}">
         <template #toolbar>
 
@@ -44,8 +44,8 @@
         </template>
         <template #billName="{ text, record }">
           <div class="editable-cell">
-            <div v-if="editableData[record.waterFunctionAreaBillId]" class="editable-cell-input-wrapper">
-              <a-input v-model:value="editableData[record.waterFunctionAreaBillId].billName" @pressEnter="save(record)" />
+            <div v-if="editableData[record.nationalLevelWaterFunctionAreaBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.nationalLevelWaterFunctionAreaBillId].billName" @pressEnter="save(record)" />
               <check-outlined class="editable-cell-icon-check" @click="save(record)" />
             </div>
             <div v-else class="editable-cell-text-wrapper">
@@ -56,9 +56,9 @@
         </template>
         <template #reportTime="{ text, record }">
           <div class="editable-cell">
-            <div v-if="editableData[record.waterFunctionAreaBillId]" class="editable-cell-input-wrapper">
-              <a-date-picker v-model:value="editableData[record.waterFunctionAreaBillId].reportTime"></a-date-picker>
-              <!-- <a-input v-model:value="editableData[record.waterFunctionAreaBillId].reportTime" @pressEnter="save(record)" /> -->
+            <div v-if="editableData[record.nationalLevelWaterFunctionAreaBillId]" class="editable-cell-input-wrapper">
+              <a-date-picker v-model:value="editableData[record.nationalLevelWaterFunctionAreaBillId].reportTime"></a-date-picker>
+              <!-- <a-input v-model:value="editableData[record.nationalLevelWaterFunctionAreaBillId].reportTime" @pressEnter="save(record)" /> -->
               <check-outlined class="editable-cell-icon-check" @click="save(record)" />
             </div>
             <div v-else class="editable-cell-text-wrapper">
@@ -111,7 +111,7 @@
     removeBatchWaterFunctionAreaBill,
     updateWaterFunctionAreaBill,
     verifyWaterFunctionAreaBill
-  } from "@/api/ecology/drinking-water";
+  } from "@/api/ecology/water-function-area";
   import moment from "moment";
   export default {
     name: 'DrinkingCollectWaterBill',
@@ -144,23 +144,6 @@
             },
 
           },
-          {
-            title: '区域等级',
-            dataIndex: 'regionLevel',
-            sorter: true,
-          },
-           {
-            title: '水源类型',
-            dataIndex: 'waterSourceType',
-            sorter: true,
-            customRender: ({text})=> text == 1?"地表水":"地下水"
-          },
-            {
-            title: '水源状态',
-            dataIndex: 'waterFunctionAreaType',
-            sorter: true,
-            customRender: ({text})=> text == 1?"在用":"备用"
-          },
           {
             title: '条目',
             dataIndex: 'recordSize',
@@ -265,18 +248,18 @@
       },
       detail(record) {
         this.$router.replace({
-          path: "/water/drinking-water/collect/water/" + record.waterFunctionAreaBillId
+          path: "/water/river/function/collect/water/" + record.nationalLevelWaterFunctionAreaBillId
         })
       },
       edit(record) {
-        this.editableData[record.waterFunctionAreaBillId] = _.cloneDeep(record);
-        this.editableData[record.waterFunctionAreaBillId].reportTime = moment(this.editableData[record.waterFunctionAreaBillId]
+        this.editableData[record.nationalLevelWaterFunctionAreaBillId] = _.cloneDeep(record);
+        this.editableData[record.nationalLevelWaterFunctionAreaBillId].reportTime = moment(this.editableData[record.nationalLevelWaterFunctionAreaBillId]
           .reportTime)
       },
       verify(record,checked) {
         const hide = this.$message.loading('请求中..', 0);
         verifyWaterFunctionAreaBill({
-          waterFunctionAreaBillId: record.waterFunctionAreaBillId,
+          nationalLevelWaterFunctionAreaBillId: record.nationalLevelWaterFunctionAreaBillId,
           checked
         }).then(res => {
           if (res.data.code == 0) {
@@ -300,11 +283,11 @@
       save(record) {
 
         let {
-          waterFunctionAreaBillId,
+          nationalLevelWaterFunctionAreaBillId,
           billName,
           reportTime
-        } = this.editableData[record.waterFunctionAreaBillId];
-        if (!waterFunctionAreaBillId || !reportTime) {
+        } = this.editableData[record.nationalLevelWaterFunctionAreaBillId];
+        if (!nationalLevelWaterFunctionAreaBillId || !reportTime) {
           this.$message.error('请填写完整信息再提交')
           return
         }
@@ -312,7 +295,7 @@
         reportTime = reportTime.format("x")
         reportTime = Number(reportTime)
         updateWaterFunctionAreaBill({
-          waterFunctionAreaBillId,
+          nationalLevelWaterFunctionAreaBillId,
           billName,
           reportTime
         }).then(res => {
@@ -327,7 +310,7 @@
           console.log(e);
           this.$message.error(e.message);
         }).finally(() => {
-          delete this.editableData[record.waterFunctionAreaBillId]
+          delete this.editableData[record.nationalLevelWaterFunctionAreaBillId]
           hide()
         })
 
@@ -335,7 +318,7 @@
       /* 删除单个 */
       remove(row) {
         const hide = this.$message.loading('请求中..', 0);
-        removeWaterFunctionAreaBill(row.waterFunctionAreaBillId).then(res => {
+        removeWaterFunctionAreaBill(row.nationalLevelWaterFunctionAreaBillId).then(res => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
             this.reload();
@@ -347,7 +330,7 @@
         }).finally(() => hide());
       },
       removeBatch() {
-        const ids = this.selectionList.map(item => item.waterFunctionAreaBillId);
+        const ids = this.selectionList.map(item => item.nationalLevelWaterFunctionAreaBillId);
         const hide = this.$message.loading('请求中..', 0);
         removeBatchWaterFunctionAreaBill(ids).then(res => {
           if (res.data.code === 0) {
@@ -361,7 +344,7 @@
           this.$message.error(e.msg);
         }).finally(() => hide());
       },
-    
+
     }
   }
 </script>
@@ -409,4 +392,4 @@
   .editable-cell:hover .editable-cell-icon {
     display: inline-block;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/water/water-function-area/collect/water.vue b/src/views/water/water-function-area/collect/water.vue
index 003baeb..c84cbe4 100644
--- a/src/views/water/water-function-area/collect/water.vue
+++ b/src/views/water/water-function-area/collect/water.vue
@@ -31,7 +31,7 @@
       </a-form>
       <a-modal
         v-model:visible="showEdit"
-        :title="form.waterFunctionAreaId !== undefined ? '修改记录' : '添加记录'"
+        :title="form.nationalLevelWaterFunctionAreaId !== undefined ? '修改记录' : '添加记录'"
         :confirm-loading="loading"
         :width="1000"
         :body-style="{ paddingBottom: '8px' }"
@@ -41,12 +41,14 @@
           ref="form"
           :model="form"
           :rules="rules"
-          :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
-          :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
+          :label-col="{ md: { span: 24 }, sm: { span: 24 } }"
+          :wrapper-col="{ md: { span: 24 }, sm: { span: 24 } }"
+          layout="vertical"
+          labelAlign="left"
         >
-          <a-row>
+          <a-row gutter="12"	>
             <a-col :md="12" :sm="24">
-              <a-form-item label="日期" name="monitorDate">
+              <a-form-item label="采样时间" name="monitorDate">
                 <a-date-picker
                   v-model:value="form.monitorDate"
                   :locale="locale"
@@ -54,22 +56,38 @@
               </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-form-item label="时间" name="monitorTime">-->
+<!--                <a-time-picker-->
+<!--                  v-model:value="form.monitorTime"-->
+<!--                  format="HH:mm"-->
+<!--                />-->
+<!--              </a-form-item>-->
             </a-col>
+            <template  v-for="(item,index) in tableColumns" :key="index">
+              <template v-if="item.children">
+                <a-col  v-for="(citem,cindex) in item.children" :key="cindex"  :md="12" :sm="24">
+                  <a-form-item :label="item.title + '-' + citem.title" :name="citem.dataIndex">
+                    <a-input
+                      v-model:value="form[citem.dataIndex]"
+                      :placeholder="'请输入' +item.title + '-' + citem.title"
+                      allow-clear
+                    />
+                  </a-form-item>
+                </a-col>
+              </template>
+              <template v-else>
+                <a-col :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>
+              </template>
+            </template>
+
           </a-row>
         </a-form>
       </a-modal>
@@ -77,7 +95,7 @@
       <ele-pro-table
         v-model:selection="selectionList"
         ref="table"
-        row-key="waterFunctionAreaId"
+        row-key="nationalLevelWaterFunctionAreaId"
         :datasource="url"
         :columns="columns"
         :where="where"
@@ -140,13 +158,13 @@ import {
   updateWaterFunctionArea,
   getWaterFunctionAreaBill,
   // getColumnOptions,
-} from "@/api/ecology/drinking-water";
+} from "@/api/ecology/water-function-area";
 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: "DrinkingCollectWater",
+  name: "WaterFunctionAreaCollectWater",
   components: {},
   data() {
     const { billId } = this.$route.params;
@@ -160,26 +178,10 @@ export default {
       // 表格列配置
       columns: [
         ...tableColumns,
-        {
-          title: "区域等级",
-          dataIndex: "regionLevel",
-          sorter: true,
-        },
-        {
-          title: "水源类型",
-          dataIndex: "waterSourceType",
-          sorter: true,
-          customRender: ({ text }) => (text == 1 ? "地表水" : "地下水"),
-        },
-        {
-          title: "水源状态",
-          dataIndex: "waterFunctionAreaType",
-          sorter: true,
-          customRender: ({ text }) => (text == 1 ? "在用" : "备用"),
-        },
+
         {
           title: "创建人",
-          dataIndex: "username",
+          dataIndex: "userName",
           sorter: true,
         },
         {
@@ -194,9 +196,9 @@ export default {
         },
       ],
       // 表格搜索条件
-      waterFunctionAreaBillId: billId,
+      nationalLevelWaterFunctionAreaBillId: billId,
       where: {
-        waterFunctionAreaBillId: billId,
+        nationalLevelWaterFunctionAreaBillId: billId,
       },
       // 表格选中数据
       selectionList: [],
@@ -223,8 +225,8 @@ export default {
     loadOptionData() {},
     /* 刷新表格 */
     reload() {
-      console.log(this.$route);
-      console.log(this.$router);
+      console.log("--------------------------")
+      console.log(this.url);
       this.$refs.table.reload({
         where: this.where,
       });
@@ -232,17 +234,17 @@ export default {
     /* 重置搜索 */
     reset() {
       this.where = {
-        waterFunctionAreaBillId: this.waterFunctionAreaBillId,
+        nationalLevelWaterFunctionAreaBillId: this.nationalLevelWaterFunctionAreaBillId,
       };
       this.reload();
     },
     /* 显示编辑 */
     openEdit(record) {
       const cloneRecord = _.cloneDeep(record);
-      if (record && cloneRecord.monitorTime) {
+      if (record && cloneRecord.samplingTime) {
         console.log(moment(cloneRecord.monitorTime).format("YYYY MM DD"));
-        cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
-        cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
+        cloneRecord.monitorDate = moment(cloneRecord.samplingTime);
+        cloneRecord.monitorTime = moment(cloneRecord.samplingTime);
       }
       // cloneRecord.mi
       this.form = Object.assign({}, cloneRecord);
@@ -261,14 +263,15 @@ export default {
       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();
+      form.samplingTime = 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.waterFunctionAreaId) {
+      delete form["monitorTime"];
+      if (form.nationalLevelWaterFunctionAreaId) {
         updateWaterFunctionArea(form)
           .then((res) => {
             if (res.data.code == 0) {
@@ -287,7 +290,7 @@ export default {
             hide();
           });
       } else {
-        form.waterFunctionAreaBillId = this.waterFunctionAreaBillId;
+        form.nationalLevelWaterFunctionAreaBillId = this.nationalLevelWaterFunctionAreaBillId;
         saveWaterFunctionArea(form)
           .then((res) => {
             if (res.data.code == 0) {
@@ -309,7 +312,7 @@ export default {
     /* 删除单个 */
     remove(row) {
       const hide = this.$message.loading("请求中..", 0);
-      removeWaterFunctionArea(row.waterFunctionAreaId)
+      removeWaterFunctionArea(row.nationalLevelWaterFunctionAreaId)
         .then((res) => {
           if (res.data.code === 0) {
             this.$message.success(res.data.msg);
@@ -324,7 +327,7 @@ export default {
         .finally(() => hide());
     },
     removeBatch() {
-      const ids = this.selectionList.map((item) => item.waterFunctionAreaId);
+      const ids = this.selectionList.map((item) => item.nationalLevelWaterFunctionAreaId);
       const hide = this.$message.loading("请求中..", 0);
       removeBatchWaterFunctionArea(ids)
         .then((res) => {
@@ -345,4 +348,4 @@ export default {
 </script>
 
 <style scoped lang="less">
-</style>
\ No newline at end of file
+</style>