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