一堆翻译补充

src/lang/modules/DataSources/En.js

@@ -30,7 +30,9 @@ export default {
     label_classify:'Indicator Category',
     label_update_remin:'Update Reminder',
     ph_update_remin:'Please select the update time',
-    add_tobase_btn:'Add to Indicator Library'
+    add_tobase_btn:'Add to Indicator Library',
+
+    edb_not_allow_delete:'This metric has been added to the ETA database and cannot be deleted',
   },
 
   /* 数据录入 */
@@ -82,6 +84,8 @@ export default {
     col_amt:'Turnover',
     col_oi:'Holdings',
     col_settle:'Settlement Price',
+    ph_inland:'Domestic exchange',
+    ph_foreign:'Overseas exchange',
   },
 
   /* 钢联化工数据库 */

src/lang/modules/DataSources/Zh.js

@@ -30,7 +30,9 @@ export default {
     label_classify:'指标分类',
     label_update_remin:'更新提醒',
     ph_update_remin:'请选择更新时间',
-    add_tobase_btn:'加入指标库'
+    add_tobase_btn:'加入指标库',
+
+    edb_not_allow_delete:'该指标已加入指标库，不可删除',
   },
 
   /* 数据录入 */
@@ -83,6 +85,8 @@ export default {
     col_amt:'成交额',
     col_oi:'持仓量',
     col_settle:'结算价',
+    ph_inland:'国内交易所',
+    ph_foreign:'海外交易所',
   },
 
   /* 钢联化工数据库 */

src/lang/modules/ETATables/En.js

@@ -83,6 +83,7 @@ export default {
     table_data_update_msg: "The table data has been updated",
     formula_lable: "Formula",
     parent_directory_lable: "Parent directory",
+    not_allow_edit:'Currently not editable'
   },
 
   /* 自定义分析  */

src/lang/modules/ETATables/Zh.js

@@ -83,6 +83,7 @@ export default {
     table_data_update_msg: "表格数据已更新",
     formula_lable: "公式",
     parent_directory_lable: "上级目录",
+    not_allow_edit:'当前不可编辑'
   },
 
   /* 自定义分析  */

src/lang/modules/EtaBase/En.js

@@ -183,7 +183,8 @@ export default {
     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',
-    
+    time_duration_num:'Enter a valid number',
+    time_duration_type:'Select the correct time period'
   },
 
   /* 代码运算页面 */

src/lang/modules/EtaBase/Zh.js

@@ -183,6 +183,8 @@ export default {
     calculating_batch:'批量计算中...',
     complete_information_msg:'请填写完整信息',
     please_which_take_msg:'请等待计算完成,该过程可能持续2-3分钟',
+    time_duration_num:'请输入正确的数字',
+    time_duration_type:'请选择正确的时间段'
      
   },
 

src/lang/modules/EtaChart/commonLang.js

@@ -40,6 +40,14 @@ export default {
     zh:'请选择时间段',
     en:'Please select time period'
   },
+  date_tip_count:{
+    zh:'最近{year}年',
+    en:'Last {year} years'
+  },
+  data_tip_since:{
+    zh:'{date}~至今',
+    en:'Since {date}'
+  },
   calendar_gre: {
     zh: '公历',
     en: 'Gregorian Calendar'

src/views/chartRelevance_manage/fittingEquation/fittingEquationChartEditor.vue

@@ -55,7 +55,7 @@
 						type="date"
 						range
 						value-type="format"
-						placeholder="请选择时间段"
+						:placeholder="$t('Chart.choose_time')"
 					/>
 				</div>
         

src/views/chartRelevance_manage/relevance/relevanceChartEditor.vue

@@ -65,7 +65,7 @@
               type="month"
               range
               value-type="format"
-              placeholder="请选择时间段"
+              :placeholder="$t('Chart.choose_time')"
               @change="dateChange"
             />
           </div>

src/views/chartRelevance_manage/statistic/statisticFeatureChartEditor.vue

@@ -50,7 +50,7 @@
               type="month"
               range
               value-type="format"
-              placeholder="请选择时间段"
+              :placeholder="$t('Chart.choose_time')"
               @change="dateChange"
             />
           </div>
@@ -187,7 +187,7 @@
               type="month"
               range
               value-type="format"
-              placeholder="请选择时间段"
+              :placeholder="$t('Chart.choose_time')"
               @change="dateChange($event,'frequecny')"
             />
           </div>

src/views/dataEntry_manage/chartSetting.vue

@@ -1761,9 +1761,9 @@ export default {
         this.chartInfo.DateType === 5
           ? `${this.chartInfo.StartDate}~${this.chartInfo.EndDate}`
           : this.chartInfo.DateType === 6
-          ? `${this.chartInfo.StartDate}~至今`
+          ? /* `${this.chartInfo.StartDate}~至今` */ this.$t('Chart.data_tip_since',{date:this.chartInfo.StartDate})
           : this.chartInfo.DateType === 20
-          ?`最近${this.chartInfo.StartYear}年`
+          ?/* `最近${this.chartInfo.StartYear}年` */ this.$t('Chart.date_tip_count',{year:this.chartInfo.StartYear})
           :/* '请选择时间段' */this.$t('Chart.choose_time');
 
     },
@@ -2189,11 +2189,11 @@ export default {
 				this.select_date = [dateStart, dateEnd];
 
         if(data.dateType==20){
-          this.dateTip = `最近${data.count_year}年`
+          this.dateTip = /* `最近${data.count_year}年` */ this.$t('Chart.date_tip_count',{year:data.count_year})
         }else if (data.dateType === 5) {
           this.dateTip = `${data.start_date}~${data.end_date}`;
         } else {
-          this.dateTip = `${data.start_date}~至今`;
+          this.dateTip = /* `${data.start_date}~至今`; */ this.$t('Chart.data_tip_since',{date:data.start_date})
         }
       }
       this.getPreviewChartInfo();

src/views/dataEntry_manage/components/DateChooseDia.vue

@@ -115,13 +115,13 @@ export default {
 		/* 确认时间 返回回调 */
 		saveHandle() {
 			if(this.radioType == 1 && (!parseInt(this.count_year))) {
-				this.$message.warning('请输入正确的数字')
+				this.$message.warning(/* '请输入正确的数字' */this.$t('EtaBasePage.time_duration_num'))
 				return 
 			}
 			// console.log(this.radioType,this.dateType,this.start_date,this.end_date,this.dates,this.count_year);
 
 			if(this.radioType == 2 && (!this.start_date || (!this.end_date && this.dateType === 2))) {
-				this.$message.warning('请选择正确的时间段')
+				this.$message.warning(/* '请选择正确的时间段' */this.$t('EtaBasePage.time_duration_type'))
 			}else {
 				this.$emit('dateBack',{
 					dateType: this.radioType==1?20:this.dateType === 1 ? 6 : 5,

src/views/dataEntry_manage/databaseComponents/chartTrendRender.vue

@@ -379,8 +379,8 @@ export default {
         data.dateType === 5
           ? `${data.start_date}~${data.end_date}`
           : data.dateType === 6
-					?`${data.start_date}~至今`
-					:`最近${this.count_year}年`
+					?/* `${data.start_date}~至今` */ this.$t('Chart.data_tip_since',{date:data.start_date})
+					:/* `最近${this.count_year}年` */ this.$t('Chart.date_tip_count',{year:this.count_year})
 			if(this.chart_type === 2){
 				let latestYear = parseInt(this.chartInfo.LatestDate.substring(0,4))
 				let dateStart = data.start_date

src/views/dataEntry_manage/databaseComponents/createChart.vue

@@ -174,7 +174,7 @@ export default {
 			/* 日期弹窗 */
       isDateDia: false, // 时间段弹窗
       dateForm: {},
-      dateTip: '请选择时间段',
+      dateTip: /* '请选择时间段' */this.$t('Chart.choose_time'),
 			limitData: {
 				letMin: 0,
 				leftMax: 0,
@@ -282,7 +282,7 @@ export default {
     changeYear(item) {
       this.year_select = item.value;
       this.select_date = [];
-      this.dateTip = '请选择时间段';
+      this.dateTip = /* '请选择时间段' */this.$t('Chart.choose_time');
 
 			const { MinValue,MaxValue } = this.chartInfo;
 			this.oldOptions = {
@@ -321,8 +321,8 @@ export default {
         data.dateType === 5
           ? `${data.start_date}~${data.end_date}`
           : data.dateType === 6
-					?`${data.start_date}~至今`
-					:`最近${this.count_year}年`
+					?/* `${data.start_date}~至今` */ this.$t('Chart.data_tip_since',{date:data.start_date})
+					:/* `最近${this.count_year}年` */ this.$t('Chart.date_tip_count',{year:this.count_year})
 			if(this.chart_type === 2){
 				let latestYear = parseInt(this.chartInfo.LatestDate.substring(0,4))
 				let dateStart = data.start_date
@@ -710,7 +710,7 @@ export default {
 			this.count_year=5
 			this.select_date = [];
 			this.options = {};
-			this.dateTip = '请选择时间段';
+			this.dateTip = /* '请选择时间段' */this.$t('Chart.choose_time');
 			this.oldOptions = {};
 			this.calendar_type = '公历';
 			this.season_year = [];

src/views/dataEntry_manage/editChart.vue

@@ -915,10 +915,10 @@ export default {
         this.chartInfo.DateType === 5
           ? `${this.chartInfo.StartDate}~${this.chartInfo.EndDate}`
           : this.chartInfo.DateType === 6
-          ? `${this.chartInfo.StartDate}~至今`
+          ? /* `${this.chartInfo.StartDate}~至今` */ this.$t('Chart.data_tip_since',{date:this.chartInfo.StartDate})
           : this.chartInfo.DateType === 20
-          ?`最近${this.chartInfo.StartYear}年`
-          :'请选择时间段';
+          ?/* `最近${this.chartInfo.StartYear}年` */ this.$t('Chart.date_tip_count',{year:this.chartInfo.StartYear})
+          :/* '请选择时间段' */this.$t('Chart.choose_time');
 			
     },
     // 设置配置项

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -579,11 +579,11 @@ export default {
 			this.select_date = [dateStart, dateEnd];
 
 			if(data.dateType==20){
-				this.dateTip = `最近${data.count_year}年`
+				this.dateTip = /* `最近${data.count_year}年` */ this.$t('Chart.date_tip_count',{year:data.count_year})
 			}else if (data.dateType === 5) {
 				this.dateTip = `${data.start_date}~${data.end_date}`;
 			} else {
-				this.dateTip = `${data.start_date}~至今`;
+				this.dateTip = /* `${data.start_date}~至今` */ this.$t('Chart.data_tip_since',{date:data.start_date});
 			}
 
 			this.getPreviewSplineInfo();

src/views/dataEntry_manage/targetList.vue

@@ -597,7 +597,7 @@ export default {
 				TradeCode:item.TradeCode
 			}).then(res => {
 				if(res.Data.Status===1){
-					this.$message.error("该指标已加入指标库，不可删除")
+					this.$message.error(/* "该指标已加入指标库，不可删除" */ this.$t('ManualEdbListPage.edb_not_allow_delete'))
 					return
 				}else{
 					this.$confirm(

src/views/datasheet_manage/common/option.js

@@ -7,6 +7,7 @@
 */
 import * as sheetInterface from '@/api/modules/sheetApi.js';
 import { Message } from 'element-ui';
+import bus from "@/api/bus";
 
 export function initSheet(container,options={},sheetInfo={},limit,callbackItems) {
   console.log(limit);
@@ -30,7 +31,7 @@ export function initSheet(container,options={},sheetInfo={},limit,callbackItems)
     hook: {
       cellEditBefore:(range)=>{
         if(limit.disabled){
-          Message.warning("当前不可编辑")
+          Message.warning(/* "当前不可编辑" */ bus.$i18nt.t('OnlineExcelPage.not_allow_edit'))
           setTimeout(()=>{
             luckysheet.exitEditMode();
           },0)
@@ -59,7 +60,7 @@ export function initSheet(container,options={},sheetInfo={},limit,callbackItems)
         if(limit.disabled){
           if((!luckysheet.stopUndo)){
             setTimeout(()=>{
-              Message.warning("当前不可编辑")
+              Message.warning(/* "当前不可编辑" */ bus.$i18nt.t('OnlineExcelPage.not_allow_edit'))
               if(luckysheet.withdrawUndo) {
                 // 重做用户撤销的操作，我们自己的重做操作，不能再撤销
                 luckysheet.stopUndo=false

src/views/futures_manage/futuresBase.vue

@@ -18,7 +18,7 @@
           @change="() => {filterObj.exchange='';getExchangeOptions()}"
         >
           <el-option
-              v-for="(item,index) in ['国内交易所','海外交易所']"
+              v-for="(item,index) in [/* '国内交易所' */$t('FutureBasePage.ph_inland'),/* '海外交易所' */$t('FutureBasePage.ph_foreign')]"
               :key="index"
               :label="item"
               :value="index"
@@ -35,7 +35,7 @@
           <el-option
             v-for="item in exchangeOptions"
             :key="item.Exchange"
-            :label="item.Exchange"
+            :label="$i18nt.locale==='zh'?item.Exchange:item.ExchangeEn"
             :value="item.Exchange"
           >
           </el-option>

src/views/mychart_manage/components/chartDetailDia.vue

@@ -852,9 +852,9 @@ export default {
         this.chartInfo.DateType === 5
           ? `${this.chartInfo.StartDate}~${this.chartInfo.EndDate}`
           : this.chartInfo.DateType === 6
-          ? `${this.chartInfo.StartDate}~至今`
+          ? /* `${this.chartInfo.StartDate}~至今` */ this.$t('Chart.data_tip_since',{date:this.chartInfo.StartDate})
           : this.chartInfo.DateType === 20
-          ?`最近${this.chartInfo.StartYear}年`
+          ?/* `最近${this.chartInfo.StartYear}年` */ this.$t('Chart.date_tip_count',{year:this.chartInfo.StartYear})
           :/* '请选择时间段' */ this.$t('Chart.choose_time');
 
     },
@@ -933,8 +933,8 @@ export default {
           data.dateType === 5
           ? `${data.start_date}~${data.end_date}`
           : data.dateType === 6
-					?`${data.start_date}~至今`
-					:`最近${this.count_year}年`
+					?/* `${data.start_date}~至今` */ this.$t('Chart.data_tip_since',{date:data.start_date})
+					:/* `最近${this.count_year}年` */ this.$t('Chart.date_tip_count',{year:this.count_year})
       if(this.chartInfo.ChartType === 2){
 				let latestYear = parseInt(this.tableData[0].LatestDate.substring(0,4))
 				let dateStart = data.start_date

src/views/predictEdb_manage/components/chartInfo.vue

@@ -239,8 +239,8 @@ export default {
                 data.dateType === 5
                 ? `${data.start_date}~${data.end_date}`
                 : data.dateType === 6
-                ?`${data.start_date}~至今`
-                :`最近${this.count_year}年`
+                ?/* `${data.start_date}~至今` */ this.$t('Chart.data_tip_since',{date:data.start_date})
+                :/* `最近${this.count_year}年` */ this.$t('Chart.date_tip_count',{year:this.count_year})
 
             this.$emit('refreshData','saveLimit')
         },