From 1d73a0440a135c321de53940f8800973eb9501ab Mon Sep 17 00:00:00 2001
From: shixiaoman <531268472@qq.com>
Date: Mon, 22 Nov 2021 22:22:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=9F=E6=B2=B3=E6=B0=B4=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/water/river-api-relate.js     |   6 +-
 src/api/ecology/water/river-autonomous.js     |   6 +-
 src/api/ecology/water/river-plcae.js          |   6 +-
 src/api/ecology/water/river-water.js          |   4 +-
 .../water/river-station/statistic/average.vue | 258 ------
 .../water/river-station/statistic/base.vue    | 570 --------------
 .../water/river-station/statistic/compare.vue | 508 ------------
 .../water/river-station/statistic/index.vue   |  56 --
 .../river-station/statistic/site-day-avg.vue  | 654 ++++------------
 .../water/river-station/statistic/site.vue    | 738 +++++-------------
 src/views/water/river/collect/index.vue       |  26 -
 src/views/water/river/collect/utils.js        |   9 +-
 src/views/water/river/dict/api-relate.vue     |   3 +
 src/views/water/river/dict/autonomous.vue     |   3 +
 src/views/water/river/statistic/base.vue      | 408 +++-------
 src/views/water/river/statistic/index.vue     |  16 +-
 .../water-function-area/statistic/auto.vue    | 453 ++++-------
 .../water-function-area/statistic/base.vue    | 570 --------------
 .../water-function-area/statistic/colums.js   |  53 +-
 .../water-function-area/statistic/index.vue   |  40 -
 .../statistic/national.vue                    | 508 +++++-------
 21 files changed, 920 insertions(+), 3975 deletions(-)
 delete mode 100644 src/views/water/river-station/statistic/average.vue
 delete mode 100644 src/views/water/river-station/statistic/base.vue
 delete mode 100644 src/views/water/river-station/statistic/compare.vue
 delete mode 100644 src/views/water/river-station/statistic/index.vue
 delete mode 100644 src/views/water/water-function-area/statistic/base.vue
 delete mode 100644 src/views/water/water-function-area/statistic/index.vue

diff --git a/src/api/ecology/water/river-api-relate.js b/src/api/ecology/water/river-api-relate.js
index c557ebd..d6a9d74 100644
--- a/src/api/ecology/water/river-api-relate.js
+++ b/src/api/ecology/water/river-api-relate.js
@@ -29,6 +29,9 @@ const copyBatchAqiRelate = function (data){
 const getColumnOptions = function(column){
     return axios.get("waterFunctionArea/nationalLevelWaterFunctionAreaPoint/options",{params:{column}})
 }
+const listInfo = function(){
+    return axios.post("/waterFunctionArea/nationalLevelWaterFunctionAreaPoint/listInfo",{})
+}
 export {
     listAllUrl,
     saveAqiRelate,
@@ -36,6 +39,7 @@ export {
     removeBatchAqiRelate,
     removeAqiRelate,
     copyBatchAqiRelate,
-    getColumnOptions
+    getColumnOptions,
+    listInfo
 
 }
diff --git a/src/api/ecology/water/river-autonomous.js b/src/api/ecology/water/river-autonomous.js
index 62f5e9d..4719d9a 100644
--- a/src/api/ecology/water/river-autonomous.js
+++ b/src/api/ecology/water/river-autonomous.js
@@ -28,6 +28,9 @@ const copyBatchStandard = function (data){
 const getColumnOptions = function(column){
     return axios.get("waterFunctionArea/autonomousWaterFunctionAreaPoint/options",{params:{column}})
 }
+const listInfo = function(){
+    return axios.post("/waterFunctionArea/autonomousWaterFunctionAreaPoint/listInfo",{})
+}
 export {
     listAllUrl,
     saveStandard,
@@ -35,6 +38,7 @@ export {
     removeBatchStandard,
     removeStandard,
     copyBatchStandard,
-    getColumnOptions
+    getColumnOptions,
+    listInfo
 
 }
diff --git a/src/api/ecology/water/river-plcae.js b/src/api/ecology/water/river-plcae.js
index 7cd615a..89bce65 100644
--- a/src/api/ecology/water/river-plcae.js
+++ b/src/api/ecology/water/river-plcae.js
@@ -27,6 +27,9 @@ const copyBatchPlace = function (data){
 const getColumnOptions = function(column){
     return axios.get("/waterFunctionArea/surfaceWaterPoint/options",{params:{column}})
 }
+const listInfo = function(){
+    return axios.post("/waterFunctionArea/surfaceWaterPoint/listInfo",{})
+}
 export {
     listAllUrl,
     savePlace,
@@ -34,6 +37,7 @@ export {
     removeBatchPlace,
     removePlace,
     copyBatchPlace,
-    getColumnOptions
+    getColumnOptions,
+    listInfo
 
 }
diff --git a/src/api/ecology/water/river-water.js b/src/api/ecology/water/river-water.js
index 59436ed..4386723 100644
--- a/src/api/ecology/water/river-water.js
+++ b/src/api/ecology/water/river-water.js
@@ -28,8 +28,8 @@ const copyBatchPlace = function (data){
 const getColumnOptions = function(column){
     return axios.get("/waterFunctionArea/WaterStationPoint/options",{params:{column}})
 }
-const listInfo = function(data){
-    return axios.get("/waterFunctionArea/WaterStationPoint",{params:data})
+const listInfo = function(){
+    return axios.post("/waterFunctionArea/autonomousWaterFunctionAreaPoint/listInfo",{})
 }
 export {
     listInfo,
diff --git a/src/views/water/river-station/statistic/average.vue b/src/views/water/river-station/statistic/average.vue
deleted file mode 100644
index d482e65..0000000
--- a/src/views/water/river-station/statistic/average.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<template>
-  <div class="">
-    <ele-pro-table
-      ref="table"
-      row-key="id"
-      :datasource="url"
-      :columns="columns"
-      :where="where"
-      :needPage="false"
-      @done="(d) => (data = d.data)"
-      :scroll="{ x: 'max-content' }"
-    >
-      <template #toolbar>
-        <!-- 搜索表单 -->
-        <a-form :model="where" layout="inline" :labelCol="{ offset: 1 }">
-          <a-row>
-            <a-col :lg="6" :md="12" :sm="24" :xs="24">
-              <a-form-item label="昼夜:">
-                <a-select
-                  :options="timeSlotOptions"
-                  v-model:value="where.timeSlot"
-                  placeholder="昼夜"
-                >
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="8" :md="12" :sm="24" :xs="24">
-              <a-form-item label="时间范围:">
-                <!-- <a-month-picker v-model:value="timeScope" placeholder="起始" /> -->
-                <a-range-picker v-model:value="timeScope" format="YYYY-MM-DD" />
-              </a-form-item>
-            </a-col>
-
-            <a-col :lg="4" :md="12" :sm="24" :xs="24">
-              <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-                <a-space>
-                  <a-button type="primary" @click="reload">查询</a-button>
-                  <a-button @click="reset">重置</a-button>
-                  <a-button @click="exportFile">导出excel</a-button>
-                </a-space>
-              </a-form-item>
-            </a-col>
-          </a-row>
-        </a-form>
-        <!-- <a-space>
-            
-          </a-space> -->
-      </template>
-      <template #Leq="{ text, record }">
-        <a-tag
-          v-if="
-            (where.timeSlot == '昼' && text <= 68) ||
-            (where.timeSlot == '夜' && text <= 58)
-          "
-          color="green"
-          >{{ text }}</a-tag
-        >
-        <a-tag
-          v-else-if="
-            (record.timeSlot == '昼' && text > 68 && text <= 70) ||
-            (record.timeSlot == '夜' && text > 58 && text <= 60)
-          "
-          color="blue"
-          >{{ text }}</a-tag
-        >
-        <a-tag
-          v-else-if="
-            (record.timeSlot == '昼' && text > 70 && text <= 72) ||
-            (record.timeSlot == '夜' && text > 60 && text <= 62)
-          "
-          color="red"
-          >{{ text }}</a-tag
-        >
-        <a-tag
-          v-else-if="
-            (record.timeSlot == '昼' && text > 62 && text <= 74) ||
-            (record.timeSlot == '夜' && text > 62 && text <= 64)
-          "
-          color="red"
-          >{{ text }}</a-tag
-        >
-        <a-tag
-          v-else-if="
-            (record.timeSlot == '昼' && text > 74) ||
-            (record.timeSlot == '夜' && text > 64)
-          "
-          color="red"
-          >{{ text }}</a-tag
-        >
-        <template v-else color="#FFF">{{ text }}</template>
-      </template>
-    </ele-pro-table>
-  </div>
-</template>
-
-<script>
-import _ from "lodash";
-import XLSX from "xlsx";
-import { pageRoadNoiseStatisticUrl } from "@/api/ecology/noise/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
deleted file mode 100644
index 39bfef4..0000000
--- a/src/views/water/river-station/statistic/base.vue
+++ /dev/null
@@ -1,570 +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.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/noise/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() {
-
-      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
deleted file mode 100644
index 43bbc77..0000000
--- a/src/views/water/river-station/statistic/compare.vue
+++ /dev/null
@@ -1,508 +0,0 @@
-<template>
-  <div class="">
-    <a-form :model="where" :rules="whereRules" :labelCol="{ offset: 1 }">
-      <a-row>
-        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="统计模块:">
-            <a-select
-              :options="groupModelOptions"
-              v-model:value="where.groupModel"
-              placeholder="统计模块"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col> -->
-        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="时间细度:">
-            <a-select
-              :options="groupTimeLengthOptions"
-              v-model:value="where.groupTimeLength"
-              placeholder=""
-            >
-            </a-select>
-          </a-form-item>
-        </a-col> -->
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item name="timeRange" label="时间范围:">
-            <a-range-picker
-              @panelChange="timeRangePanelChange"
-              v-model:value="timeRange"
-              format="YYYY"
-              :mode="['year', 'year']"
-            />
-          </a-form-item>
-        </a-col>
-        <a-col :lg="6" :md="12" :sm="24" :xs="24">
-          <a-form-item label="昼夜:">
-            <a-select
-              :options="timeSlotOptions"
-              v-model:value="where.timeSlot"
-              placeholder="昼夜"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-
-        <a-col :lg="12" :md="12" :sm="24" :xs="24">
-          <a-form-item label="类型:">
-            <a-select
-              v-model:value="where.valueType"
-              :options="valueTypeOptions"
-              mode="multiple"
-              placeholder="至少选择一项"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
-              <a-form-item label="时间范围:">
-                <a-range-picker @change="reportTimeScopeChange" :mode="['year','year']" separator="~" v-model:value="where.reportTimeScope" ><a-range-picker>
-                   <template #renderExtraFooter>
-                      extra footer
-                    </template>
-                </a-range-picker>
-              </a-form-item>
-            </a-col> -->
-
-        <a-col :lg="12" :md="12" :sm="24" :xs="24">
-          <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
-            <a-space>
-              <a-button type="primary" @click="reload">查询</a-button>
-              <a-button @click="reset">重置</a-button>
-              <a-button @click="exportFile">导出Excel</a-button>
-            </a-space>
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-    <ele-pro-table
-      v-if="hisYears.length > 0"
-      ref="table"
-      row-key="id"
-      :datasource="url"
-      :columns="columns"
-      :where="where"
-      :needPage="false"
-      :initLoad="false"
-      :scroll="{ x: 'max-content' }"
-      :method="'POST'"
-      @done="(d) => (data = d.data)"
-    >
-      <template #toolbar>
-        <!-- 搜索表单 -->
-
-        <!-- <a-space>
-            
-        </a-space> -->
-      </template>
-    </ele-pro-table>
-  </div>
-</template>
-
-<script>
-// import _ from "lodash";
-import { ref } from "vue";
-import XLSX from "xlsx";
-import {
-  pageRoadNoiseCompare,
-  getHistoryyears,
-} from "@/api/ecology/noise/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
deleted file mode 100644
index 7b7f135..0000000
--- a/src/views/water/river-station/statistic/index.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<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-station/statistic/site-day-avg.vue b/src/views/water/river-station/statistic/site-day-avg.vue
index 43bbc77..c324d69 100644
--- a/src/views/water/river-station/statistic/site-day-avg.vue
+++ b/src/views/water/river-station/statistic/site-day-avg.vue
@@ -1,508 +1,188 @@
+<!-- 江河水查看数据页面-->
 <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="统计模块"
-            >
+  <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-form-item label="断面名称">
+            <a-select v-model:value="where.sectionName" allowClear showSearch>
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              </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
-              :options="groupTimeLengthOptions"
-              v-model:value="where.groupTimeLength"
-              placeholder=""
-            >
+          <a-form-item label="月份:">
+            <a-month-picker v-model:value="where.time" :disabled-date="disabledDate" />
+          </a-form-item>
+          <a-form-item label="类型:" style="width:100px">
+            <a-select v-model:value="where.type" allowClear showSearch>
+              <a-select-option value="0">上半月</a-select-option>
+              <a-select-option value="1">下半月</a-select-option>
+              <a-select-option value="2">整月</a-select-option>
             </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>
+          <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 ref="table" :datasource="datasource" :columns="columns" :where="where"
+        :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
+      </ele-pro-table>
+    </a-card>
   </div>
+  <!-- 编辑弹窗 -->
 </template>
 
 <script>
-// import _ from "lodash";
-import { ref } from "vue";
-import XLSX from "xlsx";
-import {
-  pageRoadNoiseCompare,
-  getHistoryyears,
-} from "@/api/ecology/noise/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: [
+  import {
+    // autonomyWaterFunctionTotalUrl,
+    listWaterSiteMonthTotal
+  } from "@/api/ecology/river-statis";
+  import {
+    listInfo
+  } from "@/api/ecology/water/river-water";
+  import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+  // import {
+  //   tableColumns
+  // } from "./colums";
+  import XLSX from "xlsx";
+  export default {
+    name: "RiverCollectWater",
+    components: {},
+    data() {
+      return {
+        data: [],
+        locale,
+        datasource: {},
+        // 表格数据接口
+        // url: autonomyWaterFunctionTotalUrl,
+        selection: [],
+        // tableColumns,
+        // 表格列配置
+        columns: [
         {
-          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: "市级"
+            title: '所在河流名称',
+            dataIndex: 'riverName',
+            key: 'riverName',
+          },
+          {
+            title: '自动站名称',
+            dataIndex: 'stationName',
+            key: 'stationName',
+          },
+          {
+            title: '水质考核目标',
+            dataIndex: 'waterTarget',
+            key: 'waterTarget',
+          },
+          {
+            title: '水质类别',
+            dataIndex: 'waterQualityType',
+            key: 'waterQualityType',
+          },
+          {
+            title: '水温（℃）',
+            dataIndex: 'waterTemperature',
+            key: 'waterTemperature',
+          },
+          {
+            title: 'pH (无量纲)',
+            dataIndex: 'ph',
+            key: 'ph',
+          },  
+          {
+            title: '溶解氧(mg/L)',
+            dataIndex: 'dissolvedOxygen',
+            key: 'dissolvedOxygen',
+          },  
+          {
+            title: '高锰酸盐指数 (mg/L)',
+            dataIndex: 'permanganateIndex',
+            key: 'permanganateIndex',
+          },  
+          {
+            title: '氨氮 (mg/L)',
+            dataIndex: 'ammonia',
+            key: 'ammonia',
+          },  
+          {
+            title: '总磷(mg/L)',
+            dataIndex: 'totalPhosphorus',
+            key: 'totalPhosphorus',
+          },  
+          {
+            title: '总氮(mg/L)',
+            dataIndex: 'totalNitrogen',
+            key: 'totalNitrogen',
+          },  
+        ],
+        // 表格搜索条件
+        where: {},
+        sectionInfo: {},
+        loading: false,
+        rules: {},
       };
-      this.this.timeScope = [];
-      this.reload();
     },
-    reportTimeScopeChange(d, dstr) {
-      console.log(d, dstr);
+    created() {
+      listInfo().then((res) => {
+        if (res.data.code == 0) {
+          console.log(res.data.data)
+          this.visibleWater = true;
+          this.sectionInfo = res.data.data
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      })
     },
-    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,
+    methods: {
+      /* 刷新表格 */
+      reload() {
+        // this.$refs.table.reload({
+        //   where: this.where,
+        // });
+        listWaterSiteMonthTotal(this.where).then((res) => {
+          if (res.data.code == 0) {
+            this.$message.success(res.data.msg);
+            this.datasource = res.data.data;
+          } else {
+            this.$message.error(res.data.msg);
+          }
         });
-      } 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,
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {};
+        this.reload();
+      },
+      /* 导出 */
+      exportFile() {
+        const columns = this.columns.filter(item => item.dataIndex);
+        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());
       }
 
-      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
+<style scoped lang="less">
+</style>
diff --git a/src/views/water/river-station/statistic/site.vue b/src/views/water/river-station/statistic/site.vue
index 39bfef4..69094bc 100644
--- a/src/views/water/river-station/statistic/site.vue
+++ b/src/views/water/river-station/statistic/site.vue
@@ -1,57 +1,36 @@
+<!-- 江河水查看数据页面-->
 <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-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.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-form-item label="断面名称">
+            <a-select v-model:value="where.sectionName" allowClear showSearch>
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <!-- <a-form-item label="年份:">
+            <a-date-picker valueFormat="YYYY" v-model:value="where.year"></a-date-picker>
+          </a-form-item>
+          <a-form-item label="月份:">
+            <a-date-picker valueFormat="MM" v-model:value="where.month"></a-date-picker>
+          </a-form-item> -->
+          <a-form-item label="月份:">
+              <a-month-picker
+              v-model:value="where.time"
+              :disabled-date="disabledDate"
+            />
+          </a-form-item>
+          <a-form-item label="类型:" style="width:100px"> 
+            <a-select v-model:value="where.type" allowClear showSearch>
+              <a-select-option value="0">上半月</a-select-option>
+              <a-select-option value="1">下半月</a-select-option>
+              <a-select-option value="2">整月</a-select-option>
+            </a-select>
+          </a-form-item>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
               <a-space>
@@ -64,24 +43,12 @@
         </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 ref="table" :datasource="momData" :columns="columnsMom" :where="where"
+        :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
+      </ele-pro-table>
+
+      <ele-pro-table ref="table" :datasource="yoyData" :columns="columnsYoy" :where="where"
+        :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
       </ele-pro-table>
     </a-card>
   </div>
@@ -89,482 +56,175 @@
 </template>
 
 <script>
-// import _ from "lodash";
-import XLSX from "xlsx";
-import { pageRoadNoiseUrl, getColumnOptions } from "@/api/ecology/noise/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: [
+ import {
+  listWaterSiteYoy
+  } from "@/api/ecology/river-statis";
+  import {
+    listInfo
+  } from "@/api/ecology/water/river-water";
+  import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+  // import {
+  //   tableColumns
+  // } from "./colums";
+  import XLSX from "xlsx";
+  export default {
+    name: "RiverCollectWater",
+    components: {},
+    data() {
+      return {
+        data: [],
+        momData:[],
+        yoyData:[],
+        datasource: {},
+        columnsMom: [{
+            title: '所在河流名称',
+            dataIndex: 'riverName',
+            key: 'riverName',
+          },
+          {
+            title: '自动站名称',
+            dataIndex: 'stationName',
+            key: 'stationName',
+          },
+          {
+            title: "溶解氧（mg/L）", children: [
+              {title: "本半月", dataIndex: "oxygenMonth"},
+              {title: "上期", dataIndex: "oxygenLast"},
+              {title: "增减", dataIndex: "oxygenLastvalue"},
+            ]
+          },
+          {
+            title: "高锰酸盐指数（mg/L）", children: [
+              {title: "本半月", dataIndex: "permanganateMonth"},
+              {title: "上期", dataIndex: "permanganateLast"},
+              {title: "增减", dataIndex: "permanganateLastValue"},
+            ]
+          },
+          {
+            title: "氨氮（mg/L）", children: [
+              {title: "本半月", dataIndex: "ammoniaMonth"},
+              {title: "上期", dataIndex: "ammoniaLast"},
+              {title: "增减", dataIndex: "ammoniaLastValue"},
+            ]
+          },
+          {
+            title: "总磷（mg/L）", children: [
+              {title: "本半月", dataIndex: "phosphorusMonth"},
+              {title: "上期", dataIndex: "phosphorusLast"},
+              {title: "增减", dataIndex: "phosphorusLastValue"},
+            ]
+          },
+        ],
+        columnsYoy: [
         {
-          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() {
-
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        checked: 1,
+            title: '所在河流名称',
+            dataIndex: 'riverName',
+            key: 'riverName',
+          },
+          {
+            title: '自动站名称',
+            dataIndex: 'stationName',
+            key: 'stationName',
+          },
+          {
+            title: "溶解氧（mg/L）", children: [
+              {title: "本半月", dataIndex: "oxygenMonth"},
+              {title: "去年同期", dataIndex: "oxygenLastYearStage"},
+              {title: "增减", dataIndex: "oxygenYearvalue"},
+            ]
+          },
+          {
+            title: "高锰酸盐指数（mg/L）", children: [
+              {title: "本半月", dataIndex: "permanganateMonth"},
+              {title: "去年同期", dataIndex: "permanganateLastYearStage"},
+              {title: "增减", dataIndex: "permanganateYearValue"},
+            ]
+          },
+          {
+            title: "氨氮（mg/L）", children: [
+              {title: "本半月", dataIndex: "ammoniaMonth"},
+              {title: "去年同期", dataIndex: "ammoniaLastYearStage"},
+              {title: "增减", dataIndex: "ammoniaYearValue"},
+            ]
+          },
+          {
+            title: "总磷（mg/L）", children: [
+              {title: "本半月", dataIndex: "phosphorusMonth"},
+              {title: "去年同期", dataIndex: "phosphorusLastYearStage"},
+              {title: "增减", dataIndex: "phosphorusYearValue"},
+            ]
+          },
+        ],
+        locale,
+        bill: {},
+        // 表格数据接口
+        // url: nationalWaterFunctionTotalUrl,
+        selection: [],
+        // tableColumns,
+        // // 表格列配置
+        // columns: [
+        //   ...tableColumns,
+        // ],
+        // 表格搜索条件
+        where: {},
+        sectionInfo: {},
+        loading: false,
+        rules: {},
       };
-      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());
+    created() {
+      listInfo().then((res) => {
+        if (res.data.code == 0) {
+          console.log(res.data.data)
+          this.visibleWater = true;
+          this.sectionInfo = res.data.data
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      })
     },
-  },
-};
+    methods: {
+      /* 刷新表格 */
+      reload() {
+        listWaterSiteYoy(this.where).then((res) => {
+          console.log(res.data.data);
+          if (res.data.code == 0) {
+              this.$message.success(res.data.msg);
+              res.data.data.momData.forEach((m)=> {
+                this.momData.push(m);
+              })
+              res.data.data.yoyData.forEach((y)=> {
+                this.yoyData.push(y);
+              })
+            } else {
+              this.$message.error(res.data.msg);
+            }
+        });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {};
+        this.reload();
+      },
+      /* 导出 */
+      exportFile() {
+        const columns = this.columns.filter(item => item.dataIndex);
+        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
+</style>
diff --git a/src/views/water/river/collect/index.vue b/src/views/water/river/collect/index.vue
index c84ce44..3b73c77 100644
--- a/src/views/water/river/collect/index.vue
+++ b/src/views/water/river/collect/index.vue
@@ -27,23 +27,6 @@
             <DownOutlined />
           </a-button>
         </a-dropdown>
-       
-            <!-- <a-modal v-model:visible="visibleWater" title="水站导入" :footer="null">
-               <a-select allowClear placeholder="请选择站名"   @change="currentSel" style="width:150px">
-                <a-select-option
-                  v-for="item in form"
-                  :key="item.waterStationPointId"
-                  :label="item.stationName" :value="item"
-                  >{{item.stationName}}</a-select-option
-                >
-              </a-select>
-              <a-upload
-              :before-upload="importFileStation"
-              :showUploadList="false"
-              accept=".xls,.xlsx,.csv">
-                  <a-button key="submit" type="primary" :loading="loading">导入</a-button>
-              </a-upload>
-          </a-modal> -->
         <a-dropdown>
           <template #overlay>
             <a-menu @click="handleMenuClick">
@@ -147,15 +130,6 @@
             if (res.data.code == 0) {
               console.log(res.data.data)
               this.visibleWater = true;
-              // this.form = res.data.data.map(item => {
-              //           return {
-              //             riverName: item.riverName,
-              //             stationName: item.stationName,
-              //             system:item.system,
-              //             waterStationPointId:item.waterStationPointId,
-              //             waterTarget:item.waterTarget
-              //           }
-              //       })
               res.data.data.forEach(e => {               
                 this.form.push(e);
               });
diff --git a/src/views/water/river/collect/utils.js b/src/views/water/river/collect/utils.js
index 123ef50..95d4371 100644
--- a/src/views/water/river/collect/utils.js
+++ b/src/views/water/river/collect/utils.js
@@ -114,6 +114,7 @@ export default {
     },
     // 国家级水功能区上报数据
     toNationalLevelDataObj(excelData) {
+        var dataTime;
         return excelData.map(item => {
             let date = new Date();
             let year = date.getFullYear(); // 年
@@ -123,7 +124,9 @@ export default {
                 time =  item[14].replace('月','-').replace('日','').trim();
                 samplingTime = year+"-"+time;
             }
-           
+            if(samplingTime != ''){
+                dataTime = samplingTime;
+            }
             const row = {
                 waterSystem:item[1],
                 riverLakeLibrary:item[2],
@@ -138,7 +141,7 @@ export default {
                 waterQualityGoal:item[11],
                 dataSources:item[12],
                 sectionName:item[13],
-                samplingTime:samplingTime,
+                samplingTime:samplingTime==''?dataTime:samplingTime,
                 wTemp:item[15],
                 ph:item[16],
                 dissolvedOxygen:item[17],
@@ -192,7 +195,7 @@ export default {
             watershed:item[2],
             river:item[3],
             sectionName:item[4],
-            monitorTime:item[5],
+            monitorTime:item[5]==null || item[5]==''?new Date():item[5],
             place:item[6],
             periodWaterQuality:item[7],
             waterTemperature:item[8],
diff --git a/src/views/water/river/dict/api-relate.vue b/src/views/water/river/dict/api-relate.vue
index b5898b7..164be78 100644
--- a/src/views/water/river/dict/api-relate.vue
+++ b/src/views/water/river/dict/api-relate.vue
@@ -306,6 +306,9 @@ export default {
             loading: false,
             rules: {
                 year: [{required: true, message: '请输入年份'}],
+                waterQualityGoal:[{
+                    required:true,message: "请输入考核目标",
+                }]
             },
             yearOptions: [],
             showNYear:false,
diff --git a/src/views/water/river/dict/autonomous.vue b/src/views/water/river/dict/autonomous.vue
index 61a699f..6a63951 100644
--- a/src/views/water/river/dict/autonomous.vue
+++ b/src/views/water/river/dict/autonomous.vue
@@ -308,6 +308,9 @@ export default {
             loading: false,
             rules: {
                 year: [{required: true, message: '请输入年份'}],
+                waterQualityGoal:[{
+                    required:true,message: "请输入考核目标",
+                }]
             },
             yearOptions: [],
             showNYear:false,
diff --git a/src/views/water/river/statistic/base.vue b/src/views/water/river/statistic/base.vue
index 9c3c336..11fb4c0 100644
--- a/src/views/water/river/statistic/base.vue
+++ b/src/views/water/river/statistic/base.vue
@@ -1,300 +1,142 @@
+<!-- 江河水查看数据页面-->
 <template>
-    <div class="ele-body">
-        <a-card :bordered="false">
-            <!-- 搜索表单 -->
-            <a-form
-                :model="where"
-                layout="inline"
-            >
-                <a-form-item label="起始日期:">
-                    <a-date-picker valueFormat="YYYY-MM-DD 00:00:00" v-model:value="where.timeStart"></a-date-picker>
-                </a-form-item>
-                <a-form-item label="结束日期:">
-                    <a-date-picker valueFormat="YYYY-MM-DD 23:59:59" v-model:value="where.timeEnd"></a-date-picker>
-                </a-form-item>
-                        <a-form-item label="区域等级:">
-                            <a-select v-model:value="where.regionLevel"  placeholder="选择区域等级" allowClear showSearch>
-                                <a-select-option
-                                    v-for="(item) in regionLevelOptions"
-                                    :key="item.value"
-                                >{{ item.label }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                        <a-form-item label="监测点:">
-                            <a-select v-model:value="where.place" placeholder="选择监测点" allowClear showSearch>
-                                <a-select-option
-                                    v-for="(item) in placeOptions"
-                                    :key="item.value"
-                                >{{ item.label }}
-                                </a-select-option
-                                >
-                            </a-select>
-                        </a-form-item>
+  <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-form-item label="断面名称">
+            <a-select v-model:value="where.sectionName" allowClear showSearch>
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="起始日期:">
+            <a-date-picker valueFormat="YYYY-MM-DD 00:00:00" v-model:value="where.timeStart"></a-date-picker>
+          </a-form-item>
+          <a-form-item label="结束日期:">
+            <a-date-picker valueFormat="YYYY-MM-DD 23:59:59" v-model:value="where.timeEnd"></a-date-picker>
+          </a-form-item>
 
-                        <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>
-            <!-- 表格 -->
-            <ele-pro-table
-                v-model:selection="selectionList"
-                ref="table"
-                row-key="ambientAirId"
-                :datasource="url"
-                :columns="columns"
-                :where="where"
-                :scroll="{ x: 'max-content' }"
-                @done="(d) => (data = d.data)"
-                :init-load="false"
-            >
-
-            </ele-pro-table>
-        </a-card>
-    </div>
-    <!-- 编辑弹窗 -->
+          <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 ref="table" row-key="surfaceWaterSectionId" :datasource="url" :columns="columns" :where="where"
+        :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 {pageAirUrl, getColumnOptions, listAllAir} from "@/api/ecology/atmosphere/air";
-import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
-import moment from "moment";
-//   import utils from "./utils";
-export default {
-    name: "StatisticAirBase",
+  import {
+    getRiverBill,
+    pageRiverUrl
+  } from "@/api/ecology/river";
+  import {
+    listInfo
+  } from "@/api/ecology/water/river-plcae";
+  import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+  import {
+    tableColumns
+  } from ".././collect/colums";
+  import XLSX from "xlsx";
+  export default {
+    name: "RiverCollectWater",
     components: {},
     data() {
-        const year = new Date().getFullYear();
-        return {
-            data: [],
-            locale,
-            bill: {},
-            // 表格数据接口
-            url: pageAirUrl,
-            selection: [],
-            // 表格列配置
-            columns: [
-                {
-                    title: "监测日期",
-                    dataIndex: "monitorTime",
-                    sorter: true,
-                    customRender: ({text}) => moment(text).format("YYYY-MM-DD")
-                },
-                {
-                    title: "城市",
-                    dataIndex: "city",
-                    sorter: true,
-                },
-                {
-                    title: "测点名称",
-                    dataIndex: "place",
-                    sorter: true,
-                },
-                {
-                    title: "SO2/(μg/m3)",
-                    dataIndex: "so2",
-                    sorter: true,
-                },
-                {
-                    title: "NO2/(μg/m3)",
-                    dataIndex: "no2",
-                    sorter: true,
-                },
-                {
-                    title: "PM10/(μg/m3)",
-                    dataIndex: "pm10",
-                    sorter: true,
-                },
-                {
-                    title: "CO/(mg/m3)",
-                    dataIndex: "co",
-                    sorter: true,
-                },
-                {
-                    title: "臭氧（O3）最大8小时滑动平均浓度/(μg/m3)",
-                    dataIndex: "o3",
-                    sorter: true,
-                },
-                {
-                    title: "PM2.5",
-                    dataIndex: "pm25",
-                    sorter: true,
-                },
-                {
-                    title: "空气质量指数AQI",
-                    dataIndex: "aqi",
-                    sorter: true,
-                },
-                {
-                    title: "首要污染物",
-                    dataIndex: "primaryPollutant",
-                    sorter: true,
-                },
-                {
-                    title: "空气质量指数级别",
-                    dataIndex: "aqiLevel",
-                    sorter: true,
-                },
-                {
-                    title: "空气质量状况",
-                    dataIndex: "airQualityStatus",
-                    sorter: true,
-                },
-                {
-                    title: "备注",
-                    dataIndex: "remark",
-                    sorter: true,
-                },
-                {
-                    title: "创建人",
-                    dataIndex: "username",
-                    sorter: true,
-                }
-            ],
-            regionLevelOptions: [
-                {label: "市区", value: "city"},
-                {label: "城区", value: "area"},
-                {label: "县区", value: "county"},
-                {label: "站点", value: "place"},
-            ],
-            placeOptions:[],
-            time:[],
-            // 表格搜索条件
-            where: {
-                checked: 1,
-                timeStart: moment(`${year}-01-01 00:00:00`).format("YYYY-MM-DD 00:00:00"),
-                timeEnd: moment().format("YYYY-MM-DD 23:59:59")
-            },
-            // 表格选中数据
-            selectionList: [],
-        };
+      const {
+        billId
+      } = this.$route.params;
+      return {
+        data: [],
+        locale,
+        bill: {},
+        // 表格数据接口
+        url: pageRiverUrl,
+        selection: [],
+        tableColumns,
+        // 表格列配置
+        columns: [
+          ...tableColumns,
+        ],
+        // 表格搜索条件
+        surfaceWaterSectionBillId: billId,
+        where: {
+          surfaceWaterSectionBillId: billId,
+        },
+        sectionInfo: {},
+        loading: false,
+        rules: {},
+      };
     },
     mounted() {
-        this.loadOptionData();
-        this.reload();
+      const {
+        billId
+      } = this.$route.params;
+      console.log(billId, 'billId');
+      getRiverBill(billId).then((res) => {
+        this.bill = res.data.data;
+        this.columns.splice(this.columns.length - 1, 1);
+      });
+      this.loadOptionData();
+    },
+    created() {
+      listInfo().then((res) => {
+        if (res.data.code == 0) {
+          console.log(res.data.data)
+          this.visibleWater = true;
+          this.sectionInfo = res.data.data
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      })
     },
     methods: {
-        /**获取下来框数据 */
-        loadOptionData() {
-            getColumnOptions("place").then((res) => {
-                this.placeOptions = res.data.data.map((item) => {
-                    return {
-                        label: item,
-                        value: item,
-                    };
-                });
-            });
-        },
-        /* 刷新表格 */
-        reload() {
-            this.$refs.table.reload({
-                where: this.where,
-            });
-        },
-        /* 重置搜索 */
-        reset() {
-            this.where = {
-                checked: 1,
-            };
-            this.reload();
-        },
-        exportFile() {
+      /**获取下来框数据 */
+      loadOptionData() {},
+      /* 刷新表格 */
+      reload() {
+        this.$refs.table.reload({
+          where: this.where,
+        });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {
+          surfaceWaterSectionId: this.surfaceWaterSectionId,
+        };
+        this.reload();
+      },
+      /* 导出 */
+      exportFile() {
+        const columns = this.columns.filter(item => item.dataIndex);
+        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);
+        });
 
-            const columns = [
-                {
-                    title: "监测日期",
-                    dataIndex: "monitorTime",
-                    sorter: true,
-                    customRender: ({text}) => moment(text).format("YYYY-MM-DD HH:mm")
-                },
-                {
-                    title: "城市",
-                    dataIndex: "city",
-                    sorter: true,
-                },
-                {
-                    title: "测点名称",
-                    dataIndex: "place",
-                    sorter: true,
-                },
-                {
-                    title: "SO2/(μg/m3)",
-                    dataIndex: "so2",
-                    sorter: true,
-                },
-                {
-                    title: "NO2/(μg/m3)",
-                    dataIndex: "no2",
-                    sorter: true,
-                },
-                {
-                    title: "PM10/(μg/m3)",
-                    dataIndex: "pm10",
-                    sorter: true,
-                },
-                {
-                    title: "CO/(mg/m3)",
-                    dataIndex: "co",
-                    sorter: true,
-                },
-                {
-                    title: "臭氧（O3）最大8小时滑动平均浓度/(μg/m3)",
-                    dataIndex: "o3",
-                    sorter: true,
-                },
-                {
-                    title: "PM2.5",
-                    dataIndex: "pm25",
-                    sorter: true,
-                },
-                {
-                    title: "空气质量指数AQI",
-                    dataIndex: "aqi",
-                    sorter: true,
-                },
-                {
-                    title: "首要污染物",
-                    dataIndex: "primaryPollutant",
-                    sorter: true,
-                },
-                {
-                    title: "空气质量指数级别",
-                    dataIndex: "aqiLevel",
-                    sorter: true,
-                },
-                {
-                    title: "空气质量状况",
-                    dataIndex: "airQualityStatus",
-                    sorter: true,
-                },
-                {
-                    title: "备注",
-                    dataIndex: "remark",
-                    sorter: true,
-                },
-            ];
-            const arr = [];
-            const th = columns.map((item) => item.title);
-            arr.push(th);
-            listAllAir(this.where).then(res => {
-                if (res.data.code == 0) {
-                    res.data.data.forEach((d) => {
-                        const td = columns.map((item) => d[item.dataIndex]);
-                        arr.push(td);
-                    });
-                    let sheet = XLSX.utils.aoa_to_sheet(arr);
-                  this.$util.exportSheet(XLSX, sheet, moment(this.where.timeStart).format("YYYY年MM月DD日") + "至" + moment(this.where.timeEnd).format("YYYY年MM月DD日") + "基础数据");
+        let sheet = XLSX.utils.aoa_to_sheet(arr);
+        this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+      }
 
-                }
-            })
-
-        },
     },
-};
+  };
+
 </script>
 
 <style scoped lang="less">
diff --git a/src/views/water/river/statistic/index.vue b/src/views/water/river/statistic/index.vue
index d654b0d..f47460c 100644
--- a/src/views/water/river/statistic/index.vue
+++ b/src/views/water/river/statistic/index.vue
@@ -8,36 +8,36 @@
               <base-statistic></base-statistic>
             </a-tab-pane>
             <a-tab-pane tab="当月水质达标" key="base1">
-              <function-bill ref="functionWater"></function-bill>
+              <function-bill ></function-bill>
             </a-tab-pane>
             <a-tab-pane tab="平均水质达标" key="base2">
-              <function-bill ref="functionWater"></function-bill>
+              <function-bill></function-bill>
             </a-tab-pane>
             <a-tab-pane tab="当月综合指数" key="base3">
-              <function-bill ref="functionWater"></function-bill>
+              <function-bill></function-bill>
             </a-tab-pane>
             <a-tab-pane tab="平均水质指数" key="base4">
-              <function-bill ref="functionWater"></function-bill>
+              <function-bill ></function-bill>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
         <a-tab-pane tab="水功能区" key="ccb">
           <a-tabs v-model:activeWater="activeWater">
             <a-tab-pane tab="自治区级水功能" key="water1">
-              <auto-statis ref="water"></auto-statis>
+              <auto-statis></auto-statis>
             </a-tab-pane>
             <a-tab-pane tab="国家级水功能" key="water2">
-              <national-statis ref="functionWater"></national-statis>
+              <national-statis></national-statis>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
         <a-tab-pane tab="水站" key="ccd">
           <a-tabs v-model:activeSite="activeSite">
             <a-tab-pane tab="水站数据统计" key="site1">
-              <site-statis ref="water"></site-statis>
+              <site-statis ></site-statis>
             </a-tab-pane>
             <a-tab-pane tab="水站日均值数据统计" key="site2">
-              <site-day-statis ref="functionWater"></site-day-statis>
+              <site-day-statis></site-day-statis>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
diff --git a/src/views/water/water-function-area/statistic/auto.vue b/src/views/water/water-function-area/statistic/auto.vue
index ec2aaf5..8da09f3 100644
--- a/src/views/water/water-function-area/statistic/auto.vue
+++ b/src/views/water/water-function-area/statistic/auto.vue
@@ -1,142 +1,38 @@
-<!--江河水功能区自治区数据统计-->
+<!-- 江河水查看数据页面-->
 <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-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-form-item label="断面名称">
+            <a-select v-model:value="where.sectionName" allowClear showSearch>
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="起始日期:">
+            <a-date-picker valueFormat="YYYY-MM-DD 00:00:00" v-model:value="where.timeStart"></a-date-picker>
+          </a-form-item>
+          <a-form-item label="结束日期:">
+            <a-date-picker valueFormat="YYYY-MM-DD 23:59:59" v-model:value="where.timeEnd"></a-date-picker>
+          </a-form-item>
+
           <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>
-      <a-modal
-        v-model:visible="showEdit"
-        :title="form.waterStationWaterFunctionAreaId !== 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="monitorTime">
-                <a-date-picker
-                  v-model:value="form.monitorTime"
-                  :locale="locale"
-                />
-              </a-form-item>
-            </a-col>
-            <a-col :md="12" :sm="24">
-            </a-col>
-            <template  v-for="(item,index) in tableCityColumns" :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="waterStationWaterFunctionAreaId"
-        :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 ref="table"  :datasource="datasource" :columns="columns" :where="where"
+        :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
       </ele-pro-table>
     </a-card>
   </div>
@@ -144,181 +40,156 @@
 </template>
 
 <script>
-import _ from "lodash";
-import {
-  pageRiverStationUrl,
-  saveRiverStation,
-  removeRiverStation,
-  removeBatchRiverStation,
-  updateRiverStation,
-  getRiverStationBill,
-} from "@/api/ecology/river-station";
-import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
-import { tableCityColumns } from "./colums";
-//   import utils from "./utils";
-export default {
-  name: "AutoStatis",
-  components: {},
-  data() {
-    const { billId } = this.$route.params;
-    return {
-      locale,
-      bill: {},
-      // 表格数据接口
-      url: pageRiverStationUrl,
-      selection: [],
-      tableCityColumns,
-      // 表格列配置
-      columns: [
-        ...tableCityColumns,
-
-        {
-          title: "创建人",
-          dataIndex: "userName",
-          sorter: true,
-        },
-        {
-          title: "操作",
-          key: "action",
-          width: 150,
-          align: "center",
-          fixed: "right",
-          slots: {
-            customRender: "action",
-          },
-        },
-      ],
-      // 表格搜索条件
-      waterStationWaterFunctionAreaBillId: billId,
-      where: {
-        waterStationWaterFunctionAreaBillId: 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 = {
-        waterStationWaterFunctionAreaBillId: this.waterStationWaterFunctionAreaBillId,
+  import {
+    // autonomyWaterFunctionTotalUrl,
+    autonomyWaterFunctionTotal
+  } from "@/api/ecology/river-statis";
+  import {
+    listInfo
+  } from "@/api/ecology/water/river-autonomous";
+  import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+  import {
+    tableColumns
+  } from "./colums";
+  import XLSX from "xlsx";
+  export default {
+    name: "RiverCollectWater",
+    components: {},
+    data() {
+      return {
+        data: [],
+        locale,
+        datasource: {},
+         // 表格数据接口
+        // url: autonomyWaterFunctionTotalUrl,
+        selection: [],
+        tableColumns,
+        // 表格列配置
+        columns: [
+          ...tableColumns,
+        ],
+        // 表格搜索条件
+        where: {},
+        sectionInfo: {},
+        loading: false,
+        rules: {},
       };
-      this.reload();
     },
-    /* 显示编辑 */
-    openEdit(record) {
-      const cloneRecord = _.cloneDeep(record);
-      this.form = Object.assign({}, cloneRecord);
-      this.showEdit = true;
-      this.$nextTick(() => {
-        this.$refs.form.clearValidate(); // 清除表单验证信息
+    mounted() {
+      autonomyWaterFunctionTotal().then((res) => {
+        res.data.data.forEach((e) => {
+          e.wTemp = "-1";
+          e.ph = "-1";
+          e.dissolvedOxygen = "-1";
+          e.cod = "-1";
+          e.fiveDayBod = "-1";
+          e.ammonia = "-1";
+          e.cu = "-1";
+          e.zn = "-1";
+          e.f = "-1";
+          e.se = "-1";
+          e.as = "-1";
+          e.hg = "-1";
+          e.cd = "-1";
+          e.cr6 = "-1";
+          e.pb = "-1";
+          e.cyanide = "-1";
+          e.vPhen = "-1";
+          e.oils = "-1";
+          e.anSaa = "-1";
+          e.s = "-1";
+          e.coloOrg = "-1";
+          e.so4 = "-1";
+          e.cl = "-1";
+          e.nitrateNitrogen = "-1";
+          e.fe = "-1";
+          e.mn = "-1";
+          e.nTotal = "-1";
+          e.transp = "-1";
+          e.chla = "-1";
+          e.ffeMajorOverStandardItemsMultiples =  "-1";
+          e.lprlMajorOverStandardItemsMultiples =  "-1";
+        })
+        this.datasource = res.data.data;
       });
     },
+    created() {
+      listInfo().then((res) => {
+        if (res.data.code == 0) {
+          console.log(res.data.data)
+          this.visibleWater = true;
+          this.sectionInfo = res.data.data
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      })
+    },
+    methods: {
+      /* 刷新表格 */
+      reload() {
+        // this.$refs.table.reload({
+        //   where: this.where,
+        // });
+        autonomyWaterFunctionTotal().then((res) => {
+        res.data.data.forEach((e) => {
+          e.wTemp = "-1";
+          e.ph = "-1";
+          e.dissolvedOxygen = "-1";
+          e.cod = "-1";
+          e.fiveDayBod = "-1";
+          e.ammonia = "-1";
+          e.cu = "-1";
+          e.zn = "-1";
+          e.f = "-1";
+          e.se = "-1";
+          e.as = "-1";
+          e.hg = "-1";
+          e.cd = "-1";
+          e.cr6 = "-1";
+          e.pb = "-1";
+          e.cyanide = "-1";
+          e.vPhen = "-1";
+          e.oils = "-1";
+          e.anSaa = "-1";
+          e.s = "-1";
+          e.coloOrg = "-1";
+          e.so4 = "-1";
+          e.cl = "-1";
+          e.nitrateNitrogen = "-1";
+          e.fe = "-1";
+          e.mn = "-1";
+          e.nTotal = "-1";
+          e.transp = "-1";
+          e.chla = "-1";
+          e.ffeMajorOverStandardItemsMultiples =  "-1";
+          e.lprlMajorOverStandardItemsMultiples =  "-1";
+        })
+        this.datasource = res.data.data;
+      });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {};
+        this.reload();
+      },
+      /* 导出 */
+      exportFile() {
+        const columns = this.columns.filter(item => item.dataIndex);
+        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);
+        });
 
-    save() {
-      const hide = this.$message.loading("请求中..", 0);
-      const form = _.cloneDeep(this.form);
-      if (form.waterStationWaterFunctionAreaId) {
-        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.waterStationWaterFunctionAreaBillId = this.waterStationWaterFunctionAreaBillId;
-        form.userId = this.$store.state.user.user.userId
-        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();
-          });
+        let sheet = XLSX.utils.aoa_to_sheet(arr);
+        this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
       }
+
     },
-    /* 删除单个 */
-    remove(row) {
-      const hide = this.$message.loading("请求中..", 0);
-      removeRiverStation(row.waterStationWaterFunctionAreaId)
-        .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.waterStationWaterFunctionAreaId);
-      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">
diff --git a/src/views/water/water-function-area/statistic/base.vue b/src/views/water/water-function-area/statistic/base.vue
deleted file mode 100644
index 39bfef4..0000000
--- a/src/views/water/water-function-area/statistic/base.vue
+++ /dev/null
@@ -1,570 +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.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/noise/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() {
-
-      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/colums.js b/src/views/water/water-function-area/statistic/colums.js
index 094a206..9dce1ac 100644
--- a/src/views/water/water-function-area/statistic/colums.js
+++ b/src/views/water/water-function-area/statistic/colums.js
@@ -4,24 +4,53 @@ const tableColumns = [
     {title: "水质目标", dataIndex: "waterQualityGoal", sorter: true,},
     {title: "数据来源", dataIndex: "dataSources", sorter: true,},
     {title: "断面名称", dataIndex: "sectionName", sorter: true,},
-    // {title: "采样时间", dataIndex: "samplingTime", sorter: true,},
+    {title: "水温", dataIndex: "wTemp", 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: "ffeWaterFunctionAreaWaterQualityCategory"},
-    {title: "达标评价结论", dataIndex: "ffeCompliantEvaluationConclusion"},
-    {title: "主要超标项目及其超标倍数", dataIndex: "ffeMajorOverStandardItemsMultiples"},
-
-    {title: "水功能区水质类别", dataIndex: "lprlWaterFunctionAreaWaterQualityCategory"},
-    {title: "达标评价结论", dataIndex: "lprlCompliantEvaluationConclusion"},
-    {title: "主要超标项目及其超标倍数", dataIndex: "lprlMajorOverStandardItemsMultiples"},
+    {title: "铜", dataIndex: "cu", sorter: true,},
+    {title: "锌", dataIndex: "zn", sorter: true,},
+    {title: "氟化物", dataIndex: "f", sorter: true,},
+    {title: "硒", dataIndex: "se", sorter: true,},
+    {title: "砷", dataIndex: "as", sorter: true,},
+    {title: "汞", dataIndex: "hg", sorter: true,},
+    {title: "镉", dataIndex: "cd", sorter: true,},
+    {title: "六价铬", dataIndex: "cr6", sorter: true,},
+    {title: "铅", dataIndex: "pb", sorter: true,},
+    {title: "氰化物", dataIndex: "cyanide", sorter: true,},
+    {title: "挥发酚", dataIndex: "vPhen", sorter: true,},
+    {title: "石油类", dataIndex: "oils", sorter: true,},
+    {title: "阴离子表面活性剂", dataIndex: "anSaa", sorter: true,},
+    {title: "硫化物", dataIndex: "s", sorter: true,},
+    {title: "粪大肠菌群", dataIndex: "coloOrg", sorter: true,},
+    {title: "硫酸盐", dataIndex: "so4", sorter: true,},
+    {title: "氯化物", dataIndex: "cl", sorter: true,},
+    {title: "硝酸盐氮", dataIndex: "nitrateNitrogen", sorter: true,},
+    {title: "铁", dataIndex: "fe", sorter: true,},
+    {title: "锰", dataIndex: "mn", sorter: true,},
+    {title: "总氮", dataIndex: "nTotal", sorter: true,},
+    {title: "透明度", dataIndex: "transp", sorter: true,},
+    {title: "叶绿素", dataIndex: "chla", 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,},
-
-];
+  
+  ];
 
 export {tableColumns}
diff --git a/src/views/water/water-function-area/statistic/index.vue b/src/views/water/water-function-area/statistic/index.vue
deleted file mode 100644
index f04a754..0000000
--- a/src/views/water/water-function-area/statistic/index.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<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-tabs>
-    </a-card>
-  </div>
-</template>
-
-<script>
-  /**
-   * 
-   * 
-   * 
-   */
-  import BaseStatistic from "./base.vue";
-  export default {
-    name: 'StatisticSoundRoad',
-    components: {
-      BaseStatistic,
-    },
-    data() {
-      return {
-        activeKey: 'base'
-      };
-        
-    },
-    methods: {
-     
-    }
-
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/water/water-function-area/statistic/national.vue b/src/views/water/water-function-area/statistic/national.vue
index 5a827a1..6f1bc0c 100644
--- a/src/views/water/water-function-area/statistic/national.vue
+++ b/src/views/water/water-function-area/statistic/national.vue
@@ -1,148 +1,38 @@
-<!--江河水功能区国家级数据统计-->
+<!-- 江河水查看数据页面-->
 <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-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-form-item label="断面名称">
+            <a-select v-model:value="where.sectionName" allowClear showSearch>
+              <a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="起始日期:">
+            <a-date-picker valueFormat="YYYY-MM-DD 00:00:00" v-model:value="where.timeStart"></a-date-picker>
+          </a-form-item>
+          <a-form-item label="结束日期:">
+            <a-date-picker valueFormat="YYYY-MM-DD 23:59:59" v-model:value="where.timeEnd"></a-date-picker>
+          </a-form-item>
+
           <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>
-      <a-modal
-        v-model:visible="showEdit"
-        :title="form.nationalLevelWaterFunctionAreaId !== 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="nationalLevelWaterFunctionAreaId"
-        :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 ref="table" :datasource="datasource" :columns="columns" :where="where"
+        :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
       </ele-pro-table>
     </a-card>
   </div>
@@ -150,204 +40,184 @@
 </template>
 
 <script>
-import _ from "lodash";
-import {
-  pageWaterFunctionAreaUrl,
-  saveWaterFunctionArea,
-  removeWaterFunctionArea,
-  removeBatchWaterFunctionArea,
-  updateWaterFunctionArea,
-  getWaterFunctionAreaBill,
-  // getColumnOptions,
-} 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: "WaterFunctionAreaCollectWater",
-  components: {},
-  data() {
-    const { billId } = this.$route.params;
-    return {
-      locale,
-      bill: {},
-      // 表格数据接口
-      url: pageWaterFunctionAreaUrl,
-      selection: [],
-      tableColumns,
-      // 表格列配置
-      columns: [
-        ...tableColumns,
-
-        {
-          title: "创建人",
-          dataIndex: "userName",
-          sorter: true,
+  import {
+    // nationalWaterFunctionTotalUrl,
+    nationalWaterFunctionTotal
+  } from "@/api/ecology/river-statis";
+  import {
+    listInfo
+  } from "@/api/ecology/water/river-api-relate";
+  import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+  import {
+    tableColumns
+  } from "./colums";
+  import XLSX from "xlsx";
+  export default {
+    name: "RiverCollectWater",
+    components: {},
+    data() {
+      return {
+        data: [],
+        datasource: {
+          wTemp: '-1',
+          ph: '-1',
+          dissolvedOxygen: '-1',
+          cod: '-1',
+          fiveDayBod: '-1',
+          ammonia: '-1',
+          cu: '-1',
+          zn: '-1',
+          f: '-1',
+          se: '-1',
+          as: '-1',
+          hg: '-1',
+          cd: '-1',
+          cr6: '-1',
+          pb: '-1',
+          cyanide: '-1',
+          vPhen: '-1',
+          oils: '-1',
+          anSaa: '-1',
+          s: '-1',
+          coloOrg: '-1',
+          so4: '-1',
+          cl: '-1',
+          nitrateNitrogen: '-1',
+          fe: '-1',
+          mn: '-1',
+          nTotal: '-1',
+          transp: '-1',
+          chla: '-1'
         },
-        {
-          title: "操作",
-          key: "action",
-          width: 150,
-          align: "center",
-          fixed: "right",
-          slots: {
-            customRender: "action",
-          },
-        },
-      ],
-      // 表格搜索条件
-      nationalLevelWaterFunctionAreaBillId: billId,
-      where: {
-        nationalLevelWaterFunctionAreaBillId: 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("--------------------------")
-      console.log(this.url);
-      this.$refs.table.reload({
-        where: this.where,
-      });
-    },
-    /* 重置搜索 */
-    reset() {
-      this.where = {
-        nationalLevelWaterFunctionAreaBillId: this.nationalLevelWaterFunctionAreaBillId,
+        locale,
+        bill: {},
+        // 表格数据接口
+        // url: nationalWaterFunctionTotalUrl,
+        selection: [],
+        tableColumns,
+        // 表格列配置
+        columns: [
+          ...tableColumns,
+        ],
+        // 表格搜索条件
+        where: {},
+        sectionInfo: {},
+        loading: false,
+        rules: {},
       };
-      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(); // 清除表单验证信息
+    mounted() {
+      nationalWaterFunctionTotal().then((res) => {
+        res.data.data.forEach((e) => {
+          e.wTemp = "-1";
+          e.ph = "-1";
+          e.dissolvedOxygen = "-1";
+          e.cod = "-1";
+          e.fiveDayBod = "-1";
+          e.ammonia = "-1";
+          e.cu = "-1";
+          e.zn = "-1";
+          e.f = "-1";
+          e.se = "-1";
+          e.as = "-1";
+          e.hg = "-1";
+          e.cd = "-1";
+          e.cr6 = "-1";
+          e.pb = "-1";
+          e.cyanide = "-1";
+          e.vPhen = "-1";
+          e.oils = "-1";
+          e.anSaa = "-1";
+          e.s = "-1";
+          e.coloOrg = "-1";
+          e.so4 = "-1";
+          e.cl = "-1";
+          e.nitrateNitrogen = "-1";
+          e.fe = "-1";
+          e.mn = "-1";
+          e.nTotal = "-1";
+          e.transp = "-1";
+          e.chla = "-1";
+          e.ffeMajorOverStandardItemsMultiples =  "-1";
+          e.lprlMajorOverStandardItemsMultiples =  "-1";
+        })
+        this.datasource = res.data.data;
       });
     },
+    created() {
+      listInfo().then((res) => {
+        if (res.data.code == 0) {
+          console.log(res.data.data)
+          this.visibleWater = true;
+          this.sectionInfo = res.data.data
+        } else {
+          this.$message.error(res.data.msg);
+        }
+      })
+    },
+    methods: {
+      /* 刷新表格 */
+      reload() {
+        nationalWaterFunctionTotal(this.where).then((res) => {
+          res.data.data.forEach((e) => {
+            e.wTemp = "-1";
+            e.ph = "-1";
+            e.dissolvedOxygen = "-1";
+            e.cod = "-1";
+            e.fiveDayBod = "-1";
+            e.ammonia = "-1";
+            e.cu = "-1";
+            e.zn = "-1";
+            e.f = "-1";
+            e.se = "-1";
+            e.as = "-1";
+            e.hg = "-1";
+            e.cd = "-1";
+            e.cr6 = "-1";
+            e.pb = "-1";
+            e.cyanide = "-1";
+            e.vPhen = "-1";
+            e.oils = "-1";
+            e.anSaa = "-1";
+            e.s = "-1";
+            e.coloOrg = "-1";
+            e.so4 = "-1";
+            e.cl = "-1";
+            e.nitrateNitrogen = "-1";
+            e.fe = "-1";
+            e.mn = "-1";
+            e.nTotal = "-1";
+            e.transp = "-1";
+            e.chla = "-1";
+            e.ffeMajorOverStandardItemsMultiples =  "-1";
+            e.lprlMajorOverStandardItemsMultiples =  "-1";
+          })
+          this.datasource = res.data.data;
+        });
+      },
+      /* 重置搜索 */
+      reset() {
+        this.where = {};
+        this.reload();
+      },
+      /* 导出 */
+      exportFile() {
+        const columns = this.columns.filter(item => item.dataIndex);
+        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);
+        });
 
-    save() {
-      console.log("save开始"+this.form)
-      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());
-      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.nationalLevelWaterFunctionAreaId) {
-        console.log("编辑开始"+form)
-        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 {
-        console.log("保存开始"+form);
-        form.nationalLevelWaterFunctionAreaBillId = this.nationalLevelWaterFunctionAreaBillId;
-        form.userId = this.$store.state.user.user.userId
-        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();
-          });
+        let sheet = XLSX.utils.aoa_to_sheet(arr);
+        this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
       }
+
     },
-    /* 删除单个 */
-    remove(row) {
-      const hide = this.$message.loading("请求中..", 0);
-      removeWaterFunctionArea(row.nationalLevelWaterFunctionAreaId)
-        .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.nationalLevelWaterFunctionAreaId);
-      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">