cxmo 1 gadu atpakaļ
vecāks
revīzija
d5efb3b285
1 mainītis faili ar 6 papildinājumiem un 9 dzēšanām
  1. 6 9
      src/views/ppt_manage/newVersion/pptPublish.vue

+ 6 - 9
src/views/ppt_manage/newVersion/pptPublish.vue

@@ -277,9 +277,9 @@ export default {
       const start = Date.now()
       const SlideMaster = _.cloneDeep(pptSlideMaster) 
       SlideMaster.objects[1] = {image: {x:0,y:0,w:10,h:7,path:this.pptBgImage}}
-      let pptx = pptInit(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 coverImg = $(`#${coverId} .cover img`)[0].src
       cover.addImage({
@@ -291,7 +291,7 @@ export default {
         size: { type: "contain" },
       })
       //自定义封面页的内容
-      cover = this.setPPTCover(cover,this.pptCoverContent,this.coverInfo.page.Title) */
+      cover = this.setPPTCover(cover,this.pptCoverContent,this.coverInfo.page.Title)
       const length = this.pageList.length;
       for (let i = 0; i < length; i++) {
         let slide = pptx.addSlide({ masterName: pptSlideMaster.title });
@@ -385,10 +385,7 @@ export default {
             const offsetY = realSize.height===imgData2Obj.imgHeight?0:(percentHeight-(realSize.height/imgData2Obj.imgHeight*percentHeight))/2
             const realX = Number(x.substring(0,x.length-1))+offsetX
             const realY = Number(y.substring(0,y.length-1))+offsetY
-            /* const realWidth = offsetX===0?width:(realSize.width/imgData2Obj.imgWidth*percentWidth)
-            const realHeight = offsetY===0?height:(realSize.height/imgData2Obj.imgHeight*percentHeight) */
-            //console.log('position x',x,' y',y,' width',width,' height',height)
-            //console.log('x y',realX,realY,'w h',realWidth,realHeight)
+
             slide.addImage({
               path:imgData2+'?v='+new Date().getTime(),
               x:realX+'%',
@@ -437,7 +434,7 @@ export default {
         }
       }
       //添加封底 如果有
-      /* if(this.pptBackImage.length){
+      if(this.pptBackImage.length){
         let back = pptx.addSlide()
         let backId = this.loadingAll?'back':'changeback'
         let backImg = $(`#${backId} img`)[0].src
@@ -449,7 +446,7 @@ export default {
             h: '100%',
             size: { type: "contain" },
         })
-      } */
+      }
      
       this.loadingInstance.close();
       //结束计时