|
@@ -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' )
|