ETA1.4.9 init

src/views/ppt_manage/newVersion/components/CoverNew.vue

@@ -0,0 +1,23 @@
+<template>
+    <!-- 自定义封面页渲染 -->
+    <div class="cover-new-wrap">
+
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+
+        };
+    },
+    methods: {
+
+    },
+};
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/ppt_manage/newVersion/components/catalog/mergePPTDialog.vue

@@ -11,97 +11,9 @@
         <span style="fontsize: 16px">合并PPT</span>
       </div>
       <div class="dialog-container">
-      <!--  <div class="tree-container-wrap">
-          <div class="public-tree">
-            <h3>公共PPT</h3>
-            <div class="tree-container">
-              <div class="tree-list" :key="treeKey">
-                <div class="list-item" v-for="(item,index) in publicList" :key="item.nodeKeyId" @click.stop="expandList(index,'public')">
-                  <p class="item-label"><span @click.stop="expandList(index,'public')"><i :class="item.expand?'el-icon-caret-bottom':'el-icon-caret-right'"></i></span> {{item.label}}</p>
-                  <template v-if="item.expand">
-                    <div class="list-child" v-for="i in item.children" :key="i.nodeKeyId">
-                      <el-checkbox
-                        :disabled="disabled&&!choosedIdArr.includes(i.PptId)||i.disabled"
-                        v-model="i.checked"
-                        @change="(checked)=>{changeCheck(checked,i,'public')}"
-                      >{{i.label}}</el-checkbox>
-                    </div>
-                  </template>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="private-tree">
-            <h3>我的PPT</h3>
-            <div class="tree-container">
-              <div class="tree-list" :key="treeKey">
-                <div class="list-item" v-for="(item,index) in privateList" :key="item.nodeKeyId" @click.stop="expandList(index,'private')">
-                  <p class="item-label"><span @click.stop="expandList(index,'private')"><i :class="item.expand?'el-icon-caret-bottom':'el-icon-caret-right'"></i></span> {{item.label}}</p>
-                  <template v-if="item.expand">
-                    <div class="list-child" v-for="i in item.children" :key="i.nodeKeyId">
-                      <el-checkbox
-                        :disabled="disabled&&!choosedIdArr.includes(i.PptId)||i.disabled"
-                        v-model="i.checked"
-                        @change="(checked)=>{changeCheck(checked,i,'private')}"
-                      >{{i.label}}</el-checkbox>
-                    </div>
-                  </template>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div> -->
         <div class="ppt-form">
           <div class="input-item" style="position:relative;">
             <h3>请选择PPT</h3>
-            <!-- <div class="select-node-show" @click.stop="showCatalog = !showCatalog">
-              <div class="select-node" v-for="item in choosedItemArr" :key="item.PptId">
-                <span>{{ item.Title }}</span>
-                <i class="el-icon-error" @click.stop="changeCheck(false,item,'unknow')"></i>
-              </div>
-              <div v-show="choosedItemArr.length===0" style="color:#606266;opacity:.54;margin-left:10px;">请选择PPT</div>
-              <span class="expand" @click.stop="showCatalog = !showCatalog"><i :class="showCatalog?'el-icon-arrow-up':'el-icon-arrow-down'"></i></span>
-            </div>
-            <div class="catalog-wrap" v-show="showCatalog">
-              <div class="public-tree">
-                <h3>公共PPT</h3>
-                <div class="tree-container">
-                  <div class="tree-list" :key="treeKey">
-                    <div class="list-item" v-for="(item,index) in publicList" :key="item.nodeKeyId" @click.stop="expandList(index,'public')">
-                      <p class="item-label"><span @click.stop="expandList(index,'public')"><i :class="item.expand?'el-icon-caret-bottom':'el-icon-caret-right'"></i></span> {{item.label}}</p>
-                      <template v-if="item.expand">
-                        <div class="list-child" v-for="i in item.children" :key="i.nodeKeyId">
-                          <el-checkbox
-                            :disabled="disabled&&!choosedIdArr.includes(i.PptId)||i.disabled"
-                            v-model="i.checked"
-                            @change="(checked)=>{changeCheck(checked,i,'public')}"
-                          >{{i.label}}</el-checkbox>
-                        </div>
-                      </template>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="private-tree" style="margin-top:10px;">
-                <h3>我的PPT</h3>
-                <div class="tree-container">
-                  <div class="tree-list" :key="treeKey">
-                    <div class="list-item" v-for="(item,index) in privateList" :key="item.nodeKeyId" @click.stop="expandList(index,'private')">
-                      <p class="item-label"><span @click.stop="expandList(index,'private')"><i :class="item.expand?'el-icon-caret-bottom':'el-icon-caret-right'"></i></span> {{item.label}}</p>
-                      <template v-if="item.expand">
-                        <div class="list-child" v-for="i in item.children" :key="i.nodeKeyId">
-                          <el-checkbox
-                            :disabled="disabled&&!choosedIdArr.includes(i.PptId)||i.disabled"
-                            v-model="i.checked"
-                            @change="(checked)=>{changeCheck(checked,i,'private')}"
-                          >{{i.label}}</el-checkbox>
-                        </div>
-                      </template>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div> -->
             <div class="select-ppt-wrap select-wrap">
               <el-tabs value="public">
                 <el-tab-pane label="公共PPT" name="public">
@@ -165,21 +77,6 @@
             <h3>PPT标题</h3>
             <el-input  placeholder="请输入PPT标题" v-model="pptInfo.Title" required ></el-input>
           </div>
-          <div class="input-item">
-            <h3>PPT类型</h3>
-            <el-input  placeholder="请输入PPT类型" v-model="pptInfo.ReportType" required ></el-input>
-          </div>
-  <!--         <div class="input-item date-picker">
-            <h3>PPT日期</h3>
-            <el-date-picker
-              v-model="pptInfo.PptDate"
-              type="month"
-              ref="date_pic"
-              format="yyyy年M月"
-              value-format="yyyy年M月"
-              placeholder="请选择日期">
-            </el-date-picker>
-          </div> -->
         </div>
       </div>
       <div slot="footer" class="foot-container">
@@ -201,18 +98,14 @@ export default {
       type:Boolean,
       default:false
     },
-/*     catalogId:{
-      type:Number,
-      default:0
-    } */
   },
   data() {
     return {
       pptInfo:{
         Title:'',
-        ReportType:'',
-        BackgroundImg:'https://hzstatic.hzinsights.com/ppt/bg3.jpg',
-        PptDate:(new Date().getFullYear())+'年'+(new Date().getMonth()+1)+'月',
+        //ReportType:'',
+        BackgroundImg:'',//读取etaBaseConfig中封面页的第一个
+        //PptDate:(new Date().getFullYear())+'年'+(new Date().getMonth()+1)+'月',
         BackIndex:0,
         TemplateType:1
       },//PPT的标题信息
@@ -236,6 +129,7 @@ export default {
         this.init()
         this.getCatalogsList()
         this.getPrivateList()
+        this.getBaseConfig()
       }
       if(!newValue){
         if(this.saveLoading){
@@ -268,7 +162,14 @@ export default {
       }
       await this.addNewPpt()
       if(this.PptId!==0){
-        this.$emit('merged',{PptId:this.PptId,catalogId:this.selectedCatalogId})
+        //this.$emit('merged',{PptId:this.PptId,catalogId:this.selectedCatalogId})
+        //跳转至ppt编辑页
+        this.$router.push({
+            path:'/ppteditor',
+            query:{
+                id:this.PptId
+            }
+        })
       }
         
     },
@@ -281,12 +182,12 @@ export default {
       if(!this.pptInfo.Title.length){
         return {result:false,msg:'请填写PPT标题'}
       }
-      if(!this.pptInfo.ReportType){
+      /* if(!this.pptInfo.ReportType){
         return {result:false,msg:'请填写PPT类型'}
       }
       if(!this.pptInfo.PptDate){
         return {result:false,msg:'请选择日期'}
-      }
+      } */
       if(this.selectedCatalogId===0){
         return {result:false,msg:'请选择一个目录'}
       }
@@ -440,12 +341,16 @@ export default {
     //重置data的值
     init(){
       Object.assign(this.$data,this.$options.data())
+    },
+    getBaseConfig(){
+        etaBaseConfigInterence.getBaseConfig().then(res=>{
+                if(res.Ret!==200) return
+                const {CnPptCoverImgs='',EnPptCoverImgs=''} = res.Data||{}
+                this.pptInfo.BackgroundImg = this.$parent.currentLang!=='en'?CnPptCoverImgs.split(',')[0]:EnPptCoverImgs.split(',')[0]
+        })
     }
   },
-  mounted(){
-    //console.log('merge')
-    //this.getCatalogsList()
-  }
+  mounted(){}
 };
 </script>
 

src/views/ppt_manage/newVersion/components/editor/ChooseCoverNew.vue

@@ -0,0 +1,23 @@
+<template>
+    <!-- ppt自定义封面编辑 -->
+    <div class="choose-cover-new-wrap">
+
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+
+        };
+    },
+    methods: {
+
+    },
+};
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -114,8 +114,8 @@
                 <el-button type="text" @click="handleChangeEditModal"><i class="el-icon-sort" style="transform: rotate(90deg);margin-right:5px;"></i>{{isEditLayer?'ppt编辑':'图层编辑'}}</el-button>
             </div>
             <div class="richtext-tool"></div>
-            <div class="addppt-right-box" v-if="!isEditLayer">
-
+            <!-- 防止el-tabs未渲染时触发scrollToActiveTab 报错,v-if改为v-show-->
+            <div class="addppt-right-box" v-show="!isEditLayer">
               <el-tabs v-model="tabsactive">
                 <el-tab-pane :label="tab" :name="tab" v-for="tab in panelTabs" :key="tab"></el-tab-pane>
               </el-tabs>
@@ -152,7 +152,6 @@
                     <div v-for="(item,index) in sandTableList" :key="index" class="sandTable-item" >
                       <p class="chart_tit">{{item.Name}}</p>
                       <img :src="item.PicUrl" style="width:100%;-webkit-user-drag:none;"  @click="chooseChart(item,'sandImage')"/>
-                      <!-- <p class="source-identification">来源：弘则研究</p> -->
                     </div>
                     <div v-loading = "sandTableLoading" class="loaded-text">{{loadedText}}</div>
                   </template>
@@ -181,7 +180,7 @@
               </div>
             </div>
             <!-- 图层编辑 -->
-            <div class="layer-edit-box" v-else>
+            <div class="layer-edit-box" v-show="isEditLayer">
               	<el-collapse v-model="activeNames" class="tool-list">
                   <el-collapse-item title="图层元素" name="el">
                     <div class="el-wrap">