Merge branch 'eta1.7.5'

src/lang/modules/systemManage/BaseConfig.js

@@ -35,6 +35,11 @@ export const BaseConfigEn = {
     connect_wx:'Associated Public Account',
     wx_original_id:'Please Enter Original ID',
     wx_original_tips:'Note: When filling in associated public account, AppID, AppSecret and original ID must all be provided. ',
+    report_sheet_size:'Report Table Font',
+    report_type1:'Smart Report',
+    report_type2:'Report list',
+    report_type3:'English Report',
+    report_sheet_tip: 'Set the font size for shared tables, time series tables, and mixed tables when inserting into research reports',
 
     ppt_zh:'Chinese PPT',
     ppt_en:'English PPT',
@@ -44,6 +49,8 @@ export const BaseConfigEn = {
     ppt_tip01:'Upload Format: png, jpg. Maximum of three images can be uploaded, recommended image ratio: 10:7',
     ppt_tip02:'Upload Format: png, jpg. Recommended image ratio: 10:7',
     ppt_tip03:'Upload Format: png, jpg. Recommended image ratio: 10:7',
+    ppt_sheet:' PPT Table',
+    ppt_sheet_tip: 'Set the font size for shared tables, time series tables, and mixed tables when inserting into PPT',
 
     resource_placeholder01:'Please enter the image name',
     resource_placeholder02:'Please select the image type',
@@ -96,6 +103,11 @@ export const BaseConfigZh = {
     connect_wx:'关联公众号',
     wx_original_id:'请输入原始Id',
     wx_original_tips:'注：关联公众号填写时，AppID、AppSecret原始ID均需填写。',
+    report_sheet_size:'研报表格字体',
+    report_type1:'智能研报',
+    report_type2:'研报列表',
+    report_type3:'英文研报',
+    report_sheet_tip: '设置共享表格、时间序列表格、混合表格插入研报的表格字号',
 
     ppt_zh:'中文PPT',
     ppt_en:'英文PPT',
@@ -105,6 +117,8 @@ export const BaseConfigZh = {
     ppt_tip01:'上传格式：png、jpg，最多上传三张，建议图片比例：10:7',
     ppt_tip02:'上传格式：png、jpg，建议图片比例：10:7',
     ppt_tip03:'上传格式：png、jpg，建议图片比例：10:7',
+    ppt_sheet:'PPT表格',
+    ppt_sheet_tip: '设置共享表格、时间序列表格、混合表格插入PPT的表格字号',
 
     resource_placeholder01:'请输入图片名称',
     resource_placeholder02:'请选择图片类型',

src/views/ppt_manage/mixins/pptMixins.js

@@ -50,6 +50,7 @@ export default {
       pptCoverDepartName:'',//封面部门名称 ETA1.4.9后不再使用
       pptCoverTextColor:'',//控制上面两个字段展示的颜色 ETA1.4.9后不再使用
       pptCoverContent:'',//自定义封面页的内容
+      pptSheetSize:'',//ppt内嵌表格的字号
 
 
       setEnName:false,
@@ -118,8 +119,8 @@ export default {
     async getpptConfig(){
         const res = await etaBaseConfigInterence.getBaseConfig()
         if(res.Ret!==200) return 
-        const {CnPptCoverImgs,CnPptBackgroundImg,CnPptBottomImg,PptCompanyName,PptTeamName,PptFontColor,
-               EnPptCoverImgs,EnPptBackgroundImg,EnPptBottomImg,PptCompanyNameEn,PptTeamNameEn,PptFontColorEn
+        const {CnPptCoverImgs,CnPptBackgroundImg,CnPptBottomImg,PptCompanyName,PptTeamName,PptFontColor,CnPptSheetSize,
+               EnPptCoverImgs,EnPptBackgroundImg,EnPptBottomImg,PptCompanyNameEn,PptTeamNameEn,PptFontColorEn,EnPptSheetSize
               } = res.Data
         if(this.currentLang==='en'){
             this.pptCoverList = EnPptCoverImgs.split(',')
@@ -128,6 +129,7 @@ export default {
             this.pptCoverCompenyName = PptCompanyNameEn
             this.pptCoverDepartName = PptTeamNameEn
             this.pptCoverTextColor = PptFontColorEn
+            this.pptSheetSize = EnPptSheetSize
         }else{
             this.pptCoverList = CnPptCoverImgs.split(',')
             this.pptBgImage = CnPptBackgroundImg
@@ -135,6 +137,7 @@ export default {
             this.pptCoverCompenyName = PptCompanyName
             this.pptCoverDepartName = PptTeamName
             this.pptCoverTextColor = PptFontColor
+            this.pptSheetSize = CnPptSheetSize
         }
     },
     //获取ppt详情

src/views/ppt_manage/newVersion/components/formatEl/SheetEl.vue

@@ -4,16 +4,36 @@
   <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:${$parent.$parent.pptSheetSize}px`" cellpadding="0" cellspacing="0">
       <tbody>
         <tr v-for="(row,rowIndex) in tableData" :key="rowIndex">
           <td v-for="(col,colIndex) in row" 
               :key="colIndex"
               :rowspan="col.mc.rs===0?1:col.mc.rs"
-              :colspan="col.mc.cs===0?1:col.mc.cs">
-            <div>{{col.m}}</div>
+              :colspan="col.mc.cs===0?1:col.mc.cs"
+              :style="`
+                color: ${col.fc};
+                font-weight: ${col.bl ? 'bold' : 'normal'};
+                font-style: ${col.it ? 'italic' : 'normal'};
+                background: ${col.bg||'transparent'};
+              `"
+          >
+            <!-- 单元格拆分 -->
+            <div class="split-word" v-if="col.ct.s">
+              <span 
+                v-for="(word,word_index) in col.ct.s" 
+                :key="`${rowIndex}_${colIndex}_${word_index}`"
+                :style="`
+                  color: ${word.fc};
+                  font-weight: ${word.bl ? 'bold' : 'normal'};
+                  font-style: ${word.it ? 'italic' : 'normal'};
+                `"
+              >{{word.v}}</span>
+            </div>
+            <div v-else>{{col.m}}</div>
           </td>
         </tr>
       </tbody>
@@ -68,11 +88,17 @@ export default {
 .table-wrap{
   /* overflow: auto; */
   table{
-    width:100%;
+    width:99%;
+    table-layout: auto;
     td{
+        width: auto;
+        height: auto;
 			/* 	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;
 			}
   }

src/views/ppt_manage/newVersion/utils/untils.js

@@ -623,7 +623,11 @@ export const getTableData = (data)=>{
       const cell = row[j]
       let cellOptions = {
         colspan:cell.mc.cs===0?1:cell.mc.cs,
-        rowspan:cell.mc.rs===0?1:cell.mc.rs
+        rowspan:cell.mc.rs===0?1:cell.mc.rs,
+        color: cell.fc?cell.fc.substring(1):'333',
+        fill: cell.bg ? cell.bg.substring(1):'',
+        bold: cell.bl ? true : false,
+        italic: cell.it ? true : false,
       }
         _row.push({
           text:cell.m,

src/views/report_manage/mixins/reportMixin.js

@@ -259,11 +259,17 @@ export default {
     /* 插入表格 */
     insertSheet(item) {
       const LINK_URL = this.$setting.dynamicOutLinks.ChartViewUrl+'/sheetshow';
+      let sceneMap = {
+        '/addreportNew': 2,
+        '/editreportNew': 2,
+        '/reportEnEditor': 3
+      }
+      let scene = sceneMap[this.$route.path]
       this.$nextTick(() => {
         this.editor.html.insert(
           `<p style='text-align:left; margin-top:10px;'>
             <iframe 
-              src='${LINK_URL}?code=${item.UniqueCode}' 
+              src='${LINK_URL}?code=${item.UniqueCode}&fromScene=${scene}' 
               width='100%' 
               class='iframe${item.UniqueCode}' 
               style='border-width:0px;'

src/views/smartReport/components/ETASheet.vue

@@ -60,7 +60,7 @@ export default {
             const obj={
                 compId:4,
                 compType:'sheet',
-                content:`${LINK_URL}?code=${item.UniqueCode}`
+                content:`${LINK_URL}?code=${item.UniqueCode}&fromScene=1`
             }
             return JSON.stringify(obj)
         },

src/views/system_manage/etaBaseConfig.vue

@@ -23,301 +23,379 @@
                     <el-button type="primary"  style="margin-left:20px;width:120px;" @click="saveBaseConfig">{{$t('Dialog.confirm_save_btn')}}</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="$t('SystemManage.BaseConfig.email_tem')" prop="LoginEmailTemplateSubject" >
+                            <div class="form-item-type-two">
+                                <el-input type="text" v-model="formData.LoginEmailTemplateSubject" :placeholder="$t('SystemManage.BaseConfig.email_placeholder')" >
+                                    <template slot="suffix">
+                                            <el-tooltip :content="$t('SystemManage.BaseConfig.email_tips')" 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="$t('SystemManage.BaseConfig.email_tem')" prop="LoginEmailTemplateSubject" >
-                        <div class="form-item-type-two">
-                            <el-input type="text" v-model="formData.LoginEmailTemplateSubject" :placeholder="$t('SystemManage.BaseConfig.email_placeholder')" >
-                                <template slot="suffix">
-                                        <el-tooltip :content="$t('SystemManage.BaseConfig.email_tips')" 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="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
-                    </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="$t('SystemManage.BaseConfig.company_name')" prop="CompanyName">
-                        <el-input type="text" v-model="formData.CompanyName" :placeholder="$t('SystemManage.BaseConfig.company_name_placeholder')" />
-                        <ConfigAnnotation picHintText="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="CompanyName" @showImage="previewImage"/>
-                    </el-form-item>
-                    <el-form-item :label="$t('SystemManage.BaseConfig.compay_mark')" 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: 140px;display:flex;gap:0 20px">
-                            <el-checkbox-group v-if="isShowYBChart"
-                                v-model="checkList" >
-                                <el-checkbox label="研报图表">{{$t('SystemManage.BaseConfig.report_chart')}}</el-checkbox>
-                            </el-checkbox-group>
-                            <div v-if="isShowYBShare">
-                                <el-checkbox label="研报分享" v-model="formData.WatermarkReport">{{$t('SystemManage.BaseConfig.report_share')}}</el-checkbox>
-                                <el-tooltip 
-                                    effect="dark" 
-                                    :content="$t('SystemManage.BaseConfig.report_share_tips')" 
-                                    placement="top"
-                                >
-                                    <i class="el-icon-warning"></i>
-                                </el-tooltip>
+                                    </template>
+                                </el-input>
                             </div>
-                            
-                        </div>
-                        <ConfigAnnotation :picHintText="$t('SystemManage.BaseConfig.upload_format')" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="CompanyWatermark" @showImage="previewImage"/>
-                    </el-form-item>
-                    <el-form-item :label="$t('SystemManage.BaseConfig.disclaimer')" 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="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="Disclaimer" @showImage="previewImage"/>
-                    </el-form-item>
-                    <div v-if="isShowXunFei">
-                        <!-- 科大讯飞 -->
-                        <div style="width:100%;">
-                            <span style="color:#606266;">{{$t('SystemManage.BaseConfig.iFLYTEK_service')}}</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="$t('SystemManage.BaseConfig.please_enter')+'APPID'" />
-                            </el-form-item>
-                            <el-form-item label="APIKey" prop="XfApiKey">
-                                <el-input type="text" v-model="formData.XfApiKey" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'APIKey'" />
-                            </el-form-item>
-                            <el-form-item label="APISecret" prop="XfApiSecret">
-                                <el-input type="text" v-model="formData.XfApiSecret" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'APISecret'" />
-                            </el-form-item>
-                            <el-form-item label="vcn(voice_name)" prop="XfVcn">
-                                <el-input type="text" v-model="formData.XfVcn" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'voice_name'" />
-                            </el-form-item>
-                        </template>
+                            <ConfigAnnotation picName="emailContentTemplate" @showImage="previewImage" picHintText="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
+                        </el-form-item>
                     </div>
-                    <!-- 研报审批 -->
-                    <div v-if="isShowApprove">
-                        <div style="width:100%;margin-bottom: 20px;">
-                            <span style="color:#606266;">{{$t('SystemManage.BaseConfig.report_approval')}}</span> 
-                            <el-switch v-model="approve"></el-switch>
+                    <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="$t('SystemManage.BaseConfig.company_name')" prop="CompanyName">
+                            <el-input type="text" v-model="formData.CompanyName" :placeholder="$t('SystemManage.BaseConfig.company_name_placeholder')" />
+                            <ConfigAnnotation picHintText="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="CompanyName" @showImage="previewImage"/>
+                        </el-form-item>
+                        <el-form-item :label="$t('SystemManage.BaseConfig.compay_mark')" 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: 140px;display:flex;gap:0 20px">
+                                <el-checkbox-group v-if="isShowYBChart"
+                                    v-model="checkList" >
+                                    <el-checkbox label="研报图表">{{$t('SystemManage.BaseConfig.report_chart')}}</el-checkbox>
+                                </el-checkbox-group>
+                                <div v-if="isShowYBShare">
+                                    <el-checkbox label="研报分享" v-model="formData.WatermarkReport">{{$t('SystemManage.BaseConfig.report_share')}}</el-checkbox>
+                                    <el-tooltip 
+                                        effect="dark" 
+                                        :content="$t('SystemManage.BaseConfig.report_share_tips')" 
+                                        placement="top"
+                                    >
+                                        <i class="el-icon-warning"></i>
+                                    </el-tooltip>
+                                </div>
+                                
+                            </div>
+                            <ConfigAnnotation :picHintText="$t('SystemManage.BaseConfig.upload_format')" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="CompanyWatermark" @showImage="previewImage"/>
+                        </el-form-item>
+
+                        <el-form-item>
+                            <template slot="label">
+                                <span><!-- 研报表格字体 -->{{$t('SystemManage.BaseConfig.report_sheet_size')}}</span>
+                                <el-tooltip class="item" effect="dark" :content="ReportSheetTip" placement="top-start">
+                                    <i class="el-icon-warning"/>
+                                </el-tooltip>
+                            </template>
+                            <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;">{{$t('SystemManage.BaseConfig.iFLYTEK_service')}}</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="$t('SystemManage.BaseConfig.please_enter')+'APPID'" />
+                                </el-form-item>
+                                <el-form-item label="APIKey" prop="XfApiKey">
+                                    <el-input type="text" v-model="formData.XfApiKey" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'APIKey'" />
+                                </el-form-item>
+                                <el-form-item label="APISecret" prop="XfApiSecret">
+                                    <el-input type="text" v-model="formData.XfApiSecret" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'APISecret'" />
+                                </el-form-item>
+                                <el-form-item label="vcn(voice_name)" prop="XfVcn">
+                                    <el-input type="text" v-model="formData.XfVcn" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'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">{{$t('SystemManage.BaseConfig.internal_approval')}}</el-radio>
-                                    <el-radio label="other">
-                                        <span>{{$t('SystemManage.BaseConfig.third_approval')}}</span>
-                                        <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.BaseConfig.third_approval_tips')" >
-                                            <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;">{{$t('SystemManage.BaseConfig.report_approval')}}</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">{{$t('SystemManage.BaseConfig.internal_approval')}}</el-radio>
+                                        <el-radio label="other">
+                                            <span>{{$t('SystemManage.BaseConfig.third_approval')}}</span>
+                                            <el-tooltip effect="dark" placement="top" :content="$t('SystemManage.BaseConfig.third_approval_tips')" >
+                                                <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="$t('SystemManage.BaseConfig.report_share_title_zh')" prop="H5ShareName">
-                        <el-input type="text" v-model="formData.H5ShareName" :placeholder="$t('SystemManage.BaseConfig.report_share_title_zh_placeholder')" />
-                    </el-form-item>
-                    <el-form-item :label="$t('SystemManage.BaseConfig.report_share_title_en')" prop="H5ShareEnName">
-                        <el-input type="text" v-model="formData.H5ShareEnName" :placeholder="$t('SystemManage.BaseConfig.report_share_title_en_placeholder')" />
-                    </el-form-item>
-                    <el-form-item :label="$t('SystemManage.BaseConfig.connect_wx')" prop="WxAppId">
-                        <el-input type="text" v-model.trim="formData.WxAppId" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'AppID'" />
-                    </el-form-item>
-                    <el-form-item prop="WxAppSecret">
-                        <el-input type="text" v-model.trim="formData.WxAppSecret" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'AppSecret'" />
-                    </el-form-item>
-                    <el-form-item prop="WxId">
-                        <el-input type="text" v-model.trim="formData.WxId" :placeholder="$t('SystemManage.BaseConfig.wx_original_id')" />
-                    </el-form-item>
-                    <div class="input-hint">{{$t('SystemManage.BaseConfig.wx_original_tips')}}</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">{{$t('SystemManage.BaseConfig.ppt_zh')}}</el-radio-button>
-                    <el-radio-button label="en">{{$t('SystemManage.BaseConfig.ppt_en')}}</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="$t('SystemManage.BaseConfig.disclaimer')" 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="" :buttonText="$t('SystemManage.BaseConfig.view_example_text')" picName="Disclaimer" @showImage="previewImage"/>
+                        </el-form-item>
+                        <el-form-item :label="$t('SystemManage.BaseConfig.report_share_title_zh')" prop="H5ShareName">
+                            <el-input type="text" v-model="formData.H5ShareName" :placeholder="$t('SystemManage.BaseConfig.report_share_title_zh_placeholder')" />
+                        </el-form-item>
+                        <el-form-item :label="$t('SystemManage.BaseConfig.report_share_title_en')" prop="H5ShareEnName">
+                            <el-input type="text" v-model="formData.H5ShareEnName" :placeholder="$t('SystemManage.BaseConfig.report_share_title_en_placeholder')" />
                         </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="$t('SystemManage.BaseConfig.connect_wx')" prop="WxAppId">
+                            <el-input type="text" v-model.trim="formData.WxAppId" :placeholder="$t('SystemManage.BaseConfig.please_enter')+'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="$t('SystemManage.BaseConfig.please_enter')+'AppSecret'" />
                         </el-form-item>
-                    </div> -->
-                    
-                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type01')" 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="$t('SystemManage.BaseConfig.wx_original_id')" />
+                        </el-form-item>
+                        <div class="input-hint">{{$t('SystemManage.BaseConfig.wx_original_tips')}}</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="$t('SystemManage.BaseConfig.ppt_tip01')"
-                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
-                    </el-form-item>
-                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type02')" prop="CnPptBackgroundImg">
-                        <ImgUpload 
-                            :imgUrl="formData.CnPptBackgroundImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'CnPptBackgroundImg')"
-                            @remove="deleteFormImg('CnPptBackgroundImg')"
-                            />
-                        <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
-                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip02')"
-                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
-                    </el-form-item>
-                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type03')" prop="CnPptBottomImg">
-                        <ImgUpload 
-                            :imgUrl="formData.CnPptBottomImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'CnPptBottomImg')"
-                            @remove="deleteFormImg('CnPptBottomImg')"
-                            />
-                        <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
-                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip03')"
-                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
-                    </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">{{$t('SystemManage.BaseConfig.ppt_zh')}}</el-radio-button>
+                        <el-radio-button label="en">{{$t('SystemManage.BaseConfig.ppt_en')}}</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="$t('SystemManage.BaseConfig.ppt_type01')" 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="$t('SystemManage.BaseConfig.ppt_tip01')"
+                                :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                         </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="$t('SystemManage.BaseConfig.ppt_type02')" prop="CnPptBackgroundImg">
+                            <ImgUpload 
+                                :imgUrl="formData.CnPptBackgroundImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'CnPptBackgroundImg')"
+                                @remove="deleteFormImg('CnPptBackgroundImg')"
+                                />
+                            <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
+                                :picHintText="$t('SystemManage.BaseConfig.ppt_tip02')"
+                                :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                         </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="$t('SystemManage.BaseConfig.ppt_type03')" prop="CnPptBottomImg">
+                            <ImgUpload 
+                                :imgUrl="formData.CnPptBottomImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'CnPptBottomImg')"
+                                @remove="deleteFormImg('CnPptBottomImg')"
+                                />
+                            <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
+                                :picHintText="$t('SystemManage.BaseConfig.ppt_tip03')"
+                                :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
                         </el-form-item>
-                    </div> -->
-                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type01')" prop="EnPptCoverImgs" style="min-width:400px;">
-                        <div class="input-line" style="display:flex;">
+                        <el-form-item label="PPT表格" prop="CnPptSheetSize">
+                            <template slot="label">
+                                <span>
+                                    <!-- PPT表格 -->{{$t('SystemManage.BaseConfig.ppt_sheet')}}
+                                    <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="$t('SystemManage.BaseConfig.ppt_type01')" 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="$t('SystemManage.BaseConfig.ppt_tip01')"
+                                :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
+                        </el-form-item>
+                        <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type02')" prop="EnPptBackgroundImg">
                             <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.EnPptBackgroundImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'EnPptBackgroundImg')"
+                                @remove="deleteFormImg('EnPptBackgroundImg')"
                                 />
-                            <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="$t('SystemManage.BaseConfig.ppt_tip01')"
-                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
-                    </el-form-item>
-                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type02')" prop="EnPptBackgroundImg">
-                        <ImgUpload 
-                            :imgUrl="formData.EnPptBackgroundImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'EnPptBackgroundImg')"
-                            @remove="deleteFormImg('EnPptBackgroundImg')"
-                            />
-                        <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
-                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip02')"
-                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
-                    </el-form-item>
-                    <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type03')" prop="EnPptBottomImg">
-                        <ImgUpload 
-                            :imgUrl="formData.EnPptBottomImg"
-                            @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'EnPptBottomImg')"
-                            @remove="deleteFormImg('EnPptBottomImg')"
-                            />
-                        <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
-                            :picHintText="$t('SystemManage.BaseConfig.ppt_tip03')"
-                            :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
-                    </el-form-item>
+                            <ConfigAnnotation picName="pptBgPic" @showImage="previewImage"
+                                :picHintText="$t('SystemManage.BaseConfig.ppt_tip02')"
+                                :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
+                        </el-form-item>
+                        <el-form-item :label="$t('SystemManage.BaseConfig.ppt_type03')" prop="EnPptBottomImg">
+                            <ImgUpload 
+                                :imgUrl="formData.EnPptBottomImg"
+                                @showImage="showImage"
+                                @upload="(file)=>handleUploadImage(file,'EnPptBottomImg')"
+                                @remove="deleteFormImg('EnPptBottomImg')"
+                                />
+                            <ConfigAnnotation picName="pptBackPic" @showImage="previewImage"
+                                :picHintText="$t('SystemManage.BaseConfig.ppt_tip03')"
+                                :buttonText="$t('SystemManage.BaseConfig.view_example_text')"/>
+                        </el-form-item>
+                        <el-form-item label="PPT表格" prop="CnPptSheetSize">
+                            <template slot="label">
+                                <span>
+                                    <!-- PPT表格 -->{{$t('SystemManage.BaseConfig.ppt_sheet')}}
+                                    <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>
@@ -374,6 +452,9 @@ export default {
                 WxAppSecret:'',
                 WxId:'',
                 H5ReportShareImg:'',
+                SmartReportSheetSize: '9',//智能研报表格字号
+                ReportSheetSize: '9',//研报表格字号
+                EnReportSheetSize: '9',//英文研报表格字号
 
                 UseXf:0,//是否启用科大讯飞服务 0否 1是
                 XfAppid:'',
@@ -387,6 +468,8 @@ export default {
                 EnPptCoverImgs:[],//英文ppt封面列表
                 EnPptBackgroundImg:'',//英文ppt背景图
                 EnPptBottomImg:'',//英文ppt封底图
+                CnPptSheetSize: '9',//中文ppt表格字号
+                EnPptSheetSize: '9',//英文ppt表格字号
 
                 WatermarkReport:false,//研报分享水印
 
@@ -488,6 +571,30 @@ export default {
 
             sectionType:1,//1通用设置 2资源库
 
+            reportFromType: [
+                { type:'smartReport',label: /* '智能研报' */ this.$t('SystemManage.BaseConfig.report_type1') },
+                { type:'report',label: /* '研报列表' */this.$t('SystemManage.BaseConfig.report_type2') },
+                { type:'enReport',label: /* '英文研报' */this.$t('SystemManage.BaseConfig.report_type3') },
+            ],
+            pptSheetTip: /* `设置共享表格、时间序列表格、混合表格插入PPT的表格字号` */this.$t('SystemManage.BaseConfig.ppt_sheet_tip'),
+            ReportSheetTip: /* `设置共享表格、时间序列表格、混合表格插入研报的表格字号` */this.$t('SystemManage.BaseConfig.report_sheet_tip'),
+            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' },
+            ]
+
 
         };
     },
@@ -743,6 +850,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;
@@ -818,6 +929,11 @@ export default {
                 }
             }
         }
+        .flex-wrap {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 10px;
+        }
     }
 }
-</style>
+</style>