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

Merge branch 'master' of http://git.gxwebsoft.com/shengtaiting/shengtai-admin

Browse Source 
# Conflicts:
#	src/views/sound/road/trend/index.vue
冲突解决
This commit is contained in:
hey7845
2022-01-01 08:01:40 +08:00
parent 1304789cf8 503cbc10d4
commit d95e8a44ff
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/sound/road/trend/index.vue
View File

@@ -148,7 +148,6 @@
value: item, value: item,
}; };
}); });
// this.placeOptions.unshift({ label: '所有测点', value: '所有测点'})
}); });
}, },
handleRegionLevelChange(value) { handleRegionLevelChange(value) {
@@ -229,13 +228,6 @@
show: false show: false
} }
// option.xAxis[0].splitLine = { show: false } //去除网格线
// option.xAxis[0].splitArea = { show: false } //保留网格区域
// option.xAxis[0].axisTick = { show: false } //隐藏刻度线
// let barArray = option.series.filter(item => item.type === 'bar')
// barArray.forEach(item=>{
// item.barGap = '0%'
// })
let lineArray = option.series.filter(item => item.type === 'line') let lineArray = option.series.filter(item => item.type === 'line')
lineArray.forEach((item,index) => { lineArray.forEach((item,index) => {
item.xAxisIndex = 1 item.xAxisIndex = 1
@@ -244,11 +236,6 @@
} }
item.data = item.data.map((x, i) => [(i + 1 / (option.legend.data.length + 1) * (index + 1 )) , x]) item.data = item.data.map((x, i) => [(i + 1 / (option.legend.data.length + 1) * (index + 1 )) , x])
}) })
// option.series[2].xAxisIndex = 1
// option.series[3].xAxisIndex = 1
// option.series[2].data = option.series[2].data.map((x, i) => [(0.25+i) , x])
// option.series[3].data = option.series[3].data.map((x, i) => [(0.75+ i) , x])
console.log('option', option); console.log('option', option);
trendChart.setOption(option) trendChart.setOption(option)
} }

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

@@ -104,6 +104,7 @@ const specialFilterColumns = [
{title: "透明度（cm）", dataIndex: "transp", sorter: true,}, {title: "透明度（cm）", dataIndex: "transp", sorter: true,},
{title: "溶解氧 (mg/L)", dataIndex: "dissolvedOxygen", sorter: true,}, {title: "溶解氧 (mg/L)", dataIndex: "dissolvedOxygen", sorter: true,},
{title: "高锰酸盐指数 (mg/L)", dataIndex: "codmn", 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: "nh4N", sorter: true,},
{title: "石油类 (mg/L)", dataIndex: "oils", sorter: true,}, {title: "石油类 (mg/L)", dataIndex: "oils", sorter: true,},
{title: "总氮 (mg/L)", dataIndex: "nTotal", sorter: true,}, {title: "总氮 (mg/L)", dataIndex: "nTotal", sorter: true,},