init

src/lang/en.js

@@ -40,4 +40,4 @@ export default {
   Confirm: transformLanguageData(commonLang.Confirm, "en"),
   Table: transformLanguageData(commonLang.Table, "en"),
   MsgPrompt: transformLanguageData(commonLang.MsgPrompt, "en"),
-};
+};

src/lang/langUtils.js

@@ -11,6 +11,5 @@ export function transformLanguageData(originalObject, targetLanguage) {
       transformedData[key] = originalObject[key][targetLanguage];
     }
   }
-console.log(transformedData);
   return transformedData;
 }

src/lang/modules/Slides/commonLang.js

@@ -15,8 +15,12 @@ export const operationsEn = {
   operations_english: "Go to English PPT",
   operations_preview: "Preview and Publish",
   operations_presentation: "Presentation",
-  go_to_publish:'Go to publish',
-  operations_save:'Save',
+  go_to_publish: "Go to publish",
+  operations_save: "Save",
+  operations_insert: "Insert PPT",
+  operations_switch: "Switch template",
+  paste_before_slide: "Paste before this slide",
+  paste_after_slide: "Paste after this slide",
 };
 
 /* 中文 */
@@ -32,6 +36,10 @@ export const operationsZh = {
   operations_english: "转英文PPT",
   operations_preview: "预览发布",
   operations_presentation: "演示",
-  go_to_publish:'去发布',
-  operations_save:'保存',
+  go_to_publish: "去发布",
+  operations_save: "保存",
+  operations_insert: "插入PPT",
+  operations_switch: "切换模板",
+  paste_before_slide: "粘贴到此页前",
+  paste_after_slide: "粘贴到此页后",
 };

src/lang/modules/Slides/index.js

@@ -2,7 +2,7 @@
  * 研报管理--智能PPT
  */
 
-import { litsZh, listEn } from "./pptList";
+import { listZh, listEn } from "./pptList";
 import { presentZh, presentEn } from "./pptPresent";
 import { operationsZh, operationsEn } from "./commonLang";
 /* 英文 */
@@ -14,7 +14,7 @@ export const SlidesEn = {
 
 /* 中文 */
 export const SlidesZh = {
-  ...litsZh,
+  ...listZh,
   ...operationsZh,
   ...presentZh
-};
+};

src/lang/modules/Slides/pptList.js

@@ -3,7 +3,7 @@
  */
 
 /* 英文 */
-export const litsEn = {
+export const listEn = {
   add_ppt_btn: "Add PPT",
   ppt_merge_btn: "Merge PPTs",
   input_ppt_title: "Please input slide title",
@@ -40,7 +40,10 @@ export const litsEn = {
   edit_directory_dlg: "Edit directory",
   name_directory_dlg: "Directory Name",
   input_directory_dlg: "Please Input Directory Name",
-
+  please_input_cover_title: "Please input cover title",
+  please_save_first: "Please save first",
+  re_edit_slide: "Slide",
+  please_re_edit: "content is incomplete, please re-edit!",
 };
 
 /* 中文 */
@@ -81,7 +84,10 @@ export const listZh = {
   edit_directory_dlg: "编辑目录",
   name_directory_dlg: "目录名称",
   input_directory_dlg: "请输入目录名称",
-  
+  please_input_cover_title: "请输入封面标题",
+  please_save_first: "请先保存",
+  re_edit_slide: "第",
+  please_re_edit: "页内容不完整，请重新编辑！",
 };
 
 /**

src/lang/modules/Slides/pptPresent.js

@@ -34,7 +34,8 @@ export const presentEn = {
   outline_element: "Outline settings",
   text_element: "Text settings",
   batch_deletion_successful: "批量删除成功",
-
+  retrieving_ppt_data: "Retrieving PPT data",
+  loading_urgently: "Loading urgently",
 };
 
 /* 中文 */
@@ -69,7 +70,8 @@ export const presentZh = {
   outline_element: "线框设置",
   text_element: "文本设置",
   batch_deletion_successful: "批量删除成功",
-
+  retrieving_ppt_data: "正在获取ppt数据",
+  loading_urgently: "拼命加载中",
 };
 
 /**

src/lang/zh.js

@@ -40,3 +40,4 @@ export default {
   Table: transformLanguageData(commonLang.Table, "zh"),
   MsgPrompt: transformLanguageData(commonLang.MsgPrompt, "zh"),
 };
+console.log(SlidesZh,'--==--');

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

@@ -14,10 +14,10 @@
                          />
                     </span>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item :command="{key:'insertPpt'}">插入PPT</el-dropdown-item>
-                      <el-dropdown-item :command="{key:'changeFormat'}">切换模板</el-dropdown-item>
-                      <el-dropdown-item :disabled="savePagesArrLength===0" :command="{key:'pasteBefore'}">粘贴到此页前</el-dropdown-item>
-                      <el-dropdown-item :disabled="savePagesArrLength===0" :command="{key:'pasteAfter'}">粘贴到此页后</el-dropdown-item>
+                      <el-dropdown-item :command="{key:'insertPpt'}"> {{$t('Slides.operations_insert')}}</el-dropdown-item>
+                      <el-dropdown-item :command="{key:'changeFormat'}">{{$t('Slides.operations_switch')}}</el-dropdown-item>
+                      <el-dropdown-item :disabled="savePagesArrLength===0" :command="{key:'pasteBefore'}">{{$t('Slides.paste_before_slide')}}</el-dropdown-item>
+                      <el-dropdown-item :disabled="savePagesArrLength===0" :command="{key:'pasteAfter'}">{{$t('Slides.paste_after_slide')}}</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -376,11 +376,7 @@ export default {
       /* selectCatalogId:0,//选择的目录 */
 
       default_tab: '1',
-      panelTabs: [
-        { label: this.$t('Slides.my_ppt_tabs'), key: '1' },
-        { label: this.$t('Slides.share_ppt_tabs'), key: '2' },
-        { label: this.$t('Slides.public_ppt_tabs'), key: '3' },
-      ],
+      
 
       sharedList: [],//共享目录
       sharedExpandKeys: [],//共享ppt目录默认展开的项
@@ -393,6 +389,15 @@ export default {
 
     };
   },
+  computed:{
+    panelTabs(){
+      return [
+        { label: this.$t('Slides.my_ppt_tabs'), key: '1' },
+        { label: this.$t('Slides.share_ppt_tabs'), key: '2' },
+        { label: this.$t('Slides.public_ppt_tabs'), key: '3' },
+      ]
+    } 
+  },
   watch:{
     searchTitle(newVal){
       let data = null

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -362,7 +362,7 @@ export default {
           Keyword:''
         },
         deletePageShow:false,//控制批量删除弹窗是否显示
-        chartLoadingText:'拼命加载中...',
+        chartLoadingText:`${this.$t('Slides.loading_urgently')}...`,
         loopTimer:null,//自动保存标识
 
         search_page: 1,
@@ -409,7 +409,7 @@ export default {
     async init(){
        this.dataLoading = this.$loading({
 					lock: true,
-					text: '正在获取ppt数据...',
+					text: `${this.$t('Slides.retrieving_ppt_data')}...`,
 					spinner: 'el-icon-loading',
 					customClass:'loading',
           target:document.querySelector('.page-wrap'),
@@ -827,7 +827,7 @@ export default {
         }
 
         let temp_elements = null;
-        this.chartLoadingText = '拼命加载中...'
+        this.chartLoadingText = `${this.$t('Slides.loading_urgently')}...`
         // type:sandImage 沙盘图  chart 图表 sheet
         if(type=='chart'){
           //判断选择的图表是否已经插入
@@ -1075,7 +1075,7 @@ export default {
     //保存时的校验规则:封面信息,至少一页
     save_checkPPT(){
       if(!this.firstPage.Title){
-        return {result:false,hintText:'请输入封面标题!'}
+        return {result:false,hintText:this.$t('Slides.please_input_cover_title')+'!'}
       }/* else if(!this.firstPage.ReportType){
         return {result:false,hintText:'请输入ppt类型!'}
       } */
@@ -1088,7 +1088,7 @@ export default {
     checkPPT(){
       //检验首页
       if(!this.firstPage.Title){
-        return {result:false,hintText:'请输入封面标题!'}
+        return {result:false,hintText:this.$t('Slides.please_input_cover_title')+'!'}
       }/* else if(!this.firstPage.ReportType){
         return {result:false,hintText:'请输入ppt类型!'}
       } */
@@ -1110,7 +1110,7 @@ export default {
     },
     async handlePublish(){
       if(!this.isSave){
-        this.$message.warning("请先保存!")
+        this.$message.warning(this.$t('Slides.please_save_first')+'!' )
         return
       }else{
         const {result,hintText} = this.checkPPT()

src/views/ppt_manage/newVersion/pptEnCatalog.vue

@@ -365,11 +365,7 @@ export default {
       /* selectCatalogId:0,//选择的目录 */
 
       default_tab: '1',
-      panelTabs: [
-        { label: this.$t('Slides.my_ppt_tabs'), key: '1' },
-        { label: this.$t('Slides.share_ppt_tabs'), key: '2' },
-        { label: this.$t('Slides.public_ppt_tabs'), key: '3' },
-      ],
+      
 
       sharedList: [],//共享目录
       sharedExpandKeys: [],//共享ppt目录默认展开的项
@@ -382,6 +378,15 @@ export default {
 
     };
   },
+  computed:{
+    panelTabs(){
+      return [
+        { label: this.$t('Slides.my_ppt_tabs'), key: '1' },
+        { label: this.$t('Slides.share_ppt_tabs'), key: '2' },
+        { label: this.$t('Slides.public_ppt_tabs'), key: '3' },
+      ]
+    } 
+  },
   watch:{
     searchTitle(newVal){
         let data = null

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -386,7 +386,7 @@ export default {
           Keyword:''
         },
         deletePageShow:false,//控制批量删除弹窗是否显示
-        chartLoadingText:'拼命加载中...',
+        chartLoadingText:`${this.$t('Slides.loading_urgently')}...`,
         loopTimer:null,//自动保存标识
         currentLang:'en',//语言标识
 
@@ -835,7 +835,7 @@ export default {
         }
 
         let temp_elements = null;
-        this.chartLoadingText = '拼命加载中...'
+        this.chartLoadingText = `${this.$t('Slides.loading_urgently')}...`
         // type:sandImage 沙盘图  chart 图表 sheet
         if(type=='chart'){
 

src/views/ppt_manage/newVersion/pptEnPresent.vue

@@ -280,7 +280,7 @@ export default {
     async init(){
       this.dataLoading = this.$loading({
         lock: true,
-        text: '拼命加载中...',
+        text: `${this.$t('Slides.loading_urgently')}...`,
         spinner: 'el-icon-loading',
         customClass:'loading',
         background: 'rgba(255, 255, 255, 0.8)'

src/views/ppt_manage/newVersion/pptEnPublish.vue

@@ -13,7 +13,7 @@
             <el-dropdown-item :command="3">4:3</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-				<el-button  type="primary" plain style="width:120px;height:40px;" @click="$router.push({path:'/pptenlist'})">返回列表</el-button>
+				<el-button  type="primary" plain style="width:120px;height:40px;" @click="$router.push({path:'/pptenlist'})">{{$t('Slides.return_to_list')}}</el-button>
       </div>
       <!--全加载-->
       <template v-if="loadingAll">
@@ -139,7 +139,7 @@ export default {
       if(this.loadingAll){
         this.dataLoading = this.$loading({
           lock: true,
-          text: '拼命加载中...',
+          text: `${this.$t('Slides.loading_urgently')}...`,
           spinner: 'el-icon-loading',
           customClass:'loading',
           background: 'rgba(255, 255, 255, 0.8)'
@@ -610,11 +610,11 @@ export default {
       //检验每一页
       for(let i=0;i<this.pageList.length;i++){
         if(!this.pageList[i].title){
-          return {result:false,hintText:`第${i+1}页内容不完整,请重新编辑!`}
+          return {result:false,hintText:`${this.$t('Slides.rename_successful')}${i+1}${this.$t('Slides.please_re_edit')}`}
         }
         //无内容
         if(this.pageList[i].elements.length===0){
-          return {result:false,hintText:`第${i+1}页内容不完整,请重新编辑!`}
+          return {result:false,hintText:`${this.$t('Slides.rename_successful')}${i+1}${this.$t('Slides.please_re_edit')}`}
         }
         //有文本框,但是文本框无内容
       }

src/views/ppt_manage/newVersion/pptPresent.vue

@@ -278,7 +278,7 @@ export default {
     async init(){
       this.dataLoading = this.$loading({
         lock: true,
-        text: '拼命加载中...',
+        text: `${this.$t('Slides.loading_urgently')}...`,
         spinner: 'el-icon-loading',
         customClass:'loading',
         background: 'rgba(255, 255, 255, 0.8)'

src/views/ppt_manage/newVersion/pptPublish.vue

@@ -147,7 +147,7 @@ export default {
       if(this.loadingAll){
         this.dataLoading = this.$loading({
           lock: true,
-          text: '拼命加载中...',
+          text: `${this.$t('Slides.loading_urgently')}...`,
           spinner: 'el-icon-loading',
           customClass:'loading',
           background: 'rgba(255, 255, 255, 0.8)'