|
@@ -91,7 +91,6 @@ import {countComponentName,pptConfigInit,toTextProps,toJson,svg2Base64,svgData2B
|
|
import {marginTop,modelConfig,pptSlideMaster} from './utils/config';
|
|
import {marginTop,modelConfig,pptSlideMaster} from './utils/config';
|
|
import pptmixin from '../mixins/pptMixins';
|
|
import pptmixin from '../mixins/pptMixins';
|
|
import mixins from '../mixins/mixins';
|
|
import mixins from '../mixins/mixins';
|
|
-import virtualScroll from '../mixins/virtualScrollMixins'
|
|
|
|
import html2canvas from 'html2canvas';
|
|
import html2canvas from 'html2canvas';
|
|
import pptxgen from "pptxgenjs";
|
|
import pptxgen from "pptxgenjs";
|
|
import moment from 'moment';
|
|
import moment from 'moment';
|
|
@@ -105,7 +104,7 @@ HightchartsExport(Highcharts)
|
|
HighchartszhCN(Highcharts)
|
|
HighchartszhCN(Highcharts)
|
|
export default {
|
|
export default {
|
|
components: {Cover,TransReport,CustomCover},
|
|
components: {Cover,TransReport,CustomCover},
|
|
- mixins:[pptmixin,mixins,virtualScroll],
|
|
|
|
|
|
+ mixins:[pptmixin,mixins],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
coverInfo:{
|
|
coverInfo:{
|
|
@@ -228,11 +227,7 @@ export default {
|
|
|
|
|
|
this.dataLoading.close();
|
|
this.dataLoading.close();
|
|
$('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
|
|
$('.ppt-item').css('background-image',`url(${this.pptBgImage})`);
|
|
- }else{
|
|
|
|
- await this.getpptData();
|
|
|
|
- this.initVirtualScroll()
|
|
|
|
}
|
|
}
|
|
- //console.log($('#back img')[0].src)
|
|
|
|
},
|
|
},
|
|
async getpptData(){
|
|
async getpptData(){
|
|
const {id} = this.$route.query
|
|
const {id} = this.$route.query
|
|
@@ -302,7 +297,7 @@ export default {
|
|
let pptx = pptConfigInit(new pptxgen(),this.LayoutType,'ch',SlideMaster,this.pptBgImage)
|
|
let pptx = pptConfigInit(new pptxgen(),this.LayoutType,'ch',SlideMaster,this.pptBgImage)
|
|
//添加封面
|
|
//添加封面
|
|
let cover = pptx.addSlide()
|
|
let cover = pptx.addSlide()
|
|
- let coverId = this.loadingAll?'cover':'changecover'
|
|
|
|
|
|
+ let coverId = 'cover'
|
|
let coverImg = $(`#${coverId} .cover img`)[0].src
|
|
let coverImg = $(`#${coverId} .cover img`)[0].src
|
|
cover.addImage({
|
|
cover.addImage({
|
|
path: coverImg,
|
|
path: coverImg,
|
|
@@ -446,7 +441,7 @@ export default {
|
|
//添加封底 如果有
|
|
//添加封底 如果有
|
|
if(this.pptBackImage.length){
|
|
if(this.pptBackImage.length){
|
|
let back = pptx.addSlide()
|
|
let back = pptx.addSlide()
|
|
- let backId = this.loadingAll?'back':'changeback'
|
|
|
|
|
|
+ let backId = 'back'
|
|
let backImg = $(`#${backId} img`)[0].src
|
|
let backImg = $(`#${backId} img`)[0].src
|
|
back.addImage({
|
|
back.addImage({
|
|
path: backImg,
|
|
path: backImg,
|