补充部分英文翻译

src/lang/modules/EtaChart/En.js

@@ -51,6 +51,10 @@ export default {
     edit_plotline_btn: 'Edit Marker Line',
     edit_plotarea_btn: 'Edit Marker Area',
     add_intro_btn: 'Add Chart Description',
+    add_right_edb_btn:'Add Right Axis',
+    limits_btn:'Limits Area',
+    avg_line_btn:'Average Line',
+    std_btn:'StdEV Area',
     label_select_serie:'Select axis',
     label_select_seris_placeholder:'Please select the date axis',
     label_line_scale:'Marker line position',
@@ -67,6 +71,12 @@ export default {
     section_pos_top: 'Top',
     section_pos_center: 'Center',
     section_pos_bot: 'Bottom',
+    right_edb_type_on_year:'Left Axis Year-on-Year',
+    right_edb_type_lib:'Indicator Library',
+    right_edb_type_pred:'Predictive Indicators',
+    right_edb_gen_style:'Generate Style',
+    right_edb_gen_column:'Column',
+    right_edb_gen_mark:'Mark Point',
 
     //截面散点图区域
     label_serie_set:'Series {index} Configuration',

src/lang/modules/EtaChart/Zh.js

@@ -51,6 +51,10 @@ export default {
     edit_plotline_btn: '编辑标识线',
     edit_plotarea_btn: '编辑标识区',
     add_intro_btn: '添加图表说明',
+    add_right_edb_btn:'添加右轴指标',
+    limits_btn:'同期上下限',
+    avg_line_btn:'同期均线',
+    std_btn:'同期标准差',
     label_select_serie:'选择坐标轴',
     label_select_seris_placeholder:'请选择日期坐标轴',
     label_line_scale:'标识线所在刻度',
@@ -67,6 +71,12 @@ export default {
     section_pos_top: '顶部',
     section_pos_center: '居中',
     section_pos_bot: '底部',
+    right_edb_type_on_year:'左轴指标同比',
+    right_edb_type_lib:'指标库',
+    right_edb_type_pred:'预测指标',
+    right_edb_gen_style:'生成样式',
+    right_edb_gen_column:'柱形',
+    right_edb_gen_mark:'标记点',
 
     //截面散点图区域
     label_serie_set:'系列{index}配置',

src/lang/modules/EtaChart/commonLang.js

@@ -456,7 +456,70 @@ export default {
     text_size: {
       zh:'字号',
       en:'Size'
-    }
+    },
+    chart_first_edb:{
+        zh:'图上第一个指标',
+        en:'The first indicator on the graph'
+    },
+    chart_other_edb:{
+        zh:'其他指标',
+        en:'Other indicator',
+    },
+    time_interval:{
+        zh:'时间区间',
+        en:'Time Interval'
+    },
+    follow_chart:{
+        zh:'跟随图表',
+        en:'follow the chart'
+    },
+    custom:{
+        zh:'自定义',
+        en:'custom'
+    },
+    plot_style:{
+        zh:'样式',
+        en:'style'
+    },
+    plot_calculation:{
+        zh:'计算方式',
+        en:'Calculation'
+    },
+    cal_range_val:{
+        zh:'区间',
+        en:'Range'
+    },
+    cal_range_mean:{
+        zh:'均值',
+        en:'Mean'
+    },
+    cal_range_plus:{
+        zh:'加',
+        en:'Plus'
+    },
+    cal_range_times:{
+        zh:'倍',
+        en:'times'
+    },
+    cal_range_std:{
+        zh:'标准差',
+        en:'STDEV'
+    },
+    cal_range_count:{
+        zh:'个数',
+        en:'Count'
+    },
+    cal_range_value:{
+        zh:'数值',
+        en:'Value'
+    },
+    cal_range_quantile:{
+        zh:'分位',
+        en:'Quantile'
+    },
+    
+
+
   },
 
   /* form校验 */

src/views/dataEntry_manage/components/addMarkerDialog.vue

@@ -38,7 +38,7 @@
               <div class="mark-value-wrap form-item-content">
                 <!-- 固定值：原标识线输入框 -->
                 <div class="default-value">
-                    <el-radio v-model="markerForm.markLineType" :label="1" style="margin-right: 20px;">固定</el-radio>
+                    <el-radio v-model="markerForm.markLineType" :label="1" style="margin-right: 20px;">{{$t('PredictEditPage.rule_fix')}}</el-radio>
                     <!-- 时间轴1,2,4,6的y轴数字 x轴日期  -->
                     <template v-if="[1,2,4,6].includes(chartInfo.ChartType)">
                         <el-date-picker
@@ -77,7 +77,7 @@
                 </div>
                 <!-- 指标计算 -->
                 <div class="custom-value">
-                    <el-radio v-model="markerForm.markLineType" :label="2" style="margin-left: 20px;">指标计算</el-radio>
+                    <el-radio v-model="markerForm.markLineType" :label="2" style="margin-left: 20px;">{{ $t('Edb.CalculatesAll.indicator_calculation') }}</el-radio>
                 </div>
               </div>
             </template>
@@ -155,16 +155,16 @@
           <!-- 标识线-指标计算部分 -->
           <div class="custom-value-setting-wrap" v-if="form.markerType==='line'&&markerForm.markLineType===2">
             <!-- 指标选择 -->
-            <el-form-item label="指标">
+            <el-form-item :label="$t('Edb.eta_name')">
                 <div class="edb-box-wrap form-item-content">
                     <!-- 固定第一个指标 -->
                     <div class="fixed-edb">
-                        <el-radio v-model="markerForm.edbType" :label="0">图上第一个指标</el-radio>
+                        <el-radio v-model="markerForm.edbType" :label="0">{{ $t('Chart.Detail.chart_first_edb') }}</el-radio>
                         <p>{{chartInfo.ChartName}}</p>
                     </div>
                     <!-- 指标/预测指标库的指标 -->
                     <div class="other-edb">
-                        <el-radio v-model="markerForm.edbType" :label="1" style="margin-right: 20px;">其他指标</el-radio>
+                        <el-radio v-model="markerForm.edbType" :label="1" style="margin-right: 20px;">{{$t('Chart.Detail.chart_other_edb')}}</el-radio>
                         <!-- /datamanage/edb_info/filter_by_es/all -->
                         <el-select style="width: 200px;"
                             filterable remote clearable
@@ -184,10 +184,10 @@
                 </div>
             </el-form-item>
             <!-- 时间区间选择 -->
-            <el-form-item label="时间区间">
+            <el-form-item :label="$t('Chart.Detail.time_interval')">
                 <div class="time-area-wrap">
-                    <el-radio v-model="markerForm.timeInterval" :label="0">跟随图表</el-radio>
-                    <el-radio v-model="markerForm.timeInterval" :label="1">自定义</el-radio>
+                    <el-radio v-model="markerForm.timeInterval" :label="0">{{ $t('Chart.Detail.follow_chart') }}</el-radio>
+                    <el-radio v-model="markerForm.timeInterval" :label="1">{{ $t('Chart.Detail.custom') }}</el-radio>
                 </div>
             </el-form-item>
             <!-- 如果时间区间选择自定义 -->
@@ -294,26 +294,29 @@
                 </div>
             </div>
             <!-- 计算方式 -->
-            <el-form-item label="计算方式">
+            <el-form-item :label="$t('Chart.Detail.plot_calculation')">
                 <div class="form-item-content">
+                    <!--区间均值-->
                     <div class="format">
-                        <el-radio v-model="markerForm.calculation" :label="1">区间均值</el-radio>
+                        <el-radio v-model="markerForm.calculation" :label="1">{{ $t('Chart.Detail.cal_range_val') }} {{ $t('Chart.Detail.cal_range_mean') }}</el-radio>
                     </div>
+                    <!--区间均值加N倍标准差-->
                     <div class="format">
-                        <el-radio v-model="markerForm.calculation" :label="2">区间均值</el-radio>
-                        <p>加<el-input 
+                        <el-radio v-model="markerForm.calculation" :label="2">{{ $t('Chart.Detail.cal_range_val') }}{{ $t('Chart.Detail.cal_range_mean') }}</el-radio>
+                        <p>{{ $t('Chart.Detail.cal_range_plus') }}<el-input 
                             style="width:60px" 
                             v-model="markerForm.calculationValue" 
-                            type="number" class="number-input"></el-input>倍标准差</p>
+                            type="number" class="number-input"></el-input>{{ $t('Chart.Detail.cal_range_times') }} {{ $t('Chart.Detail.cal_range_std') }}</p>
                     </div>
+                    <!--区间分位-->
                     <div class="format">
-                        <el-radio v-model="markerForm.calculation" :label="3">区间</el-radio>
+                        <el-radio v-model="markerForm.calculation" :label="3">{{ $t('Chart.Detail.cal_range_val') }}</el-radio>
                         <p>
                             <el-input style="width:60px" v-model="calculationValue" type="number" class="number-input"></el-input>%
                             <el-select v-model="calculationType" style="width:80px">
-                                <el-option label="个数" :value="3"></el-option>
-                                <el-option label="数值" :value="4"></el-option>
-                            </el-select>分位
+                                <el-option :label="$t('Chart.Detail.cal_range_count')" :value="3"></el-option>
+                                <el-option :label="$t('Chart.Detail.cal_range_value')" :value="4"></el-option>
+                            </el-select>{{ $t('Chart.Detail.cal_range_quantile') }}
                         </p>
                     </div>
                 </div>
@@ -322,7 +325,7 @@
 
           <!-- 标识线样式 可收起 -->
           <div class="mark-box" @click="isMarkStyleShow = !isMarkStyleShow;">
-            <span></span><span>样式</span>
+            <span></span><span>{{ $t('Chart.Detail.plot_style') }}</span>
           </div>
           <div class="mark-style-wrap" v-show="isMarkStyleShow">
             <el-form-item :label="$t('EtaChartAddPage.label_line_sty')" prop="dashStyle" v-if="form.markerType==='line'">

src/views/dataEntry_manage/components/addRightEdbDialog.vue

@@ -10,14 +10,14 @@
         width="650px"
         v-dialogDrag
         top="8vh"
-        title="添加右轴指标"
+        :title="$t('EtaChartAddPage.add_right_edb_btn')"
     >
         <div class="container">
            <div class="type-select">
                 <el-radio-group v-model="rightEdbForm.IndicatorType">
-                    <el-radio :label="1">左轴指标同比</el-radio>
-                    <el-radio :label="2">指标库</el-radio>
-                    <el-radio :label="3">预测指标</el-radio>
+                    <el-radio :label="1"><!-- 左轴指标同比 -->{{ $t('EtaChartAddPage.right_edb_type_on_year') }}</el-radio>
+                    <el-radio :label="2"><!-- 指标库 -->{{ $t('EtaChartAddPage.right_edb_type_lib') }}</el-radio>
+                    <el-radio :label="3"><!-- 预测指标 -->{{ $t('EtaChartAddPage.right_edb_type_pred') }}</el-radio>
                 </el-radio-group>
                 <el-select v-if="rightEdbForm.IndicatorType!==1"
                     v-model="search_txt"
@@ -59,10 +59,11 @@
             <el-form :model="rightEdbForm" :rules="formRules" hide-required-asterisk
                 label-position="right"
                 label-width="120px">
-                <el-form-item label="生成样式">
+                <!-- 生成样式-->
+                <el-form-item :label="$t('EtaChartAddPage.right_edb_gen_style')">
                     <el-select v-model="rightEdbForm.Style">
-                        <el-option label="柱形" value="column"></el-option>
-                        <el-option label="标记点" value="mark"></el-option>
+                        <el-option :label="$t('EtaChartAddPage.right_edb_gen_column')" value="column"></el-option>
+                        <el-option :label="$t('EtaChartAddPage.right_edb_gen_mark')" value="mark"></el-option>
                     </el-select>
                 </el-form-item>
                 <!-- 如果选择标记点 -->

src/views/dataEntry_manage/components/markerExplainText.js

@@ -0,0 +1,8 @@
+export const DynamicTime = `<p>配置目的：根据系统日期或者指标最新日期，设置一个动态更新的结束时间。比如上个月的月末，这个“月末”会随着最新日期的更新而动态更新。</p>
+<p>配置方法：1、选择基准日期。默认选则系统日期(当前的自然日期)，也可选指标最新日期(跟随指标的更新而更新)。在选择指标最新日期的前提下，可进行期数前移，假设前移1期，则选择指标上一期的日期。</p>
+<p>2、根据基准日期，可进行日期变换。变换方式有日期位移和指定频率两种，可自由组合。默认给出指定频率(当月第一天）加日期变换（-1天），意味着给出上个月的月末日期。</p>
+<p>配置示例：把起始日期设置在指标最新日期所在年份上一年的年末。基准日期选则指标最新日期，日期变换添加指定频率为当年第一天，再添加日期位移为-1。</p>`
+export const DynamicTimeEn = `<p>Purpose: To set a dynamically updating end time based on the system date or the latest date of the indicator. For example, the end of the last month, this "end of the month" will dynamically update as the latest date is updated. </p>
+<p>Method: 1. Select the base date. The default is the system date (the current natural date), or you can choose the latest date of the indicator (which updates with the indicator). On the premise of choosing the latest date of the indicator, you can perform period shifting, assuming a shift of 1 period, then select the date of the previous period of the indicator.</p> 
+<p>2. Based on the base date, you can perform date transformations. The transformation methods include date displacement and specified frequency, which can be freely combined. The default is to specify a frequency (the first day of the current month) plus a date transformation (-1 day), which means to provide the end date of the last month. </p>
+<p>Example: Set the start date to the end of the year of the previous year where the latest date of the indicator is located. Choose the latest date of the indicator as the base date, add a specified frequency as the first day of the year, and then add a date displacement of -1.</p>`

src/views/dataEntry_manage/components/markersSection.vue

@@ -19,7 +19,7 @@
                 alt=""
                 style="width: 16px; height: 16px; margin-right: 10px"
             />
-            <span>{{`添加右轴指标`}}</span>
+            <span>{{$t('EtaChartAddPage.add_right_edb_btn')}}</span>
         </div>
     </div>
     <!-- 雷达不要 -->
@@ -81,7 +81,7 @@
     <template v-if="chartInfo.ChartType===2">
         <div class="section-item">
             <div class="average-item" v-if="averageArea.IsAdd">
-                <span>{{averageArea.Year||0}}年区间上下限</span>
+                <span>{{ $t('EtaChartAddPage.limits_btn') }}:{{ averageArea.Year||0 }}</span>
                 <div style="flex-shrink:0">
                     <i class="el-icon-view icon" :style="averageArea.IsShow?'color:#0052D9':'color:#999'" @click="averageArea.IsShow=!averageArea.IsShow;previewSeason('updateSeason')"/>
                     <i class="el-icon-edit icon" style="margin:0 6px" @click="openAverageDialog(averageArea,1,'edit')"/>
@@ -97,12 +97,12 @@
                     alt=""
                     style="width: 16px; height: 16px; margin-right: 10px"
                 />
-                <span><!-- 添加同期上下限 -->{{`添加同期上下限`}}</span>
+                <span><!-- 添加同期上下限 -->{{$t('Table.add_btn')}}{{$i18n.locale!=='zh'?' ':''}}{{ $t('EtaChartAddPage.limits_btn') }}</span>
             </div>
         </div>
         <div class="section-item">
             <div class="average-item" v-if="averageLine.IsAdd">
-                <span>{{averageLine.Year||0}}年区间均值</span>
+                <span>{{ $t('EtaChartAddPage.avg_line_btn') }}:{{averageLine.Year||0}}</span>
                 <div style="flex-shrink:0">
                     <i class="el-icon-view icon" :style="averageLine.IsShow?'color:#0052D9':'color:#999'" @click="averageLine.IsShow=!averageLine.IsShow;previewSeason('updateSeason')"/>
                     <i class="el-icon-edit icon" style="margin:0 6px" @click="openAverageDialog(averageLine,2,'edit')"/>
@@ -118,12 +118,12 @@
                     alt=""
                     style="width: 16px; height: 16px; margin-right: 10px"
                 />
-                <span><!-- 添加同期均线 -->{{`添加同期均线`}}</span>
+                <span><!-- 添加同期均线 -->{{$t('Table.add_btn')}}{{$i18n.locale!=='zh'?' ':''}}{{ $t('EtaChartAddPage.avg_line_btn') }}</span>
             </div>
         </div>
         <div class="section-item">
             <div class="average-item" v-if="averageStd.IsAdd">
-                <span>{{averageStd.Year||0}}年区间标准差</span>
+                <span>{{ $t('EtaChartAddPage.std_btn') }}:{{averageStd.Year||0}}</span>
                 <div style="flex-shrink:0">
                     <i class="el-icon-view icon" :style="averageStd.IsShow?'color:#0052D9':'color:#999'" @click="averageStd.IsShow=!averageStd.IsShow;previewSeason('updateSeason')"/>
                     <i class="el-icon-edit icon" style="margin:0 6px" @click="openAverageDialog(averageStd,3,'edit')"/>
@@ -139,7 +139,7 @@
                     alt=""
                     style="width: 16px; height: 16px; margin-right: 10px"
                 />
-                <span><!-- 添加同期标准差 -->{{`添加同期标准差`}}</span>
+                <span><!-- 添加同期标准差 -->{{$t('Table.add_btn')}}{{$i18n.locale!=='zh'?' ':''}}{{ $t('EtaChartAddPage.std_btn') }}</span>
             </div>
         </div>
     </template>