diff --git a/public/template/县级（备用、规划）地表水饮用水.xls b/public/template/县级（备用、规划）地表水饮用水.xls
index 2904f03..f3bb858 100644
Binary files a/public/template/县级（备用、规划）地表水饮用水.xls and b/public/template/县级（备用、规划）地表水饮用水.xls differ
diff --git a/src/api/ecology/drinking-water.js b/src/api/ecology/drinking-water.js
index cd691c4..1ad0fdb 100644
--- a/src/api/ecology/drinking-water.js
+++ b/src/api/ecology/drinking-water.js
@@ -58,8 +58,8 @@ const updateWaterWithdrawal=function(data){
 
 
 // -------------------------统计---------------------
-const pageDrinkingWaterStatisticUrl = '/drinkingWater/drinkingWater/statistic';
-const pageDrinkingWaterCompare = '/drinkingWater/drinkingWater/statistic/compare';
+const pageDrinkingWaterStatisticUrl = '/drinkingWater/drinkingWater/AnalysePage';
+// const pageDrinkingWaterCompare = '/drinkingWater/drinkingWater/statistic/compare';
 const getHistoryyears = function () {
     return axios.get("/drinkingWater/drinkingWater/history-year")
 }
@@ -89,7 +89,7 @@ export {
     removeBatchDrinkingWater,
     pageDrinkingWaterStatisticUrl,
     getHistoryyears,
-    pageDrinkingWaterCompare,
+    // pageDrinkingWaterCompare,
     getColumnOptions,
     listAll,
     getGisBase,
diff --git a/src/views/water/drinking-water-village/collect/bottomWater.vue b/src/views/water/drinking-water-village/collect/bottomWater.vue
new file mode 100644
index 0000000..9062035
--- /dev/null
+++ b/src/views/water/drinking-water-village/collect/bottomWater.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 搜索表单 -->
+      <a-form
+        :model="where"
+        :label-col="{ md: { span: 8 }, sm: { span: 24 } }"
+        :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }"
+      >
+        <a-row>
+          <!-- <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item label="城区">
+              <a-select v-model:value="where.area" allowClear showSearch>
+                <a-select-option
+                  v-for="item in areaOptions"
+                  :key="item.value"
+                  >{{ item.label }}</a-select-option
+                >
+              </a-select>
+            </a-form-item>
+          </a-col> -->
+          <a-col :lg="6" :md="12" :sm="24" :xs="24">
+            <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+              <a-space>
+                <a-button type="primary" @click="reload">查询</a-button>
+                <a-button @click="reset">重置</a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+      <a-modal
+        v-model:visible="showEdit"
+        :title="form.drinkingWaterVillageId !== undefined ? '修改记录' : '添加记录'"
+        :confirm-loading="loading"
+        :width="1000"
+        :body-style="{ paddingBottom: '8px' }"
+        @ok="save"
+      >
+        <a-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+          :wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
+        >
+          <a-row>
+            <a-col :md="12" :sm="24">
+              <a-form-item label="日期" name="monitorDate">
+                <a-date-picker
+                  v-model:value="form.monitorDate"
+                  :locale="locale"
+                />
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :md="12" :sm="24">
+              <a-form-item label="时间" name="monitorTime">
+                <a-time-picker
+                  v-model:value="form.monitorTime"
+                  format="HH:mm"
+                />
+              </a-form-item>
+            </a-col> -->
+            <a-col v-for="(item,index) in tableColumns" :key="index" :md="12" :sm="24">
+              <a-form-item :label="item.title" :name="item.dataIndex">
+                <a-input
+                  v-model:value="form[item.dataIndex]"
+                  :placeholder="'请输入' + item.title"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-modal>
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="drinkingWaterVillageId"
+        :datasource="url"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+      >
+        <template v-if="bill.checked != 1" #toolbar>
+          <a-space>
+            <a-button @click="openEdit" type="primary">新增</a-button>
+            <a-popconfirm
+              :disabled="selectionList.length == 0"
+              :title="`确认删除${selectionList.length}条数据吗?`"
+              ok-text="Yes"
+              cancel-text="No"
+              @confirm="removeBatch"
+            >
+              <a-button
+                :disabled="selectionList.length == 0"
+                type="primary"
+                ghost
+                danger
+                >删除</a-button
+              >
+            </a-popconfirm>
+          </a-space>
+        </template>
+        <template #action="{ record }">
+          <a-space>
+            <a-button
+              @click="openEdit(record)"
+              type="primary"
+              shape="round"
+              size="small"
+              >修改</a-button
+            >
+            <a-popconfirm
+              :title="`确认删除这条数据吗?`"
+              ok-text="Yes"
+              cancel-text="No"
+              @confirm="remove(record)"
+            >
+              <a-button type="primary" danger shape="round" size="small"
+                >删除</a-button
+              >
+            </a-popconfirm>
+          </a-space>
+        </template>
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
+</template>
+
+<script>
+import _ from "lodash";
+import {
+  pageDrinkingWaterVillageUrl,
+  saveDrinkingWaterVillage,
+  removeDrinkingWaterVillage,
+  removeBatchDrinkingWaterVillage,
+  updateDrinkingWaterVillage,
+  getDrinkingWaterVillageBill,
+  // getColumnOptions,
+} from "@/api/ecology/drinking-water-village";
+import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+import moment from "moment";
+import { tableColumns2 } from "./colums";
+//   import utils from "./utils";
+export default {
+  name: "DrinkingCollectWater",
+  components: {},
+  data() {
+    const { billId } = this.$route.params;
+    return {
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageDrinkingWaterVillageUrl,
+      selection: [],
+      tableColumns2,
+      // 表格列配置
+      columns: [
+        {
+          title: "监测日期",
+          dataIndex: "monitorTime",
+          sorter: true,
+          customRender: ({text})=> moment(text).format("YYYY-MM-DD")
+        },
+        
+        ...tableColumns2,
+        
+        {
+          title: "区域等级",
+          dataIndex: "regionLevel",
+          sorter: true,
+        },
+        {
+          title: "水源类型",
+          dataIndex: "waterSourceType",
+          sorter: true,
+          customRender: ({ text }) => (text == 1 ? "地表水" : "地下水"),
+        },
+        // {
+        //   title: "水源状态",
+        //   dataIndex: "drinkingWaterVillageType",
+        //   sorter: true,
+        //   customRender: ({ text }) => (text == 1 ? "在用" : "备用"),
+        // },
+        {
+          title: "创建人",
+          dataIndex: "username",
+          sorter: true,
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 150,
+          align: "center",
+          fixed: "right",
+          slots: {
+            customRender: "action",
+          },
+        },
+      ],
+      // 表格搜索条件
+      drinkingWaterVillageBillId: billId,
+      where: {
+        drinkingWaterVillageBillId: billId,
+      },
+      // 表格选中数据
+      selectionList: [],
+      // 是否显示编辑弹窗
+      showEdit: false,
+      // 表单数据
+      form: {},
+      loading: false,
+      rules: {},
+    };
+  },
+  mounted() {
+    const { billId } = this.$route.params;
+    getDrinkingWaterVillageBill(billId).then((res) => {
+      this.bill = res.data.data;
+      if (res.data.data.checked == 1) {
+        this.columns.splice(this.columns.length - 1, 1);
+      }
+    });
+    this.loadOptionData();
+  },
+  methods: {
+    /**获取下来框数据 */
+    loadOptionData() {},
+    /* 刷新表格 */
+    reload() {
+
+      this.$refs.table.reload({
+        where: this.where,
+      });
+    },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        drinkingWaterVillageBillId: this.drinkingWaterVillageBillId,
+      };
+      this.reload();
+    },
+    /* 显示编辑 */
+    openEdit(record) {
+      const cloneRecord = _.cloneDeep(record);
+      if (record && cloneRecord.monitorTime) {
+        console.log(moment(cloneRecord.monitorTime).format("YYYY MM DD"));
+        cloneRecord.monitorDate = moment(cloneRecord.monitorTime);
+        cloneRecord.monitorTime = moment(cloneRecord.monitorTime);
+      }
+      // cloneRecord.mi
+      this.form = Object.assign({}, cloneRecord);
+      this.showEdit = true;
+      this.$nextTick(() => {
+        this.$refs.form.clearValidate(); // 清除表单验证信息
+      });
+    },
+
+    save() {
+      const hide = this.$message.loading("请求中..", 0);
+      const form = _.cloneDeep(this.form);
+      const date = new Date();
+      date.setFullYear(form.monitorDate.year());
+      date.setMonth(form.monitorDate.month());
+      date.setDate(form.monitorDate.date());
+      date.setHours(form.monitorTime.hour());
+      date.setMinutes(form.monitorTime.minutes());
+      form.monitorTime = date.getTime();
+      form.monitorYear = date.getFullYear();
+      form.monitorMonth = date.getMonth() + 1;
+      form.monitorDay = date.getDate();
+      form.monitorHour = date.getHours();
+      form.monitorMinute = date.getMinutes();
+      delete form["monitorDate"];
+      if (form.drinkingWaterVillageId) {
+        updateDrinkingWaterVillage(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.drinkingWaterVillageBillId = this.drinkingWaterVillageBillId;
+        saveDrinkingWaterVillage(form)
+          .then((res) => {
+            if (res.data.code == 0) {
+              this.showEdit = false;
+              this.$message.success(res.data.msg);
+              this.reload();
+            } else {
+              this.$message.error(res.data.msg);
+            }
+          })
+          .catch((error) => {
+            this.$message.error(error.message);
+          })
+          .finally(() => {
+            hide();
+          });
+      }
+    },
+    /* 删除单个 */
+    remove(row) {
+      const hide = this.$message.loading("请求中..", 0);
+      removeDrinkingWaterVillage(row.drinkingWaterVillageId)
+        .then((res) => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        })
+        .catch((e) => {
+          this.$message.error(e.msg);
+        })
+        .finally(() => hide());
+    },
+    removeBatch() {
+      const ids = this.selectionList.map((item) => item.drinkingWaterVillageId);
+      const hide = this.$message.loading("请求中..", 0);
+      removeBatchDrinkingWaterVillage(ids)
+        .then((res) => {
+          if (res.data.code === 0) {
+            this.$message.success(res.data.msg);
+            this.reload();
+          } else {
+            this.$message.error(res.data.msg);
+          }
+        })
+        .catch((e) => {
+          this.$message.error(e.msg);
+        })
+        .finally(() => hide());
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+</style>
\ No newline at end of file
diff --git a/src/views/water/drinking-water-village/collect/colums.js b/src/views/water/drinking-water-village/collect/colums.js
index 413e0d8..b3add5b 100644
--- a/src/views/water/drinking-water-village/collect/colums.js
+++ b/src/views/water/drinking-water-village/collect/colums.js
@@ -1,9 +1,10 @@
+//地表水表格
 const tableColumns = [
     {title:"断面代码",dataIndex:"sectionCode",sorter:true},
     {title: "省",dataIndex: "province",sorter: true,},
     {title: "市",dataIndex: "city",sorter: true,},
     // {title: "城区",dataIndex: "城区",sorter: true,},
-    {title: "县",dataIndex: "county",sorter: true,},
+    {title: "县(区)",dataIndex: "county",sorter: true,},
     {title: "乡镇",dataIndex: "township",sorter: true,},
     {title: "村",dataIndex: "village",sorter: true,},
     {title: "点位名称",dataIndex: "place",sorter: true,},
@@ -42,7 +43,79 @@ const tableColumns = [
     {title: "硝酸盐氮  (mg/L)",dataIndex: "nitrateNitrogen",sorter: true,},
     {title: "铁 (mg/L)",dataIndex: "fe",sorter: true,},
     {title: "锰 (mg/L)",dataIndex: "mn",sorter: true,},
-    {title: "水质类别",dataIndex: "waterQualityCategory",sorter: true,},
+    // {title: "水质类别",dataIndex: "waterQualityCategory",sorter: true,},
+    {title: "特征污染物监测项目名称",dataIndex: "characteristicPollutantMonitoringProjectName",sorter: true,},
+    {title: "特征污染物监测数值(mg/L)",dataIndex: "characteristicPollutantMonitoringValue",sorter: true,},
+    // {title: "色(mg/L)",dataIndex: "color",sorter: true,},
+    // {title: "嗅和味",dataIndex: "smellAndTaste",sorter: true,},
+    // {title: "浊度",dataIndex: "turbidity",sorter: true,},
+    // {title: "肉眼可见物",dataIndex: "visibleNakedEye",sorter: true,},
+    // {title: "总硬度(mg/L)",dataIndex: "totalHardness",sorter: true,},
+    // {title: "溶解性总固体(mg/L)",dataIndex: "totalDissolvedSolids",sorter: true,},
+    // {title: "铝(mg/L)",dataIndex: "ai",sorter: true,},
+    // {title: "耗氧量(mg/L)",dataIndex: "oxygenConsumption",sorter: true,},
+    // {title: "硝酸盐(mg/L)",dataIndex: "nitrate",sorter: true,},
+    // {title: "亚硝酸盐(mg/L)",dataIndex: "nitrite",sorter: true,},
+    // {title: "钠(mg/L)",dataIndex: "na",sorter: true,},
+    // {title: "碘化物(mg/L)",dataIndex: "lodide",sorter: true,},
+    // {title: "总大肠菌群(个/L)",dataIndex: "totalColiform",sorter: true,},
+    // {title: "菌落总数(CFU/mL)）",dataIndex: "totalNumberColonies",sorter: true,},
+    // {title: "三氯甲烷（μg/L）",dataIndex: "chcl3",sorter: true,},
+    // {title: "四氯化碳 （μg/L）",dataIndex: "ccl4",sorter: true,},
+    // {title: "苯 （μg/L）",dataIndex: "c6h6",sorter: true,},
+    // {title: "甲苯 （μg/L）",dataIndex: "c7h8",sorter: true,},
+    // {title: "总α放射性(Bq/L)",dataIndex: "totalAlphaRadioactivity",sorter: true,},
+    // {title: "总β放射性(Bq/L)",dataIndex: "totalBetaRadioactivity",sorter: true,},
+    {title: "备注",dataIndex: "remark",sorter: true,},
+];
+export {tableColumns}
+
+//地下水表格
+const tableColumns2 = [
+    {title:"断面代码",dataIndex:"sectionCode",sorter:true},
+    {title: "省",dataIndex: "province",sorter: true,},
+    {title: "市",dataIndex: "city",sorter: true,},
+    // {title: "城区",dataIndex: "城区",sorter: true,},
+    {title: "县(区)",dataIndex: "county",sorter: true,},
+    {title: "乡镇",dataIndex: "township",sorter: true,},
+    {title: "村",dataIndex: "village",sorter: true,},
+    {title: "点位名称",dataIndex: "place",sorter: true,},
+    // {title: "监测时间",dataIndex: "monitorTime",sorter: true,},
+    // {title: "湖库(是/否)",dataIndex: "lakeLibraryFlag",sorter: true,},
+    // {title: "必测村庄(是/否) ",dataIndex: "mustTestVillagesFlag",sorter: true,},
+    {title: "经度(°)",dataIndex: "longitude",sorter: true,},
+    {title: "纬度(°)",dataIndex: "latitude",sorter: true,},
+    {title: "服务人口数量(人)",dataIndex: "numberServingPopulation",sorter: true,},
+    {title: "日供水规模（吨）",dataIndex: "dailyWaterSupplyScale",sorter: true,},
+    // {title: "水温（℃）",dataIndex: "waterTemperature",sorter: true,},
+    {title: "pH(mg/L)",dataIndex: "ph",sorter: true,},
+    // {title: "溶解氧(mg/L)",dataIndex: "dissolvedOxygen",sorter: true,},
+    // {title: "高锰酸盐指数(mg/L)",dataIndex: "permanganateIndex",sorter: true,},
+    // {title: "五日生化需氧量(mg/L)",dataIndex: "fiveDayBod",sorter: true,},
+    {title: "氨氮(mg/L)",dataIndex: "ammonia",sorter: true,},
+    // {title: "总磷 (mg/L)",dataIndex: "totalPhosphorus",sorter: true,},
+    // {title: "总氮 (mg/L)",dataIndex: "totalNitrogen",sorter: true,},
+    {title: "铜 (mg/L)",dataIndex: "cu",sorter: true,},
+    {title: "锌 (mg/L)",dataIndex: "zn",sorter: true,},
+    {title: "氟化物(mg/L)",dataIndex: "fluoride",sorter: true,},
+    {title: "硒 (mg/L)",dataIndex: "se",sorter: true,},
+    {title: "砷 (mg/L)",dataIndex: "as",sorter: true,},
+    {title: "汞 (mg/L)",dataIndex: "hg",sorter: true,},
+    {title: "镉 (mg/L)",dataIndex: "cd",sorter: true,},
+    {title: "铬（六价）(mg/L)",dataIndex: "cr",sorter: true,},
+    {title: "铅 (mg/L)",dataIndex: "pb",sorter: true,},
+    {title: "氰化物 (mg/L)",dataIndex: "cyanide",sorter: true,},
+    {title: "挥发酚 (mg/L)",dataIndex: "volatilePhenol",sorter: true,},
+    // {title: "石油类 (mg/L)",dataIndex: "petro",sorter: true,},
+    {title: "阴离子表面活性剂 (mg/L)",dataIndex: "anionicSurfactant",sorter: true,},
+    {title: "硫化物 (mg/L)",dataIndex: "sulfide",sorter: true,},
+    // {title: "粪大肠菌群(个/L)",dataIndex: "fecalColiforms",sorter: true,},
+    // {title: "硫酸盐 (mg/L)",dataIndex: "sulfate",sorter: true,},
+    {title: "氯化物 (mg/L)",dataIndex: "chloride",sorter: true,},
+    // {title: "硝酸盐氮  (mg/L)",dataIndex: "nitrateNitrogen",sorter: true,},
+    {title: "铁 (mg/L)",dataIndex: "fe",sorter: true,},
+    {title: "锰 (mg/L)",dataIndex: "mn",sorter: true,},
+    // {title: "水质类别",dataIndex: "waterQualityCategory",sorter: true,},
     {title: "特征污染物监测项目名称",dataIndex: "characteristicPollutantMonitoringProjectName",sorter: true,},
     {title: "特征污染物监测数值(mg/L)",dataIndex: "characteristicPollutantMonitoringValue",sorter: true,},
     {title: "色(mg/L)",dataIndex: "color",sorter: true,},
@@ -67,5 +140,4 @@ const tableColumns = [
     {title: "总β放射性(Bq/L)",dataIndex: "totalBetaRadioactivity",sorter: true,},
     {title: "备注",dataIndex: "remark",sorter: true,},
 ];
-
-export {tableColumns}
\ No newline at end of file
+export {tableColumns2}
\ No newline at end of file
diff --git a/src/views/water/drinking-water-village/collect/index.vue b/src/views/water/drinking-water-village/collect/index.vue
index c6f431e..4e9ca66 100644
--- a/src/views/water/drinking-water-village/collect/index.vue
+++ b/src/views/water/drinking-water-village/collect/index.vue
@@ -22,7 +22,7 @@
           <template #overlay>
             <a-menu>
               <a-menu-item @click="download('农村村庄地表水饮用水','xlsx')"> 农村村庄地表水饮用水</a-menu-item>
-              <a-menu-item @click="download('农村村庄地表水饮用水','xlsx')"> 农村村庄地表水饮用水</a-menu-item>
+              <a-menu-item @click="download('农村村庄地下水饮用水','xlsx')"> 农村村庄地下水饮用水</a-menu-item>
             </a-menu>
           </template>
           <a-button  type="primary" style="left: 10px">
diff --git a/src/views/water/drinking-water-village/collect/utils.js b/src/views/water/drinking-water-village/collect/utils.js
index a57f255..d11120d 100644
--- a/src/views/water/drinking-water-village/collect/utils.js
+++ b/src/views/water/drinking-water-village/collect/utils.js
@@ -12,8 +12,9 @@ export default {
             sectionCode:item[0],
             province: item[1],
             city: item[2],
-            area: item[3].includes("区")?item[3]:null,
-            county: !item[3].includes("区")?item[3]:null,
+            // area: item[3].includes("区")?item[3]:null,
+            // county: !item[3].includes("区")?item[3]:null,
+            county:item[3],
             township: item[4],
             village: item[5],
             place: item[6],
@@ -75,8 +76,9 @@ export default {
           sectionCode:item[0],
           province: item[1],
           city: item[2],
-          area: item[3].includes("区")?item[3]:null,
-          county: !item[3].includes("区")?item[3]:null,
+          // area: item[3].includes("区")?item[3]:null,
+          // county: !item[3].includes("区")?item[3]:null,
+          county:item[3],
           township: item[4],
           village: item[5],
           place: item[6],
diff --git a/src/views/water/drinking-water-village/collect/water-bill.vue b/src/views/water/drinking-water-village/collect/water-bill.vue
index e504023..1398ce2 100644
--- a/src/views/water/drinking-water-village/collect/water-bill.vue
+++ b/src/views/water/drinking-water-village/collect/water-bill.vue
@@ -265,9 +265,16 @@
         this.reload();
       },
       detail(record) {
-        this.$router.replace({
+        if(record.waterSourceType===1){
+          this.$router.replace({
           path: "/water/drinking-water-village/collect/water/" + record.drinkingWaterVillageBillId
         })
+        }else{
+          this.$router.replace({
+          path: "/water/drinking-water-village/collect/bottomWater/" + record.drinkingWaterVillageBillId
+        })
+        }
+        
       },
       edit(record) {
         this.editableData[record.drinkingWaterVillageBillId] = _.cloneDeep(record);
diff --git a/src/views/water/drinking-water/dict/place.vue b/src/views/water/drinking-water/dict/place.vue
index f822098..de66726 100644
--- a/src/views/water/drinking-water/dict/place.vue
+++ b/src/views/water/drinking-water/dict/place.vue
@@ -106,8 +106,8 @@
                     <a-form-item label="纬度(°)" name="latitude">
                         <a-input v-model:value="form.latitude" placeholder="请输入纬度(°)" allow-clear />
                     </a-form-item>
-                    <a-form-item label="饮用水类型" name="drinkingWaterType">
-                        <a-input v-model:value="form.drinkingWaterType" placeholder="请输入饮用水类型，1在用、2备用" allow-clear />
+                    <a-form-item label="饮用水类型，1在用、2备用" name="drinkingWaterType">
+                        <a-input v-model:value="form.drinkingWaterType" placeholder="请输入饮用水类型，1或者2" allow-clear />
                     </a-form-item>
                 </a-form>
             </a-modal>
diff --git a/src/views/water/drinking-water/statistic/base.vue b/src/views/water/drinking-water/statistic/base.vue
index 39bfef4..e717ebd 100644
--- a/src/views/water/drinking-water/statistic/base.vue
+++ b/src/views/water/drinking-water/statistic/base.vue
@@ -67,20 +67,22 @@
       <ele-pro-table
         v-model:selection="selectionList"
         ref="table"
-        row-key="roadNoiseId"
+        row-key="drinkingWaterId"
         :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 #action="{text,record}">
+          <span>
+            {{
+              record.reportTime.getMonth()==null ||record.reportTime.getMonth().getMonth()==1 || record.reportTime.getMonth().getMonth() == 2 ||record.reportTime.getMonth() == 3 ||record.reportTime.getMonth()==12
+            ? text="K": 
+              record.reportTime.getMonth()==4 || record.reportTime.getMonth() == 5 ||record.reportTime.getMonth()==10||record.reportTime.getMonth()==11
+            ? text="P": text="F"
+            }}
+          </span>
         </template>
       </ele-pro-table>
     </a-card>
@@ -91,219 +93,45 @@
 <script>
 // import _ from "lodash";
 import XLSX from "xlsx";
-import { pageRoadNoiseUrl, getColumnOptions } from "@/api/ecology/noise/road-sound";
+// import { pageRoadNoiseUrl, getColumnOptions } from "@/api/ecology/noise/road-sound";
+import {
+  pageDrinkingWaterStatisticUrl,
+  // getColumnOptions
+
+} from "@/api/ecology/drinking-water";
+// import pageDictUrl from "@/api/ecology/drinking-water-dict"
 import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
+import { tableColumns } from "./colums";
 // import moment from "moment";
 //   import utils from "./utils";
+const columns =tableColumns;
+
+        // {
+        //   title: "创建人",
+        //   dataIndex: "username",
+        //   sorter: true,
+        // },
+      
+
 export default {
-  name: "StatisticSoundRoadBase",
+  name: "DrinkingWaterBase",
   components: {},
+
+
   data() {
     return {
       data: [],
       locale,
       bill: {},
       // 表格数据接口
-      url: pageRoadNoiseUrl,
+      url: pageDrinkingWaterStatisticUrl,
       selection: [],
+      columns,
       // 表格列配置
-      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: [],
+      
+      // palceOptions: [],
+      // areaOptions: [],
+      // roadOptions: [],
       regionLevelOptions: [],
       // 表格搜索条件
       where: {
@@ -314,44 +142,48 @@ export default {
     };
   },
   mounted() {
-    this.loadOptionData();
+    // this.loadOptionData();
   },
   methods: {
+    JumpFieldClick(record, column) {
+        console.log(column.dataIndex)
+      },
+
     /**获取下来框数据 */
-    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,
-          };
-        });
-      });
-    },
+    // 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() {
 
@@ -368,189 +200,7 @@ export default {
     },
     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,
-        },
+         ...tableColumns,
       ];
       const arr = [];
       const th = columns.map((item) => item.title);
@@ -567,4 +217,4 @@ export default {
 </script>
 
 <style scoped lang="less">
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/water/drinking-water/statistic/colums.js b/src/views/water/drinking-water/statistic/colums.js
new file mode 100644
index 0000000..738d4f0
--- /dev/null
+++ b/src/views/water/drinking-water/statistic/colums.js
@@ -0,0 +1,147 @@
+import moment from "moment"
+const tableColumns = [
+    
+    { title: "断面名称", dataIndex: "place", sorter: true, },
+    { title: "断面代码", dataIndex: "sectionCode", sorter: true, },
+    { title: "水源名称", dataIndex: "sourceWaterName", sorter: true, },
+    { title: "所属水系", dataIndex: "subordinateWater", sorter: true, },
+    { title: "水源地性质", dataIndex: "waterSourceProperty", sorter: true, },
+    { title: "取水点经度", dataIndex: "longitude", sorter: true, },
+    { title: "取水点纬度", dataIndex: "latitude", sorter: true, },
+    { title: "本月取水量", dataIndex: "waterWithdrawal", sorter: true, },
+    { title: "采样时间", dataIndex: "reportTime", sorter: true, customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY/MM/DD")},
+    { title: "水期代码", dataIndex: "waterPhaseCode",sorter: true, 
+        scopedSlots:{customRender:'action' }
+    },
+    { title: "水温", dataIndex: "waterTemperature", sorter: true, },
+    // {title: "采样时间",dataIndex: "monitorTime",sorter: true,},
+    { title: "pH(无量纲)", dataIndex: "ph", sorter: true, },
+    { title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true, },
+    { title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true, },
+    { title: "化学需氧量", dataIndex: "cod", sorter: true, },
+    { title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true, },
+    { title: "氨氮", dataIndex: "ammonia", sorter: true, },
+    { title: "总磷", dataIndex: "totalPhosphorus", sorter: true, },
+    { title: "总氮", dataIndex: "totalNitrogen", sorter: true, },
+    { title: "铜", dataIndex: "cu", sorter: true, },
+    { title: "锌", dataIndex: "zn", sorter: true, },
+    { title: "氟化物", dataIndex: "fluoride", sorter: true, },
+    { title: "硒", dataIndex: "se", sorter: true, },
+    { title: "砷", dataIndex: "as", sorter: true, },
+    { title: "汞", dataIndex: "hg", sorter: true, },
+    { title: "镉", dataIndex: "cd", sorter: true, },
+    { title: "铬（六价）", dataIndex: "cr", sorter: true, },
+    { title: "铅", dataIndex: "pb", sorter: true, },
+    { title: "氰化物", dataIndex: "cyanide", sorter: true, },
+    { title: "挥发酚", dataIndex: "volatilePhenol", sorter: true, },
+    { title: "石油类", dataIndex: "petro", sorter: true, },
+    { title: "阴离子表面活性剂", dataIndex: "anionicSurfactant", sorter: true, },
+    { title: "硫化物", dataIndex: "sulfide", sorter: true, },
+    { title: "粪大肠菌群(MPN/L)", dataIndex: "fecalColiforms", sorter: true, },
+    { title: "硫酸盐", dataIndex: "sulfate", sorter: true, },
+    { title: "氯化物", dataIndex: "chloride", sorter: true, },
+    { title: "硝酸盐氮", dataIndex: "nitrateNitrogen", sorter: true, },
+    { title: "铁", dataIndex: "fe", sorter: true, },
+    { title: "锰", dataIndex: "mn", sorter: true, },
+    { title: "三氯甲烷", dataIndex: "chcl3", sorter: true, },
+    { title: "四氯化碳", dataIndex: "ccl4", sorter: true, },
+    { title: "三溴甲烷", dataIndex: "chbr3", sorter: true, },
+    { title: "二氯甲烷", dataIndex: "ch2cl2", sorter: true, },
+    { title: "1，2-二氯乙烷", dataIndex: "c2h4cl2", sorter: true, },
+    { title: "环氧氯丙烷", dataIndex: "c3h5clO", sorter: true, },
+    { title: "氯乙烯", dataIndex: "c2h3cl", sorter: true, },
+    { title: "1，1-二氯乙烯", dataIndex: "c2h2cl211", sorter: true, },
+    { title: "1，2-二氯乙烯", dataIndex: "c2h2cl212", sorter: true, },
+    { title: "三氯乙烯", dataIndex: "c2hcl3", sorter: true, },
+    { title: "四氯乙烯", dataIndex: "c2cl4", sorter: true, },
+    { title: "氯丁二烯", dataIndex: "c4h5cl", sorter: true, },
+    { title: "六氯丁二烯", dataIndex: "c4cl6", sorter: true, },
+    { title: "苯乙烯", dataIndex: "c8h8", sorter: true, },
+    { title: "甲醛", dataIndex: "ch2o", sorter: true, },
+    { title: "乙醛", dataIndex: "c2h4o", sorter: true, },
+    { title: "丙烯醛", dataIndex: "c3h4o", sorter: true, },
+    { title: "三氯乙醛", dataIndex: "c2hcl3o", sorter: true, },
+    { title: "苯", dataIndex: "c6h6", sorter: true, },
+    { title: "甲苯", dataIndex: "c7h8", sorter: true, },
+    { title: "乙苯", dataIndex: "c8h10Ethylbenzene", sorter: true, },
+    { title: "二甲苯", dataIndex: "c8h10Dimethylbenzene", sorter: true, },
+    { title: "异丙苯", dataIndex: "c9h12", sorter: true, },
+    { title: "氯苯", dataIndex: "c6h5cl", sorter: true, },
+    { title: "1，2-二氯苯", dataIndex: "c6h4cl212", sorter: true, },
+    { title: "1，4-二氯苯", dataIndex: "c6h4cl214", sorter: true, },
+    { title: "三氯苯", dataIndex: "c6h3cl3", sorter: true, },
+    { title: "四氯苯", dataIndex: "c6h2cl4", sorter: true, },
+    { title: "六氯苯", dataIndex: "c6cl6", sorter: true, },
+    { title: "硝基苯", dataIndex: "c6h5no2", sorter: true, },
+    { title: "二硝基苯", dataIndex: "c6h4n2o4", sorter: true, },
+    { title: "2，4-二硝基甲苯", dataIndex: "c7h6n2o4", sorter: true, },
+    { title: "2，4，6-三硝基甲苯", dataIndex: "c7h5o6n3", sorter: true, },
+    { title: "硝基氯苯", dataIndex: "c6h4clno2", sorter: true, },
+    { title: "2，4-二硝基氯苯 ", dataIndex: "c6h3cln2o4", sorter: true, },
+    { title: "2，4-二氯苯酚", dataIndex: "c6h4cl2o", sorter: true, },
+    { title: "2，4，6-三氯苯酚", dataIndex: "c6h3cl3o", sorter: true, },
+    { title: "五氯酚", dataIndex: "c6hcl5o", sorter: true, },
+    { title: "苯胺", dataIndex: "c6h7n", sorter: true, },
+    { title: "联苯胺", dataIndex: "c6h4nh22", sorter: true, },
+    { title: "丙烯酰胺", dataIndex: "c3h5no", sorter: true, },
+    { title: "丙烯腈", dataIndex: "c3h3n", sorter: true, },
+    { title: "邻苯二甲酸二丁酯", dataIndex: "c16h22o4", sorter: true, },
+    { title: "邻苯二甲酸二（2-乙基已基）酯", dataIndex: "c16h35o4p", sorter: true, },
+    { title: "水合肼", dataIndex: "n2h4h2o", sorter: true, },
+    { title: "四乙基铅", dataIndex: "c8h20pd", sorter: true, },
+    { title: "吡啶", dataIndex: "c5h5n", sorter: true, },
+    { title: "松节油", dataIndex: "turpentine", sorter: true, },
+    { title: "苦味酸", dataIndex: "c6h3n3o7", sorter: true, },
+    { title: "丁基黄原酸", dataIndex: "butylXanthogenAcid", sorter: true, },
+    { title: "活性氯", dataIndex: "activeChlorine", sorter: true, },
+    { title: "滴滴涕", dataIndex: "c14h9cl5", sorter: true, },
+    { title: "林丹", dataIndex: "c6h6cl6", sorter: true, },
+    { title: "环氧七氯", dataIndex: "c10h5cl7O", sorter: true, },
+    { title: "对硫磷", dataIndex: "c10h14no5ps", sorter: true, },
+    { title: "甲基对硫磷", dataIndex: "c8h10o5nps", sorter: true, },
+    { title: "马拉硫磷", dataIndex: "c10h19o6ps2", sorter: true, },
+    { title: "乐果", dataIndex: "c5h12no3ps2", sorter: true, },
+    { title: "敌敌畏", dataIndex: "c4h7cl2o4p", sorter: true, },
+    { title: "敌百虫", dataIndex: "c4h8cl3o4p", sorter: true, },
+    { title: "内吸磷", dataIndex: "c8h19o3ps2", sorter: true, },
+    { title: "百菌清", dataIndex: "c8cl4n2", sorter: true, },
+    { title: "甲萘威", dataIndex: "c12h11no2", sorter: true, },
+    { title: "溴氰菊酯", dataIndex: "c22h19br2no3", sorter: true, },
+    { title: "阿特拉津", dataIndex: "c8h14cln5", sorter: true, },
+    { title: "苯并(a)芘 ", dataIndex: "c20h12", sorter: true, },
+    { title: "甲基汞", dataIndex: "ch3hg", sorter: true, },
+    { title: "多氯联苯", dataIndex: "c12h10Xclx", sorter: true, },
+    { title: "微囊藻毒素-LR", dataIndex: "微囊藻毒素-LR", sorter: true, },
+    { title: "黄磷", dataIndex: "p4", sorter: true, },
+    { title: "钼", dataIndex: "mo", sorter: true, },
+    { title: "钴", dataIndex: "co", sorter: true, },
+    { title: "铍", dataIndex: "be", sorter: true, },
+    { title: "硼", dataIndex: "b", sorter: true, },
+    { title: "锑", dataIndex: "sb", sorter: true, },
+    { title: "镍", dataIndex: "ni", sorter: true, },
+    { title: "钡", dataIndex: "ba", sorter: true, },
+    { title: "钒", dataIndex: "v", sorter: true, },
+    { title: "钛", dataIndex: "ti", sorter: true, },
+    { title: "铊", dataIndex: "tl", sorter: true, },
+
+    { title: "六价铬", dataIndex: "cr6", sorter: true, },
+    { title: "邻二氯苯", dataIndex: "odcb", sorter: true, },
+    { title: "对二氯苯", dataIndex: "pdcp", sorter: true, },
+
+    { title: "苯并(a)芘", dataIndex: "bap", sorter: true, },
+    { title: "苯并(b)荧蒽", dataIndex: "bbfa", sorter: true, },
+    { title: "磷酸盐", dataIndex: "phosphate", sorter: true, },
+    { title: "急性毒性", dataIndex: "acuteToxicity", sorter: true, },
+    { title: "余氯", dataIndex: "residualChlorine", sorter: true, },
+    { title: "六六六", dataIndex: "c6h6cl6666", sorter: true, },
+    { title: "2,4,6-三氯酚", dataIndex: "c6h3cl3o246", sorter: true, },
+    //新增
+    { title: "叶绿素（mg/m3)", dataIndex: "chlorophyll", sorter: true, },
+    { title: "透明度（cm）", dataIndex: "transparency", sorter: true, },
+    { title: "总α放射性", dataIndex: "totalAlphaRadioactivity", sorter: true, },
+    { title: "总β放射性", dataIndex: "totalBetaRadioactivity", sorter: true, },
+    { title: "1,1,1-三氯乙烷(mg/L)", dataIndex: "c2h3cl3_111", sorter: true, },
+    { title: "1,1,2-三氯乙烷(mg/L)", dataIndex: "c2h3cl3_112", sorter: true, },
+];
+
+export { tableColumns }
\ No newline at end of file
diff --git a/src/views/water/drinking-water/statistic/index.vue b/src/views/water/drinking-water/statistic/index.vue
index 7b7f135..2313f93 100644
--- a/src/views/water/drinking-water/statistic/index.vue
+++ b/src/views/water/drinking-water/statistic/index.vue
@@ -2,17 +2,47 @@
   <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 key="city" tab="市级">
+          <a-tabs v-model:active="activeCity">
+            <a-tab-pane key="city" tab="数据总览">
+              <base-statistic></base-statistic>
+            </a-tab-pane>
+            <a-tab-pane tab="超标评价" key="base1">
+              <function-bill ref="functionWater"></function-bill>
+            </a-tab-pane>
+            <a-tab-pane tab="水质类别" key="base2">
+              <function-bill ref="functionWater"></function-bill>
+            </a-tab-pane>
+          </a-tabs>
         </a-tab-pane>
-        <a-tab-pane key="average" tab="平均">
-          <average-statistic></average-statistic>
+        <a-tab-pane key="county" tab="县级">
+          <a-tabs v-model:active="activeCounty">
+            <a-tab-pane key="County" tab="数据总览">
+              <base-statistic></base-statistic>
+            </a-tab-pane>
+            <a-tab-pane tab="超标评价" key="base1">
+              <function-bill ref="functionWater"></function-bill>
+            </a-tab-pane>
+            <a-tab-pane tab="水质类别" key="base2">
+              <function-bill ref="functionWater"></function-bill>
+            </a-tab-pane>
+          </a-tabs>
         </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 key="village" tab="农村">
+         <a-tabs v-model:active="activeVillage">
+            <a-tab-pane key="village" tab="数据总览">
+              <base-statistic></base-statistic>
+            </a-tab-pane>
+            <a-tab-pane tab="超标评价" key="base1">
+              <function-bill ref="functionWater"></function-bill>
+            </a-tab-pane>
+            <a-tab-pane tab="水质类别" key="base2">
+              <function-bill ref="functionWater"></function-bill>
+            </a-tab-pane>
+          </a-tabs>
         </a-tab-pane>
       </a-tabs>
     </a-card>
@@ -21,31 +51,34 @@
 
 <script>
   /**
-   * 
-   * 
-   * 
+   *
+   *
+   *
    */
   import BaseStatistic from "./base.vue";
   // import QuarterStatistic from "./quarter.vue";
-  import Compare from "./compare.vue"
-  import AverageStatistic from "./average.vue"
+  // import Compare from "./compare.vue"
+  // import AverageStatistic from "./average.vue"
 
   export default {
-    name: 'StatisticSoundRoad',
+    name: 'DrinkWaterCollectIndex',
     components: {
       BaseStatistic,
       // QuarterStatistic,
-      Compare,
-      AverageStatistic
+      // Compare,
+      // AverageStatistic
     },
     data() {
       return {
-        activeKey: 'base'
+        activeKey: 'city',
+        activeCity:'city',
+        activeCounty:'county',
+        activeVillage:'village', 
       };
-        
+
     },
     methods: {
-     
+
     }
 
   }
@@ -53,4 +86,4 @@
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>