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

src/lang/modules/ETATables/En.js

@@ -119,16 +119,16 @@ export default {
     example_a_b: "Example formula: A-B returns the difference in days between date a and date B as a number",
     indicators_cap_reached: "The number of added indicators has reached the upper limit",
     input_formula_valid: "Calculation Formula can not be blank",
-    date_change_label: "Date transformation ",
-    date_displacement_label: "Date displacement",
+    date_change_label: "Date Change",
+    date_displacement_label: "Date Shift",
     specified_frequency_tag: "Specified frequency",
     added_frequency_offset_msg: "Specified frequency has been added.",
     added_date_offset_msg: "Added date offset",
     impord_date_title: "Import Date",
-    indicator_date_radio: "Date of indicator",
+    indicator_date_radio: "Indic Date",
     frequency_lable: "Frequency",
-    lagging_period_label: "Shift Periods Forward",
-    system_date_rai: "System Date",
+    lagging_period_label: "Period Shift",
+    system_date_rai: "Sys Date",
     term_ipt: "stage",
     formula_explanation_btn: "Formula Explanation",
     tips_text: `Formula Explanation:<br>1. Index Date: Takes the latest date of the selected index, which updates along with the latest date.<br>2. System Date: Takes the system date, which updates along with the system date.<br>3. Date Offset Examples:<br>Original date 2023/10/12, date offset function set to 5 days 0 months 0 years, the converted date will be 2023/10/17.<br>Original date 2023/10/12, date offset function set to 30 days 0 months 0 years, the converted date will be 2023/11/11.<br>Original date 2023/10/30, date offset function set to 0 days 1 month 0 years, the converted date will be 2023/11/30.<br>Original date 2023/10/31, date offset function set to 0 days 1 month 0 years, the converted date will be 2023/12/1.<br>4. Date Offset and specified frequency can be overlaid, for example:<br>Original date 2023/10/12, first date offset by 1 month (2023/11/12), then frequency set to the last day of the month, the converted date will be 2023/11/30.<br>Original date 2023/10/12, first frequency set to the last day of the month (2023/10/31), then date offset by 1 month, the converted date will be 2023/12/1.`,

src/lang/modules/EtaBase/commonLang.js

@@ -457,6 +457,26 @@ export default {
       zh: '指标计算',
       en: 'Indicator calculation'
     },
+    rule_move_average: {
+      zh: 'N期移动均值',
+      en: 'Moving Average'
+    },
+    period_over_period: {
+      zh: 'N期环比值',
+      en: 'N-Period Period-over-Period Value'
+    },
+    period_difference: {
+      zh: 'N期环比值',
+      en: 'N-Period Difference Value'
+    },
+    annualized: {
+      zh: '年化值',
+      en: 'Annualized Value'
+    },
+    frequency: {
+      zh: '降频',
+      en: 'Downsample or Reduce Frequency'
+    },
   },
 
   /* 指标添加form提示 */

src/lang/modules/ToolBox/CommodityPriceChart.js

@@ -26,7 +26,13 @@ export const CommodityPriceChartEn = {
     formula_label_placeholder:'Please enter the formula',
     formula_exp:'Formula Example',
     fun_support:'Functions Support',
-    plate_profit_name:'Plate Profit'
+    plate_profit_name:'Plate Profit',
+    tips_msg01:'Futures not selected yet',
+    tips_msg02:'Chart name cannot be empty',
+    tips_msg03:'Chart category cannot be empty',
+    tips_msg04:'Please set up the trading profit configuration first.',
+    tips_msg05:'Indicator not selected yet',
+    tips_msg06:'Please add a date.',
 };
   
 /* 中文 */
@@ -53,7 +59,13 @@ export const CommodityPriceChartZh = {
     formula_label_placeholder:'请输入公式',
     formula_exp:'公式示例',
     fun_support:'函数支持',
-    plate_profit_name:'盘面利润'
+    plate_profit_name:'盘面利润',
+    tips_msg01:'暂未选择期货',
+    tips_msg02:'图表名称不能为空',
+    tips_msg03:'图表分类不能为空',
+    tips_msg04:'请先设置盘面利润配置',
+    tips_msg05:'暂未选择指标',
+    tips_msg06:'请添加日期',
 };
   
 /**

src/lang/modules/systemManage/BaseConfig.js

@@ -47,6 +47,7 @@ export const BaseConfigEn = {
 
     resource_placeholder01:'Please enter the image name',
     resource_placeholder02:'Please select the image type',
+    resource_placeholder03:'Please upload Image',
     resource_type01:'Header',
     resource_type02:'Footer',
     resource_btn01:'Upload Image',
@@ -58,6 +59,8 @@ export const BaseConfigEn = {
     upload_suggest:'Supports formats like jpg, jpeg, png, etc. It is recommended to upload headers of 800*200 and footers of 800*80',
     resource_del_msg:'Are you sure to delete the selected image?',
 
+    tip_msg01:'Save successful, please check the corresponding page/project later',
+
 };
   
 /* 中文 */
@@ -105,6 +108,7 @@ export const BaseConfigZh = {
 
     resource_placeholder01:'请输入图片名称',
     resource_placeholder02:'请选择图片类型',
+    resource_placeholder03:'请上传图片',
     resource_type01:'版头',
     resource_type02:'版尾',
     resource_btn01:'上传图片',
@@ -115,6 +119,8 @@ export const BaseConfigZh = {
     resource_label02:'图片类型',
     upload_suggest:'支持jpg、jpeg、png等格式，建议上传版头800*200,版尾800*80',
     resource_del_msg:'是否确认删除选中图片?',
+
+    tip_msg01:'保存成功，请稍后到对应页面/项目查看',
 };
   
 /**

src/views/datasheet_manage/common/customTable.js

@@ -151,14 +151,14 @@ export function getRightClickMenu(pos,canEdit=false) {
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.to_month_quarter') : '累计值转月/季值',source: 1,fromEdbKey:5 },
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.on_year') : '同比值',source: 3,fromEdbKey:6 },
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.differ') : '同差值',source: 4,fromEdbKey:7 },
-        { label: bus.$i18nt ? bus.$i18nt.t('PredictEditPage.rule_move_average') : 'N期移动均值',source: 5,fromEdbKey:8 },
-        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.to_month_quarter') : 'N期环比值',source: 6,fromEdbKey:12 },
-        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.to_month_quarter') : 'N期环差值',source: 7,fromEdbKey:13 },
+        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.rule_move_average') : 'N期移动均值',source: 5,fromEdbKey:8 },
+        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.period_over_period') : 'N期环比值',source: 6,fromEdbKey:12 },
+        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.period_difference') : 'N期环差值',source: 7,fromEdbKey:13 },
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.up_conver') : '升频',source: 8,fromEdbKey:14 },
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.time_move') : '时间移位',source: 10,fromEdbKey:22 },
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.super_season') : '超季节性',source: 11,fromEdbKey:35 },
-        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.to_month_quarter') : '年化值',source: 12,fromEdbKey:52 },
-        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.to_month_quarter') : '降频',source: 9,fromEdbKey:51 },
+        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.annualized') : '年化值',source: 12,fromEdbKey:52 },
+        { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.frequency') : '降频',source: 9,fromEdbKey:51 },
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.cumulate') : '累计值',source: 13,fromEdbKey:62 },
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.ex_smooth') : '指数修匀',source: 15,fromEdbKey:'alpha' },
         { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.day_mean') : '日均值',source: 16,fromEdbKey:75 },

src/views/datasheet_manage/components/calculateEdbDia.vue

@@ -16,7 +16,7 @@
               @change="()=>{ $refs.selectRef.targetTypeChange();changeSource() }"
             >
               <el-radio :label="1">{{$t('Edb.CalculateBtns.to_month')}}</el-radio>
-              <el-radio :label="2">{{$t('Edb.CalculateBtns.to_month')}}</el-radio>
+              <el-radio :label="2">{{$t('Edb.CalculateBtns.to_quarter')}}</el-radio>
             </el-radio-group>
           </template>
 

src/views/datasheet_manage/components/dateMoveWaySection.vue

@@ -165,6 +165,9 @@ export default {
   .date-change-li {
     margin: 10px 0;
   }
+  .header {
+    label { width: 100px;text-align: right;margin-left: -20px;}
+  }
   .date-item {
     display: flex;
     align-items: center;

src/views/datasheet_manage/components/insertDateDia.vue

@@ -206,7 +206,7 @@ export default {
     margin: 20px 0; 
     display: flex;
     align-items: center;
-    label { width: 80px;flex-shrink: 0; }
+    label { width: 90px;flex-shrink: 0;text-align: right;}
   }
 }
 .dia-bot {

src/views/futures_manage/chartEditor.vue

@@ -230,13 +230,13 @@ export default {
 			},
 			chartRules: {
 				futures_id:[
-					{ required: true, message: '暂未选择期货', trigger: 'blur' },
+					{ required: true, message: this.$t('ToolBox.CommodityPriceChart.tips_msg01')||'暂未选择期货', trigger: 'blur' },
 				],
 				ChartName:[
-					{ required: true, message: '图表名称不能为空', trigger: 'blur' },
+					{ required: true, message: this.$t('ToolBox.CommodityPriceChart.tips_msg02')||'图表名称不能为空', trigger: 'blur' },
 				],
 				classify:[
-					{ required: true, message: '图表分类不能为空', trigger: 'blur' },
+					{ required: true, message: this.$t('ToolBox.CommodityPriceChart.tips_msg03')||'图表分类不能为空', trigger: 'blur' },
 				],
 			},
 
@@ -364,7 +364,7 @@ export default {
 
 		/* 利润曲线预览 */
 		async getProfitPreview(dateList) {
-			if(!this.profitInfo.list.length) return this.$message.warning('请先设置盘面利润配置')
+			if(!this.profitInfo.list.length) return this.$message.warning(this.$t('ToolBox.CommodityPriceChart.tips_msg04')||'请先设置盘面利润配置')
 
 			const { list,formula } = this.profitInfo;
 			let params = {
@@ -464,10 +464,10 @@ export default {
 
 		/* 保存 */
 		async saveHandle() {
-			if(!this.tableData.length) return this.$message.warning('暂未选择指标');
+			if(!this.tableData.length) return this.$message.warning(this.$t('ToolBox.CommodityPriceChart.tips_msg05')||'暂未选择指标');
 			await this.$refs.diaForm.validate();
 
-			if(!this.$refs.BarOptRef.dateList.length)  return this.$message.warning('请添加日期');
+			if(!this.$refs.BarOptRef.dateList.length)  return this.$message.warning(this.$t('ToolBox.CommodityPriceChart.tips_msg06')||'请添加日期');
 
 			let public_param = {
 				ChartClassifyId: this.chartInfo.classify || 0,
@@ -510,7 +510,7 @@ export default {
 
 		/* 利润曲线保存 */
 		async handleSaveProfit(public_param) {
-			if(!this.profitInfo.list.length)  return this.$message.warning('请先设置盘面利润配置');
+			if(!this.profitInfo.list.length)  return this.$message.warning(this.$t('ToolBox.CommodityPriceChart.tips_msg04')||'请先设置盘面利润配置');
 			const { list,formula } = this.profitInfo;
 			let params = {
 				...public_param,
@@ -558,7 +558,7 @@ export default {
         ImageUrl: Data.ResourceUrl,
       });
 
-			this.$message.success(this.chart_code ? '添加成功' : '保存成功');
+			this.$message.success(this.chart_code ? this.$t('MsgPrompt.add_msg2')||'添加成功' : this.$t('MsgPrompt.saved_msg')||'保存成功');
 			this.$router.replace({
 				path: '/commordityChartBase',
 				query: {

src/views/report_manage/everyday.vue

@@ -332,7 +332,7 @@ export default {
         height: 350,
         fontSizeDefaultSelection: "16",
         theme: "dark", //主题
-        placeholderText: "请输入内容",
+        placeholderText: localStorage.getItem('i18n') == 'en' ? 'Please input content' : "请输入内容",
         language: localStorage.getItem('i18n') == 'en' ? 'en' : "zh_cn", //国际化
         imageUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url
         videoUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url

src/views/report_manage/mixins/editor.js

@@ -45,7 +45,7 @@ export default {
         fontSize: ["12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
         fontSizeDefaultSelection: "16",
         theme: "dark", //主题
-        placeholderText: "请输入内容",
+        placeholderText: localStorage.getItem('i18n') == 'en' ? 'Please input content' : "请输入内容",
         language: localStorage.getItem('i18n') == 'en' ? 'en' : "zh_cn", //国际化
         imageUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url
         videoUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url

src/views/report_manage/mixins/reportMixin.js

@@ -95,7 +95,7 @@ export default {
         fontSize: ["12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
         fontSizeDefaultSelection: "16",
         theme: "dark", //主题
-        placeholderText: "请输入内容",
+        placeholderText: localStorage.getItem('i18n') == 'en' ? 'Please input content' : "请输入内容",
         language: localStorage.getItem('i18n') == 'en' ? 'en' : "zh_cn", //国际化
         imageUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url
         videoUploadURL: process.env.VUE_APP_API_ROOT + "/report/uploadImg", //上传url

src/views/report_manage/reportEn/reportEditor.vue

@@ -494,7 +494,7 @@ export default {
         fontSizeDefaultSelection: "16",
         quickInsertEnabled: false,
         theme: "dark", //主题
-        placeholderText:'请输入overview',
+        placeholderText:localStorage.getItem('i18n') == 'en' ? 'Please Overview' : '请输入overview',
         language: localStorage.getItem('i18n') == 'en' ? 'en' : "zh_cn",
         //允许粘贴的样式
         pasteAllowedStyleProps: ['font-family', 'font-size', 'color']

src/views/smartReport/components/TextEdit.vue

@@ -62,8 +62,8 @@ export default {
                 fontSize: ["12", "13","14","15", "16", "18", "20", "24", "28", "32", "36", "40"],
                 fontSizeDefaultSelection: "16",
                 theme: "dark", //主题
-                placeholderText: "请输入内容",
-                language: "zh_cn", //国际化
+                placeholderText: localStorage.getItem('i18n') == 'en' ? 'Please input content' : "请输入内容",
+                language: localStorage.getItem('i18n') == 'en' ? 'en' : "zh_cn", //国际化
                 imageDefaultWidth: false,
                 quickInsertEnabled: false,
                 toolbarVisibleWithoutSelection: true, //是否开启 不选中模式

src/views/system_manage/components/smartReportImgSet.vue

@@ -144,9 +144,9 @@ export default {
                 imgUrl:''
             },
             formRules:{
-                name:[{ required: true, message: '请输入图片名称', trigger: 'blur' }],
-                type:[{ required: true, message: '请选择图片类型', trigger: 'change' }],
-                imgUrl:[{ required: true, message: '请上传图片', trigger: 'change' }]
+                name:[{ required: true, message: this.$t('SystemManage.BaseConfig.resource_placeholder01')||'请输入图片名称', trigger: 'blur' }],
+                type:[{ required: true, message: this.$t('SystemManage.BaseConfig.resource_placeholder02')||'请选择图片类型', trigger: 'change' }],
+                imgUrl:[{ required: true, message: this.$t('SystemManage.BaseConfig.resource_placeholder03')||'请上传图片', trigger: 'change' }]
             },
 
             showViewer:false,

src/views/system_manage/etaBaseConfig.vue

@@ -677,7 +677,7 @@ export default {
                         }
                     }).then(res=>{
                         if(res.Ret!==200) return 
-                        this.$message.success('保存成功，请稍后到对应页面/项目查看')
+                        this.$message.success(this.$t('SystemManage.BaseConfig.tip_msg01')||'保存成功，请稍后到对应页面/项目查看')
                     })
                 }
             })