Merge branch 'requirements_157'

src/lang/modules/PredictEdb/En.js

@@ -32,6 +32,7 @@ export default {
     season_select_cont: 'N Years Consecutive',
     season_select_formula: 'Fixed N Years',
     label_periods: 'Number of Periods',
+    label_years: 'Number of Years',
     option_season_calendar1: 'Calendar',
     option_season_calendar2: 'Lunar Calendar',
     label_yoy_year: 'YoY Year',
@@ -55,7 +56,8 @@ export default {
     label_value_yoy_end: 'End Value of YoY',
     label_value_year: 'Annual Value',
 
-    label_rule: 'Rule',
+    // label_rule: 'Rule',
+    label_time_period: 'Time Period',
     rule_newset: 'Latest Value',
     rule_fix: "Fixed Value" ,
     rule_onyear: "YoY" ,

src/lang/modules/PredictEdb/Zh.js

@@ -32,6 +32,7 @@ export default {
     season_select_cont: '连续N年',
     season_select_formula: '指定N年',
     label_periods: '期数',
+    label_years: '年数',
     option_season_calendar1: '公历',
     option_season_calendar2: '农历',
     label_yoy_year: '同比年份',
@@ -55,7 +56,8 @@ export default {
     label_value_yoy_end: '同比增速终值',
     label_value_year: '年度值',
 
-    label_rule: '规则',
+    // label_rule: '规则',
+    label_time_period: '时间段',
     rule_newset: '最新',
     rule_fix: "固定值" ,
     rule_onyear: "同比" ,
@@ -71,7 +73,7 @@ export default {
     rule_yoy_growth: "同比增速差值" ,
     rule_linear_reg: "一元线性拟合" ,
     rule_n_year: 'N年均值',
-    rule_value_back: '年度倒退值',
+    rule_value_back: '年度值倒推',
     rule_tip: `
       预测规则说明：<br> 
       1、最新：预测值全部等于最新值；<br>

src/views/predictEdb_manage/addPredicEdb.vue

@@ -123,7 +123,7 @@
             :name="index"
           >
             <template slot="title">
-              <span class="text_oneLine"><!-- 规则 -->{{$t('PredictEditPage.label_rule')}}{{ index + 1 }}</span>
+              <span class="text_oneLine"><!-- 时间段 -->{{$t('PredictEditPage.label_time_period')}}{{ index + 1 }}</span>
               <i
                 class="el-icon-delete del-icon"
                 @click.stop="removeRuleHandle(item, index)"
@@ -196,7 +196,7 @@
                   </el-select>
                 </div>
                 <div class="item" v-if="item.season_way===1">
-                  <span class="label"><!-- 期数 -->{{$t('PredictEditPage.label_periods')}}</span>
+                  <span class="label"><!-- 年数 -->{{$t('PredictEditPage.label_years')}}</span>
                   <el-input
                     v-model="item.n_value"
                     style="width: 100%"

src/views/predictEdb_manage/components/rulesDetailDia.vue

@@ -20,7 +20,7 @@
             :name="index"
           >
             <template slot="title">
-              <span class="text_oneLine" style="font-size: 16px;">{{$t('PredictEditPage.label_rule')}}{{ index + 1 }}({{predictTypeMap[item.predict_type]}})</span>
+              <span class="text_oneLine" style="font-size: 16px;">{{$t('PredictEditPage.label_time_period')}}{{ index + 1 }}({{predictTypeMap[item.predict_type]}})</span>
             </template>
             <div class="wrap">
               <div class="item">