diff --git a/src/views/water/lake/statistic/inner/component/comparison.vue b/src/views/water/lake/statistic/inner/component/comparison.vue index 727826b..9c7b1f3 100644 --- a/src/views/water/lake/statistic/inner/component/comparison.vue +++ b/src/views/water/lake/statistic/inner/component/comparison.vue @@ -3,7 +3,7 @@
- + { + filterData[index] = {} filterData[index].type = item.type; filterData[index].pointName = item.pointName; // 筛选出年份 - // if(Array.isArray(item.data)){ - // item.data.forEach((single,i)=>{ - // 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; + if(Array.isArray(item.data)){ + item.data.forEach((single,i)=>{ + 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; - // addCloumns[index].title = single.year - - // if(i==0){ - // addCloumns[index].children = [ - // { title: "水质类别", dataIndex: `waterType${i}`, sorter: true }, - // { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${i}`, sorter: true }, - // { title: "级别", dataIndex: `level${i}`, sorter: true }, - // { - // title: "超标项目(超标倍数)", - // dataIndex: `overflow${i}`, - // sorter: true, - // }, - // ] - // } + addCloumns[index] = {} + addCloumns[index].title = single.year + addCloumns[index].align = 'center' + if(i==0){ + 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' }, + { + title: "超标项目(超标倍数)", + align:'center', + dataIndex: `overflow${i}`, + sorter: true, + }, + ] + } - // }) - // } + }) + } }) } @@ -177,7 +181,7 @@ console.log('filterData',filterData) this.columns = [ { title: "类别", dataIndex: "type", sorter: true }, - { title: "点位名称", dataIndex: "pointName", sorter: true }, + { title: "点位名称", dataIndex: "pointName", sorter: true}, ...addCloumns ] this.datasource = filterData; @@ -215,4 +219,7 @@ console.log('filterData',filterData) \ No newline at end of file