Merge branch 'bug6952' into debug

src/views/ppt_manage/mixins/mixins.js

@@ -628,13 +628,13 @@ export default {
     setSeasonChart() {
       /* 季节性图的图表配置 */
       const chartData = this.dataList[0];
-      const {SeasonRightConfig={}} = this.chartInfo
+      const {SeasonRightConfig={},Calendar} = this.chartInfo
        /* 主题样式*/
       const chartTheme =  this.chartInfo.ChartThemeStyle ? JSON.parse(this.chartInfo.ChartThemeStyle) : null;
 
       // 农历数据需要去除第一项 在ETA1.0.5之后，除了这里 农历和公历处理逻辑一样
       const temChartDataList=chartData.DataList||[]
-      const chartDataHandle=this.calendar_type === '农历'?
+      const chartDataHandle=Calendar === '农历'?
       temChartDataList.filter((item, index) => index > 0):
       temChartDataList