Pārlūkot izejas kodu

Merge branch 'eta1.8.0' of http://8.136.199.33:3000/eta_front/eta_front into eta1.8.0

cxmo 11 mēneši atpakaļ
vecāks
revīzija
0fe0591e93

+ 47 - 4
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',
+    
   },
 
   /* 代码运算页面 */

+ 43 - 1
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分钟',
+     
   },
 
   /* 代码运算页面 */

+ 38 - 3
src/lang/modules/EtaBase/commonLang.js

@@ -128,7 +128,10 @@ export default {
     zh:'年数',
     en:'Number of years'
   },
-
+  please_select: {
+    en: "Please select",
+    zh: "请选择",
+  },
 
   /* 指标相关字段 */
   Detail: {
@@ -243,8 +246,7 @@ export default {
     select_catalogue:{
       zh:'所属目录',
       en:'catalogue'
-    }
-
+    },
   },
 
   /* 单位 */
@@ -489,6 +491,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提示 */
@@ -689,6 +719,10 @@ export default {
       zh: '请选择指标',
       en: 'Please select Indicator'
     },
+    input_n_value: {
+      zh: '请输入N数值',
+      en: 'Enter N Value'
+    },
     input_keyword: {
       zh: '请输入关键词',
       en: 'Please enter a keyword'
@@ -697,6 +731,7 @@ export default {
       zh: '请输入值',
       en: 'Please input a value'
     }
+    
   },
   
   /* 公示说明 */

+ 3 - 0
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",
+
 
   //列表页操作栏
   list_ppt_item_publish:'Publish',
@@ -236,6 +238,7 @@ export const listZh = {
   is_delete_ppt: "确定删除该页ppt吗",
   add_least_one: "请至少添加一张",
   preview_report_btn: "预览报告",
+  last_save_time: "最近保存时间",
 
   //列表页操作栏
   list_ppt_item_publish:'预览发布',

+ 8 - 2
src/lang/modules/StatisticAnalysis/CrossVarietyChart.js

@@ -20,7 +20,10 @@ export const CrossVarietyChartEn = {
     add_date:'Add date',
     latest_date:'Latest date',
     n_day_before:'N days ago',
-    fixed_date:'fixed date'
+    fixed_date:'fixed date',
+    please_select:'Please Select',
+    chart_name_input:'Enter Chart Name',
+    fill_chart_name:'Please Fill in the Chart Name!',
 };
   
 /* 中文 */
@@ -41,7 +44,10 @@ export const CrossVarietyChartZh = {
     add_date:'添加日期',
     latest_date:'最新日期',
     n_day_before:'N天前',
-    fixed_date:'固定日期'
+    fixed_date:'固定日期',
+    please_select:'请选择',
+    chart_name_input:'请输入图表名称',
+    fill_chart_name:'请填写图表名称!',
 };
   
 /**

+ 18 - 0
src/lang/modules/systemManage/BaseConfig.js

@@ -68,6 +68,14 @@ export const BaseConfigEn = {
 
     tip_msg01:'Save successful, please check the corresponding page/project later',
 
+
+    login_info:'Filing Info',
+    login_info_pld:'Text Split ≥2 Spaces for New Lines on Small Screens',
+    login_title:'Login Page Title',
+    login_title_pld:'Enter Login Page Title',
+    login_name:'Website Name',
+    login_name_pld:'Enter Website Name',
+    login_diagram:'View Diagram',
 };
   
 /* 中文 */
@@ -135,6 +143,16 @@ export const BaseConfigZh = {
     resource_del_msg:'是否确认删除选中图片?',
 
     tip_msg01:'保存成功,请稍后到对应页面/项目查看',
+
+    login_info:'备案信息',
+    login_info_pld:'文本中输入≥2个空格表示文本分段,小屏时换行显示',
+    login_title:'登录页标题',
+    login_title_pld:'请输入登录页标题',
+    login_name:'网站名称',
+    login_name_pld:'请输入网站名称',
+    login_diagram:'查看示意图',
+
+    
 };
   
 /**

+ 112 - 0
src/lang/modules/systemManage/DataRefresh.js

@@ -0,0 +1,112 @@
+/**
+ * 系统设置-基本配置
+ */
+
+/**
+ * $t('SystemManage.DataRefreshZh.XXX')
+ */
+
+/* 中文 */
+export const DataRefreshZh = {
+  select_source: "选择数据源",
+  select_source_pld: "请选择数据源",
+  database_label: "经济数据库",
+  date_label: "日期序列",
+  default_time: "默认刷新时间",
+  data_frequency: "数据频度",
+  time_label: "时间",
+  refresh_cell: "刷新单元格数",
+  refresh_all: "全部刷新",
+  refresh_cells_pld: "请输入刷新单元格数",
+  refresh_time_add: "添加刷新时间",
+  refresh_success_msg: "设置默认刷新时间成功",
+  status_success_msg: "设置刷新状态成功",
+  time_success_msg: "设置刷新时间成功",
+
+  terminal_code_select: "终端编码",
+  eta_class_select: "ETA指标库分类",
+  enable_op: "启用刷新",
+  pause_op: "暂停刷新",
+  all_list: "列表全选",
+  set_time: "设置刷新时间",
+  please_select: "请选择",
+  set_status: "设置刷新状态",
+  indicator_name: "指标ID/指标名称",
+  complete_data_source: "请选择完整数据源",
+
+  table_code: "指标编码",
+  table_name: "指标全称",
+  table_date: "最新日期",
+  table_value: "最新值",
+  table_frequency: "频度",
+  table_time: "刷新时间",
+  table_creator: "创建人",
+  table_status: "刷新状态",
+
+  refresh_rate: "刷新频率",
+  trading_day: "每交易日",
+  daily_date: "每自然日",
+  weekly_date: "每周",
+  decadal_date: "每旬",
+  monthly_date: "每月",
+  quarterly_date: "每季",
+  semiannually_date: "每半年",
+  annually_date: "每年",
+  day_n: "第N天",
+  last_day: "最后一天",
+  select_refresh_rate: "请选择刷新频率",
+  select_refresh_time: "请选择刷新时间",
+};
+
+/* 英文 */
+export const DataRefreshEn = {
+  select_source: "Select Data Source",
+  select_source_pld: "Please select a data source",
+  database_label: "Economic Database",
+  date_label: "Date Series",
+  default_time: "Default Refresh Time",
+  data_frequency: "Data Frequency",
+  time_label: "Time",
+  refresh_cell: "Refresh Cell Count",
+  refresh_all: "Refresh All",
+  refresh_cells_pld: "Please Enter the Number of Cells to Refresh",
+  refresh_time_add: "Add Refresh Time",
+  refresh_success_msg: "Default Refresh Time Set Successfully",
+  status_success_msg: " Refresh status set successfully",
+  time_success_msg: " Refresh time set successfully",
+
+  terminal_code_select: "Terminal Code",
+  eta_class_select: "ETA Indicator Library Classification",
+  enable_op: "Enable Refresh",
+  pause_op: "Pause Refresh",
+  all_list: "Select All in List",
+  set_time: "Set Refresh Time",
+  please_select: "Please Select",
+  set_status: "Set Refresh Status",
+  indicator_name: "Indicator ID/Indicator Name",
+  complete_data_source: "Please select a complete data source",
+
+  table_code: "Indicator Code",
+  table_name: "Full Indicator Name",
+  table_date: "Latest Date",
+  table_value: "Latest Value",
+  table_frequency: "Frequency",
+  table_time: "Refresh Time",
+  table_creator: "Creator",
+  table_status: "Refresh Status",
+
+
+  refresh_rate: "Refresh Rate",
+  trading_day: "Every Trading Day",
+  daily_date: "Daily",
+  weekly_date: "Weekly",
+  decadal_date: "Decadal",
+  monthly_date: "Monthly",
+  quarterly_date: "Quarterly",
+  semiannually_date: "Semiannually",
+  annually_date: "Annually",
+  day_n: "Day N",
+  last_day: "Last Day",
+  select_refresh_rate: "Please select a refresh rate",
+  select_refresh_time: "Please select a refresh time",
+};

+ 3 - 1
src/lang/modules/systemManage/indexEn.js

@@ -8,6 +8,7 @@ import {OutLinkConfigEn} from './OutLinkConfig'
 import {DataSourceAccountEn} from './DataSourceAccount'
 import {ChartSetEn} from './ChartSet'
 import {ReportApproveEn} from './ReportApprove'
+import {DataRefreshEn} from './DataRefresh'
 
 export default {
   // 系统设置
@@ -21,7 +22,8 @@ export default {
     OutLinkConfig:OutLinkConfigEn,
     DataSourceAccount:DataSourceAccountEn,
     ChartSet:ChartSetEn,
-    ReportApprove:ReportApproveEn
+    ReportApprove:ReportApproveEn,
+    DataRefresh:DataRefreshEn
   },
 };
 

+ 3 - 1
src/lang/modules/systemManage/indexZh.js

@@ -8,6 +8,7 @@ import { OutLinkConfigZh } from "./OutLinkConfig";
 import{DataSourceAccountZh} from './DataSourceAccount'
 import { ChartSetZh } from "./ChartSet";
 import { ReportApproveZh } from "./ReportApprove";
+import {DataRefreshZh} from './DataRefresh'
 
 export default {
   // 系统设置
@@ -21,6 +22,7 @@ export default {
     OutLinkConfig:OutLinkConfigZh,
     DataSourceAccount:DataSourceAccountZh,
     ChartSet:ChartSetZh,
-    ReportApprove:ReportApproveZh
+    ReportApprove:ReportApproveZh,
+    DataRefresh:DataRefreshZh,
   },
 };

+ 6 - 6
src/views/chartRelevance_manage/crossVarietyAnalysis/components/chartFormSection.vue

@@ -17,7 +17,7 @@
         />
         <el-select
           v-model="form.CalculateUnit"
-          placeholder="请选择"
+          :placeholder="$t('StatisticAnalysis.CrossVarietyChart.please_select')"
           style="width: 100px"
           @change="changeParams"
         >
@@ -33,7 +33,7 @@
         <el-select
           v-model="form.PercentType"
           style="width: 240px"
-          placeholder="请选择"
+          :placeholder="$t('StatisticAnalysis.CrossVarietyChart.please_select')"
           @change="changeParams"
         >
           <el-option
@@ -56,7 +56,7 @@
         <el-select
           v-model="form.TagX"
           style="width: 240px"
-          placeholder="请选择"
+          :placeholder="$t('StatisticAnalysis.CrossVarietyChart.please_select')"
           @change="changeSeries"
         >
           <el-option
@@ -71,7 +71,7 @@
       <el-form-item :label="$t('StatisticAnalysis.CrossVarietyChart.y_axis')" prop="TagY">
         <el-select
           v-model="form.TagY"
-          placeholder="请选择"
+          :placeholder="$t('StatisticAnalysis.CrossVarietyChart.please_select')"
           style="width: 240px"
           @change="changeSeries"
         >
@@ -88,7 +88,7 @@
         <el-input
           v-model="form.ChartName"
           style="width: 240px"
-          placeholder="请输入图表名称"
+          :placeholder="$t('StatisticAnalysis.CrossVarietyChart.chart_name_input')"
           @change="changeParams"
         />
       </el-form-item>
@@ -101,7 +101,7 @@
           <el-select
             v-model="item.DateType"
             style="width: 140px"
-            placeholder="请选择"
+            :placeholder="$t('StatisticAnalysis.CrossVarietyChart.please_select')"
             @change="changeParams"
           >
             <el-option

+ 43 - 15
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

+ 164 - 89
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={

+ 19 - 16
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求平均
 	},
 ]

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
src/views/semantics_manage/mixins/catalogMixin.js

@@ -136,7 +136,7 @@ export default {
                 this.$message.error(this.$t('SemanticsManage.DocumentManagement.error_notifications'))
                 return
             }
-            this.$confirm(this.$t('SemanticsManage.DocumentManagement.delete_directory_info'), this.$t('Confirm.prompt'), {
+            this.$confirm(this.$t('Slides.delete_directory_info'), this.$t('Confirm.prompt'), {
                 confirmButtonText:  this.$t('Dialog.confirm_btn'),
                 cancelButtonText: this.$t('Dialog.cancel_btn'),
                 type: 'warning',

+ 1 - 1
src/views/semantics_manage/semanticsPage.vue

@@ -11,7 +11,7 @@
       <div class="select-wrap">
         <el-select
           filterable remote
-          :placeholder="$t('SemanticsManage.DocumentComparison.input_content')"
+          :placeholder="$t('SemanticsManage.DocumentManagement.input_content')"
           v-model="searchTitle"
           :remote-method="searchHandle"
           clearable

+ 5 - 1
src/views/system_manage/components/configAnnotation.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="config-annotation-wrap">
-        <el-button type="text" @click="showImage">{{buttonText}}</el-button>
+        <el-button type="text" @click="showImage">{{showTextLang(buttonText)}}</el-button>
         <span class="hint-text">{{picHintText}}</span>
     </div>
 </template>
@@ -29,6 +29,10 @@ export default {
     methods: {
         showImage(){
             this.$emit('showImage',this.picName)
+        },
+        showTextLang(text){
+            if(text==='查看示意图') return this.$t('SystemManage.BaseConfig.login_diagram')
+             return text
         }
     },
 };

+ 45 - 36
src/views/system_manage/components/refreshConfig.vue

@@ -5,9 +5,9 @@
         <el-form :model="dynamicForm" ref="dynamicForm" label-width="110px" class="dynamic-form">
             <div class="group" v-for="(item,index) in dynamicForm.configList" :key="item.key">
                 <div class="delete btn-box" @click="deleteSetting(index)"
-                    v-if="index!==0"><i class="el-icon-delete"></i>删除</div>
-                <el-form-item label="刷新频率" class="item">
-                    <el-form-item :prop="`configList[${index}].frequency`" :rules="{required:true,message:'请选择刷新频率',trigger: 'blur'}">
+                    v-if="index!==0"><i class="el-icon-delete"></i>{{$t('Table.delete_btn')}}</div>
+                <el-form-item :label="$t('SystemManage.DataRefresh.refresh_rate')" class="item">
+                    <el-form-item :prop="`configList[${index}].frequency`" :rules="{required:true,message:$t('SystemManage.DataRefresh.select_refresh_rate'),trigger: 'blur'}">
                         <el-select v-model="item.frequency">
                             <el-option v-for="i in frequencyType" :key="i.key" 
                                 :label="i.label" :value="i.key"/>
@@ -15,7 +15,7 @@
                     </el-form-item>
                     
                     <!-- 每周 -->
-                    <el-form-item :prop="`configList[${index}].frequency_week`" v-if="item.frequency.includes('周')" :rules="{required:true,message:'请选择刷新频率',trigger: 'blur'}">
+                    <el-form-item :prop="`configList[${index}].frequency_week`" v-if="item.frequency.includes('周')" :rules="{required:true,message:$t('SystemManage.DataRefresh.select_refresh_rate'),trigger: 'blur'}">
                         <el-select v-model="item.frequency_week" class="full-input" key="week">
                             <el-option v-for="i in weekList" :key="i.key" 
                                 :label="i.label" :value="i.key"/>
@@ -24,21 +24,21 @@
                     
                     <!-- 每旬、月、季、半年、年 -->
                     <el-form-item :prop="`configList[${index}].frequency_last`" v-if="!item.frequency.includes('日')&&!item.frequency.includes('周')"
-                        :rules="{required:true,message:'请选择刷新频率',trigger: 'blur'}">
+                        :rules="{required:true,message:$t('SystemManage.DataRefresh.select_refresh_rate'),trigger: 'blur'}">
                         <el-select v-model="item.frequency_last" :key="item.key" key="option">
                             <el-option v-for="i in timeOptionList" :key="i.key" 
                                 :label="i.label" :value="i.key"/>
                         </el-select>
                     </el-form-item>
                     <el-form-item :prop="`configList[${index}].frequency_n`" v-if="item.frequency_last==='n'&&!item.frequency.includes('日')&&!item.frequency.includes('周')"
-                        :rules="{required:true,message:'请选择刷新频率',trigger: 'blur'}">
+                        :rules="{required:true,message:$t('SystemManage.DataRefresh.select_refresh_rate'),trigger: 'blur'}">
                         <el-input v-model="item.frequency_n" type="number" :min="1" :max="n_limit_map[item.frequency]||10">
                             <template slot="prefix">N=</template>
                         </el-input>
                     </el-form-item>
                 </el-form-item>
-                <el-form-item class="item" label="时间">
-                    <el-form-item :prop="`configList[${index}].time`" :rules="{required:true,message:'请选择刷新时间',trigger: 'blur'}">
+                <el-form-item class="item" :label="$t('SystemManage.DataRefresh.time_label')">
+                    <el-form-item :prop="`configList[${index}].time`" :rules="{required:true,message:$t('SystemManage.DataRefresh.select_refresh_time'),trigger: 'blur'}">
                         <el-select v-model="item.time" class="full-input" key="single">
                             <el-option v-for="i in timeList" :key="i" 
                                 :label="i" :value="i"/>
@@ -46,14 +46,14 @@
                     </el-form-item>
                 </el-form-item>
                 <el-form-item v-if="Source!==11"
-                    :prop="`configList[${index}].num`" label="刷新单元格数" class="item" :rules="{required:true,message:'请输入刷新单元格数',trigger: 'blur'}">
+                    :prop="`configList[${index}].num`" :label="$t('SystemManage.DataRefresh.refresh_cell')" class="item" :rules="{required:true,message:$t('SystemManage.DataRefresh.refresh_cells_pld'),trigger: 'blur'}">
                     <el-input v-model="item.num" type="number"></el-input>
-                    <el-checkbox v-model="item.isAll">全部刷新</el-checkbox>
+                    <el-checkbox v-model="item.isAll">{{$t('SystemManage.DataRefresh.refresh_all')}}</el-checkbox>
                 </el-form-item>
                 <div class="line"></div>
                 <div class="add btn-box" @click="addSetting"
                     v-if="index===dynamicForm.configList.length-1&&index<maxSetting-1">
-                    <i class="el-icon-circle-plus-outline"></i>添加刷新时间</div>
+                    <i class="el-icon-circle-plus-outline"></i>{{$t('SystemManage.DataRefresh.refresh_time_add')}}</div>
             </div>
         </el-form>
     </div>
@@ -78,6 +78,39 @@ export default {
             type:Object
         }
     },
+    computed:{
+         //每周,可多选
+        weekList(){
+            return [
+                {key:1,label:/* 周一*/ this.$t('ETable.Date.monday')},
+                {key:2,label:/* 周二*/this.$t('ETable.Date.tuesday')},
+                {key:3,label:/* 周三*/this.$t('ETable.Date.wednesday')},
+                {key:4,label:/* 周四*/this.$t('ETable.Date.thursday')},
+                {key:5,label:/* 周五*/this.$t('ETable.Date.friday')},
+                {key:6,label:/* 周六*/this.$t('ETable.Date.saturday')},
+                {key:7,label:/* 周日*/this.$t('ETable.Date.sunday')}
+            ]
+        },
+        frequencyType(){
+            return [
+                {label:this.$t('SystemManage.DataRefresh.daily_date'),key:'每自然日'},
+                {label:this.$t('SystemManage.DataRefresh.trading_day'),key:'每交易日'},
+                {label:this.$t('SystemManage.DataRefresh.weekly_date'),key:'每周'},
+                {label:this.$t('SystemManage.DataRefresh.decadal_date'),key:'每旬'},
+                {label:this.$t('SystemManage.DataRefresh.monthly_date'),key:'每月'},
+                {label:this.$t('SystemManage.DataRefresh.quarterly_date'),key:'每季'},
+                {label:this.$t('SystemManage.DataRefresh.semiannually_date'),key:'每半年'},
+                {label:this.$t('SystemManage.DataRefresh.annually_date'),key:'每年'},
+            ]
+        },
+        //每旬、月、季、半年、年
+        timeOptionList(){
+            return [
+                {label:/* 第N天*/this.$t('SystemManage.DataRefresh.day_n'),key:'n'},
+                {label:/* 最后一天*/this.$t('SystemManage.DataRefresh.last_day'),key:'last'}
+            ]
+        },
+    },
     data() {
         return {
             maxSetting:5,//可设置的刷新时间数量
@@ -88,31 +121,7 @@ export default {
                     }
                 ]
             },
-            frequencyType:[
-                {label:'每自然日',key:'每自然日'},
-                {label:'每交易日',key:'每交易日'},
-                {label:'每周',key:'每周'},
-                {label:'每旬',key:'每旬'},
-                {label:'每月',key:'每月'},
-                {label:'每季',key:'每季'},
-                {label:'每半年',key:'每半年'},
-                {label:'每年',key:'每年'},
-            ],
-            //每周,可多选
-            weekList:[
-                {key:1,label:'周一'},
-                {key:2,label:'周二'},
-                {key:3,label:'周三'},
-                {key:4,label:'周四'},
-                {key:5,label:'周五'},
-                {key:6,label:'周六'},
-                {key:7,label:'周日'}
-            ],
-            //每旬、月、季、半年、年
-            timeOptionList:[
-                {label:'第N天',key:'n'},
-                {label:'最后一天',key:'last'}
-            ],
+           
             //时间选项,仅整点
             timeList:[
                 '00:00','00:30','01:00','01:30','02:00','02:30','03:00','03:30',

+ 90 - 45
src/views/system_manage/dataRefreshSetting.vue

@@ -3,21 +3,21 @@
     <div class="data-refresh-setting-wrap">
         <div class="top-box">
             <div class="select-box">
-                <span>选择数据源</span>
-                <el-select placeholder="请选择数据源" v-model="Source" @change="handleSourceChange">
+                <span>{{$t('SystemManage.DataRefresh.select_source')}}</span>
+                <el-select :placeholder="$t('SystemManage.DataRefresh.select_source_pld')" v-model="Source" @change="handleSourceChange">
                     <el-option v-for="item in SourceList" :key="item.Source" 
                     :label="item.SourceName" :value="item.Source"/>
                 </el-select>
-                <el-select placeholder="请选择数据源" v-model="SubSource" v-if="SubSourceList.length" @change="handleSubSourceChange">
+                <el-select :placeholder="$t('SystemManage.DataRefresh.select_source_pld')" v-model="SubSource" v-if="SubSourceList.length" @change="handleSubSourceChange">
                     <el-option v-for="item in SubSourceList" :key="item.Source" 
                     :label="item.SubSourceName" :value="item.SubSource"/>
                 </el-select>
                 <el-button type="primary" @click="showDialog(true)"
                     v-permission="permissionBtn.sysDepartPermission.refresh_default"
-                >默认刷新时间</el-button>
+                >{{$t('SystemManage.DataRefresh.default_time')}}</el-button>
             </div>
             
-            <el-input placeholder="指标ID/指标名称" prefix-icon="el-icon-search" clearable
+            <el-input :placeholder="$t('SystemManage.DataRefresh.indicator_name')" prefix-icon="el-icon-search" clearable
                 v-model="selectOption.keyWord" @input="selectOptionChange('keyWord')"
                 v-if="![34,11].includes(Source)&&Source"></el-input>
             
@@ -25,12 +25,12 @@
         <div class="table-box" v-if="hasSelectOption">
             <div class="table-select" v-loading="selectOptionLoading">
                 <div class="select-list">
-                    <el-select placeholder="终端编码" no-match-text="请选择完整数据源" clearable
+                    <el-select :placeholder="$t('SystemManage.DataRefresh.terminal_code_select')" :no-match-text="$t('SystemManage.DataRefresh.complete_data_source')" clearable
                         v-model="selectOption.terminalCode" @change="selectOptionChange('terminalCode')">
                         <el-option v-for="i in terminalCodeList" :key="i.TerminalCode"
                             :label="i.Name" :value="i.TerminalCode"/>
                     </el-select>
-                    <el-cascader placeholder="ETA指标库分类" no-match-text="请选择完整数据源" clearable
+                    <el-cascader :placeholder="$t('SystemManage.DataRefresh.eta_class_select')" :no-match-text="$t('SystemManage.DataRefresh.complete_data_source')" clearable
                         v-model="selectOption.classify" @change="selectOptionChange('classify')"
                         :options="edbClassifyList" 
                         :show-all-levels="false"
@@ -43,7 +43,7 @@
                             multiple:true
                         }" />
                     <el-cascader
-                        placeholder="创建人" no-match-text="请选择完整数据源" style="height: 40px;"
+                        :placeholder="$t('SystemManage.DataRefresh.table_creator')" :no-match-text="$t('SystemManage.DataRefresh.complete_data_source')" style="height: 40px;"
                         v-model="selectOption.user" @change="selectOptionChange('user')"
                         :options="userList"
                         :props="{
@@ -58,26 +58,26 @@
                         clearable
                         filterable 
                     />
-                    <el-select placeholder="频度" v-model="selectOption.frequency" @change="selectOptionChange('frequency')" multiple collapse-tags clearable>
-                        <el-option v-for="i in frequencyList" :key="i"
-                            :label="i" :value="i"
+                    <el-select :placeholder="table_frequency" v-model="selectOption.frequency" @change="selectOptionChange('frequency')" multiple collapse-tags clearable>
+                        <el-option v-for="i in frequencyList" :key="i.value"
+                            :label="i.label" :value="i.value"
                         />
                     </el-select>
-                    <el-select placeholder="刷新状态" v-model="selectOption.state" @change="selectOptionChange('state')" clearable>
-                        <el-option label="启用刷新" value="启用"/>
-                        <el-option label="暂停刷新" value="暂停"/>
+                    <el-select :placeholder="$t('SystemManage.DataRefresh.table_status')" v-model="selectOption.state" @change="selectOptionChange('state')" clearable>
+                        <el-option :label="$t('SystemManage.DataRefresh.enable_op')" value="启用"/>
+                        <el-option :label="$t('SystemManage.DataRefresh.pause_op')" value="暂停"/>
                     </el-select>
                 </div>
                 <div class="select-other">
-                    <el-checkbox :indeterminate="isIndeterminate" v-model="isCheckAll" @change="listCheckAllChange">列表全选</el-checkbox>
+                    <el-checkbox :indeterminate="isIndeterminate" v-model="isCheckAll" @change="listCheckAllChange">{{$t('SystemManage.DataRefresh.all_list')}}</el-checkbox>
                     <el-button type="primary" @click="showDialog(false)"
                         v-permission="permissionBtn.sysDepartPermission.refresh_time"
                         :disabled="!tableData.length"
-                    >设置刷新时间</el-button>
+                    >{{$t('SystemManage.DataRefresh.set_time')}}</el-button>
                     <el-button type="primary" @click="isSetStateDialogShow=true"
                         v-permission="permissionBtn.sysDepartPermission.refresh_state"
                         :disabled="!tableData.length"
-                    >设置刷新状态</el-button>
+                    >{{$t('SystemManage.DataRefresh.set_status')}}</el-button>
                 </div>
             </div>
             <el-table :data="tableData" border
@@ -102,7 +102,7 @@
                     >
                     <template slot-scope="{row}">
                         <span v-if="column.key==='IsStop'">
-                            {{row.IsStop?'暂停刷新':'启用刷新'}}
+                            {{row.IsStop? $t('SystemManage.DataRefresh.pause_op') : $t('SystemManage.DataRefresh.enable_op') }}
                         </span>
                         <span v-else>
                             {{row[column.key]}}
@@ -119,7 +119,7 @@
         </div>
         <!-- 默认刷新时间,设置刷新时间 -->
         <el-dialog custom-class="refresh-setting-dialog"
-            :title="(isDefault?'默认':'设置')+'刷新时间'"
+            :title="dlgTextLangShow((isDefault?'默认':'设置')+'刷新时间')"
             :visible.sync="isSetTimeDialogShow"
             :close-on-click-modal="false"
             :modal-append-to-body="false"
@@ -132,10 +132,10 @@
             <div class="dialog-container" v-loading="defaultDialogLoading">
                 <!-- 默认刷新时间设置数据频度 -->
                 <div class="default-box" v-if="isDefault&&Source!==11">
-                    <label style="display: block;width:88px;text-align:right;padding-right: 12px;">数据频度</label>
+                    <label style="display: block;width:88px;text-align:right;padding-right: 12px;">{{$t('SystemManage.DataRefresh.data_frequency')}}</label>
                     <el-select style="margin-left: 10px;" v-model="defaultFrequency" @change="handleDefaultChange">
-                        <el-option v-for="i in frequencyList" :key="i"
-                            :label="i" :value="i"
+                        <el-option v-for="i in frequencyList" :key="i.value"
+                            :label="i.label" :value="i.value"
                         />
                     </el-select>
                 </div>
@@ -151,13 +151,13 @@
             </div>
             <!-- 弹窗按钮 -->
             <div class="dialog-btn">
-                <el-button type="primary" plain @click="isSetTimeDialogShow=false">取消</el-button>
-                <el-button type="primary" @click="handleSetRefreshTime">确定</el-button>
+                <el-button type="primary" plain @click="isSetTimeDialogShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" @click="handleSetRefreshTime">{{$t('Dialog.confirm_btn')}}</el-button>
             </div>
         </el-dialog>
         <!-- 设置刷新状态 -->
         <el-dialog custom-class="refresh-setting-dialog"
-            title="设置刷新状态"
+            :title="$t('SystemManage.DataRefresh.set_status')"
             :visible.sync="isSetStateDialogShow"
             :close-on-click-modal="false"
             :modal-append-to-body="false"
@@ -168,13 +168,13 @@
             center
         >
             <div class="dialog-container" style="text-align: center;margin:60px 0;">
-                <el-radio label="暂停" v-model="isState">暂停刷新</el-radio>
-                <el-radio label="启用" v-model="isState">启用刷新</el-radio>
+                <el-radio label="暂停" v-model="isState">{{$t('SystemManage.DataRefresh.pause_op')}}</el-radio>
+                <el-radio label="启用" v-model="isState">{{$t('SystemManage.DataRefresh.enable_op')}}</el-radio>
             </div>
             <!-- 弹窗按钮 -->
             <div class="dialog-btn">
-                <el-button type="primary" plain @click="isSetStateDialogShow=false">取消</el-button>
-                <el-button type="primary" @click="setRefreshStatus">确定</el-button>
+                <el-button type="primary" plain @click="isSetStateDialogShow=false">{{$t('Dialog.cancel_btn')}}</el-button>
+                <el-button type="primary" @click="setRefreshStatus">{{$t('Dialog.confirm_btn')}}</el-button>
             </div>
         </el-dialog>
     </div>
@@ -185,6 +185,52 @@ import RefreshConfig from './components/refreshConfig.vue';
 import {dataRefreshInterface,dataAuthInterface} from '@/api/modules/dataApi.js';
 export default {
     components: { RefreshConfig },
+    computed:{
+        frequencyList() {
+            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.month"),
+                },
+                {
+                value: "年度",
+                label: /* '年度' */ this.$t("Edb.FreAll.year"),
+                },
+            ];
+        },
+        columns() {
+            return [
+                { key: "IndexCode", label:/* '指标编码' */ this.$t('SystemManage.DataRefresh.table_code')},
+                { key: "IndexName", label:/* '指标全称' */ this.$t('SystemManage.DataRefresh.table_name'), minWidth: 150 },
+                { key: "EndDate", label:/* '最新日期' */ this.$t('SystemManage.DataRefresh.table_date'), sortable: "custom" },
+                { key: "EndValue", label:/* '最新值' */ this.$t('SystemManage.DataRefresh.table_value')},
+                { key: "SysUserRealName", label:/* '创建人' */ this.$t('SystemManage.DataRefresh.table_creator') },
+                { key: "Frequency", label:/* '频度' */ this.$t('SystemManage.DataRefresh.table_frequency') },
+                { key: "RefreshTime", label:/* '刷新时间' */ this.$t('SystemManage.DataRefresh.table_time'), minWidth: 150 },
+                { key: "IsStop", label:/* '刷新状态' */ this.$t('SystemManage.DataRefresh.table_status')},
+            ];
+        },
+    },
     data() {
         return {
             Source:'',
@@ -192,7 +238,6 @@ export default {
             SubSource:'',
             SubSourceList:[],
 
-            frequencyList:['日度','周度','旬度','月度','季度','半年度','年度'],
             terminalCodeList:[],
             edbClassifyList:[],
             userList:[],
@@ -210,16 +255,7 @@ export default {
             hasSelectOption:false,
             selectOptionLoading:false,
 
-            columns: [
-                {key: 'IndexCode',label: '指标编码'},
-                {key: 'IndexName',label: '指标全称',minWidth:150},
-                {key: 'EndDate',label: '最新日期',sortable:'custom'},
-                {key: 'EndValue',label: '最新值'},
-                {key: 'SysUserRealName',label: '创建人'}, 
-                {key: 'Frequency',label: '频度'},
-                {key: 'RefreshTime',label: '刷新时间',minWidth:150},
-                {key: 'IsStop',label: '刷新状态'}
-            ],
+            
             tableData: [],
             tableDataIds:[],
             pageSize:10,
@@ -251,11 +287,12 @@ export default {
             if(isDefault){
                 //判断数据源是否选择
                 if(!this.Source){
-                    this.$message.warning("请选择数据源")
+                    // this.$message.warning("请选择数据源")
+                    this.$message.warning(this.$t('SystemManage.DataRefresh.select_source_pld'))
                     return
                 }
                 /* if(this.SubSourceList.length&&!this.SubSource){
-                    this.$message.warning("请选择完整数据源")
+                    this.$message.warning("$t('SystemManage.DataRefresh.complete_data_source')")
                     return
                 } */
                 //SMM不带频度
@@ -597,7 +634,8 @@ export default {
                 List:list
             }).then(res=>{
                 if(res.Ret!==200) return
-                this.$message.success("设置刷新时间成功")
+                // this.$message.success("设置刷新时间成功")
+                this.$message.success(this.$t('SystemManage.DataRefresh.time_success_msg'))
                 this.selectOptionChange()
                 this.isSetTimeDialogShow = false
             })
@@ -610,7 +648,8 @@ export default {
                 List:list
             }).then(res=>{
                 if(res.Ret!==200) return 
-                this.$message.success("设置默认刷新时间成功")
+                // this.$message.success("设置默认刷新时间成功")
+                this.$message.success(this.$t('SystemManage.DataRefresh.refresh_success_msg'))
                 this.isSetTimeDialogShow = false
             })
         },
@@ -632,7 +671,8 @@ export default {
                 ModifyStatus:this.isState
             }).then(res=>{
                 if(res.Ret!==200) return 
-                this.$message.success("设置刷新状态成功")
+                this.$message.success(this.$t('SystemManage.DataRefresh.status_success_msg'))
+                // this.$message.success("设置刷新状态成功")
                 this.selectOptionChange()
                 this.isSetStateDialogShow = false
             })
@@ -646,6 +686,11 @@ export default {
                 this.selectOption.sortType = ''
             }
             this.selectOptionChange()
+        },
+        dlgTextLangShow(e){
+            if(e==='默认刷新时间') return this.$t('SystemManage.DataRefresh.default_time')
+            if(e==='设置刷新时间') return this.$t('SystemManage.DataRefresh.set_time')
+            return e
         }
     },
     mounted(){

+ 6 - 6
src/views/system_manage/etaBaseConfig.vue

@@ -78,16 +78,16 @@
                         </el-form-item>
                     </div>
                     <div class="side">
-                        <el-form-item label="备案信息" prop="ICPLicense">
-                            <el-input type="text" v-model="formData.ICPLicense" placeholder="文本中输入≥2个空格表示文本分段,小屏时换行展示" />
+                        <el-form-item :label="$t('SystemManage.BaseConfig.login_info')" prop="ICPLicense">
+                            <el-input type="text" v-model="formData.ICPLicense" :placeholder="$t('SystemManage.BaseConfig.login_info_pld')" />
                             <ConfigAnnotation picHintText="" picName="ICPLicense" @showImage="previewImage"/>
                         </el-form-item>
-                        <el-form-item label="登录页标题" prop="ETATitle">
-                            <el-input type="text" v-model="formData.ETATitle" placeholder="请输入登录页标题" />
+                        <el-form-item :label="$t('SystemManage.BaseConfig.login_title')" prop="ETATitle">
+                            <el-input type="text" v-model="formData.ETATitle" placeholder="$t('SystemManage.BaseConfig.login_title_pld')" />
                             <ConfigAnnotation picHintText="" picName="ETATitle" @showImage="previewImage"/>
                         </el-form-item>
-                        <el-form-item label="网站名称" prop="TabName">
-                            <el-input type="text" v-model="formData.TabName" placeholder="请输入登录页标题" />
+                        <el-form-item :label="login_name" prop="TabName">
+                            <el-input type="text" v-model="formData.TabName" placeholder="$t('SystemManage.BaseConfig.login_name_pld')" />
                             <ConfigAnnotation picHintText="" picName="TabName" @showImage="previewImage"/>
                         </el-form-item>
                     </div>