Browse Source

Merge branch 'chart14.3'

Karsa 1 year ago
parent
commit
e1ec11b06c
1 changed files with 9 additions and 2 deletions
  1. 9 2
      src/views/chartShow/index.vue

+ 9 - 2
src/views/chartShow/index.vue

@@ -166,7 +166,8 @@ export default defineComponent({
           2: initCommodityData,
           3: initRelevanceChartData,
           4: initRelevanceChartData,
-          5: initCommodityData
+          5: initCommodityData,
+          6: initFittingEquation
         }
         sourceTypeMap[Data.ChartInfo.Source] && sourceTypeMap[Data.ChartInfo.Source](Data);
         
@@ -275,6 +276,12 @@ export default defineComponent({
       }
     }
 
+    /* 拟合方程曲线 */
+    const initFittingEquation = (data) => {
+      state.dataList = [data.DataResp];
+      setDefaultLineOptions();
+    }
+
 
     /* 散点截面图 */
     const sectionScatterData = ref<any>({});
@@ -1468,7 +1475,7 @@ export default defineComponent({
     const refreshChart = _.debounce(async () => {
       loading.value = true;
       let res: any=null
-      if(state.chartInfo.Source === 1){
+      if([1,6].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});