Przeglądaj źródła

非编辑页展示封面页,生成封面页

cxmo 1 rok temu
rodzic
commit
2aae52dd3f

BIN
src/assets/img/ppt_m/text-icon.png


+ 84 - 35
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 chartRelevanceApi from '@/api/modules/chartRelevanceApi.js';
 import { defaultOpts } from '@/utils/defaultOptions';
-import {formatPPTDate,checkPPTpageElemant,getStrSize,isShowPPTTitle} from '../newVersion/utils/untils.js';
+import {formatPPTDate,checkPPTpageElemant,getStrSize,isShowPPTTitle,toTextProps,toJson} from '../newVersion/utils/untils.js';
 import FormatOne from '../newVersion/components/formatPage/FormatOne.vue';
 import FormatTwo from '../newVersion/components/formatPage/FormatTwo.vue';
 import FormatThree from '../newVersion/components/formatPage/FormatThree.vue';
@@ -41,9 +41,10 @@ export default {
       pptCoverList:[],//配置ppt封面
       pptBgImage:'',//ppt背景图
       pptBackImage:'',//ppt封底
-      pptCoverCompenyName:'',//封面公司名称
-      pptCoverDepartName:'',//封面部门名称
-      pptCoverTextColor:'',//控制上面两个字段展示的颜色
+      pptCoverCompenyName:'',//封面公司名称 ETA1.4.9后不再使用
+      pptCoverDepartName:'',//封面部门名称 ETA1.4.9后不再使用
+      pptCoverTextColor:'',//控制上面两个字段展示的颜色 ETA1.4.9后不再使用
+      pptCoverContent:'',//自定义封面页的内容
 
 
       setEnName:false,
@@ -60,6 +61,53 @@ export default {
     }
   },
   methods: {
+    //配置自定义封面内容
+    setPPTCover(cover,pptCoverContent='',title=''){
+        let contentList = []
+        try{
+            contentList = JSON.parse(pptCoverContent)
+        }catch(e){
+            contentList=[]
+        }
+        //将contentList的内容通过addText写入,方法与图层写入文字一致
+        for(let i=0;i<contentList.length;i++){
+            const {
+                percentageTop,
+                percentageLeft,
+                percentageWidth,
+                percentageHeight,
+                richContent
+            } = contentList[i]
+            const position = {
+                x:percentageLeft*100+'%',
+                y:percentageTop*100+'%',
+                w:percentageWidth*100+'%',
+                h:percentageHeight*100+'%'
+            }
+            let textData = toTextProps(toJson(richContent))
+            cover.addText(textData,{
+                ...position,
+                margin:10,
+                fontSize:16*0.75,
+                valign:'top'
+            })
+        }
+        //若contentList为空,则在右下的位置显示标题
+        if(!contentList.length){
+            cover.addText(
+                [{text:title,options:{fontSize:28*0.75,breakLine:true}}],
+                {
+                    x:'38%',
+                    y:'50%',
+                    w:'60%',
+                    h:'28%',
+                    color:'ffffff',
+                    align:'center',
+                    fontFace:'SimHei'
+                })
+        }
+        return cover
+    },
     //获取基本配置-ppt配置
     async getpptConfig(){
         const res = await etaBaseConfigInterence.getBaseConfig()
@@ -90,37 +138,38 @@ export default {
       }):await pptEnInterface.getpptDetail({PptId:id})
       if(res.Ret===200){
         const {
-			Content,
-			Title,
-			ReportType,
-			BackgroundImg,
-			PptDate,
-			TemplateType,
-      ReportId,
-      ModifyTime,
-      PublishTime,
-      Editor
-		} = res.Data
-      const pptDate = formatPPTDate(this.currentLang,PptDate)
-      let legalContent = JSON.parse(Content)
-      legalContent = legalContent.map(page=>{
-        page.elements = checkPPTpageElemant(page)
-        return page
-      })
-      this.result = {
-			status: 200,
-			content: legalContent,
-			FirstPage: {
-				Title,
-				ReportType,
-				BackgroundImg,
-				PptDate:pptDate,
-				TemplateType,
-			},
-      ReportId,
-      ModifyTime,
-      PublishTime,Editor
-		}
+            Content,
+            Title,
+            ReportType,
+            BackgroundImg,
+            PptDate,
+            TemplateType,
+            ReportId,
+            ModifyTime,
+            PublishTime,
+            Editor
+        } = res.Data
+        const pptDate = formatPPTDate(this.currentLang, PptDate)
+        let legalContent = JSON.parse(Content)
+        legalContent = legalContent.map(page => {
+            page.elements = checkPPTpageElemant(page)
+            return page
+        })
+        this.result = {
+            status: 200,
+            content: legalContent,
+            FirstPage: {
+                Title,
+                ReportType,
+                BackgroundImg,
+                PptDate: pptDate,
+                TemplateType,
+            },
+            ReportId,
+            ModifyTime,
+            PublishTime,
+            Editor
+        }
       }else{
         this.result = {status:'',content:'获取ppt数据失败!'}
       }

+ 0 - 54
src/views/ppt_manage/newVersion/components/CoverNew.vue

@@ -1,54 +0,0 @@
-<template>
-    <!-- 自定义封面页渲染 -->
-    <div class="cover-new-wrap">
-        <!-- 封面图 -->
-        <img :src="pageInfo.BackgroundImg" class="cover-img" style="object-fit: fill !important;">
-        <TextEl v-for="el in coverList" :key="el.id"
-            :element-info="el"
-            :isCoverEdit="false"
-            :isActive="false"
-        />
-    </div>
-</template>
-
-<script>
-import TextEl from './editor/chooseCover/TextEl.vue';
-
-export default {
-    props: {
-        pageInfo: {
-            type: Object
-        },
-        CoverContent: {
-            type: String,
-            default: ''
-        }
-    },
-    data() {
-        return {
-            coverList: [{ "id": 1234, "type": "text", "left": 624, "top": 433, "width": 227, "height": 84, "fontSize": 12, "content": "请输入内容", "richContent": "<p><span style=\"font-size: 48px;\">😔😄😔</span></p>", "realWidth": 227, "realHeight": 84, "percentageLeft": 0.6446280991735537, "percentageTop": 0.6390200708382527, "percentageWidth": 0.23450413223140495, "percentageHeight": 0.12396694214876035 }, { "id": 5678, "type": "text", "left": 571, "top": 313, "width": 352, "height": 96, "fontSize": 12, "content": "请输入内容", "richContent": "<p><span style=\"color: #ecf0f1; font-size: 24px;\">哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈</span></p>", "realWidth": 352, "realHeight": 96, "percentageLeft": 0.5898760330578512, "percentageTop": 0.4619244391971665, "percentageWidth": 0.36363636363636365, "percentageHeight": 0.14167650531286896 }],
-        };
-    },
-    methods: {
-        setCoverContent() {
-            //this.coverList = JSON.parse(this.CoverContent);
-        }
-    },
-    mounted() {
-        this.setCoverContent();
-    },
-    components: { TextEl }
-};
-</script>
-
-<style scoped lang="scss">
-.cover-new-wrap{
-    width:100%;
-    height:100%;
-    position:relative;
-    .cover-img{
-        width: 100%;
-        height: 100%;
-    }
-}
-</style>

+ 118 - 0
src/views/ppt_manage/newVersion/components/CustomCover.vue

@@ -0,0 +1,118 @@
+<template>
+    <!-- 自定义封面页渲染 -->
+    <div class="cover-new-wrap">
+        <!-- 封面图 -->
+        <img :src="pageInfo.BackgroundImg||''" class="cover-img" style="object-fit: fill !important;">
+        <!-- 自定义文本 -->
+        <div v-for="el in coverList" :key="el.id"
+            class="cover-el el-text" :id="`cover-el-${el.id}`" :style="{
+            top: el.percentageTop*100 + '%',
+            left: el.percentageLeft*100 + '%',
+            width: el.percentageWidth*100 + '%',
+            height: el.percentageHeight*100 + '%',
+            pointerEvents:'none'
+        }" >
+            <div class="layer-editor-wrap">
+                <div style="width:100%;height:100%;" :id="`${el.id}-editorDom`" @mousedown.stop>
+                        <div class="editor-content" :style="{width:el.width+'px'}" v-html="el.richContent"></div>
+                </div>
+            </div>
+        </div>
+        <!-- 如果没有自定义文本,则在右下的位置显示标题 -->
+        <div class="cover-el default" v-if="!coverList.length">
+            <div class="editor-content"><p style="font-size:28px;">{{ pageInfo.Title }}</p></div>
+        </div>
+    </div>
+</template>
+
+<script>
+const mock = [{"id":1234,"type":"text","left":624,"top":433,"width":227,"height":84,"fontSize":12,"content":"请输入内容","richContent":"<p><span style=\"font-size: 48px;\">😔😄😔</span></p>","realWidth":227,"realHeight":84,"percentageLeft":0.6446280991735537,"percentageTop":0.6390200708382527,"percentageWidth":0.23450413223140495,"percentageHeight":0.12396694214876035},{"id":5678,"type":"text","left":571,"top":313,"width":352,"height":96,"fontSize":12,"content":"请输入内容","richContent":"<p><span style=\"color: #ecf0f1; font-size: 24px;\">哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈</span></p>","realWidth":352,"realHeight":96,"percentageLeft":0.5898760330578512,"percentageTop":0.4619244391971665,"percentageWidth":0.36363636363636365,"percentageHeight":0.14167650531286896}]
+export default {
+    name:'CoverNew',
+    props: {
+        pageInfo: {
+            type: Object,
+            default:{}
+        },
+        CoverContent: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            coverList: [],
+        };
+    },
+    methods: {
+        setCoverContent() {
+            //this.coverList = JSON.parse(this.CoverContent);
+            try{
+                this.coverList = JSON.parse(this.CoverContent)
+            }catch(e){
+                this.coverList = mock
+            }
+        }
+    },
+    mounted() {
+        this.setCoverContent();
+    },
+};
+</script>
+
+<style lang="scss">
+    .cover-el {
+        .layer-editor-wrap {
+            .editor-content {
+                ul {
+                    margin-left: 1em;
+                    list-style-type: disc;
+                }
+
+                ol {
+                    margin-left: 1em;
+                    list-style-type: decimal;
+                }
+            }
+        }
+    }
+</style>
+<style scoped lang="scss">
+.cover-new-wrap{
+    width:100%;
+    height:100%;
+    position:relative;
+    .cover-img{
+        width: 100%;
+        height: 100%;
+    }
+    .cover-el{
+        position: absolute;
+        .layer-editor-wrap {
+            z-index: 2;
+            width: 100%;
+            height: 100%;
+            /* padding: 10px; */
+            box-sizing: border-box;
+            position: relative;
+            >div {
+                cursor: pointer;
+            }
+            .editor-content {
+                padding: 10px;
+                position: absolute;
+                transform-origin: 0 0;
+                word-wrap: break-word;
+            }
+        }
+        &.default{
+            width:62%; 
+            font-size:16px; 
+            text-align:center; 
+            line-height:1.6;
+            right:20px; 
+            top:50%;
+        }
+    }
+}
+</style>

+ 3 - 5
src/views/ppt_manage/newVersion/components/catalog/pptContent.vue

@@ -5,9 +5,7 @@
       <template  v-for="(item,index) in loadArr">
           <div class="ppt-item" id="cover" v-if="index===0" :key="item.id">
             <!-- <Cover :pageInfo="firstPage" v-show="firstPage"></Cover> -->
-            <CoverNew v-show="firstPage"
-                :pageInfo="firstPage"
-            />
+            <CustomCover :pageInfo="firstPage" v-show="firstPage"/>
             <!-- <div class="ppt-info">
               <p>作者:{{pptItem.AdminRealName}}</p>
               <p>{{pptItem.PptxUrl?'发布':'保存'}}时间:{{$moment(pptTime).format('YYYY-MM-DD')}}</p>
@@ -57,7 +55,7 @@ import Highcharts from "highcharts/highstock";
 import HighchartszhCN  from '@/utils/highcahrts-zh_CN'
 HighchartszhCN(Highcharts)
 import addMyClassifyDia from '@/views/dataEntry_manage/components/addMyClassifyDia';
-import CoverNew from '../CoverNew.vue';
+import CustomCover from '../CustomCover.vue';
 export default {
   props:{
     pptItem:{ //ppt信息
@@ -65,7 +63,7 @@ export default {
     }
   },
   mixins:[pptmixin,mixins],
-  components:{ Cover, addMyClassifyDia, CoverNew },
+  components:{ Cover, addMyClassifyDia, CustomCover },
   data() {
     return {
         pageList:[],//ppt数组

+ 49 - 15
src/views/ppt_manage/newVersion/components/editor/ChooseCoverNew.vue

@@ -6,11 +6,11 @@
         :modal-append-to-body="false"
         title="自定义封面页"
         custom-class="choose-cover-new-wrap"
-        v-dialogDrag center width="80%" top="5vh"
+        v-dialogDrag center width="75%" top="5vh"
         @close="$emit('close')"
     >
-        <div class="container" @mousedown.stop="clickOutside">
-            <div class="edit-cover-wrap">
+        <div class="container">
+            <div class="edit-cover-wrap" @mousedown.stop="clickOutside">
                 <div class="cover">
                     <!-- 封面图 -->
                     <div class="editor-area" :style="`background-image:url(${pptCoverList[choosedIndex]});`">
@@ -26,18 +26,18 @@
                     </div>
                 </div>
                 <div class="editor-tool">
-                    <div class="title-box">
+                    <div class="title-box box">
                         <p>PPT标题</p>
                         <el-input v-model="pageData.Title"
                             placeholder="请输入PPT标题" style="width:100%;"></el-input>
                     </div>
-                    <div class="el-box">
-                        <p @click.stop="addTextEl">插入文本<span>icon</span></p>
+                    <div class="el-box box">
+                        <p @click.stop="addTextEl">插入文本<span><img src="~@/assets/img/ppt_m/text-icon.png"></span></p>
                     </div>
-                    <div class="el-tool-box">
-                        <p>文本设置</p>
-                        <div class="cover-text-toolbar"></div>
-                        <!-- <p v-if="!isActiveEl">请选择文本元素</p> -->
+                    <div class="el-tool-box box">
+                        <p style="margin-bottom: 10px;">文本设置</p>
+                        <div class="cover-text-toolbar" @mousedown.stop></div>
+                        <p v-if="!activeEl.id">请选择文本元素</p>
                     </div>
                     <div class="dialog-btn">
                         <el-button @click="saveCover">保存</el-button>
@@ -85,13 +85,25 @@ export default {
             choosedIndex:0
         };
     },
+    watch:{
+        isShowChooseCover(newVal){
+            this.changeActEl({})
+            if(newVal){
+                this.setCoverInfo()
+            }
+        }
+    },
     methods: {
         setCoverInfo() {
             this.searchIndex = this.pptCoverList.findIndex(i=>i===this.firstPage.BackgroundImg)
             if(this.searchIndex===-1){
-                this.pageData.BackgroundImg = this.bgList[0]
+                this.pageData.BackgroundImg = this.pptCoverList[0]
+            }
+            try{
+                this.coverElList = JSON.parse(this.CoverContent);
+            }catch(e){
+                this.coverElList = []
             }
-            this.coverElList = JSON.parse(this.CoverContent);
         },
         saveCover() {
             //校验
@@ -181,8 +193,16 @@ export default {
     .el-dialog__body{
         padding:25px !important;
         flex: 1;
-        overflow: hidden;
+        overflow: auto;
+        color: inherit;
+    }
+    .tox-menu.tox-swatches-menu.tox-selected-menu{
+      left:auto !important;
+      right:0;
     }
+    .tox-menu{
+        max-height: 200px !important;
+      }
 }
 </style>
 <style scoped lang="scss">
@@ -195,10 +215,9 @@ export default {
         .edit-cover-wrap{
             display: flex;
             flex: 1;
-            overflow: auto;
+            /* overflow: auto; */
             .cover,.editor-tool{
                 box-sizing: border-box;
-                overflow-y: auto;
             }
             .cover{
                 min-width: 640px;
@@ -210,6 +229,7 @@ export default {
                 border:1px solid #C8CDD9;
                 border-radius: 4px;
                 padding:10px;
+                overflow-y: visible;
                 .editor-area{
                     position: relative;
                     width:100%;
@@ -225,6 +245,20 @@ export default {
                 min-width:320px;
                 padding-left:20px;
                 /* background-color: burlywood; */
+                .box{
+                    margin-bottom: 10px;
+                    p{
+                        span{
+                            cursor: pointer;
+                            margin-left: 10px;
+                            vertical-align: middle;
+                            img{
+                                width:23px;
+                                height:23px;
+                            }
+                        }
+                    }
+                }
             }
         }
         .dialog-btn{

+ 2 - 2
src/views/ppt_manage/newVersion/components/editor/chooseCover/TextEl.vue

@@ -137,14 +137,14 @@
             z-index: 2;
             width: 100%;
             height: 100%;
-            padding: 10px;
+            padding: 10px; //空出可以移动的区域
             box-sizing: border-box;
             position: relative;
             >div {
                 cursor: pointer;
             }
             .editor-content {
-                padding: 10px;
+                /* padding: 10px; */
                 font-size: 16px;
                 position: absolute;
                 transform-origin: 0 0;

+ 20 - 76
src/views/ppt_manage/newVersion/pptPublish.vue

@@ -21,7 +21,8 @@
         <div class="ppt-wrap flex-center">
           <!-- 封面 -->
           <div class="ppt-item" id="cover" style="background-size:20%;">
-            <Cover :pageInfo="coverInfo.page"></Cover>
+            <!-- <Cover :pageInfo="coverInfo.page"></Cover> -->
+            <CustomCover :pageInfo="coverInfo.page"></CustomCover>
           </div>
           <!-- 内容 -->
           <div class="ppt-item" v-for="(item,index) in pageList" :key="item.id">
@@ -43,57 +44,6 @@
           </div>
         </div>
       </template>
-      <!-- 虚拟列表 -->
-      <template v-else>
-        <div class="list-wrap" id="scroller" @scroll="handleScroll">
-          <div class="ppt-wrap flex-center" id="scroller-inner">
-            <!-- <div class="ppt-item" v-for="(item,index) in loadList" :key="item.id" :data-set="item.title">
-              <span style="font-size:24px;">第{{index}}项,title{{item.title}}</span>
-            </div> -->
-            <template v-for="(item) in loadList">
-              <template v-if="item.index">
-                <!-- 是封面 -->
-                <div class="ppt-item" id="cover" v-if="coverInfo.page" :key="item.id" :data-set="item.title">
-                  <Cover :pageInfo="coverInfo.page"></Cover>
-                </div>
-              </template>
-              <template v-else-if="item.idName==='back'">
-                <!-- 是封底 -->
-                <div class="ppt-item" id="back" :key="item.id" :data-set="item.title">
-                  <img src="~@/assets/img/pptlastimg.png" class="pptbg" />
-                </div>
-              </template>
-              <template v-else>
-                <!-- 是内容 -->
-                <div class="ppt-item" :key="item.id" :data-set="item.title">
-                  <div class="title-wrap">
-                    {{item.title}} 
-                  </div>
-                  <component
-                    :is="getComponentName(item.modelId)"
-                    :ref="`pptPage_${item.sourceIndex}`"
-                    :pageIndex="item.sourceIndex"
-                    :pageItem="item" 
-                    type="show"
-                    >
-                  </component>
-                </div>
-              </template>
-          </template>
-          </div>
-        </div>
-      </template>
-      <!-- 封面封底 -->
-      <template v-if="isPublish&&!loadingAll">
-        <div class="fixed-wrap">
-          <div class="ppt-item" id="changecover">
-              <Cover :pageInfo="coverInfo.page"></Cover>
-          </div>
-          <div class="ppt-item" id="changeback" style="overflow:hidden;">
-              <img src="~@/assets/img/pptlastimg.png" class="pptbg" style="width:100%;"/>
-            </div>
-          </div>
-      </template>
       <!-- <trans-report
         v-if="coverInfo.page"
         :transReportShow="transReportShow"
@@ -106,6 +56,7 @@
 
 <script>
 import Cover from './components/Cover.vue';
+import CustomCover from './components/CustomCover.vue';
 import TransReport from './components/catalog/transReport.vue';
 //import {pageList} from './utils/mock';
 import {countComponentName,pptInit,pptConfigInit,toTextProps,toJson,svg2Base64,getImgRealSize,calcScale,getShapeOptions,createRandomCode,getTableData} from './utils/untils';
@@ -125,7 +76,7 @@ import {uploadFileDirect} from "@/utils/common.js"
 HightchartsExport(Highcharts)
 HighchartszhCN(Highcharts)
 export default {
-  components: {Cover,TransReport},
+  components: {Cover,TransReport,CustomCover},
   mixins:[pptmixin,mixins,virtualScroll],
   data() {
     return {
@@ -172,11 +123,11 @@ export default {
   methods: {
     async transHandle(){
       //需要校验PPT
-      const {result,hintText} = this.checkPPT()
+     /*  const {result,hintText} = this.checkPPT()
       if(!result){
         this.$message.warning(hintText)
         return
-      }
+      } */
       this.loadingInstance = this.$loading({
         lock:true,
         fullscreen: true,
@@ -184,12 +135,15 @@ export default {
       });
       this.isPublish = true
       if(this.loadingAll){
-        await this.pageToPptx()       
-      }else{
-        //将滚动条置顶
-        this.scroller.scrollTop = 0
-        await this.pageToPptx()
-      }  
+        //await this.pageToPptx() 
+        //mock本地生成封面调试
+        let pptx = pptInit(new pptxgen(),this.LayoutType,'ch')
+        let cover = pptx.addSlide()
+        let mockContent1 = JSON.stringify([{ "id": 1234, "type": "text", "left": 624, "top": 433, "width": 227, "height": 84, "fontSize": 12, "content": "请输入内容", "richContent": "<p><span style=\"font-size: 48px;\">😔😄😔</span></p>", "realWidth": 227, "realHeight": 84, "percentageLeft": 0.6446280991735537, "percentageTop": 0.6390200708382527, "percentageWidth": 0.23450413223140495, "percentageHeight": 0.12396694214876035 }, { "id": 5678, "type": "text", "left": 571, "top": 313, "width": 352, "height": 96, "fontSize": 12, "content": "请输入内容", "richContent": "<p><span style=\"color: #ecf0f1; font-size: 24px;\">哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈</span></p>", "realWidth": 352, "realHeight": 96, "percentageLeft": 0.5898760330578512, "percentageTop": 0.4619244391971665, "percentageWidth": 0.36363636363636365, "percentageHeight": 0.14167650531286896 }])
+        let mockContent2=''
+        cover = this.setPPTCover(cover,mockContent2,this.coverInfo.page.Title)
+        pptx.writeFile({ fileName: "test.pptx" })
+      }
       this.isPublish = false
     },
     //计算ppt的版式名称
@@ -290,13 +244,6 @@ export default {
       const length = this.pageList.length;
       for (let i = 0; i < length; i++) {
         //console.log(`正在生成,第${i+1}页...`,`lastVisibleItemIndex:`,this.lastVisibleItemIndex)
-        if(!this.loadingAll){
-          if(this.lastVisibleItemIndex<=i+this.buffer+1){
-            //将滚动条触底,加载下一页
-            const {scrollHeight} = this.scroller
-            this.scroller.scrollTop = scrollHeight
-          }
-        }
         let slide = pptx.addSlide({ masterName: pptSlideMaster.title });
         //添加背景图片
         //slide.background = { path: "/static/pptnextimg.png" };
@@ -473,14 +420,14 @@ export default {
         size: { type: "contain" },
       })
       //生成的ppt需要可以在封面页更改标题和类型,所以封面信息手动写入
-      const coverInfo = [
-        //{text:'—————————————————————————————————\n',options:{fontSize:16*0.75,breakLine:true}},
+      /* const coverInfo = [
+        {text:'—————————————————————————————————\n',options:{fontSize:16*0.75,breakLine:true}},
         {text:this.coverInfo.page.Title,options:{fontSize:28*0.75,breakLine:true}},
         {text:`\n— ${this.pptCoverCompenyName||'ETA'} ● ${this.coverInfo.page.ReportType} —`,
          options:{fontSize:16*0.75,breakLine:false}},
         {text:`\n${this.pptCoverDepartName||'投研部'}`,options:{fontSize:16*0.75,breakLine:true}},
         {text:this.coverInfo.page.PptDate,options:{fontSize:16*0.75,breakLine:true}},
-        //{text:'\n—————————————————————————',options:{fontSize:16*0.75,breakLine:true}}
+        {text:'\n—————————————————————————',options:{fontSize:16*0.75,breakLine:true}}
       ]
       cover.addText(coverInfo,{
         x:'38%',
@@ -490,7 +437,8 @@ export default {
         color:(this.pptCoverTextColor||'#ffffff').slice(1),
         align:'center',
         fontFace:'SimHei'
-      })
+      }) */
+      cover = this.setPPTCover(cover,this.pptCoverContent,this.coverInfo.page.Title)
       //遍历pptx.slides,重新给每一项的部分属性赋值,再推入pptx2.slides中
       //第一页不需要,因为是空白的
       for(let i=1;i<pptx.slides.length;i++){
@@ -746,10 +694,6 @@ export default {
   mounted(){
     this.init()
     this._scrollTop = 0
-    if(!this.loadingAll){
-      this.scroller = document.getElementById('scroller')
-      this.scrollerInner = document.getElementById("scroller-inner")
-    }
   },
   updated(){
     /*