补充英文翻译

src/lang/modules/EtaChart/En.js

@@ -28,6 +28,9 @@ export default {
       1、If the start date is earlier than the end date, the default is not to cross the year, and you can check the check box to cross the year.</br>
       2、If the start date is later than or equal to the end date, it will cross the year and the check is not allowed.
     `,
+    dynamic_time_tip:`<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>`,
     label_cross_year:'Cross the year',
     label_legend_set:'Legend Name Settings',
     no_set_msg: 'No configuration available',
@@ -84,6 +87,12 @@ export default {
     right_edb_format:'Number Format',
     right_edb_format_per:'Percent',
     right_edb_format_dec:'Decimal',
+    right_edb_mark_connect_text:'Mark Point Line',
+    right_edb_mark_connected:'Connected',
+    right_edb_mark_not_connected:'Not Connected',
+    right_edb_mark_connect_line_color:'Line Color',
+    right_edb_mark_connect_line_style:'Line Style',
+    right_edb_mark_connect_line_width:'Line Width',
 
     //截面散点图区域
     label_serie_set:'Series {index} Configuration',

src/lang/modules/EtaChart/Zh.js

@@ -28,6 +28,10 @@ export default {
       1、若开始日期小于结束日期，则默认不跨年，允许勾选跨年</br>
       2、若开始日期大于等于结束日期，则跨年，不允许取消勾选
     `,
+    dynamic_time_tip:`<p>配置目的：根据系统日期或者指标最新日期，设置一个动态更新的结束时间。比如上个月的月末，这个“月末”会随着最新日期的更新而动态更新。</p>
+    <p>配置方法：1、选择基准日期。默认选则系统日期(当前的自然日期)，也可选指标最新日期(跟随指标的更新而更新)。在选择指标最新日期的前提下，可进行期数前移，假设前移1期，则选择指标上一期的日期。</p>
+    <p>2、根据基准日期，可进行日期变换。变换方式有日期位移和指定频率两种，可自由组合。默认给出指定频率(当月第一天）加日期变换（-1天），意味着给出上个月的月末日期。</p>
+    <p>配置示例：把起始日期设置在指标最新日期所在年份上一年的年末。基准日期选则指标最新日期，日期变换添加指定频率为当年第一天，再添加日期位移为-1。</p>`,
     label_cross_year:'跨年',
     label_legend_set:'图例名称设置',
     no_set_msg: '暂无配置',
@@ -84,6 +88,12 @@ export default {
     right_edb_format:'数字格式',
     right_edb_format_per:'百分数',
     right_edb_format_dec:'小数',
+    right_edb_mark_connect_text:'标记点连线',
+    right_edb_mark_connected:'有',
+    right_edb_mark_not_connected:'无',
+    right_edb_mark_connect_line_color:'连线颜色',
+    right_edb_mark_connect_line_style:'连线线型',
+    right_edb_mark_connect_line_width:'连线粗细',
 
     //截面散点图区域
     label_serie_set:'系列{index}配置',

src/lang/modules/EtaChart/commonLang.js

@@ -517,7 +517,42 @@ export default {
         zh:'分位',
         en:'Quantile'
     },
-    
+    time_base:{
+        zh:'基准日期',
+        en:'Base Date'
+    },
+    sys_time:{
+        zh:'系统日期',
+        en:'System Date'
+    },
+    edb_new_time:{
+        zh:'指标最新日期',
+        en:'Indicator Latest Date'
+    },
+    edb_periods:{
+        zh:'期数',
+        en:'periods'
+    },
+    edb_periods_lead:{
+        zh:'前移',
+        en:' forward lead'
+    },
+    edb_period:{
+        zh:'期',
+        en:'periods'
+    },
+    edb_time_fix:{
+        zh:'固定',
+        en:'Fix'
+    },
+    edb_time_now:{
+        zh:'至今',
+        en:'So Far'
+    },
+    edb_time_dyn:{
+        zh:'动态',
+        en:'Dynamic'
+    }
 
 
   },

src/views/dataEntry_manage/components/addMarkerDialog.vue

@@ -193,10 +193,10 @@
             <!-- 如果时间区间选择自定义 -->
             <div class="custom-time-wrap" v-if="markerForm.timeInterval===1">
                 <!-- 起始时间 -->
-                <el-form-item label="起始时间">
+                <el-form-item :label="$t('Table.start_time')">
                     <div class="form-item-content">
                         <div class="format">
-                            <el-radio v-model="markerForm.startTime.timeType" :label="1" style="margin-right: 0;">固定</el-radio>
+                            <el-radio v-model="markerForm.startTime.timeType" :label="1" style="margin-right: 0;"><!-- 固定 -->{{ $t('Chart.Detail.edb_time_fix') }}</el-radio>
                             <el-date-picker
                                 v-model="markerForm.startTime.date"
                                 popper-class="x-range-picker-date"
@@ -208,8 +208,9 @@
                             ></el-date-picker>
                         </div>
                         <div class="format">
-                            <el-radio v-model="markerForm.startTime.timeType" :label="2" style="margin-left:20px;margin-right:0">动态</el-radio>
-                            <el-tooltip effect="dark" content="说明说明" placement="top">
+                            <el-radio v-model="markerForm.startTime.timeType" :label="2" style="margin-left:20px;margin-right:0"><!-- 动态 -->{{ $t('Chart.Detail.edb_time_dyn') }}</el-radio>
+                            <el-tooltip effect="dark" placement="top">
+                                <div slot="content" v-html="$t('EtaChartAddPage.dynamic_time_tip')"></div>
                                 <i class="el-icon-question" style="font-size: 16px;"></i>
                             </el-tooltip>
                         </div>
@@ -218,19 +219,19 @@
                 <!-- 起始时间为动态 -->
                 <div class="start-time-custom-wrap" v-if="markerForm.startTime.timeType===2">
                     <!-- 基准日期 -->
-                    <el-form-item label="基准日期">
+                    <el-form-item :label="$t('Chart.Detail.time_base')">
                         <div class="form-item-content">
                             <div class="format">
-                                <el-radio v-model="markerForm.startTime.baseDate" :label="0">系统日期</el-radio>
+                                <el-radio v-model="markerForm.startTime.baseDate" :label="0"><!-- 系统日期 -->{{ $t('Chart.Detail.sys_time') }}</el-radio>
                             </div>
                             <div class="format" style="display: flex;align-items: center;">
                                 <p>
-                                    <el-radio v-model="markerForm.startTime.baseDate" :label="1" style="margin-right:5px;">指标最新日期</el-radio>
+                                    <el-radio v-model="markerForm.startTime.baseDate" :label="1" style="margin-right:5px;"><!-- 指标最新日期 -->{{ $t('Chart.Detail.edb_new_time') }}</el-radio>
                                 </p>
-                                <p>期数前移
+                                <p><!-- 期数前移 -->{{ $t('Chart.Detail.edb_periods') }}{{ $t('Chart.Detail.edb_periods_lead') }}
                                     <el-input style="width:60px" type="number" class="number-input"
                                     v-model="markerForm.startTime.conf.moveForward" />
-                                    期
+                                    <!-- 期 -->{{ $t('Chart.Detail.edb_period') }}
                                 </p>
                             </div>
                         </div>
@@ -242,13 +243,13 @@
                 </div>
                 
                 <!-- 结束时间 -->
-                <el-form-item label="结束时间">
+                <el-form-item :label="$t('Edb.Detail.e_end_time')">
                     <div class="form-item-content">
                         <div class="format">
-                            <el-radio v-model="markerForm.endTime.timeType" :label="3">至今</el-radio>
+                            <el-radio v-model="markerForm.endTime.timeType" :label="3"><!-- 至今 -->{{ $t('Chart.Detail.edb_time_now') }}</el-radio>
                         </div>
                         <div class="format">
-                            <el-radio v-model="markerForm.endTime.timeType" :label="1" style="margin-right: 0;">固定</el-radio>
+                            <el-radio v-model="markerForm.endTime.timeType" :label="1" style="margin-right: 0;"><!-- 固定 -->{{ $t('Chart.Detail.edb_time_fix') }}</el-radio>
                             <el-date-picker
                                 v-model="markerForm.endTime.date"
                                 popper-class="x-range-picker-date"
@@ -260,8 +261,9 @@
                             ></el-date-picker>
                         </div>
                         <div class="format">
-                            <el-radio v-model="markerForm.endTime.timeType" :label="2" style="margin-right: 0;">动态</el-radio>
-                            <el-tooltip effect="dark" content="说明说明" placement="top">
+                            <el-radio v-model="markerForm.endTime.timeType" :label="2" style="margin-right: 0;"><!-- 动态 -->{{ $t('Chart.Detail.edb_time_dyn') }}</el-radio>
+                            <el-tooltip effect="dark" placement="top">
+                                <div slot="content" v-html="$t('EtaChartAddPage.dynamic_time_tip')"></div>
                                 <i class="el-icon-question" style="font-size: 16px;"></i>
                             </el-tooltip>
                         </div>
@@ -271,19 +273,19 @@
                 <!-- 结束时间为动态 -->
                 <div class="end-time-custom-wrap" v-if="markerForm.endTime.timeType===2">
                     <!-- 基准日期 -->
-                    <el-form-item label="基准日期">
+                    <el-form-item :label="$t('Chart.Detail.time_base')">
                         <div class="form-item-content">
                             <div class="format">
-                                <el-radio v-model="markerForm.endTime.baseDate" :label="0">系统日期</el-radio>
+                                <el-radio v-model="markerForm.endTime.baseDate" :label="0"><!-- 系统日期 -->{{ $t('Chart.Detail.sys_time') }}</el-radio>
                             </div>
                             <div class="format" style="display: flex;align-items: center;">
                                 <p>
-                                    <el-radio v-model="markerForm.endTime.baseDate" :label="1" style="margin-right:5px;">指标最新日期</el-radio>
+                                    <el-radio v-model="markerForm.endTime.baseDate" :label="1" style="margin-right:5px;"><!-- 指标最新日期 -->{{ $t('Chart.Detail.edb_new_time') }}</el-radio>
                                 </p>
-                                <p>期数前移
+                                <p><!-- 期数前移 -->{{ $t('Chart.Detail.edb_periods') }}{{ $t('Chart.Detail.edb_periods_lead') }}
                                     <el-input style="width:60px" type="number" class="number-input"
                                     v-model="markerForm.endTime.conf.moveForward" />
-                                    期
+                                    <!-- 期 -->{{ $t('Chart.Detail.edb_period') }}
                                 </p>
                             </div>
                         </div>

src/views/dataEntry_manage/components/addRightEdbDialog.vue

@@ -67,6 +67,7 @@
                     </el-select>
                 </el-form-item>
                 <!-- 如果选择标记点 -->
+                <!-- 标记点形状 -->
                 <el-form-item :label="$t('EtaChartAddPage.right_edb_mark_shape')" v-if="rightEdbForm.Style==='mark'">
                     <el-select v-model="rightEdbForm.Shape">
                         <el-option 
@@ -90,6 +91,7 @@
                     ></el-color-picker>
                 </el-form-item>
                 <!-- 如果选择标记点 -->
+                <!-- 标记点大小 -->
                 <el-form-item :label="$t('EtaChartAddPage.right_edb_mark_size')" v-if="rightEdbForm.Style==='mark'">
                     <el-input-number 
                         v-model="rightEdbForm.Size" 
@@ -108,15 +110,16 @@
                     </el-radio-group>
                 </el-form-item>
                 <!-- 如果选择标记点 -->
-                <el-form-item label="标记点连线" v-if="rightEdbForm.Style==='mark'">
+                <!-- 标记点连线 -->
+                <el-form-item :label="$t('EtaChartAddPage.right_edb_mark_connect_text')" v-if="rightEdbForm.Style==='mark'">
                     <el-radio-group v-model="rightEdbForm.IsConnected">
-                        <el-radio :label="0">无</el-radio>
-                        <el-radio :label="1">有</el-radio>
+                        <el-radio :label="0">{{$t('EtaChartAddPage.right_edb_mark_not_connected')}}</el-radio>
+                        <el-radio :label="1">{{ $t('EtaChartAddPage.right_edb_mark_connected') }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <!-- 如果选择连线 -->
                 <template v-if="rightEdbForm.IsConnected">
-                    <el-form-item label="连线颜色">
+                    <el-form-item :label="$t('EtaChartAddPage.right_edb_mark_connect_line_color')">
                         <el-color-picker
                         style="width: 90px"
                         v-model="rightEdbForm.LineColor"
@@ -124,7 +127,7 @@
                         :predefine="predefineColors"
                         ></el-color-picker>
                     </el-form-item>
-                    <el-form-item label="连线线型">
+                    <el-form-item :label="$t('EtaChartAddPage.right_edb_mark_connect_line_style')">
                         <el-select v-model="rightEdbForm.LineStyle">
                             <el-option v-for="lineItem in lineStylesOpts"
                                 :key="lineItem.value"
@@ -136,7 +139,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="连线粗细">
+                    <el-form-item :label="$t('EtaChartAddPage.right_edb_mark_connect_line_width')">
                         <el-input-number 
                             v-model="rightEdbForm.LineWidth" 
                             controls-position="right" 
@@ -148,8 +151,8 @@
            </div>
         </div>
         <div slot="footer" class="dialog-footer" style="text-align: center;">
-            <el-button @click="$emit('close')">取消</el-button>
-            <el-button type="primary" @click="confirmPerson">保存</el-button>
+            <el-button @click="$emit('close')">{{$t('Dialog.cancel_btn')}}</el-button>
+            <el-button type="primary" @click="confirmPerson">{{$t('Dialog.confirm_save_btn')}}</el-button>
         </div>
     </el-dialog>
 </template>

src/views/dataEntry_manage/components/markerExplainText.js

@@ -1,8 +0,0 @@
-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>`