浏览代码

拟合方程、利润曲线、统计特征类型的图表插入PPT时,显示标题

cxmo 1 年之前
父节点
当前提交
24d079f398
共有 2 个文件被更改,包括 26 次插入2 次删除
  1. 6 2
      src/views/ppt_manage/mixins/pptMixins.js
  2. 20 0
      src/views/ppt_manage/newVersion/utils/untils.js

+ 6 - 2
src/views/ppt_manage/mixins/pptMixins.js

@@ -10,7 +10,7 @@ import futuresInterface from '@/api/modules/futuresBaseApi';
 import { fittingEquationInterface,statisticFeatureInterface } from '@/api/modules/chartRelevanceApi';
 import { fittingEquationInterface,statisticFeatureInterface } from '@/api/modules/chartRelevanceApi';
 import chartRelevanceApi from '@/api/modules/chartRelevanceApi.js';
 import chartRelevanceApi from '@/api/modules/chartRelevanceApi.js';
 import { defaultOpts } from '@/utils/defaultOptions';
 import { defaultOpts } from '@/utils/defaultOptions';
-import {formatPPTDate,checkPPTpageElemant,getStrSize} from '../newVersion/utils/untils.js';
+import {formatPPTDate,checkPPTpageElemant,getStrSize,isShowPPTTitle} from '../newVersion/utils/untils.js';
 import FormatOne from '../newVersion/components/formatPage/FormatOne.vue';
 import FormatOne from '../newVersion/components/formatPage/FormatOne.vue';
 import FormatTwo from '../newVersion/components/formatPage/FormatTwo.vue';
 import FormatTwo from '../newVersion/components/formatPage/FormatTwo.vue';
 import FormatThree from '../newVersion/components/formatPage/FormatThree.vue';
 import FormatThree from '../newVersion/components/formatPage/FormatThree.vue';
@@ -412,10 +412,14 @@ export default {
         MyChartType: 2 季节性图,7 柱形图,  10 截面散点图,
         MyChartType: 2 季节性图,7 柱形图,  10 截面散点图,
         Source:2
         Source:2
         MyChartType: 8 商品价格曲线图
         MyChartType: 8 商品价格曲线图
+        Source:5
+        MyChartType: 8 利润曲线
+        Source:6 拟合方程曲线
+        Source:7 统计特征
         以上图表需要显示标题
         以上图表需要显示标题
       */
       */
      const {Source,MyChartType} = options
      const {Source,MyChartType} = options
-     const isShowTitle = Source===1&&[2,7,10].includes(MyChartType)||Source===2&&MyChartType===8
+     const isShowTitle = isShowPPTTitle(Source,MyChartType)
       this.$nextTick(() => {
       this.$nextTick(() => {
         let is_linear = options.series 
         let is_linear = options.series 
           ? options.series.every(_ => _.type === 'scatter' ) || options.series.some(_ => _.chartType === 'linear'  )
           ? options.series.every(_ => _.type === 'scatter' ) || options.series.some(_ => _.chartType === 'linear'  )

+ 20 - 0
src/views/ppt_manage/newVersion/utils/untils.js

@@ -641,3 +641,23 @@ export const getContextMenuPos = (layerId) =>{
     return {clientX:menuBoundingClientRect.x - layerBoundingClientRect.x,
     return {clientX:menuBoundingClientRect.x - layerBoundingClientRect.x,
             clientY:menuBoundingClientRect.y - layerBoundingClientRect.y,}
             clientY:menuBoundingClientRect.y - layerBoundingClientRect.y,}
 }
 }
+
+//根据Source 和 MyChartType判断图表是否显示标题
+/*
+    Source:1
+    MyChartType: 2 季节性图,7 柱形图,  10 截面散点图,
+    Source:2
+    MyChartType: 8 商品价格曲线图
+    Source:5
+    MyChartType: 8 利润曲线
+    Source:6 拟合方程曲线
+    Source:7 统计特征
+    以上图表需要显示标题
+*/
+export const isShowPPTTitle = (Source,MyChartType)=>{
+    const sense_1 = Source===1&&[2,7,10].includes(MyChartType)
+    const sense_2 = Source===2&&MyChartType===8
+    const sense_3 = Source===5&&MyChartType===8
+    const sense_4 = [6,7].includes(Source)
+    return sense_1||sense_2||sense_3||sense_4
+}