This commit is contained in:
weicw
2021-11-04 22:58:12 +08:00
parent 18f4bd8a4d
commit 9b52b7abac
4 changed files with 386 additions and 403 deletions

View File

@@ -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
});

View File

@@ -4,13 +4,16 @@
<!-- 搜索表单 -->
<a-form
:model="where"
:label-col="{ md: { span: 6 }, sm: { span: 24 } }"
:wrapper-col="{ md: { span: 18 }, sm: { span: 24 } }"
layout="inline"
>
<a-row>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<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>
<a-select v-model:value="where.regionLevel" allowClear showSearch placeholder="选择区域等级">
<a-select-option
v-for="(item) in regionLevelOptions"
:key="item.value"
@@ -19,10 +22,8 @@
>
</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 v-model:value="where.place" allowClear showSearch placeholder="选择监测点">
<a-select-option
v-for="(item) in palceOptions"
:key="item.value"
@@ -31,21 +32,7 @@
>
</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>
@@ -53,8 +40,6 @@
<a-button @click="exportFile">导出Excel</a-button>
</a-space>
</a-form-item>
</a-col>
</a-row>
</a-form>
<!-- 表格 -->
<ele-pro-table
@@ -82,11 +67,13 @@ 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() {
const year = new Date().getFullYear();
return {
data: [],
locale,
@@ -150,27 +137,27 @@ export default {
},
{
title: "SO42",
dataIndex: "sulfateRadical",
dataIndex: "so42",
sorter: true,
},
{
title: "NO3",
dataIndex: "nitrate",
dataIndex: "no3",
sorter: true,
},
{
title: "F",
dataIndex: "fluorine",
dataIndex: "f",
sorter: true,
},
{
title: "CL",
dataIndex: "chlorine",
dataIndex: "cl",
sorter: true,
},
{
title: "NH4",
dataIndex: "ammoniumRadical",
dataIndex: "nh4",
sorter: true,
},
{
@@ -216,6 +203,8 @@ export default {
// 表格搜索条件
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: [],
@@ -321,27 +310,27 @@ export default {
},
{
title: "SO42",
dataIndex: "sulfateRadical",
dataIndex: "so42",
sorter: true,
},
{
title: "NO3",
dataIndex: "nitrate",
dataIndex: "no3",
sorter: true,
},
{
title: "F",
dataIndex: "fluorine",
dataIndex: "f",
sorter: true,
},
{
title: "CL",
dataIndex: "chlorine",
dataIndex: "cl",
sorter: true,
},
{
title: "NH4",
dataIndex: "ammoniumRadical",
dataIndex: "nh4",
sorter: true,
},
{

View File

@@ -4,12 +4,12 @@ const tableColumns = [
{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: "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: "ammoniumRadical",sorter: true,},
{title: "铵根离子",dataIndex: "nh4",sorter: true,},
{title: "钾离子",dataIndex: "k",sorter: true,},
{title: "镁离子",dataIndex: "mg",sorter: true,},
{title: "钙离子",dataIndex: "ca",sorter: true,},

View File

@@ -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>