diff --git a/src/api/ecology/water-function-area.js b/src/api/ecology/water-function-area.js
new file mode 100644
index 0000000..eb6e0c7
--- /dev/null
+++ b/src/api/ecology/water-function-area.js
@@ -0,0 +1,94 @@
+import axios from 'axios';
+// ----------------------列表-----------------------
+const pageBillUrl = '/waterFunctionArea/waterFunctionAreaBill/page';
+// 添加
+const saveWaterFunctionAreaBill = function (data) {
+    return axios.post("/waterFunctionArea/waterFunctionAreaBill/importBatch",data)
+}
+
+// 删除
+const removeWaterFunctionAreaBill = function (id) {
+    return axios.delete(`/waterFunctionArea/waterFunctionAreaBill/${id}`,)
+}
+// 批量删除
+const removeBatchWaterFunctionAreaBill = function (ids) {
+    return axios.delete("/waterFunctionArea/waterFunctionAreaBill/batch",{data:ids})
+}
+
+// 修改
+const updateWaterFunctionAreaBill = function (data) {
+    return axios.put("/waterFunctionArea/waterFunctionAreaBill",data)
+}
+// 审核
+const verifyWaterFunctionAreaBill = function (data) {
+    return axios.put("/waterFunctionArea/waterFunctionAreaBill/verify",data);
+}
+const getWaterFunctionAreaBill = function (id) {
+    return axios.get(`/waterFunctionArea/waterFunctionAreaBill/${id}`)
+}
+// -------------------------数据---------------------
+const pageWaterFunctionAreaUrl = '/waterFunctionArea/waterFunctionArea/page';
+
+const listAll = function(data){
+    return axios.get("/waterFunctionArea/waterFunctionArea",{params:data})
+}
+// 添加
+const saveWaterFunctionArea = function (data) {
+    return axios.post("/waterFunctionArea/waterFunctionArea",data)
+}
+
+// 删除
+const removeWaterFunctionArea = function (id) {
+    return axios.delete(`/waterFunctionArea/waterFunctionArea/${id}`,)
+}
+// 批量删除
+const removeBatchWaterFunctionArea = function (ids) {
+    return axios.delete("/waterFunctionArea/waterFunctionArea/batch",{data:ids})
+}
+
+// 修改
+const updateWaterFunctionArea = function (data) {
+        return axios.put("/waterFunctionArea/waterFunctionArea",data)
+}
+
+
+
+// -------------------------统计---------------------
+const pageWaterFunctionAreaStatisticUrl = '/waterFunctionArea/waterFunctionArea/statistic';
+const pageWaterFunctionAreaCompare = '/waterFunctionArea/waterFunctionArea/statistic/compare';
+const getHistoryyears = function () {
+    return axios.get("/waterFunctionArea/waterFunctionArea/history-year")
+}
+const getColumnOptions = function(column){
+    return axios.get("/waterFunctionArea/waterFunctionArea/options",{params:{column}})
+}
+
+const getGisBase = function(data){
+    return axios.get("/waterFunctionArea/waterFunctionArea/gis",{params:data})
+}
+
+const getGisArea = function(data){
+    return axios.get("/waterFunctionArea/waterFunctionArea/gis/area",{params:data})
+}
+export {
+    pageBillUrl,
+    saveWaterFunctionAreaBill,
+    removeWaterFunctionAreaBill,
+    updateWaterFunctionAreaBill,
+    removeBatchWaterFunctionAreaBill,
+    verifyWaterFunctionAreaBill,
+    getWaterFunctionAreaBill,
+    pageWaterFunctionAreaUrl,
+    saveWaterFunctionArea,
+    removeWaterFunctionArea,
+    updateWaterFunctionArea,
+    removeBatchWaterFunctionArea,
+    pageWaterFunctionAreaStatisticUrl,
+    getHistoryyears,
+    pageWaterFunctionAreaCompare,
+    getColumnOptions,
+    listAll,
+    getGisBase,
+    getGisArea
+  
+}
diff --git a/src/views/water/river/collect/index.vue b/src/views/water/river/collect/index.vue
index 6899a0b..501b184 100644
--- a/src/views/water/river/collect/index.vue
+++ b/src/views/water/river/collect/index.vue
@@ -94,7 +94,6 @@ export default {
             });
             return;
           }
-
           const tasks = [];
           if (billData.length > 0) {
             tasks.push(
diff --git a/src/views/water/water-function-area/collect/colums.js b/src/views/water/water-function-area/collect/colums.js
new file mode 100644
index 0000000..d801d8d
--- /dev/null
+++ b/src/views/water/water-function-area/collect/colums.js
@@ -0,0 +1,128 @@
+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: "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
diff --git a/src/views/water/water-function-area/collect/index.vue b/src/views/water/water-function-area/collect/index.vue
new file mode 100644
index 0000000..a0c3b90
--- /dev/null
+++ b/src/views/water/water-function-area/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 { saveWaterFunctionAreaBill } from "@/api/ecology/water-function-area";
+export default {
+  name: "DrinkWaterCollectIndex",
+  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(
+              saveWaterFunctionAreaBill({
+                reportTime: new Date(reportDate1).getTime(),
+                billName: billName1,
+                regionLevel: "市级",
+                waterSourceType: 1,
+                waterFunctionAreaType: 1,
+                waterFunctionAreaList: billData1,
+              })
+            );
+          }
+
+          if (billData2.length > 0) {
+            tasks.push(
+              saveWaterFunctionAreaBill({
+                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) {
+            // 上传到服务器
+            saveWaterFunctionAreaBill({
+              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) {
+            // 上传到服务器
+            saveWaterFunctionAreaBill({
+              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>
\ No newline at end of file
diff --git a/src/views/water/water-function-area/collect/utils.js b/src/views/water/water-function-area/collect/utils.js
new file mode 100644
index 0000000..d59e42a
--- /dev/null
+++ b/src/views/water/water-function-area/collect/utils.js
@@ -0,0 +1,57 @@
+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;
+        })
+
+    },
+}
\ No newline at end of file
diff --git a/src/views/water/water-function-area/collect/water-bill.vue b/src/views/water/water-function-area/collect/water-bill.vue
new file mode 100644
index 0000000..854936f
--- /dev/null
+++ b/src/views/water/water-function-area/collect/water-bill.vue
@@ -0,0 +1,412 @@
+<template>
+  <div>
+            <!-- 表格 -->
+      <ele-pro-table v-model:selection="selectionList" ref="table" row-key="waterFunctionAreaBillId" :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.waterFunctionAreaBillId]" class="editable-cell-input-wrapper">
+              <a-input v-model:value="editableData[record.waterFunctionAreaBillId].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.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)" /> -->
+              <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,
+    // saveWaterFunctionAreaBill,
+    removeWaterFunctionAreaBill,
+    removeBatchWaterFunctionAreaBill,
+    updateWaterFunctionAreaBill,
+    verifyWaterFunctionAreaBill
+  } from "@/api/ecology/drinking-water";
+  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: 'regionLevel',
+            sorter: true,
+          },
+           {
+            title: '水源类型',
+            dataIndex: 'waterSourceType',
+            sorter: true,
+            customRender: ({text})=> text == 1?"地表水":"地下水"
+          },
+            {
+            title: '水源状态',
+            dataIndex: 'waterFunctionAreaType',
+            sorter: true,
+            customRender: ({text})=> text == 1?"在用":"备用"
+          },
+          {
+            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/drinking-water/collect/water/" + record.waterFunctionAreaBillId
+        })
+      },
+      edit(record) {
+        this.editableData[record.waterFunctionAreaBillId] = _.cloneDeep(record);
+        this.editableData[record.waterFunctionAreaBillId].reportTime = moment(this.editableData[record.waterFunctionAreaBillId]
+          .reportTime)
+      },
+      verify(record,checked) {
+        const hide = this.$message.loading('请求中..', 0);
+        verifyWaterFunctionAreaBill({
+          waterFunctionAreaBillId: record.waterFunctionAreaBillId,
+          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 {
+          waterFunctionAreaBillId,
+          billName,
+          reportTime
+        } = this.editableData[record.waterFunctionAreaBillId];
+        if (!waterFunctionAreaBillId || !reportTime) {
+          this.$message.error('请填写完整信息再提交')
+          return
+        }
+        const hide = this.$message.loading('请求中..', 0);
+        reportTime = reportTime.format("x")
+        reportTime = Number(reportTime)
+        updateWaterFunctionAreaBill({
+          waterFunctionAreaBillId,
+          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.waterFunctionAreaBillId]
+          hide()
+        })
+
+      },
+      /* 删除单个 */
+      remove(row) {
+        const hide = this.$message.loading('请求中..', 0);
+        removeWaterFunctionAreaBill(row.waterFunctionAreaBillId).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.waterFunctionAreaBillId);
+        const hide = this.$message.loading('请求中..', 0);
+        removeBatchWaterFunctionAreaBill(ids).then(res => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        }).catch(e => {
+
+          this.$message.error(e.msg);
+        }).finally(() => hide());
+      },
+    
+    }
+  }
+</script>
+
+<style lang="less">
+  .editable-cell {
+    position: relative;
+
+    .editable-cell-input-wrapper,
+    .editable-cell-text-wrapper {
+      padding-right: 24px;
+    }
+
+    .editable-cell-text-wrapper {
+      padding: 5px 24px 5px 5px;
+    }
+
+    .editable-cell-icon,
+    .editable-cell-icon-check {
+      position: absolute;
+      right: 0;
+      width: 20px;
+      cursor: pointer;
+    }
+
+    .editable-cell-icon {
+      margin-top: 4px;
+      display: none;
+    }
+
+    .editable-cell-icon-check {
+      line-height: 28px;
+    }
+
+    .editable-cell-icon:hover,
+    .editable-cell-icon-check:hover {
+      color: #108ee9;
+    }
+
+    .editable-add-btn {
+      margin-bottom: 8px;
+    }
+  }
+
+  .editable-cell:hover .editable-cell-icon {
+    display: inline-block;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/water/water-function-area/collect/water.vue b/src/views/water/water-function-area/collect/water.vue
new file mode 100644
index 0000000..003baeb
--- /dev/null
+++ b/src/views/water/water-function-area/collect/water.vue
@@ -0,0 +1,348 @@
+<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.waterFunctionAreaId !== 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="waterFunctionAreaId"
+        :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 {
+  pageWaterFunctionAreaUrl,
+  saveWaterFunctionArea,
+  removeWaterFunctionArea,
+  removeBatchWaterFunctionArea,
+  updateWaterFunctionArea,
+  getWaterFunctionAreaBill,
+  // getColumnOptions,
+} from "@/api/ecology/drinking-water";
+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",
+  components: {},
+  data() {
+    const { billId } = this.$route.params;
+    return {
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageWaterFunctionAreaUrl,
+      selection: [],
+      tableColumns,
+      // 表格列配置
+      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",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+          slots: {
+            customRender: "action",
+          },
+        },
+      ],
+      // 表格搜索条件
+      waterFunctionAreaBillId: billId,
+      where: {
+        waterFunctionAreaBillId: billId,
+      },
+      // 表格选中数据
+      selectionList: [],
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 表单数据
+      form: {},
+      loading: false,
+      rules: {},
+    };
+  },
+  mounted() {
+    const { billId } = this.$route.params;
+    getWaterFunctionAreaBill(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 = {
+        waterFunctionAreaBillId: this.waterFunctionAreaBillId,
+      };
+      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.waterFunctionAreaId) {
+        updateWaterFunctionArea(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.waterFunctionAreaBillId = this.waterFunctionAreaBillId;
+        saveWaterFunctionArea(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);
+      removeWaterFunctionArea(row.waterFunctionAreaId)
+        .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.waterFunctionAreaId);
+      const hide = this.$message.loading("请求中..", 0);
+      removeBatchWaterFunctionArea(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/water-function-area/statistic/average.vue b/src/views/water/water-function-area/statistic/average.vue
new file mode 100644
index 0000000..fb5825a
--- /dev/null
+++ b/src/views/water/water-function-area/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/water-function-area/statistic/base.vue b/src/views/water/water-function-area/statistic/base.vue
new file mode 100644
index 0000000..75e6a60
--- /dev/null
+++ b/src/views/water/water-function-area/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/water-function-area/statistic/compare.vue b/src/views/water/water-function-area/statistic/compare.vue
new file mode 100644
index 0000000..733daea
--- /dev/null
+++ b/src/views/water/water-function-area/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/water-function-area/statistic/index.vue b/src/views/water/water-function-area/statistic/index.vue
new file mode 100644
index 0000000..c9fb001
--- /dev/null
+++ b/src/views/water/water-function-area/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