-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
+
+
@@ -74,68 +56,59 @@
diff --git a/src/views/water/lake/collect/special-bill.vue b/src/views/water/lake/collect/special-bill.vue
index 0a02841..4c67d93 100644
--- a/src/views/water/lake/collect/special-bill.vue
+++ b/src/views/water/lake/collect/special-bill.vue
@@ -17,10 +17,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -216,12 +239,12 @@
/* 刷新表格 */
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.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/water/lake/collect/water-bill.vue b/src/views/water/lake/collect/water-bill.vue
index 59be957..13faf98 100644
--- a/src/views/water/lake/collect/water-bill.vue
+++ b/src/views/water/lake/collect/water-bill.vue
@@ -18,9 +18,32 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -216,12 +239,12 @@
/* 刷新表格 */
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.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/water/lake/dict/inner.vue b/src/views/water/lake/dict/inner.vue
index 9c9a2ac..929a7bc 100644
--- a/src/views/water/lake/dict/inner.vue
+++ b/src/views/water/lake/dict/inner.vue
@@ -50,7 +50,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -136,6 +147,23 @@
title: "点位名称",
dataIndex: "sectionName",
sorter: true,
+ },
+ {
+ title: "点位经度",
+ dataIndex: "longitude",
+ },
+ {
+ title: "点位纬度",
+ dataIndex: "latitude",
+ },
+ {
+ title: "类别",
+ dataIndex: "type",
+ },
+ {
+ title: "排序",
+ dataIndex: "sort",
+ sorter: true,
},
{
title: "操作",
@@ -171,6 +199,22 @@
required: true,
message: '请输入点位名称'
}],
+ longitude: [{
+ required: true,
+ message: '请输入点位经度'
+ }],
+ latitude: [{
+ required: true,
+ message: '请输入点位纬度'
+ }],
+ type: [{
+ required: true,
+ message: '请输入类型'
+ }],
+ sort: [{
+ required: true,
+ message: '请输入排序'
+ }],
},
yearOptions: [],
showNYear: false,
diff --git a/src/views/water/lake/dict/special.vue b/src/views/water/lake/dict/special.vue
index ce6c261..60a4503 100644
--- a/src/views/water/lake/dict/special.vue
+++ b/src/views/water/lake/dict/special.vue
@@ -107,7 +107,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -251,6 +262,23 @@ export default {
title: "水期代码",
dataIndex: "waterCode",
},
+ {
+ title: "点位经度",
+ dataIndex: "longitude",
+ },
+ {
+ title: "点位纬度",
+ dataIndex: "latitude",
+ },
+ {
+ title: "类别",
+ dataIndex: "type",
+ },
+ {
+ title: "排序",
+ dataIndex: "sort",
+ sorter: true,
+ },
{
title: "操作",
key: "action",
@@ -276,7 +304,23 @@ export default {
year: [{required: true, message: '请输入年份'}],
sectionName:[{
required:true,message: "请输入点位名称",
- }]
+ }],
+ longitude: [{
+ required: true,
+ message: '请输入点位经度'
+ }],
+ latitude: [{
+ required: true,
+ message: '请输入点位纬度'
+ }],
+ type: [{
+ required: true,
+ message: '请输入类型'
+ }],
+ sort: [{
+ required: true,
+ message: '请输入排序'
+ }],
},
yearOptions: [],
showNYear:false,
diff --git a/src/views/water/lake/statistic/inner/component/average.vue b/src/views/water/lake/statistic/inner/component/average.vue
index c8c5e81..4cd9ff1 100644
--- a/src/views/water/lake/statistic/inner/component/average.vue
+++ b/src/views/water/lake/statistic/inner/component/average.vue
@@ -6,7 +6,6 @@
item.title);
arr.push(th);
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/inner/component/avg-nutritional.vue b/src/views/water/lake/statistic/inner/component/avg-nutritional.vue
index b6f12a3..1e51c23 100644
--- a/src/views/water/lake/statistic/inner/component/avg-nutritional.vue
+++ b/src/views/water/lake/statistic/inner/component/avg-nutritional.vue
@@ -6,7 +6,6 @@
index + 1
+ // },
+ // {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,},
{title: "水质类别", dataIndex: "waterType", sorter: true,},
@@ -125,7 +131,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/inner/component/com-nutritional.vue b/src/views/water/lake/statistic/inner/component/com-nutritional.vue
index cd35ed4..ca962e0 100644
--- a/src/views/water/lake/statistic/inner/component/com-nutritional.vue
+++ b/src/views/water/lake/statistic/inner/component/com-nutritional.vue
@@ -6,7 +6,6 @@
index + 1
+ // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,},
@@ -129,7 +135,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/inner/component/comparison.vue b/src/views/water/lake/statistic/inner/component/comparison.vue
index b328004..3633320 100644
--- a/src/views/water/lake/statistic/inner/component/comparison.vue
+++ b/src/views/water/lake/statistic/inner/component/comparison.vue
@@ -6,7 +6,6 @@
{
- filterData[index]['comprehensiveNutrition'+i] = single.comprehensiveNutrition;
- filterData[index]['level'+i] = single.level;
- filterData[index]['overflow'+i] = single.overflow;
- filterData[index]['waterType'+i] = single.waterType;
- filterData[index]['year'+i] = single.year;
+ item.data.forEach((single)=>{
+ // 生成格式化数据
+ filterData[index]['comprehensiveNutrition'+single.year] = single.comprehensiveNutrition;
+ filterData[index]['level'+single.year] = single.level;
+ filterData[index]['overflow'+single.year] = single.overflow;
+ filterData[index]['waterType'+single.year] = single.waterType;
+ filterData[index]['year'+single.year] = single.year;
-
- if(i==0 && index==0){
- addCloumns[index] = {}
- addCloumns[index].title = single.year
- addCloumns[index].align = 'center'
+ // 只拿第一条数据的年份做循环生成表头
+ if(index==0){
+ // 生成导出用的扁平化表头
+ addSCloumns = [...addSCloumns, {dataIndex: `waterType${single.year}`},
+ { dataIndex: `comprehensiveNutrition${single.year}`},
+ {dataIndex: `level${single.year}`},
+ {dataIndex: `overflow${single.year}`}]
- addSCloumns = [
- {dataIndex: `waterType${i}`},
- { dataIndex: `comprehensiveNutrition${i}`},
- {dataIndex: `level${i}`},
- {dataIndex: `overflow${i}`}
- ]
-
- addCloumns[index].children = [
- { title: "水质类别", dataIndex: `waterType${i}`, sorter: true,align:'center' },
- { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${i}`, sorter: true,align:'center' },
- { title: "级别", dataIndex: `level${i}`, sorter: true,align:'center' },
+ // 页面展示所需表头
+ addCloumns[single.year] = {}
+ addCloumns[single.year].title = single.year
+ addCloumns[single.year].align = 'center'
+ addCloumns[single.year].children = [
+ { title: "水质类别", dataIndex: `waterType${single.year}`, sorter: true,align:'center' },
+ { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${single.year}`, sorter: true,align:'center' },
+ { title: "级别", dataIndex: `level${single.year}`, sorter: true,align:'center' },
{
title: "超标项目（超标倍数）",
align:'center',
- dataIndex: `overflow${i}`,
+ dataIndex: `overflow${single.year}`,
sorter: true,
},
]
@@ -187,6 +186,14 @@ export default {
})
}
this.columns = [
+ // {
+ // title: "序号",
+ // key: 'index',
+ // dataIndex: 'index',
+ // width: 48,
+ // align: 'center',
+ // customRender: ({index}) => index + 1
+ // },
{ title: "类别", dataIndex: "type", sorter: true },
{ title: "点位名称", dataIndex: "pointName", sorter: true},
...addCloumns
@@ -223,21 +230,22 @@ export default {
let th1 = []
let th2 = []
columns.forEach(item=>{
- th1.push(item.title)
+
if(Array.isArray(item.children) && item.children.length>0){
item.children.forEach(single=>{
- th1.push('')
+ th1.push(item.title)
th2.push(single.title)
})
}else{
+ th1.push(item.title)
th2.push('')
}
})
arr.push(th1)
arr.push(th2)
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = this.sColumns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/inner/component/raw-colums.js b/src/views/water/lake/statistic/inner/component/raw-colums.js
index c02d599..6bc2930 100644
--- a/src/views/water/lake/statistic/inner/component/raw-colums.js
+++ b/src/views/water/lake/statistic/inner/component/raw-colums.js
@@ -17,13 +17,20 @@ const innerFilterColumns = [
{title: "石油类", dataIndex: "petro", sorter: true,},
{title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,},
{title: "化学需氧量", dataIndex: "cod", sorter: true,},
- {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,},
+ {title: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
{title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
{title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
{title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
]
const innerTableColumns = [
+ // {
+ // key: 'index',
+ // dataIndex: 'index',
+ // width: 48,
+ // align: 'center',
+ // customRender: ({index}) => index + 1
+ // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "pointName", sorter: true,},
{title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
@@ -45,7 +52,7 @@ const innerTableColumns = [
{title: "石油类", dataIndex: "petro", sorter: true,},
{title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,},
{title: "化学需氧量", dataIndex: "cod", sorter: true,},
- {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,},
+ {title: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
{title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
{title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
{title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
@@ -53,7 +60,14 @@ const innerTableColumns = [
];
const averageTableColumns = [
- {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
+ // {
+ // key: 'index',
+ // dataIndex: 'index',
+ // width: 48,
+ // align: 'center',
+ // customRender: ({index}) => index + 1
+ // },
+ // {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "pointName", sorter: true,},
{title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
{title: "pH值", dataIndex: "ph", sorter: true,},
@@ -74,7 +88,7 @@ const averageTableColumns = [
{title: "石油类", dataIndex: "petro", sorter: true,},
{title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,},
{title: "化学需氧量", dataIndex: "cod", sorter: true,},
- {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,},
+ {title: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
{title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
{title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
{title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
diff --git a/src/views/water/lake/statistic/inner/component/raw.vue b/src/views/water/lake/statistic/inner/component/raw.vue
index 4becfd6..42730ba 100644
--- a/src/views/water/lake/statistic/inner/component/raw.vue
+++ b/src/views/water/lake/statistic/inner/component/raw.vue
@@ -6,12 +6,12 @@
@@ -156,7 +156,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/inner/component/search.vue b/src/views/water/lake/statistic/inner/component/search.vue
index 346875a..271d24a 100644
--- a/src/views/water/lake/statistic/inner/component/search.vue
+++ b/src/views/water/lake/statistic/inner/component/search.vue
@@ -201,7 +201,7 @@ export default {
emitData(val){
if(val && this.where.startTime && this.where.endTime){
- this.$emit("search", this.where);
+ this.searchData();
}
},
@@ -217,12 +217,27 @@ export default {
/**获取下来框数据 */
loadOptionData() {
getLakeDropdown().then((res) => {
- this.palceOptions = res.data.data.map((item) => {
- return {
- label: item.regionName,
- value: item.regionName,
- };
- });
+
+ let palceOptions = {}
+ let newPlace = []
+ res.data.data.forEach(item=>{
+ palceOptions[item.regionName] = item.regionName
+ })
+ for(let i in palceOptions){
+ newPlace.push({
+ label: palceOptions[i],
+ value: palceOptions[i],
+ })
+ }
+ this.palceOptions = [...newPlace]
+
+
+ // this.palceOptions = res.data.data.map((item) => {
+ // return {
+ // label: item.regionName,
+ // value: item.regionName,
+ // };
+ // });
this.sectionOptions= res.data.data.map((item) => {
return {
label: item.sectionName,
@@ -253,9 +268,12 @@ export default {
this.where = {
checked: 1,
};
+ this.filter = innerFilterColumns.map((item) => item.dataIndex);
+ this.handleOk()
this.searchData();
},
searchData() {
+ this.where.filter = [...this.filter]
this.$emit("search", this.where);
},
exportFile() {
diff --git a/src/views/water/lake/statistic/inner/index.vue b/src/views/water/lake/statistic/inner/index.vue
index a9f0e68..e19d94b 100644
--- a/src/views/water/lake/statistic/inner/index.vue
+++ b/src/views/water/lake/statistic/inner/index.vue
@@ -9,13 +9,13 @@
-
+
-
+
-
+
diff --git a/src/views/water/lake/statistic/special/component/average.vue b/src/views/water/lake/statistic/special/component/average.vue
index 8d2a594..317c88e 100644
--- a/src/views/water/lake/statistic/special/component/average.vue
+++ b/src/views/water/lake/statistic/special/component/average.vue
@@ -6,7 +6,6 @@
item.title);
arr.push(th);
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/special/component/avg-nutritional.vue b/src/views/water/lake/statistic/special/component/avg-nutritional.vue
index 39a4ca7..68a37bc 100644
--- a/src/views/water/lake/statistic/special/component/avg-nutritional.vue
+++ b/src/views/water/lake/statistic/special/component/avg-nutritional.vue
@@ -6,7 +6,6 @@
index + 1
+ // },
+ // {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,},
{title: "水质类别", dataIndex: "waterType", sorter: true,},
@@ -126,7 +132,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/special/component/com-nutritional.vue b/src/views/water/lake/statistic/special/component/com-nutritional.vue
index 03552de..7a6ca29 100644
--- a/src/views/water/lake/statistic/special/component/com-nutritional.vue
+++ b/src/views/water/lake/statistic/special/component/com-nutritional.vue
@@ -6,7 +6,6 @@
index + 1
+ // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,},
@@ -129,7 +135,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/special/component/comparison.vue b/src/views/water/lake/statistic/special/component/comparison.vue
index b336b93..94e2c34 100644
--- a/src/views/water/lake/statistic/special/component/comparison.vue
+++ b/src/views/water/lake/statistic/special/component/comparison.vue
@@ -6,7 +6,6 @@
{
- filterData[index]['comprehensiveNutrition'+i] = single.comprehensiveNutrition;
- filterData[index]['level'+i] = single.level;
- filterData[index]['overflow'+i] = single.overflow;
- filterData[index]['waterType'+i] = single.waterType;
- filterData[index]['year'+i] = single.year;
+ item.data.forEach((single)=>{
+ // 生成格式化数据
+ filterData[index]['comprehensiveNutrition'+single.year] = single.comprehensiveNutrition;
+ filterData[index]['level'+single.year] = single.level;
+ filterData[index]['overflow'+single.year] = single.overflow;
+ filterData[index]['waterType'+single.year] = single.waterType;
+ filterData[index]['year'+single.year] = single.year;
-
- if(i==0 && index==0){
- addCloumns[index] = {}
- addCloumns[index].title = single.year
- addCloumns[index].align = 'center'
+ // 只拿第一条数据的年份做循环生成表头
+ if(index==0){
+ // 生成导出用的扁平化表头
+ addSCloumns = [...addSCloumns, {dataIndex: `waterType${single.year}`},
+ { dataIndex: `comprehensiveNutrition${single.year}`},
+ {dataIndex: `level${single.year}`},
+ {dataIndex: `overflow${single.year}`}]
- addSCloumns = [
- {dataIndex: `waterType${i}`},
- { dataIndex: `comprehensiveNutrition${i}`},
- {dataIndex: `level${i}`},
- {dataIndex: `overflow${i}`}
- ]
-
- addCloumns[index].children = [
- { title: "水质类别", dataIndex: `waterType${i}`, sorter: true,align:'center' },
- { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${i}`, sorter: true,align:'center' },
- { title: "级别", dataIndex: `level${i}`, sorter: true,align:'center' },
+ // 页面展示所需表头
+ addCloumns[single.year] = {}
+ addCloumns[single.year].title = single.year
+ addCloumns[single.year].align = 'center'
+ addCloumns[single.year].children = [
+ { title: "水质类别", dataIndex: `waterType${single.year}`, sorter: true,align:'center' },
+ { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${single.year}`, sorter: true,align:'center' },
+ { title: "级别", dataIndex: `level${single.year}`, sorter: true,align:'center' },
{
title: "超标项目（超标倍数）",
align:'center',
- dataIndex: `overflow${i}`,
+ dataIndex: `overflow${single.year}`,
sorter: true,
},
]
@@ -187,6 +186,13 @@ export default {
})
}
this.columns = [
+ // {
+ // key: 'index',
+ // dataIndex: 'index',
+ // width: 48,
+ // align: 'center',
+ // customRender: ({index}) => index + 1
+ // },
{ title: "类别", dataIndex: "type", sorter: true },
{ title: "点位名称", dataIndex: "pointName", sorter: true},
...addCloumns
@@ -223,27 +229,28 @@ export default {
let th1 = []
let th2 = []
columns.forEach(item=>{
- th1.push(item.title)
+
if(Array.isArray(item.children) && item.children.length>0){
item.children.forEach(single=>{
- th1.push('')
+ th1.push(item.title)
th2.push(single.title)
})
}else{
+ th1.push(item.title)
th2.push('')
}
})
arr.push(th1)
arr.push(th2)
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = this.sColumns.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());
- },
+ }
},
};
diff --git a/src/views/water/lake/statistic/special/component/raw-colums.js b/src/views/water/lake/statistic/special/component/raw-colums.js
index c02d599..31c795b 100644
--- a/src/views/water/lake/statistic/special/component/raw-colums.js
+++ b/src/views/water/lake/statistic/special/component/raw-colums.js
@@ -17,13 +17,20 @@ const innerFilterColumns = [
{title: "石油类", dataIndex: "petro", sorter: true,},
{title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,},
{title: "化学需氧量", dataIndex: "cod", sorter: true,},
- {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,},
+ {title: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
{title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
{title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
{title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
]
const innerTableColumns = [
+ // {
+ // key: 'index',
+ // dataIndex: 'index',
+ // width: 48,
+ // align: 'center',
+ // customRender: ({index}) => index + 1
+ // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "pointName", sorter: true,},
{title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
@@ -45,7 +52,7 @@ const innerTableColumns = [
{title: "石油类", dataIndex: "petro", sorter: true,},
{title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,},
{title: "化学需氧量", dataIndex: "cod", sorter: true,},
- {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,},
+ {title: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
{title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
{title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
{title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
@@ -53,31 +60,38 @@ const innerTableColumns = [
];
const averageTableColumns = [
- {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
- {title: "断面名称", dataIndex: "pointName", sorter: true,},
- {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
+ // {
+ // key: 'index',
+ // dataIndex: 'index',
+ // width: 48,
+ // align: 'center',
+ // customRender: ({index}) => index + 1
+ // },
+ // {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
+ {title: "断面名称", dataIndex: "sectionName", sorter: true,},
+ {title: "水温(℃)", dataIndex: "wTemp", sorter: true,},
{title: "pH值", dataIndex: "ph", sorter: true,},
- {title: "透明度（cm）", dataIndex: "transparency", sorter: true,},
- {title: "溶解氧饱和度（﹪）", dataIndex: "dissolvedOxygenSaturation", sorter: true,},
+ {title: "透明度（cm）", dataIndex: "transp", sorter: true,},
+ // {title: "溶解氧饱和度（﹪）", dataIndex: "dissolvedOxygenSaturation", sorter: true,},
{title: "溶解氧", dataIndex: "dissolvedOxygen", sorter: true,},
- {title: "高锰酸盐指数", dataIndex: "permanganateIndex", sorter: true,},
- {title: "五日生化需氧量", dataIndex: "fiveDayBod", sorter: true,},
- {title: "总氮 ", dataIndex: "totalNitrogen", sorter: true,},
- {title: "氨氮", dataIndex: "ammonia", sorter: true,},
- {title: "挥发酚", dataIndex: "volatilePhenol", sorter: true,},
+ {title: "高锰酸盐指数 (mg/L)", dataIndex: "codmn", sorter: true,},
+ {title: "五日生化需氧量", dataIndex: "bod5", sorter: true,},
+ {title: "总氮 (mg/L)", dataIndex: "nTotal", sorter: true,},
+ {title: "氨氮 (mg/L)", dataIndex: "nh4N", sorter: true,},
+ {title: "挥发酚 (mg/L)", dataIndex: "vPhen", sorter: true,},
{title: "砷(mg/L)", dataIndex: "as", sorter: true,},
- {title: "汞 (mg/L)", dataIndex: "hg", sorter: true,},
+ {title: "汞 (mg/L)", dataIndex: "wHg", sorter: true,},
{title: "六价铬 (mg/L)", dataIndex: "cr6", sorter: true,},
- {title: "铅 (mg/L)", dataIndex: "pb", sorter: true,},
+ {title: "铅 (mg/L)", dataIndex: "wPb", sorter: true,},
{title: "镉 (mg/L)", dataIndex: "cd", sorter: true,},
- {title: "总磷", dataIndex: "totalPhosphorus", sorter: true,},
- {title: "石油类", dataIndex: "petro", sorter: true,},
- {title: "粪大肠菌群（MPN/L）", dataIndex: "fecalColiforms", sorter: true,},
- {title: "化学需氧量", dataIndex: "cod", sorter: true,},
- {title: "叶绿素a (mg/L)", dataIndex: "chlA", sorter: true,},
+ {title: "总磷 (mg/L)", dataIndex: "pTotal", sorter: true,},
+ {title: "石油类 (mg/L)", dataIndex: "oils", sorter: true,},
+ {title: "粪大肠菌群 (mg/L)", dataIndex: "coloOrg", sorter: true,},
+ {title: "化学需氧量 (mg/L)", dataIndex: "codcr", sorter: true,},
+ {title: "叶绿素a (mg/m3)", dataIndex: "chlA", sorter: true,},
{title: "阴离子表面活性剂(mg/L)", dataIndex: "anSaa", sorter: true,},
{title: "硫化物(mg/L) ", dataIndex: "s", sorter: true,},
- {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
+ // {title: "氧化还原电位（mV）", dataIndex: "oxidationReductionPotential", sorter: true,}
];
@@ -90,6 +104,7 @@ const specialFilterColumns = [
{title: "透明度（cm）", dataIndex: "transp", sorter: true,},
{title: "溶解氧 (mg/L)", dataIndex: "dissolvedOxygen", sorter: true,},
{title: "高锰酸盐指数 (mg/L)", dataIndex: "codmn", sorter: true,},
+ {title: "五日生化需氧量", dataIndex: "bod5", sorter: true,},
{title: "氨氮 (mg/L)", dataIndex: "nh4N", sorter: true,},
{title: "石油类 (mg/L)", dataIndex: "oils", sorter: true,},
{title: "总氮 (mg/L)", dataIndex: "nTotal", sorter: true,},
diff --git a/src/views/water/lake/statistic/special/component/raw.vue b/src/views/water/lake/statistic/special/component/raw.vue
index 9f8b5ef..9b253a5 100644
--- a/src/views/water/lake/statistic/special/component/raw.vue
+++ b/src/views/water/lake/statistic/special/component/raw.vue
@@ -6,7 +6,6 @@
{
@@ -157,7 +156,7 @@ export default {
const arr = [];
const th = columns.map((item) => item.title);
arr.push(th);
- this.data.forEach((d) => {
+ this.datasource.forEach((d) => {
const td = columns.map((item) => d[item.dataIndex]);
arr.push(td);
});
diff --git a/src/views/water/lake/statistic/special/component/search.vue b/src/views/water/lake/statistic/special/component/search.vue
index 38865fd..799321f 100644
--- a/src/views/water/lake/statistic/special/component/search.vue
+++ b/src/views/water/lake/statistic/special/component/search.vue
@@ -51,7 +51,7 @@
@@ -120,8 +120,8 @@