补充英文翻译

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/newVersion/components/formatEl/SheetEl.vue

@@ -13,8 +13,27 @@
           <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>

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.bg.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/system_manage/etaBaseConfig.vue

@@ -127,7 +127,13 @@
                             <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="研报表格字体">
+                        <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>
@@ -304,7 +310,7 @@
                         <el-form-item label="PPT表格" prop="CnPptSheetSize">
                             <template slot="label">
                                 <span>
-                                    PPT表格
+                                    <!-- PPT表格 -->{{$t('SystemManage.BaseConfig.ppt_sheet')}}
                                     <el-tooltip class="item" effect="dark" :content="pptSheetTip" placement="top-start">
                                         <i class="el-icon-warning"/>
                                     </el-tooltip>
@@ -374,7 +380,7 @@
                         <el-form-item label="PPT表格" prop="CnPptSheetSize">
                             <template slot="label">
                                 <span>
-                                    PPT表格
+                                    <!-- PPT表格 -->{{$t('SystemManage.BaseConfig.ppt_sheet')}}
                                     <el-tooltip class="item" effect="dark" :content="pptSheetTip" placement="top-start">
                                         <i class="el-icon-warning"/>
                                     </el-tooltip>
@@ -566,11 +572,12 @@ export default {
             sectionType:1,//1通用设置 2资源库
 
             reportFromType: [
-                { type:'smartReport',label: '智能研报' },
-                { type:'report',label: '研报列表' },
-                { type:'enReport',label: '英文研报' },
+                { 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的表格字号`,
+            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' },