Browse Source

商品价格曲线优化v1.9.5

jwyu 8 months ago
parent
commit
214e4e13e3
1 changed files with 10 additions and 2 deletions
  1. 10 2
      src/hooks/chart/useChartRender.ts

+ 10 - 2
src/hooks/chart/useChartRender.ts

@@ -1127,7 +1127,7 @@ const setCommodityChart = () => {
   //x轴
   //x轴
   let xAxis = {
   let xAxis = {
     ...scatterXAxis,
     ...scatterXAxis,
-    categories: commodityXData.map(_ => language.value === 'zh' ? _.Name:_.NameEn),
+    categories: commodityXData.filter(_=>_.IsHide===0).map(_ => language.value === 'zh' ? _.Name:_.NameEn),
     tickWidth: 1,
     tickWidth: 1,
     labels: {
     labels: {
       style: {
       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;
 }
 }