头两个 ok

src/lang/modules/EtaBase/En.js

@@ -90,9 +90,9 @@ export default {
     label_move_way: 'Moving Mode',
     label_n_val: 'N equals to',
     label_calendar: 'Calendar',
-    label_val_type: '数据取值',
-    val_type_end: '期末值',
-    val_type_average: '平均值',
+    label_val_type: 'Data Retrieval',
+    val_type_end: 'Period-End Value',
+    val_type_average: 'Average Value',
 
     /* 指标拼接弹窗 */
     concat_tab_1:'Direct Splicing',
@@ -121,7 +121,50 @@ export default {
     label_date_tab2: 'Union of Part of Dates',
 
     /* 最新值弹窗 */
-    latest_val: 'latest value'
+    latest_val: 'latest value',
+
+    /* 批量计算弹窗 */
+    title_batch_calc : 'Batch Calc - Select',
+    title_batch_save : 'Batch Save Results',
+    default_select_text : 'Default',
+    mean_imputation_select_text : 'Mean Imputation',
+    formula_example_text : 'Formula Example: A+100, or A*2',
+    formula_example_text_a_b : 'A+B, or A/B, A/(A+B)',
+    formula_lable: "Formula",
+    metric_label_b: "Metric B",
+    alpha_value_lable: "Alpha Value",
+    equal_zeto: "Equal to Zero",
+    sum_radio_label: "Sum",
+    average_radio_label: "Average",
+    pending_metrics: "Pending Metrics (<{num})",
+    label_classify:'Metric Category',
+    select_frequency: "Choose Frequency",
+    table_col_creator:'Creator',
+    label_all_check:'Select All List',
+    full_metric_name:'Full Metric Name',
+    table_col_creator:'Author',
+    add_to_selections:'Add to Selections',
+    serial_num:'Serial Number',
+    search_value_days_options:'Search Nearest Value Within 35 Days Before and After',
+    not_alculate_options:'Do Not Calculate',
+    forward_fill_options:'Forward Fill',
+    backward_fill_options:'Backward Fill',
+    edbTagA:'Metric A',
+    edbTagB:'Metric B',
+    specify_series_label:'Specify Metric Time Series',
+    union_series_label:'Union of All Metric Time Series',
+    numeric_greater_msg:'Please enter a numeric alpha value greater than 0 and less than 1',
+    select_indicator_msg:'Please select indicator B',
+    limit_indicators_msg:'The limit for batch adding indicators has been reached',
+    gen_metric_name_label:'Gen Metric Name',
+    metric_name_input:'Enter Metric Name',
+    catalogue_directory:'Catalogue / Directory',
+    subdirectory_radio:'Subdirectory',
+    directory_radio:'Same Directory',
+    calculating_batch:'Calculating Batch...',
+    complete_information_msg:'Please fill in the complete information',
+    please_which_take_msg:'Please wait for the calculation to complete, which may take 2-3 minutes',
+    
   },
 
   /* 代码运算页面 */

src/lang/modules/EtaBase/Zh.js

@@ -121,8 +121,50 @@ export default {
     label_date_tab2: '部分日期并集',
 
     /* 最新值弹窗 */
-    latest_val: '最新值'
+    latest_val: '最新值',
 
+    /* 批量计算弹窗 */
+    title_batch_calc : '批量计算-选择指标和计算公式',
+    title_batch_save : '批量计算-结果保存',
+    default_select_text : '默认',
+    mean_imputation_select_text : '均值填充',
+    formula_example_text : '公式示例：A+100，或A*2',
+    formula_example_text_a_b : '公式示例：A+B，或A/B，A/(A+B)',
+    formula_lable: "公式",
+    metric_label_b: "指标B",
+    alpha_value_lable: "alpha值",
+    equal_zeto: "等于0",
+    sum_radio_label: "求和",
+    average_radio_label: "求平均",
+    pending_metrics: "待选指标（选择指标数量不超过{num}）",
+    label_classify:'指标分类',
+    select_frequency: "请选择频率",
+    table_col_creator:'创建人',
+    label_all_check:'列表全选',
+    full_metric_name:'指标全称',
+    table_col_creator:'创建人 创建人',
+    add_to_selections:'加入已选指标',
+    serial_num:'序号',
+    search_value_days_options:'查找前后35天最近值',
+    not_alculate_options:'不计算',
+    forward_fill_options:'前值填充',
+    backward_fill_options:'后值填充',
+    edbTagA:'指标A',
+    edbTagB:'指标B',
+    specify_series_label:'指定指标时间序列',
+    union_series_label:'所有指标时间序列并集',
+    numeric_greater_msg:'请输入>0，<1的数值的alpha值',
+    select_indicator_msg:'请选择指标B',
+    limit_indicators_msg:'已达批量添加指标数量上限',
+    gen_metric_name_label:'生成指标名称',
+    metric_name_input:'请填写指标名称',
+    catalogue_directory:'目录',
+    subdirectory_radio:'分目录',
+    directory_radio:'同目录',
+    calculating_batch:'批量计算中...',
+    complete_information_msg:'请填写完整信息',
+    please_which_take_msg:'请等待计算完成,该过程可能持续2-3分钟',
+     
   },
 
   /* 代码运算页面 */

src/lang/modules/EtaBase/commonLang.js

@@ -124,7 +124,10 @@ export default {
     zh:'年数',
     en:'Number of years'
   },
-
+  please_select: {
+    en: "Please select",
+    zh: "请选择",
+  },
 
   /* 指标相关字段 */
   Detail: {
@@ -239,8 +242,7 @@ export default {
     select_catalogue:{
       zh:'所属目录',
       en:'catalogue'
-    }
-
+    },
   },
 
   /* 单位 */
@@ -477,6 +479,34 @@ export default {
       zh: '降频',
       en: 'Downsample or Reduce Frequency'
     },
+    to_monthly_v2: {
+      zh: '转月值',
+      en: 'To Monthly Value'
+    },
+    to_quarterly_v2: {
+      zh: '转季值',
+      en: 'To Quarterly Value'
+    },
+    latest_processing: {
+      zh: '最新值处理',
+      en: 'Latest Value Processing'
+    },
+    compute_w_const: {
+      zh: '与常数计算',
+      en: 'Compute w/ Const'
+    },
+    single_metric_op: {
+      zh: '与单指标计算',
+      en: 'Single Metric Op'
+    },
+    multi_metric: {
+      zh: '多指标求和/平均',
+      en: 'Sum/Avg Multi-Metric'
+    },
+    super_seasonal: {
+      zh: '超级季节性',
+      en: 'Super Seasonal'
+    },
   },
 
   /* 指标添加form提示 */
@@ -672,7 +702,12 @@ export default {
     input_select_edb: {
       zh: '请选择指标',
       en: 'Please select Indicator'
+    },
+    input_n_value: {
+      zh: '请输入N数值',
+      en: 'Enter N Value'
     }
+    
   },
   
   /* 公示说明 */

src/lang/modules/Slides/pptList.js

@@ -114,6 +114,8 @@ export const listEn = {
   is_delete_ppt: "Are you sure you want to delete this PowerPoint slide?",
   add_least_one: "Please add at least one PowerPoint slide.",
   preview_report_btn: "Preview report.",
+  last_save_time: "Last save time",
+
 };
 
 /* 中文 */
@@ -230,4 +232,5 @@ export const listZh = {
   is_delete_ppt: "确定删除该页ppt吗",
   add_least_one: "请至少添加一张",
   preview_report_btn: "预览报告",
+  last_save_time: "最近保存时间",
 };

src/views/dataEntry_manage/databaseComponents/batchComputedSave.vue

@@ -5,10 +5,10 @@
             border 
             height="500px"
         >
-            <el-table-column label="指标全称" align="center" prop="EdbName"/>
-            <el-table-column label="生成指标名称" align="center">
+            <el-table-column :label="$t('EtaBasePage.full_metric_name')" align="center" prop="EdbName"/>
+            <el-table-column :label="$t('EtaBasePage.gen_metric_name_label')" align="center">
                 <template slot-scope="scope">
-                    <el-input :disabled="operationForm.view" v-model="scope.row.name" placeholder="请填写指标名称" style="width:100%"/>
+                    <el-input :disabled="operationForm.view" v-model="scope.row.name" :placeholder="$t('EtaBasePage.metric_name_input')" style="width:100%"/>
                 </template>
             </el-table-column>
             <el-table-column label="单位" align="center" width="200px">
@@ -16,11 +16,11 @@
                     <selectUnit :disabled="operationForm.view||[6].includes(sourceTypeVal)" v-model="scope.row.unit"/>
                 </template>
             </el-table-column>
-            <el-table-column label="频度" align="center" width="200px">
+            <el-table-column :label="$t('Edb.Detail.e_fre')" align="center" width="200px">
                 <template slot-scope="scope">
                     <el-select
 						v-model="scope.row.frequency"
-						placeholder="请选择频率"
+						:placeholder="$t('EtaBasePage.select_frequency')"
                         @change="handleFrequencyChange(scope)"
                         :disabled="operationForm.view||[5,6,14,61,63].includes(sourceTypeVal)"
 					>
@@ -32,14 +32,14 @@
 						>
 						</el-option>
 					</el-select>
-                </template>
+                </template>              
             </el-table-column>
             <el-table-column align="center" width="300px">
                 <template slot="header" slot-scope="scope">
-                    <span style="margin-right:40px;display:inline-block">目录</span>
+                    <span style="margin-right:40px;display:inline-block"> <!-- 目录 -->{{$t('EtaBasePage.catalogue_directory')}}</span>
                     <el-radio-group :disabled="operationForm.view" v-model="classifyType" @change="handleClassifyTypeChange">
-                        <el-radio :label="0">分目录</el-radio>
-                        <el-radio :label="1">同目录</el-radio>
+                        <el-radio :label="0"><!-- 分目录 -->{{$t('EtaBasePage.subdirectory_radio')}}</el-radio>
+                        <el-radio :label="1"><!-- 同目录 -->{{$t('EtaBasePage.directory_radio')}}</el-radio>
                     </el-radio-group>
                 </template>
                 <template slot-scope="{row,$index}">
@@ -47,7 +47,7 @@
 						v-model="row.classify"
 						:options="classifyOpt"
 						:props="levelProps"
-						placeholder="请选择指标目录"
+						:placeholder="$t('Edb.InputHolderAll.input_menu')"
                         :disabled="(classifyType===1&&$index>0)||operationForm.view"
                         @change="handleClassifyChange(row,$index)"
 					/>
@@ -55,8 +55,8 @@
             </el-table-column>
         </el-table>
         <div style="text-align:center;margin:60px 0 40px 0" v-if="!operationForm.view">
-            <el-button type="primary" plain @click="handleClose">取消</el-button>
-            <el-button type="primary" @click="handleSubmit" :loading="loading">{{loading ? '批量计算中...' : '批量计算'}}</el-button>
+            <el-button type="primary" plain @click="handleClose">{{$t('Dialog.cancel_btn')}}</el-button>
+            <el-button type="primary" @click="handleSubmit" :loading="loading">{{loading ? $t('EtaBasePage.calculating_batch') : $t('EtaBasePage.batch_calculate_tab')}}</el-button>
         </div>
     </div>
 </template>
@@ -80,11 +80,39 @@ export default {
             if(!this.computedType) return 0
             if(this.subComputedType) return this.subComputedType
             return ['withNum','withEDB'].includes(this.computedType)?4:this.computedType
+        },
+      frequencyArr (){
+            return [
+                {
+					value: '日度',
+					label: /* '日度'  */this.$t('Edb.FreAll.day'),
+				},
+				{
+					value: '周度',
+					label: /* '周度' */this.$t('Edb.FreAll.week'),
+				},
+				{
+					value: '旬度',
+					label: /* '旬度' */this.$t('Edb.FreAll.dekad'),
+				},
+				{
+					value: '月度',
+					label: /* '月度' */this.$t('Edb.FreAll.month'),
+				},
+				{
+					value: '季度',
+					label: /* '季度' */ this.$t('Edb.FreAll.quarter'),
+				},
+				
+				{
+					value: '年度',
+					label: /* '年度' */ this.$t('Edb.FreAll.year'),
+				}
+            ]
         }
     },
     data() {
         return {
-            frequencyArr: ['日度', '周度','旬度','月度', '季度', '年度'],
 
             list:[],
 
@@ -270,11 +298,11 @@ export default {
             console.log(params);
 
             let isEnough = params.EdbList.every(item => item.EdbName&&item.Unit&&item.ClassifyId&&item.Frequency)
-            if(!isEnough) return this.$message.warning('请填写完整信息');
+            if(!isEnough) return this.$message.warning(/*'请填写完整信息'*/ this.$t('EtaBasePage.complete_information_msg'));
 
             this.loading=true
             const tipMsg=setTimeout(() => {
-                this.$message.success('请等待计算完成,该过程可能持续2-3分钟')
+                this.$message.success(/*''请等待计算完成,该过程可能持续2-3分钟''*/ this.$t('EtaBasePage.please_which_take_msg'))
             }, 500);
             const res=this.isEdit?await dataBaseInterface.batchCalculateTargetEdit(params) : await dataBaseInterface.batchCalculateTargetAdd(params)
             this.loading=false

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -8,14 +8,14 @@
 		center
 		top="5vh"
 		v-dialogDrag
-        :title="showSave?'批量计算-结果保存':'批量计算-选择指标和计算公式'"
+        :title="showSave ? $t('EtaBasePage.title_batch_save') : $t('EtaBasePage.title_batch_calc')"
 	>
         <div class="batch-computed-wrap" v-if="!showSave">
             <el-form inline :disabled="operationForm.view">
             <div class="type-wrap">
                 <div style="margin-right:50px">
-                    <span>计算公式</span>
-                    <el-select :disabled="isEdit" v-model="computedType" @change="handleComputedTypeChange" placeholder="请选择">
+                    <span><!-- 计算公式 -->{{$t('EtaBasePage.calculate_formula')}}</span>
+                    <el-select :disabled="isEdit" v-model="computedType" @change="handleComputedTypeChange" :placeholder="$t('Edb.please_select')">
                         <el-option 
                             v-for="opt in computedBatchTypes" 
                             :key="opt.type" 
@@ -28,40 +28,46 @@
                     <!-- 累计值转月/季值 -->
                     <el-form-item v-if="computedType=='toMonthSeason'">
                         <el-radio-group v-model="subComputedType" @change="handleComputedSubTypeChange">
-                            <el-radio :label="5">转月值</el-radio>
-                            <el-radio :label="61">转季值</el-radio>
+                            <el-radio :label="5">
+                                <!-- 转月值 -->
+                                {{$t('Edb.CalculatesAll.to_monthly_v2')}}
+                            </el-radio>
+                            <el-radio :label="61">
+                                <!-- 转季值 -->
+                                {{$t('Edb.CalculatesAll.to_quarterly_v2')}}
+                            </el-radio>
                         </el-radio-group>
                     </el-form-item>
 
                     <!-- N期移动均值、N期环比值、N期环差值 -->
-                    <el-form-item required v-if="[8,12,13].includes(computedType)" label="N等于" style="width:280px">
-                        <el-input v-model="formData.nNum" placeholder="请输入N数值" type="number" style="width:200px"></el-input>
+                    <el-form-item required v-if="[8,12,13].includes(computedType)" :label="$t('EtaBasePage.label_n_val')" style="width:280px">
+                        <el-input v-model="formData.nNum" :placeholder="$t('Edb.InputHolderAll.input_n_value')" type="number" style="width:200px"></el-input>
                     </el-form-item>
 
                     <!-- 超级季节性 -->
                     <template v-if="computedType==35">
-                    <el-form-item required label="N等于" style="width:280px">
-                        <el-input v-model="formData.nNum" placeholder="请输入N数值" type="number" style="width:200px"></el-input>
+                    <el-form-item required :label="$t('EtaBasePage.label_n_val')" style="width:280px">
+                        <el-input v-model="formData.nNum" :placeholder="$t('Edb.InputHolderAll.input_n_value')" type="number" style="width:200px"></el-input>
                     </el-form-item>
-                    <el-form-item label="日历"  style="width:180px">
+                    <el-form-item :label="$t('EtaBasePage.label_calendar')"  style="width:180px">
                         <el-select v-model="formData.calendarType" style="width:120px">
-                            <el-option label="公历" value="公历"></el-option>
-                            <el-option label="农历" value="农历"></el-option>
+                            <el-option :label="$t('Chart.calendar_gre')" value="公历"></el-option>
+                            <el-option :label="$t('Chart.calendar_lunar')" value="农历"></el-option>
                         </el-select>
                     </el-form-item>
                     </template>
 
                     <!-- 降频 -->
                     <template v-if="computedType==51">
-                    <el-form-item required label="频度" style="width:180px">
+                    <el-form-item required :label="$t('Edb.Detail.e_fre')" style="width:180px">
                         <el-select v-model="formData.frequency" style="width:120px">
-                            <el-option v-for="opt in frequencyArr" :key="opt" :label="opt" :value="opt"></el-option>
+                            <el-option v-for="opt in frequencyArr" :key="opt.value" :label="opt.label" :value="opt.value"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="数据取值"  style="width:200px">
+                    <el-form-item :label="$t('EtaBasePage.label_val_type')"  style="width:200px">
                         <el-select v-model="formData.valueType" style="width:120px">
-                            <el-option key="期末值" label="期末值" value="期末值"/>
-							<el-option key="平均值" label="平均值" value="平均值"/>
+                            <el-option key="期末值" :label="$t('EtaBasePage.val_type_end')" value="期末值"/>
+							<el-option key="平均值" :label="$t('EtaBasePage.val_type_average')" value="平均值"/>
                         </el-select>
                     </el-form-item>
                     </template>
@@ -69,48 +75,57 @@
                     <!-- 累计值 -->
                     <template v-if="computedType=='accumulate'">
                     <el-form-item>
-                        <el-radio v-model="subComputedType" :label="62">累计值</el-radio>
+                        <el-radio v-model="subComputedType" :label="62">
+                            <!-- 累计值 -->
+                            {{$t('Edb.CalculatesAll.cumulate')}}
+                        </el-radio>
                     </el-form-item>
-                    <el-form-item required label="频度" style="width:180px" v-if="subComputedType==62">
+                    <el-form-item required :label="$t('Edb.Detail.e_fre')" style="width:180px" v-if="subComputedType==62">
                         <el-select v-model="formData.frequency" style="width:120px">
-                            <el-option v-for="opt in frequencyArr" :key="opt" :label="opt" :value="opt"></el-option>
+                            <el-option v-for="opt in frequencyArr" :key="opt.value" :label="opt.label" :value="opt.value"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="最新值处理"  style="width:210px" v-if="subComputedType==62">
+                    <el-form-item :label="$t('Edb.CalculatesAll.latest_processing')"  style="width:210px" v-if="subComputedType==62">
                         <el-select v-model="formData.newValue" style="width:120px">
-                            <el-option label="默认" :value="0"/>
-							<el-option label="均值填充" :value="1"/>
+                            <el-option :label="$t('EtaBasePage.default_select_text')" :value="0"/>
+							<el-option :label="$t('EtaBasePage.mean_imputation_select_text')" :value="1"/>
                         </el-select>
                     </el-form-item>
                     <el-form-item>
-                        <el-radio v-model="subComputedType" :label="63">年初至今累计值</el-radio>
+                        <el-radio v-model="subComputedType" :label="63">
+                            <!-- /* '年初至今累计值' */ -->
+                            {{$t('Edb.CalculatesAll.cumulate_oneyear')}}
+                        </el-radio>
                     </el-form-item>
                     </template>
 
                     <!-- 指数修匀 -->
                     <template v-if="computedType==72">
-                    <el-form-item required label="alpha值" style="width:220px">
-                        <el-input v-model.trim="formData.alphaValue" style="width:140px" placeholder="请输入alpha值"></el-input>
+                    <el-form-item required :label="$t('EtaBasePage.alpha_value_lable')" style="width:220px">
+                        <el-input v-model.trim="formData.alphaValue" style="width:140px" :placeholder="$t('Edb.InputHolderAll.input_alpha_val')"></el-input>
                     </el-form-item>
                     </template>
 
                     <!-- 与常数计算 -->
                     <template v-if="computedType=='withNum'">
-                    <el-form-item required label="公式">
-                        <el-input v-model="formData.formula" placeholder="请输入公式" clearable style="width: 200px"/>
-                        <span>公式示例：A+100，或A*2</span>
+                    <el-form-item required :label="$t('EtaBasePage.formula_lable')">
+                        <el-input v-model="formData.formula" :placeholder="$t('EtaBasePage.input_formula_msg')" clearable style="width: 200px"/>
+                        <span>
+                            <!-- 公式示例：A+100，或A*2 -->
+                            {{$t('EtaBasePage.formula_example_text')}}
+                        </span>
                     </el-form-item>
                     </template>
 
                     <!-- 与单指标计算 -->
                     <template v-if="computedType=='withEDB'">
-                    <el-form-item required label="指标B">
+                    <el-form-item required :label="$t('EtaBasePage.metric_label_b')">
                         <el-select
                             v-model="select_target"
                             v-loadMore="searchLoad"
                             :filterable="!select_target"
                             clearable
-                            placeholder="请输入指标名称"
+                            :placeholder="$t('Edb.InputHolderAll.input_name')"
                             style="width: 250px"
                             remote
                             :remote-method="getTarget"
@@ -139,24 +154,27 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item required label="公式">
-                        <el-input v-model="formData.formula" placeholder="请输入公式" clearable style="width: 200px"/>
-                        <span>公式示例：A+B，或A/B，A/(A+B)</span>
+                    <el-form-item required :label="$t('EtaBasePage.formula_lable')">
+                        <el-input v-model="formData.formula" :placeholder="$t('EtaBasePage.input_formula_msg')" clearable style="width: 200px"/>
+                        <span>
+                            <!-- 公式示例：A+B，或A/B，A/(A+B) -->
+                         {{$t('EtaBasePage.formula_example_text_a_b')}}
+                        </span>
                     </el-form-item>
-                    <el-form-item label="生成指标时间序列">
+                    <el-form-item :label="$t('EtaBasePage.create_edb_time_index')">
                         <el-cascader
 							v-model="formData.timeSeriesVal"
 							style="width:180px"
 							:options="timeSeriesOpt"
 							:props="{emitPath:false}"
 							:show-all-levels="false"
-							placeholder="请选择"
+							:placeholder="$t('Edb.please_select')"
 						></el-cascader>
                     </el-form-item>
-                    <el-form-item label="空值处理">
+                    <el-form-item :label="$t('EtaBasePage.null_val_deal')">
                         <el-select
 							v-model="formData.nullValueWay"
-							placeholder="请选择"
+							:placeholder="$t('Edb.please_select')"
                             style="width:180px"
 						>
 							<el-option
@@ -168,12 +186,12 @@
 							</el-option>
 						</el-select>
                     </el-form-item>
-                    <el-form-item label="MAX、MIN空值处理" v-if="showMaxNullDeal">
+                    <el-form-item :label="$t('EtaBasePage.max_null_val')" v-if="showMaxNullDeal">
                         <el-select
 							v-model="formData.maxNullWay"
-							placeholder="请选择"
+							:placeholder="$t('Edb.please_select')"
 						>
-							<el-option label="等于0" :value="1" />
+							<el-option :label="$t('EtaBasePage.equal_zeto')" :value="1" />
 							<el-option label="跳过空值" :value="2" />
 						</el-select>
                     </el-form-item>
@@ -183,24 +201,24 @@
                     <template v-if="computedType=='multipleEDB'">
                     <el-form-item style="margin-right:30px">
                     <el-radio-group :disabled="isEdit" v-model="subComputedType">
-                        <el-radio :label="81">求和</el-radio>
-                        <el-radio :label="82">求平均</el-radio>
+                        <el-radio :label="81"><!--  -->{{$t('EtaBasePage.sum_radio_label')}}</el-radio>
+                        <el-radio :label="82"><!-- 求平均 -->{{$t('EtaBasePage.average_radio_label')}}</el-radio>
                     </el-radio-group>
                     </el-form-item>
-                    <el-form-item label="生成指标时间序列">
+                    <el-form-item :label="$t('EtaBasePage.create_edb_time_index')">
                         <el-cascader
 							v-model="formData.timeSeriesVal"
 							style="width:180px"
 							:options="timeSeriesOpt"
 							:props="{emitPath:false}"
 							:show-all-levels="false"
-							placeholder="请选择"
+							:placeholder="$t('Edb.please_select')"
 						></el-cascader>
                     </el-form-item>
-                    <el-form-item label="空值处理">
+                    <el-form-item :label="$t('EtaBasePage.null_val_deal')">
                         <el-select
 							v-model="formData.nullValueWay"
-							placeholder="请选择"
+							:placeholder="$t('Edb.please_select')"
                             style="width:180px"
 						>
 							<el-option
@@ -219,7 +237,10 @@
             </div>
             </el-form>
             <div class="filter-wrap" style="margin-top:20px">
-                <p style="margin-bottom:10px">待选指标（选择指标数量不超过{{MAXAddNUM}}）</p>
+                <p style="margin-bottom:10px">
+                    <!-- 待选指标（选择指标数量不超过{{MAXAddNUM}}） -->
+                    {{$t('EtaBasePage.pending_metrics',{num:MAXAddNUM})}}
+                </p>
                 <div>
                     <el-cascader
 						v-model="filter.classify"
@@ -227,13 +248,13 @@
 						:props="classifyProps"
 						clearable
                         collapse-tags
-						placeholder="指标分类"
+						:placeholder="$t('EtaBasePage.label_classify')"
                         style="width: 240px"
                         @change="handleFilter"
 					/>
                     <el-select
 						v-model="filter.frequency"
-						placeholder="请选择频率"
+						:placeholder="$t('EtaBasePage.select_frequency')"
 						style="width: 140px"
 						clearable
                         multiple
@@ -243,15 +264,15 @@
 					>
 						<el-option
 							v-for="item in frequencyArr"
-							:key="item"
-							:label="item"
-							:value="item"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
 						>
 						</el-option>
 					</el-select>
                     <el-cascader
                         v-model="filter.user"
-                        placeholder="创建人"
+                        :placeholder="$t('EtaBasePage.table_col_creator')"
                         :options="sysUserOpts"
                         :props="sysUserProps"
                         collapse-tags
@@ -262,7 +283,7 @@
                         @change="handleFilter"
                     />
                     <el-input 
-                        placeholder="指标ID/指标名称" 
+                        :placeholder="$t('Edb.InputHolderAll.input_name_orid')" 
                         v-model="filter.keyword"
                         style="width: 200px"
                         @keydown.enter.native="handleFilter"
@@ -270,7 +291,7 @@
                         <i slot="prefix" class="el-input__icon el-icon-search"></i>
                     </el-input>
                     <el-checkbox 
-                        label="列表全选" 
+                        :label="$t('EtaBasePage.label_all_check')" 
                         v-model="isCheckAll" 
                         :indeterminate="isCheckIndeterminate" 
                         style="margin-left:10px"
@@ -293,12 +314,12 @@
                         v-loading="listLoading"
                     >
                         <el-table-column type="selection" min-width="50" align="center" :selectable="filterEdbAuth"/>
-                        <el-table-column label="指标全称" show-overflow-tooltip align="center" prop="EdbName"/>
-                        <el-table-column label="最新日期" align="center" prop="EndDate" width="120px" />
-                        <el-table-column label="最新值" align="center" show-overflow-tooltip prop="EndValue" width="80px"/>
-                        <el-table-column label="创建人" align="center" show-overflow-tooltip prop="SysUserRealName" width="80px"/>
-                        <el-table-column label="频度" align="center" prop="Frequency" width="50px"/>
-                        <el-table-column label="单位" show-overflow-tooltip align="center" prop="Unit" width="50px"/>
+                        <el-table-column :label="$t('EtaBasePage.full_metric_name')" show-overflow-tooltip align="center" prop="EdbName"/>
+                        <el-table-column :label="$t('Edb.Detail.e_latest_date')" align="center" prop="EndDate" width="120px" />
+                        <el-table-column :label="$t('Edb.Detail.e_latest_value')" align="center" show-overflow-tooltip prop="EndValue" width="80px"/>
+                        <el-table-column :label="$t('EtaBasePage.table_col_creator')" align="center" show-overflow-tooltip prop="SysUserRealName" width="80px"/>
+                        <el-table-column :label="$t('Edb.Detail.e_fre')" align="center" prop="Frequency" width="50px"/>
+                        <el-table-column :label="$t('Edb.Detail.e_unit')" show-overflow-tooltip align="center" prop="Unit" width="50px"/>
                     </el-table>
                     <m-page 
                         style="margin-top:10px"
@@ -312,7 +333,10 @@
                     />
                 </div>
                 <div style="padding-top:200px;margin:0 30px">
-                    <el-button type="primary" :disabled="operationForm.view" :loading="addLoading" @click="getAddEdbListData">加入已选指标</el-button>
+                    <el-button type="primary" :disabled="operationForm.view" :loading="addLoading" @click="getAddEdbListData">
+                        <!-- 加入已选指标 -->
+                        {{$t('EtaBasePage.add_to_selections')}}
+                    </el-button>
                 </div>
                 <div class="right-box">
                     <el-table 
@@ -320,12 +344,12 @@
                         border 
                         height="500px"
                     >
-                        <el-table-column label="序号" width="50px" align="center" prop="No" v-if="computedType=='multipleEDB'">
+                        <el-table-column :label="$t('EtaBasePage.serial_num')" width="50px" align="center" prop="No" v-if="computedType=='multipleEDB'">
                             <template slot-scope="scope">
                                 {{scope.$index|getNoText}}
                             </template>
                         </el-table-column>
-                        <el-table-column label="指标全称" show-overflow-tooltip align="center" prop="EdbName"/>
+                        <el-table-column :label="$t('EtaBasePage.full_metric_name')" show-overflow-tooltip align="center" prop="EdbName"/>
                         <el-table-column width="50px" align="center" v-if="!operationForm.view">
                             <template slot="header" slot-scope="scope">
                                 <img @click="handleDelSelect('all')" style="width:15px;height:15px;cursor: pointer;" src="~@/assets/img/ai_m/delete.png" alt="">
@@ -338,8 +362,8 @@
                 </div>
             </div>
             <div style="text-align:center;margin:60px 0 40px 0">
-                <el-button type="primary" plain @click="handleCloseSelf">取消</el-button>
-                <el-button type="primary" @click="handleNextStep">下一步</el-button>
+                <el-button type="primary" plain @click="handleCloseSelf">{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" @click="handleNextStep">{{$t('Dialog.next_step')}}</el-button>
             </div>
         </div>
         <!-- 结果保存 -->
@@ -401,11 +425,13 @@ export default {
         timeSeriesOpt(){
             let arr=[
                 {
-                    label:`指标A`,
+                    // label:`指标A`,
+                    label:this.$t('EtaBasePage.edbTagA'),
                     value:'A'
                 },
                 {
-                    label:`指标B`,
+                    // label:`指标B`,
+                    label:this.$t('EtaBasePage.edbTagB'),
                     value:'B'
                 }
             ]
@@ -419,12 +445,14 @@ export default {
             }
             return [
                 {
-                    label:'指定指标时间序列',
+                    // label:'指定指标时间序列',
+                    lable:this.$t('EtaBasePage.specify_series_label'),
 					value:'0',
                     children:arr
                 },
                 {
-					label:'所有指标时间序列并集',
+					// label:'所有指标时间序列并集',
+                    lable:this.$t('EtaBasePage.union_series_label'),
 					value:'all',
 				}
             ]
@@ -432,9 +460,56 @@ export default {
 
         frequencyArr(){
             if(this.computedType==75){
-                return ['周度','旬度','月度', '季度', '年度']
+                
+                return [
+                {
+					value: '周度',
+					label: /* '周度' */this.$t('Edb.FreAll.week'),
+				},
+				{
+					value: '旬度',
+					label: /* '旬度' */this.$t('Edb.FreAll.dekad'),
+				},
+				{
+					value: '月度',
+					label: /* '月度' */this.$t('Edb.FreAll.month'),
+				},
+				{
+					value: '季度',
+					label: /* '季度' */ this.$t('Edb.FreAll.quarter'),
+				},
+				
+				{
+					value: '年度',
+					label: /* '年度' */ this.$t('Edb.FreAll.year'),
+				}]
             }
-            return ['日度', '周度','旬度','月度', '季度', '年度']
+            return [
+                {
+					value: '日度',
+					label: /* '日度'  */this.$t('Edb.FreAll.day'),
+				},
+				{
+					value: '周度',
+					label: /* '周度' */this.$t('Edb.FreAll.week'),
+				},
+				{
+					value: '旬度',
+					label: /* '旬度' */this.$t('Edb.FreAll.dekad'),
+				},
+				{
+					value: '月度',
+					label: /* '月度' */this.$t('Edb.FreAll.month'),
+				},
+				{
+					value: '季度',
+					label: /* '季度' */ this.$t('Edb.FreAll.quarter'),
+				},
+				
+				{
+					value: '年度',
+					label: /* '年度' */ this.$t('Edb.FreAll.year'),
+				}]
         }
     },
     watch: {
@@ -511,7 +586,6 @@ export default {
                 keyword:''
             },
 
-            // frequencyArr: ['日度', '周度','旬度','月度', '季度', '年度'],
             classifyOpt: [],
 			classifyProps: {
 				label: 'ClassifyName',
@@ -530,11 +604,12 @@ export default {
             },
 
             nullWayOptions: [
-				{ label: '查找前后35天最近值',value: 0 },
-				{ label: '不计算',value: 1 },
-				{ label: '前值填充',value: 2 },
-				{ label: '后值填充',value: 3 },
-				{ label: '等于0',value: 4 },
+               
+				{ label: /* '查找前后35天最近值' */  this.$t('EtaBasePage.EtaBasePage'),value: 0 },
+				{ label: /* '不计算' */ this.$t('EtaBasePage.not_alculate_options'),value: 1 },
+				{ label: /* '前值填充' */this.$t('EtaBasePage.forward_fill_options'),value: 2 },
+				{ label: /* '后值填充' */this.$t('EtaBasePage.backward_fill_options') ,value: 3 },
+				{ label: /* '等于0' */this.$t('EtaBasePage.equal_zeto') ,value: 4 },
 			],
 
             isCheckAll:false,//是否全选
@@ -591,35 +666,35 @@ export default {
         // 跳转下一步
         handleNextStep(){
             if(this.selectList.length===0){
-                this.$message.warning('请选择指标')
+                this.$message.warning(/* "请选择指标"  */this.$t('Edb.InputHolderAll.input_select_edb'))
                 return
             }
             if([8,12,13,35].includes(this.computedType) && !this.formData.nNum){
-                this.$message.warning('请输入N数值')
+                this.$message.warning(/* "请输入N数值"  */ this.$t('Edb.InputHolderAll.input_n_value'))
                 return
             }
             if([51].includes(this.computedType)&& !this.formData.frequency){
-                this.$message.warning('请选择频度')
+                this.$message.warning(/*'请选择频度'*/this.$t('Edb.InputHolderAll.input_fre'))
                 return
             }
             if(['accumulate'].includes(this.computedType)&&this.subComputedType==62&& !this.formData.frequency){
-                this.$message.warning('请选择频度')
+                this.$message.warning(/*'请选择频度'*/this.$t('Edb.InputHolderAll.input_fre'))
                 return
             }
             if(this.computedType==72&&!this.formData.alphaValue){
-                this.$message.warning('请输入alpha值')
+                this.$message.warning(/*'请输入alpha值'*/this.$t('Edb.InputHolderAll.input_alpha_val'))
                 return
             }
             if(this.computedType==72&&(Number(this.formData.alphaValue)<=0||Number(this.formData.alphaValue)>=1)){
-                this.$message.warning('请输入>0，<1的数值的alpha值')
+                this.$message.warning(/*''请输入>0，<1的数值的alpha值''*/ this.$t('EtaBasePage.numeric_greater_msg'))
                 return
             }
             if(this.computedType=='withEDB'&&!this.select_target){
-                this.$message.warning('请选择指标B')
+                this.$message.warning(/*'请选择指标B'*/this.$t('EtaBasePage.select_indicator_msg'))
                 return
             }
             if(['withNum','withEDB'].includes(this.computedType)&&!this.formData.formula){
-                this.$message.warning('请输入公式')
+                this.$message.warning(/*'请输入公式'8*/this.$t('EtaBasePage.input_formula_msg'))
                 return
             }
 
@@ -635,11 +710,11 @@ export default {
         // 点击加入已选指标库
         async getAddEdbListData(){
             if(!(this.isCheckAll || this.isCheckIndeterminate ) || (!(this.list && this.list.length>0))){
-                this.$message.warning('请选择指标')
+                this.$message.warning(/* "请选择指标"  */this.$t('Edb.InputHolderAll.input_select_edb'))
                 return
             }
             if(this.selectList.length>=this.MAXAddNUM){
-                this.$message.warning('已达批量添加指标数量上限')
+                this.$message.warning(/* "已达批量添加指标数量上限"  */this.$t('EtaBasePage.limit_indicators_msg'))
                 return
             }
             const params={

src/views/dataEntry_manage/databaseComponents/util.js

@@ -155,70 +155,73 @@ export const computedBatchTypes = [
 	}
 ]
 
+
+
+
 //批量指标类型
 export const computedBatchTypesV2=[
 	{
-		name:'同比值',
+		name:/* '同比值' */bus.$i18nt.t('Edb.CalculatesAll.on_year'),
 		type:6
 	},
 	{
-		name:'同差值',
+		name:/* '同差值' */bus.$i18nt.t('Edb.CalculatesAll.differ'),
 		type:7
 	},
 	{
-		name:'累计值转月/季值',
+		name:/* '累计值转月/季值' */bus.$i18nt.t('Edb.CalculatesAll.to_month_quarter'),
 		type:'toMonthSeason'
 	},
 	{
-		name:'N期移动均值',
+		name:/* 'N期移动均值' */bus.$i18nt.t('Edb.CalculatesAll.rule_move_average'),
 		type:8
 	},
 	{
-		name:'N期环比值',
+		name:/* 'N期环比值' */bus.$i18nt.t('Edb.CalculatesAll.period_over_period'),
 		type:12
 	},
 	{
-		name:'N期环差值',
+		name:/* 'N期环差值' */bus.$i18nt.t('Edb.CalculatesAll.period_difference'),
 		type:13
 	},
 	{
-		name:'升频',
+		name:/* '升频' */bus.$i18nt.t('Edb.CalculatesAll.up_conver'),
 		type:14
 	},
 	{
-		name:'超级季节性',
+		name:/* '超级季节性' */bus.$i18nt.t('Edb.CalculatesAll.super_seasonal'),
 		type:35
 	},
 	{
-		name:'年化值',
+		name:/* '年化值' */bus.$i18nt.t('Edb.CalculatesAll.annualized'),
 		type:52
 	},
 	{
-		name:'降频',
+		name: /* '降频' */bus.$i18nt.t('Edb.CalculatesAll.down_conver'),
 		type:51
 	},
 	{
-		name: '累计值',
+		name: /* '累计值' */bus.$i18nt.t('Edb.CalculatesAll.cumulate'),
 		type: 'accumulate'
 	},
 	{
-		name:'指数修匀',
+		name:/* '指数修匀' */bus.$i18nt.t('Edb.CalculatesAll.ex_smooth'),
 		type:72
 	},
 	{
-		name:'日均值',
+		name:/* '日均值' */bus.$i18nt.t('Edb.CalculatesAll.day_mean'),
 		type: 75
 	},
 	{
-		name:'与常数计算',
+		name:/* '与常数计算' */bus.$i18nt.t('Edb.CalculatesAll.compute_w_const'),
 		type:'withNum'
 	},
 	{
-		name:'与单指标计算',
+		name:/* '与单指标计算' */bus.$i18nt.t('Edb.CalculatesAll.single_metric_op'),
 		type:'withEDB'
 	},
 	{
-		name:'多指标求和/平均',
+		name:/* '多指标求和/平均' */bus.$i18nt.t('Edb.CalculatesAll.multi_metric'),
 		type:'multipleEDB',//81求和 82求平均
 	},
 ]

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -111,7 +111,7 @@
         <div class="ppt-tool flex-column">
             <div class="save-hint" v-show="showLastSaveTime" 
                 style="color: #666; margin-bottom: 15px"
-            >最近保存时间:{{lastSaveTime}}</div>
+            >{{$t('Slides.last_save_time')}}:{{lastSaveTime}}</div>
             <div class="tool-btn">
                 <el-button v-permission="permissionBtn.pptPermission.ppt_publish"
                  type="primary" @click="handlePublish">{{$t('Slides.go_to_publish')}}</el-button>

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -108,7 +108,7 @@
         <div class="ppt-tool flex-column">
             <div class="save-hint" v-show="showLastSaveTime" 
                 style="color: #666; margin-bottom: 15px"
-            >最近保存时间:{{lastSaveTime}}</div>
+            >{{$t('Slides.last_save_time')}}:{{lastSaveTime}}</div>
             <div class="tool-btn">
                 <el-button v-permission="permissionBtn.enPPTPermission.pptEn_publish"
                  type="primary" @click="handlePublish">{{$t('Slides.go_to_publish')}}</el-button>