From 9b52b7abaca1b8c6d6565353dcaf8bd6f7b24188 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Thu, 4 Nov 2021 22:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=B8=E9=9B=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acid-rain/collect/rain-bill.vue           |  21 +-
 .../atmosphere/acid-rain/statistic/base.vue   | 731 +++++++++---------
 .../atmosphere/acid-rain/statistic/colums.js  |  34 +-
 src/views/atmosphere/air/statistic/base.vue   |   3 -
 4 files changed, 386 insertions(+), 403 deletions(-)

diff --git a/src/views/atmosphere/acid-rain/collect/rain-bill.vue b/src/views/atmosphere/acid-rain/collect/rain-bill.vue
index 4e0d1e7..b0978d1 100644
--- a/src/views/atmosphere/acid-rain/collect/rain-bill.vue
+++ b/src/views/atmosphere/acid-rain/collect/rain-bill.vue
@@ -24,8 +24,11 @@
               <a-input v-model:value.trim="where.billName" placeholder="请输入" allow-clear />
             </a-form-item>
 
-            <a-form-item label="上报时间:">
-              <a-range-picker separator="~" v-model:value="reportTimeScope" />
+            <a-form-item label="起始日期:">
+              <a-date-picker valueFormat="YYYY-MM-DD 00:00:00" v-model:value="where.createTimeStart"></a-date-picker>
+            </a-form-item>
+            <a-form-item label="结束日期:">
+              <a-date-picker valueFormat="YYYY-MM-DD 23:59:59" v-model:value="where.createTimeEnd"></a-date-picker>
             </a-form-item>
 
             <a-form-item class="ele-text-right" :wrapper-col="{span: 24}">
@@ -213,8 +216,9 @@
           }
         ],
         // 表格搜索条件
-        where: {},
-        reportTimeScope: [],
+        where: {
+
+        },
         // 表格选中数据
         selectionList: [],
         editableData: {},
@@ -223,16 +227,9 @@
       };
     },
     methods: {
-
-
       /* 刷新表格 */
       reload() {
-        this.where.reportTimeStart = null;
-        this.where.reportTimeEnd = null;
-        if (this.reportTimeScope && this.reportTimeScope.length == 2) {
-          this.where.reportTimeStart = this.reportTimeScope[0].format("Y-M-D H:m:s")
-          this.where.reportTimeEnd = this.reportTimeScope[1].format("Y-M-D H:m:s")
-        }
+
         this.$refs.table.reload({
           where: this.where
         });
diff --git a/src/views/atmosphere/acid-rain/statistic/base.vue b/src/views/atmosphere/acid-rain/statistic/base.vue
index 7d0b429..c3a0b3e 100644
--- a/src/views/atmosphere/acid-rain/statistic/base.vue
+++ b/src/views/atmosphere/acid-rain/statistic/base.vue
@@ -1,79 +1,64 @@
 <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 } }"
+  <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" allowClear showSearch placeholder="选择区域等级">
+            <a-select-option
+              v-for="(item) in regionLevelOptions"
+              :key="item.value"
+            >{{ item.label }}
+            </a-select-option
             >
-                <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-select>
+        </a-form-item>
+        <a-form-item label="测点名称:">
+          <a-select v-model:value="where.place" allowClear showSearch placeholder="选择监测点">
+            <a-select-option
+              v-for="(item) in palceOptions"
+              :key="item.value"
+            >{{ item.label }}
+            </a-select-option
+            >
+          </a-select>
+        </a-form-item>
 
-                    <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="acidRainId"
-                :datasource="url"
-                :columns="columns"
-                :where="where"
-                :scroll="{ x: 'max-content' }"
-                @done="(d) => (data = d.data)"
-            >
-                <template #Address="{ record  }">
-                    {{ record.area ? record.area : record.county ? record.county : record.city }}
-                </template>
-            </ele-pro-table>
-        </a-card>
-    </div>
-    <!-- 编辑弹窗 -->
+        <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-form>
+      <!-- 表格 -->
+      <ele-pro-table
+        v-model:selection="selectionList"
+        ref="table"
+        row-key="acidRainId"
+        :datasource="url"
+        :columns="columns"
+        :where="where"
+        :scroll="{ x: 'max-content' }"
+        @done="(d) => (data = d.data)"
+      >
+        <template #Address="{ record  }">
+          {{ record.area ? record.area : record.county ? record.county : record.city }}
+        </template>
+      </ele-pro-table>
+    </a-card>
+  </div>
+  <!-- 编辑弹窗 -->
 </template>
 
 <script>
@@ -82,310 +67,314 @@ import XLSX from "xlsx";
 import {pageAcidRainUrl, getColumnOptions} from "@/api/ecology/atmosphere/acid";
 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: "StatisticSoundZoneBase",
-    components: {},
-    data() {
-        return {
-            data: [],
-            locale,
-            bill: {},
-            // 表格数据接口
-            url: pageAcidRainUrl,
-            selection: [],
-            // 表格列配置
-            columns: [
-                {
-                    title: "采样开始时间",
-                    dataIndex: "monitorStartTime",
-                    sorter: true,
-                    customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
-                },
-                {
-                    title: "采样结束时间",
-                    dataIndex: "monitorEndTime",
-                    sorter: true,
-                    customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
-                },
-                {
-                    title: "行政代码",
-                    dataIndex: "regionCode",
-                    sorter: true,
-                    customRender: () => "450100"
-                },
-                {
-                    title: "市(县，区)",
-                    slots: {customRender: "Address"},
-                },
-                {
-                    title: "采样点",
-                    dataIndex: "place",
-                    sorter: true,
-                },
-                {
-                    title: "点位类型",
-                    dataIndex: "placeType",
-                    sorter: true,
-                },
-                {
-                    title: "降水类型",
-                    dataIndex: "precipitationType",
-                    sorter: true,
-                },
-                {
-                    title: "降水量",
-                    dataIndex: "precipitation",
-                    sorter: true,
-                },
-                {
-                    title: "pH",
-                    dataIndex: "ph",
-                    sorter: true,
-                },
-                {
-                    title: "电导率",
-                    dataIndex: "conductivity",
-                    sorter: true,
-                },
-                {
-                    title: "SO42",
-                    dataIndex: "sulfateRadical",
-                    sorter: true,
-                },
-                {
-                    title: "NO3",
-                    dataIndex: "nitrate",
-                    sorter: true,
-                },
-                {
-                    title: "F",
-                    dataIndex: "fluorine",
-                    sorter: true,
-                },
-                {
-                    title: "CL",
-                    dataIndex: "chlorine",
-                    sorter: true,
-                },
-                {
-                    title: "NH4",
-                    dataIndex: "ammoniumRadical",
-                    sorter: true,
-                },
-                {
-                    title: "Ca2",
-                    dataIndex: "ca",
-                    sorter: true,
-                },
-                {
-                    title: "Mg2",
-                    dataIndex: "mg",
-                    sorter: true,
-                },
-                {
-                    title: "Na",
-                    dataIndex: "na",
-                    sorter: true,
-                },
-                {
-                    title: "K",
-                    dataIndex: "k",
-                    sorter: true,
-                },
-                {
-                    title: "系统编码",
-                    dataIndex: "systemCode",
-                    sorter: true,
-                },
+  name: "StatisticSoundZoneBase",
+  components: {},
+  data() {
+    const year = new Date().getFullYear();
+    return {
+      data: [],
+      locale,
+      bill: {},
+      // 表格数据接口
+      url: pageAcidRainUrl,
+      selection: [],
+      // 表格列配置
+      columns: [
+        {
+          title: "采样开始时间",
+          dataIndex: "monitorStartTime",
+          sorter: true,
+          customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+        },
+        {
+          title: "采样结束时间",
+          dataIndex: "monitorEndTime",
+          sorter: true,
+          customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+        },
+        {
+          title: "行政代码",
+          dataIndex: "regionCode",
+          sorter: true,
+          customRender: () => "450100"
+        },
+        {
+          title: "市(县，区)",
+          slots: {customRender: "Address"},
+        },
+        {
+          title: "采样点",
+          dataIndex: "place",
+          sorter: true,
+        },
+        {
+          title: "点位类型",
+          dataIndex: "placeType",
+          sorter: true,
+        },
+        {
+          title: "降水类型",
+          dataIndex: "precipitationType",
+          sorter: true,
+        },
+        {
+          title: "降水量",
+          dataIndex: "precipitation",
+          sorter: true,
+        },
+        {
+          title: "pH",
+          dataIndex: "ph",
+          sorter: true,
+        },
+        {
+          title: "电导率",
+          dataIndex: "conductivity",
+          sorter: true,
+        },
+        {
+          title: "SO42",
+          dataIndex: "so42",
+          sorter: true,
+        },
+        {
+          title: "NO3",
+          dataIndex: "no3",
+          sorter: true,
+        },
+        {
+          title: "F",
+          dataIndex: "f",
+          sorter: true,
+        },
+        {
+          title: "CL",
+          dataIndex: "cl",
+          sorter: true,
+        },
+        {
+          title: "NH4",
+          dataIndex: "nh4",
+          sorter: true,
+        },
+        {
+          title: "Ca2",
+          dataIndex: "ca",
+          sorter: true,
+        },
+        {
+          title: "Mg2",
+          dataIndex: "mg",
+          sorter: true,
+        },
+        {
+          title: "Na",
+          dataIndex: "na",
+          sorter: true,
+        },
+        {
+          title: "K",
+          dataIndex: "k",
+          sorter: true,
+        },
+        {
+          title: "系统编码",
+          dataIndex: "systemCode",
+          sorter: true,
+        },
 
-                {
-                    title: "备注",
-                    dataIndex: "remark",
-                    sorter: true,
-                },
-                {
-                    title: "创建人",
-                    dataIndex: "username",
-                    sorter: true,
-                }
-            ],
-            palceOptions: [],
-            areaOptions: [],
-            regionLevelOptions: [],
-            // 表格搜索条件
-            where: {
-                checked: 1,
-            },
-            // 表格选中数据
-            selectionList: [],
-        };
-    },
-    mounted() {
-        this.loadOptionData();
-    },
-    methods: {
-        /**获取下来框数据 */
-        loadOptionData() {
-            getColumnOptions("place").then((res) => {
-                this.palceOptions = res.data.data.map((item) => {
-                    return {
-                        label: item,
-                        value: item,
-                    };
-                });
-            });
-            getColumnOptions("area").then((res) => {
-                this.areaOptions = res.data.data.map((item) => {
-                    return {
-                        label: item,
-                        value: item,
-                    };
-                });
-            });
-            getColumnOptions("region_level").then((res) => {
-                this.regionLevelOptions = res.data.data.map((item) => {
-                    return {
-                        label: item,
-                        value: item,
-                    };
-                });
-            });
+        {
+          title: "备注",
+          dataIndex: "remark",
+          sorter: true,
         },
-        /* 刷新表格 */
-        reload() {
+        {
+          title: "创建人",
+          dataIndex: "username",
+          sorter: true,
+        }
+      ],
+      palceOptions: [],
+      areaOptions: [],
+      regionLevelOptions: [],
+      // 表格搜索条件
+      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: [],
+    };
+  },
+  mounted() {
+    this.loadOptionData();
+  },
+  methods: {
+    /**获取下来框数据 */
+    loadOptionData() {
+      getColumnOptions("place").then((res) => {
+        this.palceOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("area").then((res) => {
+        this.areaOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+      getColumnOptions("region_level").then((res) => {
+        this.regionLevelOptions = res.data.data.map((item) => {
+          return {
+            label: item,
+            value: item,
+          };
+        });
+      });
+    },
+    /* 刷新表格 */
+    reload() {
 
-            this.$refs.table.reload({
-                where: this.where,
-            });
-        },
-        /* 重置搜索 */
-        reset() {
-            this.where = {
-                checked: 1,
-            };
-            this.reload();
-        },
-        exportFile() {
-            const columns = [
-
-                {
-                    title: "行政代码",
-                    dataIndex: "regionCode",
-                    sorter: true,
-                },
-                {
-                    title: "市(县，区)",
-                    dataIndex: "address",
-                    slots: {customRender: "Address"},
-                },
-                {
-                    title: "采样点",
-                    dataIndex: "place",
-                    sorter: true,
-                },
-                {
-                    title: "点位类型",
-                    dataIndex: "placeType",
-                    sorter: true,
-                },
-                {
-                    title: "采样开始时间",
-                    dataIndex: "monitorStartTime",
-                    customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
-                },
-                {
-                    title: "采样结束时间",
-                    dataIndex: "monitorEndTime",
-                    customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
-                },
-                {
-                    title: "降水类型",
-                    dataIndex: "precipitationType",
-                    sorter: true,
-                },
-                {
-                    title: "降水量",
-                    dataIndex: "precipitation",
-                    sorter: true,
-                },
-                {
-                    title: "pH",
-                    dataIndex: "ph",
-                    sorter: true,
-                },
-                {
-                    title: "电导率",
-                    dataIndex: "conductivity",
-                    sorter: true,
-                },
-                {
-                    title: "SO42",
-                    dataIndex: "sulfateRadical",
-                    sorter: true,
-                },
-                {
-                    title: "NO3",
-                    dataIndex: "nitrate",
-                    sorter: true,
-                },
-                {
-                    title: "F",
-                    dataIndex: "fluorine",
-                    sorter: true,
-                },
-                {
-                    title: "CL",
-                    dataIndex: "chlorine",
-                    sorter: true,
-                },
-                {
-                    title: "NH4",
-                    dataIndex: "ammoniumRadical",
-                    sorter: true,
-                },
-                {
-                    title: "Ca2",
-                    dataIndex: "ca",
-                    sorter: true,
-                },
-                {
-                    title: "Mg2",
-                    dataIndex: "mg",
-                    sorter: true,
-                },
-                {
-                    title: "Na",
-                    dataIndex: "na",
-                    sorter: true,
-                },
-                {
-                    title: "K",
-                    dataIndex: "k",
-                    sorter: true,
-                },
-                {
-                    title: "系统编码",
-                    dataIndex: "systemCode",
-                    sorter: true,
-                },
-            ];
-            const arr = [];
-            const th = columns.map((item) => item.title);
-            arr.push(th);
-            this.data.forEach((d) => {
-                const td = columns.map((item) => {
-                    if (item.dataIndex == "address") {
-                        return d.area ? d.area : d.county ? d.county : d.city
-                    }
-                    return d[item.dataIndex];
-                });
-                arr.push(td);
-            });
-            let sheet = XLSX.utils.aoa_to_sheet(arr);
-            this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
-        },
+      this.$refs.table.reload({
+        where: this.where,
+      });
     },
+    /* 重置搜索 */
+    reset() {
+      this.where = {
+        checked: 1,
+      };
+      this.reload();
+    },
+    exportFile() {
+      const columns = [
+
+        {
+          title: "行政代码",
+          dataIndex: "regionCode",
+          sorter: true,
+        },
+        {
+          title: "市(县，区)",
+          dataIndex: "address",
+          slots: {customRender: "Address"},
+        },
+        {
+          title: "采样点",
+          dataIndex: "place",
+          sorter: true,
+        },
+        {
+          title: "点位类型",
+          dataIndex: "placeType",
+          sorter: true,
+        },
+        {
+          title: "采样开始时间",
+          dataIndex: "monitorStartTime",
+          customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+        },
+        {
+          title: "采样结束时间",
+          dataIndex: "monitorEndTime",
+          customRender: ({text}) => moment(text, "YYYY/MM/DD HH:mm:ss").format("YYYY-MM-DD HH:mm")
+        },
+        {
+          title: "降水类型",
+          dataIndex: "precipitationType",
+          sorter: true,
+        },
+        {
+          title: "降水量",
+          dataIndex: "precipitation",
+          sorter: true,
+        },
+        {
+          title: "pH",
+          dataIndex: "ph",
+          sorter: true,
+        },
+        {
+          title: "电导率",
+          dataIndex: "conductivity",
+          sorter: true,
+        },
+        {
+          title: "SO42",
+          dataIndex: "so42",
+          sorter: true,
+        },
+        {
+          title: "NO3",
+          dataIndex: "no3",
+          sorter: true,
+        },
+        {
+          title: "F",
+          dataIndex: "f",
+          sorter: true,
+        },
+        {
+          title: "CL",
+          dataIndex: "cl",
+          sorter: true,
+        },
+        {
+          title: "NH4",
+          dataIndex: "nh4",
+          sorter: true,
+        },
+        {
+          title: "Ca2",
+          dataIndex: "ca",
+          sorter: true,
+        },
+        {
+          title: "Mg2",
+          dataIndex: "mg",
+          sorter: true,
+        },
+        {
+          title: "Na",
+          dataIndex: "na",
+          sorter: true,
+        },
+        {
+          title: "K",
+          dataIndex: "k",
+          sorter: true,
+        },
+        {
+          title: "系统编码",
+          dataIndex: "systemCode",
+          sorter: true,
+        },
+      ];
+      const arr = [];
+      const th = columns.map((item) => item.title);
+      arr.push(th);
+      this.data.forEach((d) => {
+        const td = columns.map((item) => {
+          if (item.dataIndex == "address") {
+            return d.area ? d.area : d.county ? d.county : d.city
+          }
+          return d[item.dataIndex];
+        });
+        arr.push(td);
+      });
+      let sheet = XLSX.utils.aoa_to_sheet(arr);
+      this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
+    },
+  },
 };
 </script>
 
diff --git a/src/views/atmosphere/acid-rain/statistic/colums.js b/src/views/atmosphere/acid-rain/statistic/colums.js
index 7d9bc89..a407cea 100644
--- a/src/views/atmosphere/acid-rain/statistic/colums.js
+++ b/src/views/atmosphere/acid-rain/statistic/colums.js
@@ -1,18 +1,18 @@
 const tableColumns = [
-        {title: "编号",dataIndex: "code",sorter: true,},
-        {title: "降水类型",dataIndex: "precipitationType",sorter: true,},
-        {title: "降雨量(mm)",dataIndex: "precipitation",sorter: true,},
-        {title: "pH值（无量纲）",dataIndex: "ph",sorter: true,},
-        {title: "电导率(mS/m)",dataIndex: "conductivity",sorter: true,},
-        {title: "氟离子",dataIndex: "fluorine",sorter: true,},
-        {title: "氯离子",dataIndex: "chlorine",sorter: true,},
-        {title: "硫酸根离子",dataIndex: "sulfateRadical",sorter: true,},
-        {title: "硝酸根离子",dataIndex: "nitrate",sorter: true,},
-        {title: "钠离子",dataIndex: "na",sorter: true,},
-        {title: "铵根离子",dataIndex: "ammoniumRadical",sorter: true,},
-        {title: "钾离子",dataIndex: "k",sorter: true,},
-        {title: "镁离子",dataIndex: "mg",sorter: true,},
-        {title: "钙离子",dataIndex: "ca",sorter: true,},
-        {title: "备注",dataIndex: "remark",sorter: true,},
-    ];
-    export {tableColumns}
\ No newline at end of file
+    {title: "编号",dataIndex: "code",sorter: true,},
+    {title: "降水类型",dataIndex: "precipitationType",sorter: true,},
+    {title: "降雨量(mm)",dataIndex: "precipitation",sorter: true,},
+    {title: "pH值（无量纲）",dataIndex: "ph",sorter: true,},
+    {title: "电导率(mS/m)",dataIndex: "conductivity",sorter: true,},
+    {title: "氟离子",dataIndex: "f",sorter: true,},
+    {title: "氯离子",dataIndex: "cl",sorter: true,},
+    {title: "硫酸根离子",dataIndex: "so42",sorter: true,},
+    {title: "硝酸根离子",dataIndex: "no3",sorter: true,},
+    {title: "钠离子",dataIndex: "na",sorter: true,},
+    {title: "铵根离子",dataIndex: "nh4",sorter: true,},
+    {title: "钾离子",dataIndex: "k",sorter: true,},
+    {title: "镁离子",dataIndex: "mg",sorter: true,},
+    {title: "钙离子",dataIndex: "ca",sorter: true,},
+    {title: "备注",dataIndex: "remark",sorter: true,},
+];
+export {tableColumns}
\ No newline at end of file
diff --git a/src/views/atmosphere/air/statistic/base.vue b/src/views/atmosphere/air/statistic/base.vue
index 4279315..70935cb 100644
--- a/src/views/atmosphere/air/statistic/base.vue
+++ b/src/views/atmosphere/air/statistic/base.vue
@@ -11,9 +11,6 @@
                 </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-form-item>
                         <a-form-item label="区域等级:">
                             <a-select v-model:value="where.regionLevel"  placeholder="选择区域等级" allowClear showSearch>