cxmo 6 months ago
parent
commit
e3425030c2

+ 2 - 2
src/lang/modules/Slides/commonLang.js

@@ -18,7 +18,7 @@ export const operationsEn = {
   operations_presentation: "Presentation",
   go_to_publish: "Go to publish",
   operations_save: "Save",
-  operations_reflash:"Refresh",
+  operations_refresh:"Refresh",
   operations_insert: "Insert PPT",
   operations_switch: "Switch template",
   paste_before_slide: "Paste before this slide",
@@ -50,7 +50,7 @@ export const operationsZh = {
   operations_presentation: "演示",
   go_to_publish: "去发布",
   operations_save: "保存",
-  operations_reflash:"一键刷新",
+  operations_refresh:"一键刷新",
   operations_insert: "插入PPT",
   operations_switch: "切换模板",
   paste_before_slide: "粘贴到此页前",

+ 4 - 4
src/lang/modules/Slides/pptPresent.js

@@ -35,8 +35,8 @@ export const presentEn = {
   text_element: "Text settings",
   batch_deletion_successful: "Batch deletion successfu",
   retrieving_ppt_data: "Retrieving PPT data",
-  reflash_ppt_el:"Refreshing the charts and tables in the PPT...",
-  reflash_ppt_hint:"Charts and tables have not been added and cannot be refreshed",
+  refresh_ppt_el:"Refreshing the charts and tables in the PPT...",
+  refresh_ppt_hint:"Charts and tables have not been added and cannot be refreshed",
   loading_urgently: "Loading urgently",
   convert_to_report_dlg: "PPT convert to report",
   report_type_select: "Report type",
@@ -128,8 +128,8 @@ export const presentZh = {
   text_element: "文本设置",
   batch_deletion_successful: "批量删除成功",
   retrieving_ppt_data: "正在获取ppt数据",
-  reflash_ppt_el:"正在刷新PPT内图表和表格...",
-  reflash_ppt_hint:"还未添加图表和表格,无法刷新",
+  refresh_ppt_el:"正在刷新PPT内图表和表格...",
+  refresh_ppt_hint:"还未添加图表和表格,无法刷新",
   loading_urgently: "拼命加载中",
   convert_to_report_dlg: "PPT转报告",
   report_type_select: "报告类型",

+ 21 - 21
src/views/ppt_manage/mixins/pptEditorMixins.js

@@ -23,8 +23,8 @@ export default{
       lastSaveTime:'',//自动保存时间
       isSaved:false,//是否已点击了保存/发布
 
-      reflashLoading:null,//一键刷新的loading
-      reflashBtnLoading:false,//一键刷新的按钮loading
+      refreshLoading:null,//一键刷新的loading
+      refreshBtnLoading:false,//一键刷新的按钮loading
     }
   },
   directives: {
@@ -288,8 +288,8 @@ export default{
         //渲染图表
         await this.initCharts(chartElements, page); */
 
-        chartElements.length&&await this.reflashPageChart(chartElements,page)
-        SheetElements.length&&await this.reflashPageSheet(SheetElements,page)
+        chartElements.length&&await this.refreshPageChart(chartElements,page)
+        SheetElements.length&&await this.refreshPageSheet(SheetElements,page)
         page.isUpdating = false
         //this.$message.success(this.$t('MsgPrompt.refresh_success_msg'))
         this.pageList.splice(index,1,page)
@@ -297,10 +297,10 @@ export default{
         this.autoSave()
     },
     //更新图表
-    async reflashPageChart(chartElements,page){
+    async refreshPageChart(chartElements,page){
         const codeArr = [...new Set (chartElements.map(i=>i.chartId))]
         //改成批量刷新图表的接口
-        await this.reflashCharts(codeArr,'',Date.now().toString().slice(-6))
+        await this.refreshCharts(codeArr,'',Date.now().toString().slice(-6))
         //重新获取图表数据
         for(let i=0;i<chartElements.length;i++){
             await this.getchartData(chartElements[i].chartId);
@@ -316,9 +316,9 @@ export default{
         await this.initCharts(chartElements, page);
     },
     //更新表格
-    async reflashPageSheet(sheetElements,page){
+    async refreshPageSheet(sheetElements,page){
         const codeArr = [...new Set (sheetElements.map(i=>i.sheetId))]
-        await this.reflashSheets(codeArr,'',Date.now().toString().slice(-6))
+        await this.refreshSheets(codeArr,'',Date.now().toString().slice(-6))
         //重新获取表格数据
         for(let i=0;i<sheetElements.length;i++){
             await this.getsheetData(sheetElements[i].sheetId);
@@ -438,10 +438,10 @@ export default{
     //一键刷新 图表/表格
     async refleshFormatEl(){
         //全局遮罩,按钮禁用
-        this.reflashBtnLoading = true
-        this.reflashLoading = this.$loading({
+        this.refreshBtnLoading = true
+        this.refreshLoading = this.$loading({
             lock: true,
-            text: `${this.$t('Slides.reflash_ppt_el')}...`,
+            text: `${this.$t('Slides.refresh_ppt_el')}...`,
             spinner: 'el-icon-loading',
             customClass:'loading',
             target:document.querySelector('.page-wrap'),
@@ -449,16 +449,16 @@ export default{
         });
         //刷新图表
         let chartArr = this.getPPTElIds('chart','chartId')
-        chartArr.length&&await this.reflashCharts(chartArr,this.$route.query.id,Date.now().toString().slice(-6))
+        chartArr.length&&await this.refreshCharts(chartArr,this.$route.query.id,Date.now().toString().slice(-6))
         //刷新表格
         let sheetArr = this.getPPTElIds('sheet','sheetId')
-        sheetArr.length&&await this.reflashSheets(sheetArr,this.$route.query.id,Date.now().toString().slice(-6))
-        this.reflashLoading&&this.reflashLoading.close()
+        sheetArr.length&&await this.refreshSheets(sheetArr,this.$route.query.id,Date.now().toString().slice(-6))
+        this.refreshLoading&&this.refreshLoading.close()
         if(!chartArr.length&&!sheetArr.length){
-            this.reflashBtnLoading = false
-            return this.$message.warning(this.$t('Slides.reflash_ppt_hint'))
+            this.refreshBtnLoading = false
+            return this.$message.warning(this.$t('Slides.refresh_ppt_hint'))
         }
-        this.reflashLoading = this.$loading({
+        this.refreshLoading = this.$loading({
             lock: true,
             text: `${this.$t('Slides.retrieving_ppt_data')}...`,
             spinner: 'el-icon-loading',
@@ -495,8 +495,8 @@ export default{
         }
         this.$store.commit('SET_CHART_INFO_MAP',chartInfoMap)
         //移除遮罩,按钮启用
-        this.reflashLoading&&this.reflashLoading.close()
-        this.reflashBtnLoading = false
+        this.refreshLoading&&this.refreshLoading.close()
+        this.refreshBtnLoading = false
     },
     getPPTElIds(type,typeKey){
         let code_arr = []
@@ -509,7 +509,7 @@ export default{
         }
         return [...new Set(code_arr)]
     },
-    async reflashCharts(code_arr,id,replaceId){
+    async refreshCharts(code_arr,id,replaceId){
         //获取所有图表code
         let res = await dataBaseInterface.getReportrefreshStatus({
             Source:this.currentLang==='en'?'en_ppt':'ppt',
@@ -524,7 +524,7 @@ export default{
         if(Ret!==200) return 
         this.$message.success(Msg)
     },
-    async reflashSheets(code_arr,id,replaceId){
+    async refreshSheets(code_arr,id,replaceId){
         let res = await sheetInterface.getRefreshResult({
             Source:this.currentLang==='en'?'en_ppt':'ppt',
             PrimaryId: Number(id||replaceId)

+ 2 - 2
src/views/ppt_manage/newVersion/pptEditor.vue

@@ -113,7 +113,7 @@
                 style="color: #666; margin-bottom: 15px"
             >最近保存时间:{{lastSaveTime}}</div>
             <div class="tool-btn">
-                <el-button type="primary" :loading="reflashBtnLoading" @click="refleshFormatEl">{{$t('Slides.operations_reflash')}}</el-button>
+                <el-button type="primary" :loading="refreshBtnLoading" @click="refleshFormatEl">{{$t('Slides.operations_refresh')}}</el-button>
                 <el-button v-permission="permissionBtn.pptPermission.ppt_publish"
                  type="primary" @click="handlePublish">{{$t('Slides.go_to_publish')}}</el-button>
                 <el-button @click="handleSave('save')">{{$t('Slides.operations_save')}}</el-button>
@@ -1093,7 +1093,7 @@ export default {
       if(!this.$route.query.id&&!this.pptId) return
       this.loopTimer = setInterval(()=>{
         //如果当前在刷新图表,则不进行自动保存
-        if(this.reflashBtnLoading) return
+        if(this.refreshBtnLoading) return
         const ppt_id = this.$route.query.id||this.pptId
         const {Title,ReportType,PptDate,BackgroundImg,BackIndex} = this.firstPage
         const FirstPage = {

+ 2 - 2
src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -110,7 +110,7 @@
                 style="color: #666; margin-bottom: 15px"
             >最近保存时间:{{lastSaveTime}}</div>
             <div class="tool-btn">
-                <el-button type="primary" :loading="reflashBtnLoading" @click="refleshFormatEl">{{$t('Slides.operations_reflash')}}</el-button>
+                <el-button type="primary" :loading="refreshBtnLoading" @click="refleshFormatEl">{{$t('Slides.operations_refresh')}}</el-button>
                 <el-button v-permission="permissionBtn.enPPTPermission.pptEn_publish"
                  type="primary" @click="handlePublish">{{$t('Slides.go_to_publish')}}</el-button>
                 <el-button @click="handleSave('save')">{{$t('Slides.operations_save')}}</el-button>
@@ -1081,7 +1081,7 @@ export default {
       if(!this.$route.query.id&&!this.pptId) return
       this.loopTimer = setInterval(()=>{
         //如果当前在刷新图表,则不进行自动保存
-        if(this.reflashBtnLoading) return
+        if(this.refreshBtnLoading) return
         const ppt_id = this.$route.query.id||this.pptId
         const {Title,ReportType,PptDate,BackgroundImg,BackIndex} = this.firstPage
         const FirstPage = {