|
@@ -1127,7 +1127,7 @@ const setCommodityChart = () => {
|
|
|
//x轴
|
|
|
let xAxis = {
|
|
|
...scatterXAxis,
|
|
|
- categories: commodityXData.map(_ => language.value === 'zh' ? _.Name:_.NameEn),
|
|
|
+ categories: commodityXData.filter(_=>_.IsHide===0).map(_ => language.value === 'zh' ? _.Name:_.NameEn),
|
|
|
tickWidth: 1,
|
|
|
labels: {
|
|
|
style: {
|
|
@@ -1272,7 +1272,15 @@ const filterInvalidData = (item:{ Value: number[]; Name: string; Date: string; C
|
|
|
}
|
|
|
})
|
|
|
|
|
|
- return arr;
|
|
|
+ // 根据设置的x轴显示隐藏去除值
|
|
|
+ let temArr=[]
|
|
|
+ commodityChartRenderData.value.commodityXData.forEach((i,index)=>{
|
|
|
+ if(i.IsHide!==1){
|
|
|
+ temArr.push(arr[index]||null)
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ return temArr;
|
|
|
}
|
|
|
|
|
|
|