fix指标库，预测指标库lang

src/lang/commonLang.js

@@ -124,8 +124,8 @@ export default {
       zh: "发布时间",
     },
     loading: {
-      en: '加载中...',
-      zh: 'Loading...'
+      zh: '加载中...',
+      en: 'Loading...'
     },
     data_loading: {
       en: "Data Loading",

src/lang/modules/EtaBase/En.js

@@ -45,11 +45,11 @@ export default {
     turn_rate: 'Turnover Rate',
     open_inter: 'Open Interest',
     open_val: 'Value of Open Positions',
-    fluctua_day: '日振幅',
+    fluctua_day: 'Daily Amplitude',
     have_edb_tip1:'该数据已存在数据库，名称为{name}，目录为：{menu}，如需重新添加，请删除原指标',
     have_edb_tip2:'该数据已存在数据库，名称为{name}，目录为：{menu}',
     exist_edb_tips: 'The following indicators already exist in the indicator pool, please do not re-enter them!',
-    forbid_edb_tips: '您当前暂无权限查看该指标，如需查看，请联系管理员',
+    forbid_edb_tips: 'You currently do not have the permission to view this indicator. If you need access, please contact the administrator.',
     complate_info: 'Complete Information',
     no_companyid_msg: 'Please input Company ID',
     no_edbid_msg: 'Please input Indicator ID',
@@ -60,7 +60,7 @@ export default {
     replace_all: 'Replace all',
     replace_tip: 'Tip: After the replacement, charts and calculated indicators that refer to the original indicator will be replaced by the replacement indicator.',
     replace_success_msg: 'This replacement will last for a longer period of time, confirm the replacement?',
-    replace_ing_msg: '当前正在替换中，请耐心等待',
+    replace_ing_msg: 'The replacement is currently in progress, please be patient',
     input_origin_vaild: 'Original Indicator can not be empty',
     input_replace_vaild: 'Indicator Replacement not be empty',
 
@@ -73,9 +73,12 @@ export default {
     normal_calculate_tab: 'Conventional Calculation',
     batch_calculate_tab: 'Batch Calculation',
     calculate_title: 'Calculation',
+    calculate_edit_title: 'Edit Calculation',
+    calculate_view_title: 'View Calculation',
     add_more_param: 'Add more parameters',
-    null_val_deal: '空值处理',
-    max_null_val: 'MAX、MIN空值处理',
+    create_edb_time_index: 'Generate Indicator Time Series',
+    null_val_deal: 'Null Value Handling',
+    max_null_val: 'MAX、MIN Null Value Handling',
     calculate_formula: 'Calculation Formula',
     input_formula_msg: 'Please input formula',
     input_formula_valid: 'Calculation Formula can not be blank',
@@ -83,7 +86,7 @@ export default {
     formula_examp: 'Formula Example',
     func_examp: 'Function Support',
     add_segm:'Add segment',
-    num_overrun_msg: '添加指标个数已达上限',
+    num_overrun_msg: 'The number of indicators added has reached the limit.',
     label_move_way: 'Moving Mode',
     label_n_val: 'N equals to',
     label_calendar: 'Calendar',

src/lang/modules/EtaBase/Zh.js

@@ -23,7 +23,7 @@ export default {
     prev_step: '上一步',
     improve_info: '完善信息',
     belong_menu: '所属目录',
-    add_success_msg: '新增指标成功',
+    add_success_msg: '新增指标成功！',
     econ_base: '经济数据库',
     date_serie: '日期序列',
     stock_input_pholder: '请输入证券代码，每次只查询一个证券代码',
@@ -73,7 +73,10 @@ export default {
     normal_calculate_tab: '常规计算',
     batch_calculate_tab: '批量计算',
     calculate_title: '计算指标',
+    calculate_edit_title: '编辑计算指标',
+    calculate_view_title: '查看计算指标',
     add_more_param: '添加更多参数',
+    create_edb_time_index: '生成指标时间序列',
     null_val_deal: '空值处理',
     max_null_val: 'MAX、MIN空值处理',
     calculate_formula: '计算公式',

src/lang/modules/EtaBase/commonLang.js

@@ -648,8 +648,8 @@ export default {
       3、按照输入的计算公式进行计算`,
       en: `Index calculation:<br>
       1、Select index parameters<br>
-      2、生成指标的时间序列：以第一个指标为准，其他指标去匹配第一个指标的日期序列，没有值的，按照所选空值处理方式处理<br>
-      3、按照输入的计算公式进行计算`
+      2、Generate time series for the indicator: use the first indicator as a reference, align other indicators with the date sequence of the first one, and handle missing values according to the selected method for dealing with nulls.<br>
+      3、Calculate based on the input formula.`
     },
     to_month_quarter: {
       zh: `1、累计值转月值计算方法：<br>
@@ -1091,5 +1091,34 @@ export default {
       3、Select the table, use "Ctrl + F" to call the fast search function, support quickly locate the data in the table.<br>
       Note: The system only takes data from columns A and B.`
     }
+  },
+
+  /* 提示信息 */
+  MsgPrompt: {
+    del_not_relate_edb: {
+      zh: '该目录关联指标不可删除',
+      en: 'Cannot delete index linked to this directory'
+    },
+    del_confirm_menu_or_children: {
+      zh: '确认删除当前目录及包含的子目录吗？',
+      en: 'Are you sure you want to delete the current directory and all its subdirectories?'
+    },
+    del_failed: {
+      zh: '删除失败',
+      en: 'Deletion Failed'
+    },
+    del_edb_confirm: {
+      zh: '删除后指标和指标值均不可使用，确认删除吗?',
+      en: 'Once deleted, both the indicators and their values will become unusable. Are you sure you want to delete them?'
+    },
+    del_edb_use_chart: {
+      zh: '当前指标已用作画图，不可删除',
+      en: 'The current indicator is being used for drawing and cannot be deleted.'
+    },
+    del_menu_confirm: {
+      zh: '确定删除当前目录吗?',
+      en: 'Are you sure you want to delete the current directory?'
+    }
   }
+  
 }

src/views/dataEntry_manage/databaseComponents/addTargetDiaBase.vue

@@ -174,7 +174,7 @@
           </table>
         </div>
 				<div class="dia-bot">
-					<el-button @click="wsdPrevHandle" style="width: 120px;"><!-- 上一步 -->{{$t('Edb.prev_step')}}</el-button>
+					<el-button @click="wsdPrevHandle" style="width: 120px;"><!-- 上一步 -->{{$t('Dialog.prev_step')}}</el-button>
 					<el-button type="primary" @click="wsdSaveHandle" style="width: 120px;margin-left: 50px;"><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
 				</div>
 			</template>

src/views/dataEntry_manage/databaseComponents/completeTargetDia.vue

@@ -155,7 +155,7 @@ export default {
 					}
 					dataBaseInterface.targetAdd(params).then(res => {
 						if(res.Ret === 200) {
-							this.$message.success('新增指标成功！')
+							this.$message.success(/* '新增指标成功！' */this.$t('EtaBasePage.add_success_msg'))
 							this.formData = {}
 							this.$emit('addTargetCallback',{ code:res.Data.UniqueCode,id:res.Data.EdbInfoId,classifyId:params.ClassifyId })
 						}

src/views/dataEntry_manage/databaseComponents/computedDialog.vue

@@ -14,7 +14,7 @@
 				:src="$icons.computed"
 				style="color: #fff; width: 16px; height: 16px; margin-right: 5px"
 			/>
-			<span style="font-size: 16px">{{ title }}</span>
+			<span style="font-size: 16px">{{ titleMap.get(title) }}</span>
 		</div>
 		<div class="dialog-main">
 			<ul class="add-cont">
@@ -72,7 +72,7 @@
 			<div class="computed-min">
 				<div class="computed-section" v-if="edbSource !== 'predict'">
 					<div>
-						<label class="label">生成指标时间序列</label>
+						<label class="label"><!-- 生成指标时间序列 -->{{$t('EtaBasePage.create_edb_time_index')}}</label>
 						<div style="width:200px;display: inline-block;">
 							<el-cascader
 								v-model="selectTimeSeriesVal"
@@ -474,7 +474,13 @@ export default {
 				'formula':`1、支持新增分段，实现不同分段使用不同的计算公式，若未新增分段，则所有日期序列用统一公式计算<br>
 				2、新增分段需配置新公式和时间节点，在时间节点之前（不含）使用新公式，在时间节点之后（含）使用已配置公式，每个分段公式支持修改<br>
 				3、分段时间节点不允许重复，不允许超出第一个指标的日期区间`
-			}
+			},
+
+			titleMap: new Map([
+				['计算指标',this.$t('EtaBasePage.calculate_title')],
+				['编辑计算指标',this.$t('EtaBasePage.calculate_edit_title')],
+				['查看计算指标',this.$t('EtaBasePage.calculate_view_title')],
+			])
 
 		};
 	},

src/views/dataEntry_manage/databaseComponents/util.js

@@ -329,7 +329,7 @@ export const formulaTip = new Map([
 // wind 日期序列常见指标代码
 export const windCommonIndexCodeArr=[
 	{value:'pre_close',label:bus.$i18nt.t('EtaBasePage.pre_price')},
-	{value:'open',label:bus.$i18nt.t('EtaBasePage.pre_price')/* "开盘价" */},
+	{value:'open',label:bus.$i18nt.t('EtaBasePage.op_price')/* "开盘价" */},
 	{value:'high',label:bus.$i18nt.t('EtaBasePage.high_price')/* "最高价" */},
 	{value:'low',label:bus.$i18nt.t('EtaBasePage.low_price')/* "最低价" */},
 	{value:'close',label:bus.$i18nt.t('EtaBasePage.close_price')/* "收盘价" */},

src/views/dataEntry_manage/databaseList.vue

@@ -1498,24 +1498,24 @@ export default {
 					 * 2 有子目录无指标
 					*/
 					const deleteLabelMap = {
-						1: '该目录关联指标不可删除',
-						2: '确认删除当前目录及包含的子目录吗？',
-						3: '当前指标已用作画图，不可删除',
+						1: /* '该目录关联指标不可删除' */this.$t('Edb.MsgPrompt.del_not_relate_edb'),
+						2: /* '确认删除当前目录及包含的子目录吗？' */this.$t('Edb.MsgPrompt.del_confirm_menu_or_children'),
+						3: /* '当前指标已用作画图，不可删除' */this.$t('Edb.MsgPrompt.del_edb_use_chart'),
 						4: res.Data.TipsMsg
 					}
 
 					if([1,3,4].includes(res.Data.DeleteStatus)) this.$confirm(
 							deleteLabelMap[res.Data.DeleteStatus],
-							'删除失败',
+							/* '删除失败' */this.$t('Edb.MsgPrompt.del_failed'),
 							{
-							confirmButtonText: '知道了',
+							confirmButtonText:/*  '知道了' */this.$t('Dialog.known'),
 							showCancelButton:false,
 							type: 'error'
 						})
 					else if([0,2].includes(res.Data.DeleteStatus)) this.$confirm(
 							res.Data.DeleteStatus === 2 
 							? deleteLabelMap[res.Data.DeleteStatus]
-							: data.EdbCode?'删除后指标和指标值均不可使用，确认删除吗？':'确定删除当前目录吗?', 
+							: data.EdbCode? this.$t('Edb.MsgPrompt.del_edb_confirm')/* '删除后指标和指标值均不可使用，确认删除吗？' */:/* '确定删除当前目录吗?' */this.$t('Edb.MsgPrompt.del_menu_confirm'), 
 							/* '提示' */this.$t('Dialog.warn_tit'),
 							{
 							confirmButtonText: /* '确定' */this.$t('Dialog.confirm_btn'),
@@ -1536,7 +1536,7 @@ export default {
 				EdbInfoId
 			}).then(res => {
 				if(res.Ret === 200) {
-					this.$message.success(res.Msg);
+					this.$message.success(this.$t('MsgPrompt.delete_msg'));
 					this.getTreeData();
 					this.selected_edbid = 0;
 					this.deleteLabel({code:this.select_node,id:EdbInfoId,classifyId:ClassifyId})

src/views/predictEdb_manage/components/operationDialog.vue

@@ -389,20 +389,20 @@ export default {
 				[70,this.$t('Edb.CalculatesAll.percent')],/* 百分比 */
 			]),//标题
 			saveBtnMap: new Map([
-				[42,'转月值计算'],
-				[32,'同比值计算'],
-				[33,'同差值计算'],
-				[39,'移动平均计算'],
-				[43,'环比值计算'],
-				[44,'环差值计算'],
-				[45,'升频计算'],
-				[46,'保存'],
-				[49,'超季节性计算'],
-				[55,'年化计算'],
-				[54,'降频计算'],
-				[64,'转季值计算'],
-				[65,'累计值计算'],
-				[66,'年初至今计算'],
+				[42,/* '转月值计算' */this.$t('Edb.CalculateBtns.to_month')],
+				[32,/* '同比值计算' */this.$t('Edb.CalculateBtns.on_year')],
+				[33,/* '同差值计算' */this.$t('Edb.CalculateBtns.differ')],
+				[39,/* '移动平均计算' */this.$t('Edb.CalculateBtns.n_move_average')],
+				[43,/* '环比值计算' */this.$t('Edb.CalculateBtns.n_rate')],
+				[44,/* '环差值计算' */this.$t('Edb.CalculateBtns.n_differ')],
+				[45,/* '升频计算' */this.$t('Edb.CalculateBtns.up_conver')],
+				[46,/* '保存' */this.$t('Dialog.confirm_save_btn')],
+				[49,/* '超季节性计算' */this.$t('Edb.CalculateBtns.super_season')],
+				[55,/* '年化计算' */this.$t('Edb.CalculateBtns.annual')],
+				[54,/* '降频计算' */this.$t('Edb.CalculateBtns.down_conver')],
+				[64,/* '转季值计算' */this.$t('Edb.CalculateBtns.to_quarter')],
+				[65,/* '累计值计算' */this.$t('Edb.CalculateBtns.cumulate')],
+				[66,/* '年初至今计算' */this.$t('Edb.CalculateBtns.cumulate_oneyear')],
 			]),//保存文案
 			formData: {
 				targetName:'',
@@ -589,7 +589,7 @@ export default {
 		},
 		/* 保存 */
 		async saveHandle() {
-			if(!this.select_target) return this.$message.warning('指标不能为空')
+			if(!this.select_target) return this.$message.warning(/* '指标不能为空'  */this.$t('Edb.Valids.no_edb'))
 
 				// return
 				await this.$refs.form.validate()

src/views/predictEdb_manage/predictEdb.vue

@@ -959,28 +959,26 @@ export default {
 			 * 2 有子目录无指标
 			*/
 			const deleteLabelMap = {
-				1: '该目录关联指标不可删除',
-				2: '确认删除当前目录及包含的子目录吗？',
-				3: '当前指标已用作画图，不可删除',
+				1: /* '该目录关联指标不可删除' */this.$t('Edb.MsgPrompt.del_not_relate_edb'),
+				2: /* '确认删除当前目录及包含的子目录吗？' */this.$t('Edb.MsgPrompt.del_confirm_menu_or_children'),
+				3: /* '当前指标已用作画图，不可删除' */this.$t('Edb.MsgPrompt.del_edb_use_chart'),
 				4: TipsMsg
 			}
 
 			if([1,3,4].includes(DeleteStatus)) this.$confirm(
 					deleteLabelMap[DeleteStatus],
-					'删除失败',
+					/* '删除失败' */this.$t('Edb.MsgPrompt.del_failed'),
 					{
-					confirmButtonText: '知道了',
+					confirmButtonText: /*  '知道了' */this.$t('Dialog.known'),
 					showCancelButton:false,
 					type: 'error'
 				})
 			else if([0,2].includes(DeleteStatus)) this.$confirm(
 					DeleteStatus === 2 
 					? deleteLabelMap[DeleteStatus]
-					: EdbInfoId?'删除后指标和指标值均不可使用，确认删除吗？':'确定删除当前目录吗?', 
-					'提示',
+					: EdbInfoId?this.$t('Edb.MsgPrompt.del_edb_confirm')/* '删除后指标和指标值均不可使用，确认删除吗？' */:/* '确定删除当前目录吗?' */this.$t('Edb.MsgPrompt.del_menu_confirm'), 
+					/* '提示' */this.$t('Dialog.warn_tit'),
 					{
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
 					this.delApi(ClassifyId, EdbInfoId)