Browse Source

Merge branch 'ETA1.9.7'

jwyu 6 months ago
parent
commit
e9a63e623f
2 changed files with 11 additions and 2 deletions
  1. 10 1
      src/hooks/chart/useChartRender.ts
  2. 1 1
      src/views/chartShow/index.vue

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

@@ -132,6 +132,7 @@ export const useChartRender = (Data,lang='zh',) => {
       8: initStatisticChartData,
       9: initStatisticChartData,
       10: initCrossVarietyChartData,
+      12:initIntervalAnalysisChartData
     };
   
     chartOptions = sourceTypeMap[Data.ChartInfo.Source] &&
@@ -342,7 +343,7 @@ const setDefaultLineOptions = () => {
     //获取对应轴的上下限
     //非ETA图库图表也不设置自定义上下限,相关性和统计特征也会用到曲线图
     //若chartInfo.Source为1,需在之前调用setLimitData
-    const isETASource = state.chartInfo.Source===1
+    const isETASource = [1,11,12].includes(state.chartInfo.Source)
     let minLimit = 0,maxLimit = 0
     if(isETASource){
         const limitMap = {
@@ -2098,6 +2099,14 @@ const setRadarChart = () => {
     }
 }
 
+//区间分析
+const initIntervalAnalysisChartData=(data)=>{
+    console.log('初始化区间分析数据');
+    state.dataList=data.EdbInfoList
+    setLimitData(state.dataList,data)
+    return setDefaultLineOptions()
+}
+
 
 
 // 曲线图x轴显示计算年限差 >1年 显示年/月 <=1 显示月/日

+ 1 - 1
src/views/chartShow/index.vue

@@ -194,7 +194,7 @@ export default defineComponent({
     const refreshChart = _.debounce(async () => {
       loading.value = true;
       let res: any=null
-      if([1,6,7,8,9,10,11].includes(state.chartInfo.Source)){
+      if([1,6,7,8,9,10,11,12].includes(state.chartInfo.Source)){
         res=await ChartApi.refreshChart({UniqueCode: state.chartInfo.UniqueCode})
       }else if([2,5].includes(state.chartInfo.Source)){
         res=await ChartApi.refreshCommordityChart({UniqueCode: state.chartInfo.UniqueCode});