gxwebsoft/jczxw-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/huku'

Browse Source
This commit is contained in:
gxwebsoft
2021-12-21 12:14:09 +08:00
parent 933649d880 b710b8c813
commit 5986b1cb73
11 changed files with 134 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/water/lake/statistic/inner/component/avg-nutritional.vue
View File

@@ -59,13 +59,13 @@ export default {
selection: [], selection: [],
// 表格列配置 // 表格列配置
columns: [ columns: [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,}, {title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,}, {title: "点位名称", dataIndex: "pointName", sorter: true,},

14
src/views/water/lake/statistic/inner/component/com-nutritional.vue
View File

@@ -60,13 +60,13 @@ export default {
selection: [], selection: [],
// 表格列配置 // 表格列配置
columns: [ columns: [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,}, {title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,}, {title: "点位名称", dataIndex: "pointName", sorter: true,},

66
src/views/water/lake/statistic/inner/component/comparison.vue
View File

@@ -147,34 +147,34 @@ export default {
// 筛选出年份 // 筛选出年份
if(Array.isArray(item.data)){ if(Array.isArray(item.data)){
item.data.forEach((single,i)=>{ item.data.forEach((single)=>{
filterData[index]['comprehensiveNutrition'+i] = single.comprehensiveNutrition; // 生成格式化数据
filterData[index]['level'+i] = single.level; filterData[index]['comprehensiveNutrition'+single.year] = single.comprehensiveNutrition;
filterData[index]['overflow'+i] = single.overflow; filterData[index]['level'+single.year] = single.level;
filterData[index]['waterType'+i] = single.waterType; filterData[index]['overflow'+single.year] = single.overflow;
filterData[index]['year'+i] = single.year; filterData[index]['waterType'+single.year] = single.waterType;
filterData[index]['year'+single.year] = single.year;
// 只拿第一条数据的年份做循环生成表头
if(index==0){
// 生成导出用的扁平化表头
addSCloumns = [...addSCloumns, {dataIndex: `waterType${single.year}`},
{ dataIndex: `comprehensiveNutrition${single.year}`},
{dataIndex: `level${single.year}`},
{dataIndex: `overflow${single.year}`}]
if(i==0 && index==0){ // 页面展示所需表头
addCloumns[index] = {} addCloumns[single.year] = {}
addCloumns[index].title = single.year addCloumns[single.year].title = single.year
addCloumns[index].align = 'center' addCloumns[single.year].align = 'center'
addCloumns[single.year].children = [
addSCloumns = [ { title: "水质类别", dataIndex: `waterType${single.year}`, sorter: true,align:'center' },
{dataIndex: `waterType${i}`}, { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${single.year}`, sorter: true,align:'center' },
{ dataIndex: `comprehensiveNutrition${i}`}, { title: "级别", dataIndex: `level${single.year}`, sorter: true,align:'center' },
{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' },
{ {
title: "超标项目（超标倍数）", title: "超标项目（超标倍数）",
align:'center', align:'center',
dataIndex: `overflow${i}`, dataIndex: `overflow${single.year}`,
sorter: true, sorter: true,
}, },
] ]
@@ -186,13 +186,14 @@ export default {
}) })
} }
this.columns = [ this.columns = [
{ // {
key: 'index', // title: "序号",
dataIndex: 'index', // key: 'index',
width: 48, // dataIndex: 'index',
align: 'center', // width: 48,
customRender: ({index}) => index + 1 // align: 'center',
}, // customRender: ({index}) => index + 1
// },
{ title: "类别", dataIndex: "type", sorter: true }, { title: "类别", dataIndex: "type", sorter: true },
{ title: "点位名称", dataIndex: "pointName", sorter: true}, { title: "点位名称", dataIndex: "pointName", sorter: true},
...addCloumns ...addCloumns
@@ -229,14 +230,15 @@ export default {
let th1 = [] let th1 = []
let th2 = [] let th2 = []
columns.forEach(item=>{ columns.forEach(item=>{
th1.push(item.title)
if(Array.isArray(item.children) && item.children.length>0){ if(Array.isArray(item.children) && item.children.length>0){
item.children.forEach(single=>{ item.children.forEach(single=>{
th1.push('') th1.push(item.title)
th2.push(single.title) th2.push(single.title)
}) })
}else{ }else{
th1.push(item.title)
th2.push('') th2.push('')
} }
}) })

28
src/views/water/lake/statistic/inner/component/raw-colums.js
View File

@@ -24,13 +24,13 @@ const innerFilterColumns = [
] ]
const innerTableColumns = [ const innerTableColumns = [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "pointName", sorter: true,}, {title: "断面名称", dataIndex: "pointName", sorter: true,},
{title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,}, {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
@@ -60,13 +60,13 @@ const innerTableColumns = [
]; ];
const averageTableColumns = [ const averageTableColumns = [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "pointName", sorter: true,}, {title: "断面名称", dataIndex: "pointName", sorter: true,},
{title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,}, {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},

6
src/views/water/lake/statistic/inner/index.vue
View File

@@ -9,13 +9,13 @@
<com-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='com-nutritional'"></com-nutritional> <com-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='com-nutritional'"></com-nutritional>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="average" tab="平均数据"> <a-tab-pane key="average" tab="平均数据">
<average :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></average> <average :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='average'"></average>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="avg-nutritional" tab="平均营养指数"> <a-tab-pane key="avg-nutritional" tab="平均营养指数">
<avg-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></avg-nutritional> <avg-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='avg-nutritional'"></avg-nutritional>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="comparison" tab="年度对比"> <a-tab-pane key="comparison" tab="年度对比">
<comparison :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></comparison> <comparison :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='comparison'"></comparison>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>

14
src/views/water/lake/statistic/special/component/avg-nutritional.vue
View File

@@ -60,13 +60,13 @@ export default {
selection: [], selection: [],
// 表格列配置 // 表格列配置
columns: [ columns: [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,}, {title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,}, {title: "点位名称", dataIndex: "pointName", sorter: true,},

14
src/views/water/lake/statistic/special/component/com-nutritional.vue
View File

@@ -60,13 +60,13 @@ export default {
selection: [], selection: [],
// 表格列配置 // 表格列配置
columns: [ columns: [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "类别", dataIndex: "type", sorter: true,}, {title: "类别", dataIndex: "type", sorter: true,},
{title: "点位名称", dataIndex: "pointName", sorter: true,}, {title: "点位名称", dataIndex: "pointName", sorter: true,},

67
src/views/water/lake/statistic/special/component/comparison.vue
View File

@@ -147,34 +147,34 @@ export default {
// 筛选出年份 // 筛选出年份
if(Array.isArray(item.data)){ if(Array.isArray(item.data)){
item.data.forEach((single,i)=>{ item.data.forEach((single)=>{
filterData[index]['comprehensiveNutrition'+i] = single.comprehensiveNutrition; // 生成格式化数据
filterData[index]['level'+i] = single.level; filterData[index]['comprehensiveNutrition'+single.year] = single.comprehensiveNutrition;
filterData[index]['overflow'+i] = single.overflow; filterData[index]['level'+single.year] = single.level;
filterData[index]['waterType'+i] = single.waterType; filterData[index]['overflow'+single.year] = single.overflow;
filterData[index]['year'+i] = single.year; filterData[index]['waterType'+single.year] = single.waterType;
filterData[index]['year'+single.year] = single.year;
// 只拿第一条数据的年份做循环生成表头
if(index==0){
// 生成导出用的扁平化表头
addSCloumns = [...addSCloumns, {dataIndex: `waterType${single.year}`},
{ dataIndex: `comprehensiveNutrition${single.year}`},
{dataIndex: `level${single.year}`},
{dataIndex: `overflow${single.year}`}]
if(i==0 && index==0){ // 页面展示所需表头
addCloumns[index] = {} addCloumns[single.year] = {}
addCloumns[index].title = single.year addCloumns[single.year].title = single.year
addCloumns[index].align = 'center' addCloumns[single.year].align = 'center'
addCloumns[single.year].children = [
addSCloumns = [ { title: "水质类别", dataIndex: `waterType${single.year}`, sorter: true,align:'center' },
{dataIndex: `waterType${i}`}, { title: "综合营养状态指数", dataIndex: `comprehensiveNutrition${single.year}`, sorter: true,align:'center' },
{ dataIndex: `comprehensiveNutrition${i}`}, { title: "级别", dataIndex: `level${single.year}`, sorter: true,align:'center' },
{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' },
{ {
title: "超标项目（超标倍数）", title: "超标项目（超标倍数）",
align:'center', align:'center',
dataIndex: `overflow${i}`, dataIndex: `overflow${single.year}`,
sorter: true, sorter: true,
}, },
] ]
@@ -186,13 +186,13 @@ export default {
}) })
} }
this.columns = [ this.columns = [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{ title: "类别", dataIndex: "type", sorter: true }, { title: "类别", dataIndex: "type", sorter: true },
{ title: "点位名称", dataIndex: "pointName", sorter: true}, { title: "点位名称", dataIndex: "pointName", sorter: true},
...addCloumns ...addCloumns
@@ -229,14 +229,15 @@ export default {
let th1 = [] let th1 = []
let th2 = [] let th2 = []
columns.forEach(item=>{ columns.forEach(item=>{
th1.push(item.title)
if(Array.isArray(item.children) && item.children.length>0){ if(Array.isArray(item.children) && item.children.length>0){
item.children.forEach(single=>{ item.children.forEach(single=>{
th1.push('') th1.push(item.title)
th2.push(single.title) th2.push(single.title)
}) })
}else{ }else{
th1.push(item.title)
th2.push('') th2.push('')
} }
}) })
@@ -249,7 +250,7 @@ export default {
}); });
let sheet = XLSX.utils.aoa_to_sheet(arr); let sheet = XLSX.utils.aoa_to_sheet(arr);
this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString()); this.$util.exportSheet(XLSX, sheet, new Date().getTime().toString());
}, }
}, },
}; };
</script> </script>

30
src/views/water/lake/statistic/special/component/raw-colums.js
View File

@@ -24,13 +24,13 @@ const innerFilterColumns = [
] ]
const innerTableColumns = [ const innerTableColumns = [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "pointName", sorter: true,}, {title: "断面名称", dataIndex: "pointName", sorter: true,},
{title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,}, {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
@@ -60,15 +60,15 @@ const innerTableColumns = [
]; ];
const averageTableColumns = [ const averageTableColumns = [
{ // {
key: 'index', // key: 'index',
dataIndex: 'index', // dataIndex: 'index',
width: 48, // width: 48,
align: 'center', // align: 'center',
customRender: ({index}) => index + 1 // customRender: ({index}) => index + 1
}, // },
{title: "监测时间", dataIndex: "monitorTime", sorter: true,}, {title: "监测时间", dataIndex: "monitorTime", sorter: true,},
{title: "断面名称", dataIndex: "pointName", sorter: true,}, {title: "断面名称", dataIndex: "sectionName", sorter: true,},
{title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,}, {title: "水温(℃)", dataIndex: "waterTemperature", sorter: true,},
{title: "pH值", dataIndex: "ph", sorter: true,}, {title: "pH值", dataIndex: "ph", sorter: true,},
{title: "透明度（cm）", dataIndex: "transparency", sorter: true,}, {title: "透明度（cm）", dataIndex: "transparency", sorter: true,},

6
src/views/water/lake/statistic/special/component/raw.vue
View File

@@ -26,7 +26,7 @@ import XLSX from "xlsx";
import {getLakeDropdown, specialOriginalData} from "@/api/ecology/new-lake"; import {getLakeDropdown, specialOriginalData} from "@/api/ecology/new-lake";
import locale from "ant-design-vue/es/date-picker/locale/zh_CN"; import locale from "ant-design-vue/es/date-picker/locale/zh_CN";
import Search from './search.vue'; import Search from './search.vue';
import {innerTableColumns} from "./raw-colums" import {specialTableColumns} from "./raw-colums"
export default { export default {
name: 'inner-raw', name: 'inner-raw',
components: { components: {
@@ -60,7 +60,7 @@ export default {
datasource:[], datasource:[],
selection: [], selection: [],
// 表格列配置 // 表格列配置
columns: innerTableColumns, columns: specialTableColumns,
palceOptions: [], palceOptions: [],
areaOptions: [], areaOptions: [],
regionLevelOptions: [], regionLevelOptions: [],
@@ -102,7 +102,7 @@ export default {
if(!Array.isArray(keys)){return} if(!Array.isArray(keys)){return}
let newCloumns = [...innerTableColumns] let newCloumns = [...specialTableColumns]
let filterIndex = []; let filterIndex = [];
newCloumns.forEach((item,index)=>{ newCloumns.forEach((item,index)=>{

6
src/views/water/lake/statistic/special/index.vue
View File

@@ -9,13 +9,13 @@
<com-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='com-nutritional'"></com-nutritional> <com-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='com-nutritional'"></com-nutritional>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="average" tab="平均数据"> <a-tab-pane key="average" tab="平均数据">
<average :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></average> <average :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='average'"></average>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="avg-nutritional" tab="平均营养指数"> <a-tab-pane key="avg-nutritional" tab="平均营养指数">
<avg-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></avg-nutritional> <avg-nutritional :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='avg-nutritional'"></avg-nutritional>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="comparison" tab="年度对比"> <a-tab-pane key="comparison" tab="年度对比">
<comparison :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter"></comparison> <comparison :searchForm="searchForm" :filterKeys="filterKeys" @search="changeSearch" @changeFilter="changeFilter" :visiable="activeKey=='comparison'"></comparison>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>