Karsa 1 年之前
父节点
当前提交
5ace53abb5

+ 9 - 4
src/views/ppt_manage/newVersion/components/formatEl/SheetEl.vue

@@ -4,9 +4,10 @@
   <div
     class="chart-wrap table-wrap"
     :id="`${$parent.isPreview?'preview_':''}sheet_${index}_${position}`"
-    :style="{overflow:$parent.isPreview?'hidden':'auto'}"
+    style="overflow:hidden"
   >
-    <table :key="tableKey">
+    <!-- :style="{overflow:$parent.isPreview?'hidden':'auto'}" -->
+    <table :key="tableKey" style="font-size:9px" cellpadding="0" cellspacing="0">
       <tbody>
         <tr v-for="(row,rowIndex) in tableData" :key="rowIndex">
           <td v-for="(col,colIndex) in row" 
@@ -68,11 +69,15 @@ export default {
 .table-wrap{
   /* overflow: auto; */
   table{
-    width:100%;
+    width:99%;
+    table-layout: fixed;
     td{
 			/* 	min-width: 35px; */
 				border: 1px solid #747474;
-				height: 45px;
+        word-break: break-all;
+        word-wrap: break-word;
+        line-height: 1.2em;
+				/* height: 45px; */
 				text-align: center;
 			}
   }

+ 2 - 1
src/views/report_manage/mixins/reportMixin.js

@@ -257,7 +257,8 @@ export default {
 
     /* 插入表格 */
     insertSheet(item) {
-      const LINK_URL = this.$setting.dynamicOutLinks.ChartViewUrl+'/sheetshow';
+      // const LINK_URL = this.$setting.dynamicOutLinks.ChartViewUrl+'/sheetshow';
+      const LINK_URL = 'http://192.168.77.24:3000'+'/sheetshow';
       this.$nextTick(() => {
         this.editor.html.insert(
           `<p style='text-align:left; margin-top:10px;'>

+ 2 - 1
src/views/smartReport/components/ETASheet.vue

@@ -55,7 +55,8 @@ export default {
         },
 
         getCompData(item){
-            const LINK_URL = this.$setting.dynamicOutLinks.ChartViewUrl+'/sheetshow';
+            // const LINK_URL = this.$setting.dynamicOutLinks.ChartViewUrl+'/sheetshow';
+            const LINK_URL = 'http://192.168.77.24:3000'+'/sheetshow';
             // console.log(LINK_URL);
             const obj={
                 compId:4,

+ 380 - 268
src/views/system_manage/etaBaseConfig.vue

@@ -23,296 +23,370 @@
                     <el-button type="primary"  style="margin-left:20px;width:120px;" @click="saveBaseConfig">保存</el-button>
                 </div>
             </div>
-            <!-- 登录设置模块 -->
-            <div class="part" v-show="partType===1&&isShowLoginConfig">
-                <div class="side">
-                    <!-- <el-form-item label="国内短信模板" prop="LoginSmsTpId" >
-                        <div class="form-item-type-two sms-type">
-                            <el-input type="text" v-model.trim="formData.LoginSmsTpId" placeholder="请输入国内短信模板ID" style="width: calc(50% - 10px);">
-                                <template slot="suffix">
-                                    <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
-                                        <div class="input-suffix">
-                                            <img src="~@/assets/img/icons/warn-circle-gray.png" />
-                                        </div>
-                                    </el-tooltip>
-                                </template>
-                            </el-input>
-                            <el-input type="text" v-model.trim="formData.SmsJhgnAppKey" placeholder="请输入国内短信模板appkey" style="width: calc(50% - 10px);" />
-                        </div>
-                    </el-form-item>
-                    <el-form-item label="国外短信模板" prop="LoginSmsGjTpId" >
-                        <div class="form-item-type-two sms-type">
-                            <el-input type="text" v-model.trim="formData.LoginSmsGjTpId" placeholder="请输入国外短信模板ID" style="width: calc(50% - 10px);">
-                                <template slot="suffix">
-                                    <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
+            <div class="scroll-cont">
+                <!-- 登录设置模块 -->
+                <div class="part" v-show="partType===1&&isShowLoginConfig">
+                    <div class="side">
+                        <!-- <el-form-item label="国内短信模板" prop="LoginSmsTpId" >
+                            <div class="form-item-type-two sms-type">
+                                <el-input type="text" v-model.trim="formData.LoginSmsTpId" placeholder="请输入国内短信模板ID" style="width: calc(50% - 10px);">
+                                    <template slot="suffix">
+                                        <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
+                                            <div class="input-suffix">
+                                                <img src="~@/assets/img/icons/warn-circle-gray.png" />
+                                            </div>
+                                        </el-tooltip>
+                                    </template>
+                                </el-input>
+                                <el-input type="text" v-model.trim="formData.SmsJhgnAppKey" placeholder="请输入国内短信模板appkey" style="width: calc(50% - 10px);" />
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="国外短信模板" prop="LoginSmsGjTpId" >
+                            <div class="form-item-type-two sms-type">
+                                <el-input type="text" v-model.trim="formData.LoginSmsGjTpId" placeholder="请输入国外短信模板ID" style="width: calc(50% - 10px);">
+                                    <template slot="suffix">
+                                        <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
+                                            <div class="input-suffix">
+                                                <img src="~@/assets/img/icons/warn-circle-gray.png" />
+                                            </div>
+                                        </el-tooltip>
+                                    </template>
+                                </el-input>
+                                <el-input type="text" v-model.trim="formData.SmsJhgjAppKey" placeholder="请输入国外短信模板appkey" style="width: calc(50% - 10px);" />
+                            </div>
+                        </el-form-item> -->
+                        <el-form-item label="邮件模板" prop="LoginEmailTemplateSubject" >
+                            <div class="form-item-type-two">
+                                <el-input type="text" v-model="formData.LoginEmailTemplateSubject" placeholder="请输入邮件标题" >
+                                    <template slot="suffix">
+                                            <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
                                         <div class="input-suffix">
                                             <img src="~@/assets/img/icons/warn-circle-gray.png" />
                                         </div>
                                     </el-tooltip>
-                                </template>
-                            </el-input>
-                            <el-input type="text" v-model.trim="formData.SmsJhgjAppKey" placeholder="请输入国外短信模板appkey" style="width: calc(50% - 10px);" />
-                        </div>
-                    </el-form-item> -->
-                    <el-form-item label="邮件模板" prop="LoginEmailTemplateSubject" >
-                        <div class="form-item-type-two">
-                            <el-input type="text" v-model="formData.LoginEmailTemplateSubject" placeholder="请输入邮件标题" >
-                                <template slot="suffix">
-                                        <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
-                                    <div class="input-suffix">
-                                        <img src="~@/assets/img/icons/warn-circle-gray.png" />
-                                    </div>
-                                </el-tooltip>
-                                </template>
-                            </el-input>
-                        </div>
-                    </el-form-item>
-                    <el-form-item prop="LoginEmailTemplateContent" >
-                        <froala id="email-content-editor"
-                            ref="emailContentEditor" 
-                            tag="textarea" 
-                            :config="{...disclaimerConfig,...emailEditorConfig}" v-model="formData.LoginEmailTemplateContent">
-                        </froala>
-                        <ConfigAnnotation picName="emailContentTemplate" @showImage="previewImage" picHintText=""/>
-                    </el-form-item>
-                </div>
-                <div class="side">
-                    <el-form-item label="备案信息" prop="ICPLicense">
-                        <el-input type="text" v-model="formData.ICPLicense" placeholder="文本中输入≥2个空格表示文本分段,小屏时换行展示" />
-                        <ConfigAnnotation picHintText="" picName="ICPLicense" @showImage="previewImage"/>
-                    </el-form-item>
-                    <el-form-item label="登录页标题" prop="ETATitle">
-                        <el-input type="text" v-model="formData.ETATitle" placeholder="请输入登录页标题" />
-                        <ConfigAnnotation picHintText="" picName="ETATitle" @showImage="previewImage"/>
-                    </el-form-item>
-                    <el-form-item label="网站名称" prop="TabName">
-                        <el-input type="text" v-model="formData.TabName" placeholder="请输入登录页标题" />
-                        <ConfigAnnotation picHintText="" picName="TabName" @showImage="previewImage"/>
-                    </el-form-item>
-                </div>
-            </div>
-            <!-- 研报设置 -->
-            <div class="part" v-show="partType===2">
-                <div class="side">
-                    <el-form-item label="公司名称" prop="CompanyName">
-                        <el-input type="text" v-model="formData.CompanyName" placeholder="请输入公司名称" />
-                        <ConfigAnnotation picHintText="" picName="CompanyName" @showImage="previewImage"/>
-                    </el-form-item>
-                    <el-form-item label="公司水印" prop="CompanyWatermark" class="watermark">
-                        <ImgUpload 
-                            :imgUrl="formData.CompanyWatermark"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'CompanyWatermark')"
-                            @remove="deleteFormImg('CompanyWatermark')"
-                            />
-                        <!-- 后面可能会有新的选项 -->
-                        <div style="position: absolute;top: -40px;left: 100px;display:flex;gap:0 20px">
-                            <el-checkbox-group v-if="isShowYBChart"
-                                v-model="checkList" >
-                                <el-checkbox label="研报图表"></el-checkbox>
-                            </el-checkbox-group>
-                            <div v-if="isShowYBShare">
-                                <el-checkbox label="研报分享" v-model="formData.WatermarkReport"></el-checkbox>
-                                <el-tooltip 
-                                    effect="dark" 
-                                    content="研报详情分享页水印,水印内容为分享人用户名称+手机号(无手机号时为邮箱地址)" 
-                                    placement="top"
-                                >
-                                    <i class="el-icon-warning"></i>
-                                </el-tooltip>
+                                    </template>
+                                </el-input>
                             </div>
-                            
-                        </div>
-                        <ConfigAnnotation picName="CompanyWatermark" @showImage="previewImage"/>
-                    </el-form-item>
-                    <el-form-item label="免责声明" prop="Disclaimer" class="disclaimer">
-                        <div class="rich-editor-wrap">
-                            <froala :id="`disclaimer-editor`"
-                                :ref="`disclaimerEditor`" 
-                                :tag="'textarea'" 
-                                :config="disclaimerConfig" v-model="formData.Disclaimer">
+                        </el-form-item>
+                        <el-form-item prop="LoginEmailTemplateContent" >
+                            <froala id="email-content-editor"
+                                ref="emailContentEditor" 
+                                tag="textarea" 
+                                :config="{...disclaimerConfig,...emailEditorConfig}" v-model="formData.LoginEmailTemplateContent">
                             </froala>
-                        </div>
-                        <ConfigAnnotation picHintText="" picName="Disclaimer" @showImage="previewImage"/>
-                    </el-form-item>
-                    <div v-if="isShowXunFei">
-                        <!-- 科大讯飞 -->
-                        <div style="width:100%;">
-                            <span style="color:#606266;">科大讯飞服务</span> 
-                            <el-switch v-model="Iflytek"></el-switch>
-                        </div>
-                        <template v-if="Iflytek">
-                            <el-form-item label="APPID" prop="XfAppid">
-                                <el-input type="text" v-model="formData.XfAppid" placeholder="请输入APPID" />
-                            </el-form-item>
-                            <el-form-item label="APIKey" prop="XfApiKey">
-                                <el-input type="text" v-model="formData.XfApiKey" placeholder="请输入APIKey" />
-                            </el-form-item>
-                            <el-form-item label="APISecret" prop="XfApiSecret">
-                                <el-input type="text" v-model="formData.XfApiSecret" placeholder="请输入APISecret" />
-                            </el-form-item>
-                            <el-form-item label="vcn(voice_name)" prop="XfVcn">
-                                <el-input type="text" v-model="formData.XfVcn" placeholder="请输入voice_name" />
-                            </el-form-item>
-                        </template>
+                            <ConfigAnnotation picName="emailContentTemplate" @showImage="previewImage" picHintText=""/>
+                        </el-form-item>
+                    </div>
+                    <div class="side">
+                        <el-form-item label="备案信息" prop="ICPLicense">
+                            <el-input type="text" v-model="formData.ICPLicense" placeholder="文本中输入≥2个空格表示文本分段,小屏时换行展示" />
+                            <ConfigAnnotation picHintText="" picName="ICPLicense" @showImage="previewImage"/>
+                        </el-form-item>
+                        <el-form-item label="登录页标题" prop="ETATitle">
+                            <el-input type="text" v-model="formData.ETATitle" placeholder="请输入登录页标题" />
+                            <ConfigAnnotation picHintText="" picName="ETATitle" @showImage="previewImage"/>
+                        </el-form-item>
+                        <el-form-item label="网站名称" prop="TabName">
+                            <el-input type="text" v-model="formData.TabName" placeholder="请输入登录页标题" />
+                            <ConfigAnnotation picHintText="" picName="TabName" @showImage="previewImage"/>
+                        </el-form-item>
                     </div>
-                    <!-- 研报审批 -->
-                    <div v-if="isShowApprove">
-                        <div style="width:100%;margin-bottom: 20px;">
-                            <span style="color:#606266;">研报审批</span> 
-                            <el-switch v-model="approve"></el-switch>
+                </div>
+                <!-- 研报设置 -->
+                <div class="part" v-show="partType===2">
+                    <div class="side">
+                        <el-form-item label="公司名称" prop="CompanyName">
+                            <el-input type="text" v-model="formData.CompanyName" placeholder="请输入公司名称" />
+                            <ConfigAnnotation picHintText="" picName="CompanyName" @showImage="previewImage"/>
+                        </el-form-item>
+                        <el-form-item label="公司水印" prop="CompanyWatermark" class="watermark">
+                            <ImgUpload 
+                                :imgUrl="formData.CompanyWatermark"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'CompanyWatermark')"
+                                @remove="deleteFormImg('CompanyWatermark')"
+                                />
+                            <!-- 后面可能会有新的选项 -->
+                            <div style="position: absolute;top: -40px;left: 100px;display:flex;gap:0 20px">
+                                <el-checkbox-group v-if="isShowYBChart"
+                                    v-model="checkList" >
+                                    <el-checkbox label="研报图表"></el-checkbox>
+                                </el-checkbox-group>
+                                <div v-if="isShowYBShare">
+                                    <el-checkbox label="研报分享" v-model="formData.WatermarkReport"></el-checkbox>
+                                    <el-tooltip 
+                                        effect="dark" 
+                                        content="研报详情分享页水印,水印内容为分享人用户名称+手机号(无手机号时为邮箱地址)" 
+                                        placement="top"
+                                    >
+                                        <i class="el-icon-warning"></i>
+                                    </el-tooltip>
+                                </div>
+                                
+                            </div>
+                            <ConfigAnnotation picName="CompanyWatermark" @showImage="previewImage"/>
+                        </el-form-item>
+
+                        <el-form-item label="研报表格字体">
+                            <div class="flex-wrap">
+                                <div v-for="item in reportFromType" :key="item.type">
+                                    <label>{{item.label}}</label>
+                                    <el-select v-model="formData.SmartReportSheetSize" style="width:80px;" v-if="item.type==='smartReport'">
+                                        <el-option 
+                                            v-for="size in sizeOptions" 
+                                            :key="size.val"
+                                            :label="size.label"
+                                            :value="size.val"
+                                        />
+                                    </el-select>
+                                    <el-select v-model="formData.ReportSheetSize" style="width:80px;" v-else-if="item.type==='report'">
+                                        <el-option 
+                                            v-for="size in sizeOptions" 
+                                            :key="size.val"
+                                            :label="size.label"
+                                            :value="size.val"
+                                        />
+                                    </el-select>
+                                    <el-select v-model="formData.EnReportSheetSize" style="width:80px;" v-else-if="item.type==='enReport'">
+                                        <el-option 
+                                            v-for="size in sizeOptions" 
+                                            :key="size.val"
+                                            :label="size.label"
+                                            :value="size.val"
+                                        />
+                                    </el-select>
+                                </div>
+
+                            </div>
+                        </el-form-item>
+        
+                        <div v-if="isShowXunFei">
+                            <!-- 科大讯飞 -->
+                            <div style="width:100%;">
+                                <span style="color:#606266;">科大讯飞服务</span> 
+                                <el-switch v-model="Iflytek"></el-switch>
+                            </div>
+                            <template v-if="Iflytek">
+                                <el-form-item label="APPID" prop="XfAppid">
+                                    <el-input type="text" v-model="formData.XfAppid" placeholder="请输入APPID" />
+                                </el-form-item>
+                                <el-form-item label="APIKey" prop="XfApiKey">
+                                    <el-input type="text" v-model="formData.XfApiKey" placeholder="请输入APIKey" />
+                                </el-form-item>
+                                <el-form-item label="APISecret" prop="XfApiSecret">
+                                    <el-input type="text" v-model="formData.XfApiSecret" placeholder="请输入APISecret" />
+                                </el-form-item>
+                                <el-form-item label="vcn(voice_name)" prop="XfVcn">
+                                    <el-input type="text" v-model="formData.XfVcn" placeholder="请输入voice_name" />
+                                </el-form-item>
+                            </template>
                         </div>
-                        <div class="side" v-if="approve">
-                            <el-form-item label="" prop="ReportApproveType">
-                                <el-radio-group v-model="formData.ReportApproveType">
-                                    <el-radio label="eta">ETA内部审批</el-radio>
-                                    <el-radio label="other">
-                                        <span>第三方审批</span>
-                                        <el-tooltip effect="dark" placement="top" content="中文研报(智能研报/研报列表)通过API接口对接第三方审批系统" >
-                                            <span class="hint-text">
-                                                <i class="el-icon-warning-outline"></i>
-                                            </span>
-                                        </el-tooltip>
-                                    </el-radio>
-                                </el-radio-group>
-                            </el-form-item>
+                        <!-- 研报审批 -->
+                        <div v-if="isShowApprove">
+                            <div style="width:100%;margin-bottom: 20px;">
+                                <span style="color:#606266;">研报审批</span> 
+                                <el-switch v-model="approve"></el-switch>
+                            </div>
+                            <div class="side" v-if="approve">
+                                <el-form-item label="" prop="ReportApproveType">
+                                    <el-radio-group v-model="formData.ReportApproveType">
+                                        <el-radio label="eta">ETA内部审批</el-radio>
+                                        <el-radio label="other">
+                                            <span>第三方审批</span>
+                                            <el-tooltip effect="dark" placement="top" content="中文研报(智能研报/研报列表)通过API接口对接第三方审批系统" >
+                                                <span class="hint-text">
+                                                    <i class="el-icon-warning-outline"></i>
+                                                </span>
+                                            </el-tooltip>
+                                        </el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="side">
-                    <el-form-item label="中文研报分享抬头" prop="H5ShareName">
-                        <el-input type="text" v-model="formData.H5ShareName" placeholder="请输入中文研报分享抬头" />
-                    </el-form-item>
-                    <el-form-item label="英文研报分享抬头" prop="H5ShareEnName">
-                        <el-input type="text" v-model="formData.H5ShareEnName" placeholder="请输入英文研报分享抬头" />
-                    </el-form-item>
-                    <el-form-item label="关联公众号" prop="WxAppId">
-                        <el-input type="text" v-model.trim="formData.WxAppId" placeholder="请输入AppID" />
-                    </el-form-item>
-                    <el-form-item prop="WxAppSecret">
-                        <el-input type="text" v-model.trim="formData.WxAppSecret" placeholder="请输入AppSecret" />
-                    </el-form-item>
-                    <el-form-item prop="WxId">
-                        <el-input type="text" v-model.trim="formData.WxId" placeholder="请输入原始Id" />
-                    </el-form-item>
-                    <div class="input-hint">注:关联公众号填写时,AppID、AppSecret原始ID均需填写。</div>
-                    <el-form-item  prop="H5ReportShareImg">
-                        <ImgUpload 
-                            :imgUrl="formData.H5ReportShareImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'H5ReportShareImg')"
-                            @remove="deleteFormImg('H5ReportShareImg')"
-                            />
-                        <!-- <ConfigAnnotation picName="OfficialAccountsLogoPic" @showImage="previewImage"
-                            picHintText=""/> -->
-                    </el-form-item>
-                </div>
-            </div>
-            <!-- PPT配置 -->
-            <div class="part" v-if="isShowPPT||isShowEnPPT" v-show="partType===3">
-                <el-radio-group v-model="pptLang" style="margin-bottom: 22px;">
-                    <el-radio-button label="cn">中文PPT</el-radio-button>
-                    <el-radio-button label="en">英文PPT</el-radio-button>
-                </el-radio-group>
-                <div v-if="isShowPPT" v-show="pptLang === 'cn'" class="ppt-form-item-wrap">
-                    <!-- <div class="inner-input-wrap">
-                        <el-form-item label="公司名称" prop="PptCompanyName" class="inline-form-item">
-                            <el-input type="text" v-model="formData.PptCompanyName"></el-input>
+                    <div class="side">
+                        <el-form-item label="免责声明" prop="Disclaimer" class="disclaimer">
+                            <div class="rich-editor-wrap">
+                                <froala :id="`disclaimer-editor`"
+                                    :ref="`disclaimerEditor`" 
+                                    :tag="'textarea'" 
+                                    :config="disclaimerConfig" v-model="formData.Disclaimer">
+                                </froala>
+                            </div>
+                            <ConfigAnnotation picHintText="" picName="Disclaimer" @showImage="previewImage"/>
                         </el-form-item>
-                        <el-form-item label="团队名称" prop="PptTeamName" class="inline-form-item">
-                            <el-input type="text" v-model="formData.PptTeamName"></el-input>
+
+                        <el-form-item label="中文研报分享抬头" prop="H5ShareName">
+                            <el-input type="text" v-model="formData.H5ShareName" placeholder="请输入中文研报分享抬头" />
+                        </el-form-item>
+                        <el-form-item label="英文研报分享抬头" prop="H5ShareEnName">
+                            <el-input type="text" v-model="formData.H5ShareEnName" placeholder="请输入英文研报分享抬头" />
+                        </el-form-item>
+                        <el-form-item label="关联公众号" prop="WxAppId">
+                            <el-input type="text" v-model.trim="formData.WxAppId" placeholder="请输入AppID" />
                         </el-form-item>
-                        <el-form-item label="字体颜色" prop="PptFontColor" class="inline-form-item">
-                            <el-input type="color" style="width:64px;" v-model="formData.PptFontColor"></el-input>
+                        <el-form-item prop="WxAppSecret">
+                            <el-input type="text" v-model.trim="formData.WxAppSecret" placeholder="请输入AppSecret" />
                         </el-form-item>
-                    </div> -->
-                    
-                    <el-form-item label="PPT封面图" prop="CnPptCoverImgs" style="min-width:400px;">
-                        <div class="input-line" style="display:flex;">
+                        <el-form-item prop="WxId">
+                            <el-input type="text" v-model.trim="formData.WxId" placeholder="请输入原始Id" />
+                        </el-form-item>
+                        <div class="input-hint">注:关联公众号填写时,AppID、AppSecret原始ID均需填写。</div>
+                        <el-form-item  prop="H5ReportShareImg">
                             <ImgUpload 
-                                :imgUrl="formData.CnPptCoverImgs.length===3?formData.CnPptCoverImgs[2]:''"
-                                @showImage="(arr)=>{showImageOrder({list:formData.CnPptCoverImgs,item:arr[0]})}"
-                                @upload="(file)=>handleUploadImage(file,'CnPptCoverImgs')"
-                                @remove="deleteFormImg('CnPptCoverImgs',formData.CnPptCoverImgs.length-1)"
+                                :imgUrl="formData.H5ReportShareImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'H5ReportShareImg')"
+                                @remove="deleteFormImg('H5ReportShareImg')"
                                 />
-                            <ImgThumbnail 
-                                :imgList="formData.CnPptCoverImgs.length===3?formData.CnPptCoverImgs.slice(0,2):formData.CnPptCoverImgs"
-                                @showImage="({item})=>{showImageOrder({list:formData.CnPptCoverImgs,item})}"
-                                @deleteImg="(index)=>{deleteFormImg('CnPptCoverImgs',index)}"/>
-                        </div>
-                        <ConfigAnnotation picName="pptCoverList" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,最多上传三张,建议图片比例:10:7"/>
-                    </el-form-item>
-                    <el-form-item label="PPT背景图" prop="CnPptBackgroundImg">
-                        <ImgUpload 
-                            :imgUrl="formData.CnPptBackgroundImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'CnPptBackgroundImg')"
-                            @remove="deleteFormImg('CnPptBackgroundImg')"
-                            />
-                        <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
-                    </el-form-item>
-                    <el-form-item label="PPT封底图" prop="CnPptBottomImg">
-                        <ImgUpload 
-                            :imgUrl="formData.CnPptBottomImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'CnPptBottomImg')"
-                            @remove="deleteFormImg('CnPptBottomImg')"
-                            />
-                        <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
-                    </el-form-item>
+                            <!-- <ConfigAnnotation picName="OfficialAccountsLogoPic" @showImage="previewImage"
+                                picHintText=""/> -->
+                        </el-form-item>
+                    </div>
                 </div>
-                <div v-if="isShowEnPPT" v-show="pptLang === 'en'" class="ppt-form-item-wrap">
-                    <!-- <div class="inner-input-wrap">
-                        <el-form-item label="公司名称" prop="PptCompanyNameEn" class="inline-form-item">
-                            <el-input type="text" v-model="formData.PptCompanyNameEn"></el-input>
+                <!-- PPT配置 -->
+                <div class="part" v-if="isShowPPT||isShowEnPPT" v-show="partType===3">
+                    <el-radio-group v-model="pptLang" style="margin-bottom: 22px;">
+                        <el-radio-button label="cn">中文PPT</el-radio-button>
+                        <el-radio-button label="en">英文PPT</el-radio-button>
+                    </el-radio-group>
+                    <div v-if="isShowPPT" v-show="pptLang === 'cn'" class="ppt-form-item-wrap">
+                        <!-- <div class="inner-input-wrap">
+                            <el-form-item label="公司名称" prop="PptCompanyName" class="inline-form-item">
+                                <el-input type="text" v-model="formData.PptCompanyName"></el-input>
+                            </el-form-item>
+                            <el-form-item label="团队名称" prop="PptTeamName" class="inline-form-item">
+                                <el-input type="text" v-model="formData.PptTeamName"></el-input>
+                            </el-form-item>
+                            <el-form-item label="字体颜色" prop="PptFontColor" class="inline-form-item">
+                                <el-input type="color" style="width:64px;" v-model="formData.PptFontColor"></el-input>
+                            </el-form-item>
+                        </div> -->
+                        
+                        <el-form-item label="PPT封面图" prop="CnPptCoverImgs" style="min-width:400px;">
+                            <div class="input-line" style="display:flex;">
+                                <ImgUpload 
+                                    :imgUrl="formData.CnPptCoverImgs.length===3?formData.CnPptCoverImgs[2]:''"
+                                    @showImage="(arr)=>{showImageOrder({list:formData.CnPptCoverImgs,item:arr[0]})}"
+                                    @upload="(file)=>handleUploadImage(file,'CnPptCoverImgs')"
+                                    @remove="deleteFormImg('CnPptCoverImgs',formData.CnPptCoverImgs.length-1)"
+                                    />
+                                <ImgThumbnail 
+                                    :imgList="formData.CnPptCoverImgs.length===3?formData.CnPptCoverImgs.slice(0,2):formData.CnPptCoverImgs"
+                                    @showImage="({item})=>{showImageOrder({list:formData.CnPptCoverImgs,item})}"
+                                    @deleteImg="(index)=>{deleteFormImg('CnPptCoverImgs',index)}"/>
+                            </div>
+                            <ConfigAnnotation picName="pptCoverList" @showImage="previewImage"
+                                picHintText="上传格式:png、jpg,最多上传三张,建议图片比例:10:7"/>
+                        </el-form-item>
+                        <el-form-item label="PPT背景图" prop="CnPptBackgroundImg">
+                            <ImgUpload 
+                                :imgUrl="formData.CnPptBackgroundImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'CnPptBackgroundImg')"
+                                @remove="deleteFormImg('CnPptBackgroundImg')"
+                                />
+                            <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
+                                picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
+                        </el-form-item>
+                        <el-form-item label="PPT封底图" prop="CnPptBottomImg">
+                            <ImgUpload 
+                                :imgUrl="formData.CnPptBottomImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'CnPptBottomImg')"
+                                @remove="deleteFormImg('CnPptBottomImg')"
+                                />
+                            <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
+                                picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
                         </el-form-item>
-                        <el-form-item label="团队名称" prop="PptTeamNameEn" class="inline-form-item">
-                            <el-input type="text" v-model="formData.PptTeamNameEn"></el-input>
+                        <el-form-item label="PPT表格" prop="CnPptSheetSize">
+                            <template slot="label">
+                                <span>
+                                    PPT表格
+                                    <el-tooltip class="item" effect="dark" :content="pptSheetTip" placement="top-start">
+                                        <i class="el-icon-warning"/>
+                                    </el-tooltip>
+                                </span>
+                            </template>
+                            <el-select v-model="formData.CnPptSheetSize" style="width:120px;">
+                                <el-option 
+                                    v-for="size in sizeOptions" 
+                                    :key="size.val"
+                                    :label="size.label"
+                                    :value="size.val"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                    <div v-if="isShowEnPPT" v-show="pptLang === 'en'" class="ppt-form-item-wrap">
+                        <!-- <div class="inner-input-wrap">
+                            <el-form-item label="公司名称" prop="PptCompanyNameEn" class="inline-form-item">
+                                <el-input type="text" v-model="formData.PptCompanyNameEn"></el-input>
+                            </el-form-item>
+                            <el-form-item label="团队名称" prop="PptTeamNameEn" class="inline-form-item">
+                                <el-input type="text" v-model="formData.PptTeamNameEn"></el-input>
+                            </el-form-item>
+                            <el-form-item label="字体颜色" prop="PptFontColorEn" class="inline-form-item">
+                                <el-input type="color" style="width:64px;" v-model="formData.PptFontColorEn"></el-input>
+                            </el-form-item>
+                        </div> -->
+                        <el-form-item label="PPT封面图" prop="EnPptCoverImgs" style="min-width:400px;">
+                            <div class="input-line" style="display:flex;">
+                                <ImgUpload 
+                                    :imgUrl="formData.EnPptCoverImgs.length===3?formData.EnPptCoverImgs[2]:''"
+                                    @showImage="(arr)=>{showImageOrder({list:formData.EnPptCoverImgs,item:arr[0]})}"
+                                    @upload="(file)=>handleUploadImage(file,'EnPptCoverImgs')"
+                                    @remove="deleteFormImg('EnPptCoverImgs',formData.EnPptCoverImgs.length-1)"
+                                    />
+                                <ImgThumbnail 
+                                    :imgList="formData.EnPptCoverImgs.length===3?formData.EnPptCoverImgs.slice(0,2):formData.EnPptCoverImgs"
+                                    @showImage="({item})=>{showImageOrder({list:formData.EnPptCoverImgs,item})}"
+                                    @deleteImg="(index)=>{deleteFormImg('EnPptCoverImgs',index)}"/>
+                            </div>
+                            <ConfigAnnotation picName="pptCoverList" @showImage="previewImage"
+                                picHintText="上传格式:png、jpg,最多上传三张,建议图片比例:10:7"/>
                         </el-form-item>
-                        <el-form-item label="字体颜色" prop="PptFontColorEn" class="inline-form-item">
-                            <el-input type="color" style="width:64px;" v-model="formData.PptFontColorEn"></el-input>
+                        <el-form-item label="PPT背景图" prop="EnPptBackgroundImg">
+                            <ImgUpload 
+                                :imgUrl="formData.EnPptBackgroundImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'EnPptBackgroundImg')"
+                                @remove="deleteFormImg('EnPptBackgroundImg')"
+                                />
+                            <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
+                                picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
                         </el-form-item>
-                    </div> -->
-                    <el-form-item label="PPT封面图" prop="EnPptCoverImgs" style="min-width:400px;">
-                        <div class="input-line" style="display:flex;">
+                        <el-form-item label="PPT封底图" prop="EnPptBottomImg">
                             <ImgUpload 
-                                :imgUrl="formData.EnPptCoverImgs.length===3?formData.EnPptCoverImgs[2]:''"
-                                @showImage="(arr)=>{showImageOrder({list:formData.EnPptCoverImgs,item:arr[0]})}"
-                                @upload="(file)=>handleUploadImage(file,'EnPptCoverImgs')"
-                                @remove="deleteFormImg('EnPptCoverImgs',formData.EnPptCoverImgs.length-1)"
+                                :imgUrl="formData.EnPptBottomImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'EnPptBottomImg')"
+                                @remove="deleteFormImg('EnPptBottomImg')"
                                 />
-                            <ImgThumbnail 
-                                :imgList="formData.EnPptCoverImgs.length===3?formData.EnPptCoverImgs.slice(0,2):formData.EnPptCoverImgs"
-                                @showImage="({item})=>{showImageOrder({list:formData.EnPptCoverImgs,item})}"
-                                @deleteImg="(index)=>{deleteFormImg('EnPptCoverImgs',index)}"/>
-                        </div>
-                        <ConfigAnnotation picName="pptCoverList" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,最多上传三张,建议图片比例:10:7"/>
-                    </el-form-item>
-                    <el-form-item label="PPT背景图" prop="EnPptBackgroundImg">
-                        <ImgUpload 
-                            :imgUrl="formData.EnPptBackgroundImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'EnPptBackgroundImg')"
-                            @remove="deleteFormImg('EnPptBackgroundImg')"
-                            />
-                        <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
-                    </el-form-item>
-                    <el-form-item label="PPT封底图" prop="EnPptBottomImg">
-                        <ImgUpload 
-                            :imgUrl="formData.EnPptBottomImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'EnPptBottomImg')"
-                            @remove="deleteFormImg('EnPptBottomImg')"
-                            />
-                        <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
-                            picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
-                    </el-form-item>
+                            <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
+                                picHintText="上传格式:png、jpg,建议图片比例:10:7"/>
+                        </el-form-item>
+                        <el-form-item label="PPT表格" prop="CnPptSheetSize">
+                            <template slot="label">
+                                <span>
+                                    PPT表格
+                                    <el-tooltip class="item" effect="dark" :content="pptSheetTip" placement="top-start">
+                                        <i class="el-icon-warning"/>
+                                    </el-tooltip>
+                                </span>
+                            </template>
+                            <el-select v-model="formData.EnPptSheetSize" style="width:120px;">
+                                <el-option 
+                                    v-for="size in sizeOptions" 
+                                    :key="size.val"
+                                    :label="size.label"
+                                    :value="size.val"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </div>
                 </div>
+
             </div>
         </el-form>
         
@@ -368,6 +442,9 @@ export default {
                 WxAppSecret:'',
                 WxId:'',
                 H5ReportShareImg:'',
+                SmartReportSheetSize: '9',//智能研报表格字号
+                ReportSheetSize: '9',//研报表格字号
+                EnReportSheetSize: '9',//英文研报表格字号
 
                 UseXf:0,//是否启用科大讯飞服务 0否 1是
                 XfAppid:'',
@@ -381,6 +458,8 @@ export default {
                 EnPptCoverImgs:[],//英文ppt封面列表
                 EnPptBackgroundImg:'',//英文ppt背景图
                 EnPptBottomImg:'',//英文ppt封底图
+                CnPptSheetSize: '9',//中文ppt表格字号
+                EnPptSheetSize: '9',//英文ppt表格字号
 
                 WatermarkReport:false,//研报分享水印
 
@@ -483,6 +562,30 @@ export default {
             sectionType:1,//1通用设置 2资源库
 
 
+            reportFromType: [
+                { type:'smartReport',label: '智能研报' },
+                { type:'report',label: '研报列表' },
+                { type:'enReport',label: '英文研报' },
+            ],
+            pptSheetTip: `设置共享表格、时间序列表格、混合表格插入PPT的表格字号`,
+            sizeOptions: [
+                { label:'5',val:'5' },
+                { label:'6',val:'6' },
+                { label:'7',val:'7' },
+                { label:'8',val:'8' },
+                { label:'9',val:'9' },
+                { label:'10',val:'10' },
+                { label:'11',val:'11' },
+                { label:'12',val:'12' },
+                { label:'13',val:'13' },
+                { label:'14',val:'14' },
+                { label:'15',val:'15' },
+                { label:'16',val:'16' },
+                { label:'17',val:'17' },
+                { label:'18',val:'18' },
+            ]
+
+
         };
     },
     computed:{
@@ -737,6 +840,10 @@ export default {
     // padding:30px;
     border-radius: 4px;
     background-color: #fff;
+    .scroll-cont {
+        height: calc(100vh - 310px);
+        overflow-y: auto;
+    }
     .nav-type-box{
         display: flex;
         align-items: center;
@@ -812,6 +919,11 @@ export default {
                 }
             }
         }
+        .flex-wrap {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 10px;
+        }
     }
 }
 </style>