Merge branch 'lang_dev' of http://8.136.199.33:3000/eta_front/eta_front into lang_dev

src/lang/modules/Slides/commonLang.js

@@ -25,6 +25,10 @@ export const operationsEn = {
   please_delete_existing_chartsmsg: "There is no place left, please delete existing charts/images",
   cover_info: "cover",
   back_cover_info: "Back cover",
+  confirmation_btn: "Confirmation",
+  slide_select: "Slide",
+  to_select: "To",
+  page_select: "Page",
 };
 
 /* 中文 */
@@ -50,4 +54,8 @@ export const operationsZh = {
   please_delete_existing_chartsmsg: "已无位置,请删除现有图表/图片",
   cover_info: "封面",
   back_cover_info: "封底",
+  confirmation_btn: "确认",
+  slide_select: "第",
+  to_select: "至",
+  page_select: "页",
 };

src/lang/modules/Slides/pptList.js

@@ -218,7 +218,7 @@ export const listZh = {
   x_axis_name: "X轴名称",
   es_x_axis_name: "英文X轴名称",
   please_es_x_axis_name: "请输入英文X轴名称",
-  loading_thumbnails: "加载缩略图中",
+  loading_thumbnails: "加载缩略图中...",
 
   drag_and_hold: "按住拖动",
   please_re_edit: "标题/创建人",

src/views/classify_manage/components/PermissionDialog.vue

@@ -20,9 +20,9 @@
     </div>
       <!-- 底部按钮 -->
       <div slot="footer">
-          <el-button type="primary" @click="save">{{$t('Table.confirm_save_btn')}}</el-button>
-          <el-button type="primary" @click="reset" v-if="haveReset">{{$t('Table.reset_btn')}}</el-button>
-          <el-button @click="cancelHandle">{{$t('Table.cancel_btn')}}</el-button>
+          <el-button type="primary" @click="save">{{$t('Dialog.confirm_save_btn')}}</el-button>
+          <el-button type="primary" @click="reset" v-if="haveReset">{{$t('Dialog.reset_btn')}}</el-button>
+          <el-button @click="cancelHandle">{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
   </el-dialog>
 </template>

src/views/dataEntry_manage/dataList.vue

@@ -702,7 +702,7 @@ export default {
                 .then((res) => {
                   if (res.Ret === 200) {
                     this.$message({
-                      message: "插入成功",
+                      message: this.$t('ETable.Msg.insertion_success_msg'),
                       type: "success",
                     });
                     this.page_no = 1;

src/views/datasheet_manage/components/MixedTable.vue

@@ -1093,7 +1093,7 @@ export default {
       this.insertTargetCell.DataTime = '';
       this.insertTargetCell.ShowFormatValue = this.insertTargetCell.ShowStyle ? transDecimalPlace(insertValue,JSON.parse(this.insertTargetCell.ShowStyle)) : '';
 
-      this.$message.success('插入成功')
+      this.$message.success(this.$t('ETable.Msg.insertion_success_msg'))
     },
 
     /* 初始化8行5列 */

src/views/datasheet_manage/components/sheetClassifyDia.vue

@@ -5,7 +5,7 @@
 		:visible.sync="isOpenDialog"
 		:close-on-click-modal="false"
 		:modal-append-to-body='false'
-    	:title="title"
+    	:title="getContentMenuOptText(title)"
 		@close="cancelHandle"
 		custom-class="dialog"
 		center
@@ -20,7 +20,7 @@
 				:model="formData"
 				:rules="formRules">
 				
-          <el-form-item :label="$t('OnlineExcelPage.parent_directory_lable')" prop="classify_name" v-if="formData.parentClassifyId">
+          <el-form-item :label="$t('OnlineExcelPage.parent_directory_lable')" v-if="formData.parentClassifyId">
             <span>{{formData.parentName}}</span>
           </el-form-item>
           <el-form-item :label="$t('Chart.classify_name_label')" prop="classify_name">
@@ -88,6 +88,10 @@ export default {
 		};
 	},
 	methods: {
+		getContentMenuOptText(e){
+			if(e==='添加') return this.$t('Table.add_btn') 
+            return e
+		},
 		async saveHandle() {
 			await this.$refs.diaForm.validate()
       const { classify_name,classify_id }  = this.formData;

src/views/ppt_manage/newVersion/components/editor/DeletePageDialog.vue

@@ -53,23 +53,23 @@
         <div class="select-box">
           <h3>{{$t('Slides.please_select_slide')}}</h3>
           <div class="input-box">
-            第&nbsp;
+            {{$t('Slides.slide_select')}}&nbsp;
               <input type="text"
                       :min="1" :max="pageList.length"
                       v-model.trim="startPageNum" 
                       @input="handleInput('start')"
               />
-              &nbsp;至&nbsp;
+              &nbsp; {{$t('Slides.to_select')}}&nbsp;
               <input type="text"
                       :min="1" :max="pageList.length"
                       v-model.trim="endPageNum"
                       @input="handleInput('end')"
               />
-            &nbsp;页
-            <span style="margin-left:5px; color:#409EFF;cursor:pointer;" @click="checkPage">确认</span>
+            &nbsp;{{$t('Slides.page_select')}}
+            <span style="margin-left:5px; color:#409EFF;cursor:pointer;" @click="checkPage">{{$t('Slides.confirmation_btn')}}</span>
           </div>
           <div class="choose-box">
-            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">{{$t('Common.all_select')}}</el-checkbox>
             <el-checkbox-group v-model="checkedPages" @change="handleCheckedPagesChange">
               <el-checkbox v-for="(page,index) in pageList" :label="index" :key="page.id">{{$i18n.locale == 'zh' ?`第${index+1}页`:` Slide${index+1}`}}&nbsp;&nbsp;{{page.title||'无标题'}}</el-checkbox>
             </el-checkbox-group>
@@ -130,7 +130,7 @@ export default {
       dataLoading:false,//v-loading
       isLoaded:false,//是否已经加载过
       checkBoxList:[],
-      loadingText:'加载缩略图中...'
+     
     };
   },
   watch:{
@@ -330,6 +330,11 @@ export default {
       this.isEndInput = false
     }
   },
+  computed:{
+     loadingText(){
+      return  this.$t('Slides.loading_thumbnails')
+     }
+  }
 };
 </script>
 <style scoped lang="scss">

src/views/ppt_manage/newVersion/components/editor/InsertCharts.vue

@@ -15,7 +15,7 @@
         >
         </el-option>
       </el-select>
-      <el-button type="primary" size="mini" @click="handleImport">一键导入</el-button>
+      <el-button type="primary" size="mini" @click="handleImport">{{$t('ReportManage.ReportList.click_import')}}</el-button>
       <el-tooltip
         class="search-hint"
         effect="dark"

src/views/ppt_manage/newVersion/components/formatPage/mixins.js

@@ -289,9 +289,9 @@ export default {
           console.log('chart_title',chartTitle)
           try{
             copyFit(chartTitle)
-            this.$message.success('复制成功')
+            this.$message.success(/*'复制成功'*/this.$t('MsgPrompt.copy_success_msg'))
           }catch(err){
-            this.$message.error('复制失败')
+            this.$message.error(/*'复制失败'*/this.$t('MsgPrompt.copy_fail_msg'))
           }
         },
         addChart(position){

src/views/report_manage/pdfList.vue

@@ -309,9 +309,9 @@ export default {
         async copyLink(data){
             try{
                 await navigator.clipboard.writeText(data.ShareUrl)
-                this.$message.success('复制成功')
+                this.$message.success(/*'复制成功'*/this.$t('MsgPrompt.copy_success_msg'))
             }catch(err){
-                this.$message.error('复制失败')
+                this.$message.error(/*'复制失败'*/this.$t('MsgPrompt.copy_fail_msg'))
             }
         },
     },

src/views/semantics_manage/semantics/components/addSectionLabelDialog.vue

@@ -163,7 +163,8 @@ export default {
     addTag(){
       //添加成功后，调getLabelList
       if(!this.labelName){
-        this.$message.warning('请输入标签名称')
+        // this.$message.warning('请输入标签名称')
+        this.$message.warning(this.$t('SemanticsManage.TagManagement.input_content') )
         return
       }
       if(this.labelName.length>15){