Merge branch 'debug' of http://8.136.199.33:3000/Karsa/raiwechat_link_h5 into debug

src/views/hzyb/chart/Detail.vue

@@ -975,8 +975,9 @@ const setCommodityChart = () => {
                 
                 if(haveContract) {
                     // 利润曲线指标名
+                    const isEdb=commodityEdbList.value.some(_=>_.EdbInfoId===haveContract)
                     let edb_name = resData.value.ChartInfo.Source === 5 
-                    ? (index === 0 ? obj_item.NameList[index] : `${resData.value.DataResp.ProfitName}(${obj_item.NameList[index]})`)
+                    ? (isEdb? obj_item.NameList[index] : `${resData.value.DataResp.ProfitName}(${obj_item.NameList[index]})`)
                     : commodityEdbList.value.find(_ => _.EdbInfoId === obj_item.XEdbInfoIdList[index]).EdbName;
                     str+=`<b>${ edb_name }</b>`
 
@@ -2056,6 +2057,9 @@ const setSeasonOpt=(data)=>{
 
     // 跟颜色对应
     chartTheme && (chartTheme.lineOptionList=chartTheme.lineOptionList.reverse().slice(-chartDataHandle.length))
+
+    let maxDateRange=0
+
     //常规左轴
     chartDataHandle.forEach((item,index)=>{
             //预测指标配置
@@ -2083,6 +2087,11 @@ const setSeasonOpt=(data)=>{
             ...predict_params
         }
         item.DataList=item.DataList||[]
+
+        let dateRange = item.DataList[item.DataList.length-1].DataTimestamp - item.DataList[0].DataTimestamp
+        // 时间范围
+        maxDateRange=Math.max(maxDateRange,dateRange)
+
         for(let i of item.DataList){
             seriesItem.data.push([i.DataTimestamp, i.Value])
         }
@@ -2285,10 +2294,10 @@ const setSeasonOpt=(data)=>{
         plotBands: setAxisPlotAreas(3,'datetime'),
         plotLines: setAxisPlotLines(3,'datetime')
     }
-
+    
     xAxis={
         ...xAxis,
-        tickInterval:24*3600*1000*60,//季节图
+        tickInterval:maxDateRange/6,//季节图
     }