|
@@ -1561,7 +1561,7 @@ const setCommodityChart = (leftMin,leftMax) => {
|
|
|
//x轴
|
|
|
let xAxis = {
|
|
|
...scatterXAxis,
|
|
|
- categories: commodityXData.value.map(_ => _.Name),
|
|
|
+ categories: commodityXData.value.filter(_=>_.IsHide===0).map(_ => _.Name),
|
|
|
tickWidth: 1,
|
|
|
labels: {
|
|
|
style: {
|
|
@@ -1709,14 +1709,21 @@ function filterInvalidData(item){
|
|
|
// console.log('last_index',last_index)
|
|
|
|
|
|
let arr = item.Value.map((item,index) => {
|
|
|
- if(index < first_index || index > last_index) {
|
|
|
- return null
|
|
|
- }else {
|
|
|
- return item
|
|
|
- }
|
|
|
+ if(index < first_index || index > last_index) {
|
|
|
+ return null
|
|
|
+ }else {
|
|
|
+ return item
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // 根据设置的x轴显示隐藏去除值
|
|
|
+ let temArr=[]
|
|
|
+ commodityXData.value.forEach((i,index)=>{
|
|
|
+ if(i.IsHide!==1){
|
|
|
+ temArr.push(arr[index]||null)
|
|
|
+ }
|
|
|
})
|
|
|
|
|
|
- return arr;
|
|
|
+ return temArr;
|
|
|
}
|
|
|
function initCommodityData(data){
|
|
|
const { XDataList,YDataList,EdbInfoList,ChartInfo,DataResp } = data;
|