指标库,预测指标库,图库,MyETA翻译补充

src/lang/modules/EtaChart/En.js

@@ -50,6 +50,7 @@ export default {
     edit_plotarea_btn: 'Edit Marker Area',
     add_intro_btn: 'Add Chart Description',
     label_select_serie:'Select axis',
+    label_select_seris_placeholder:'Please select the date axis',
     label_line_scale:'Marker line position',
     label_area_scale:'Marker area range',
     label_line_sty:'Line Type',

src/lang/modules/EtaChart/Zh.js

@@ -50,6 +50,7 @@ export default {
     edit_plotarea_btn: '编辑标识区',
     add_intro_btn: '添加图表说明',
     label_select_serie:'选择坐标轴',
+    label_select_seris_placeholder:'请选择日期坐标轴',
     label_line_scale:'标识线所在刻度',
     label_area_scale:'标识区所在范围',
     label_line_sty:'线型',

src/views/dataEntry_manage/addChart.vue

@@ -673,11 +673,13 @@
 									<!-- 柱状图用别名 -->
 									<el-input 
 										v-model="scope.row.EdbAliasName"
-										placeholder="指标别名"
+										:placeholder="$t('OnlineExcelPage.indicator_alias_lbl')"
 										class="target-other-name"
 										clearable
 									/>
 								</div>
+								<span v-else-if="item.key==='Frequency'">{{ getFrequencyTrans(scope.row.Frequency||'null') }}</span>
+								<span v-else-if="item.key==='Unit'">{{ getUnitTrans(scope.row.Unit) }}</span>
 								<span v-else>{{ scope.row[item.key] }}</span>
 							</template>
 						</el-table-column>

src/views/dataEntry_manage/adjustdata/adjustData.vue

@@ -109,9 +109,9 @@
             >
               <el-option
                 v-for="item in frequencyArr"
-                :key="item"
-                :label="item"
-                :value="item"
+                :key="item.label"
+                :label="item.label"
+                :value="item.value"
               >
               </el-option>
             </el-select>
@@ -157,8 +157,8 @@
 
 <script>
 import {dataBaseInterface} from '@/api/modules/chartApi'
-import { formRules,frequencyArr } from '../databaseComponents/util';
-import { unitArr } from '@/utils/defaultOptions';
+import { formRules } from '../databaseComponents/util';
+import { unitArr,frequencySelectList } from '@/utils/defaultOptions';
 import { mapState } from 'vuex';
 export default {
   data() {
@@ -173,7 +173,7 @@ export default {
       },
       formRules,
       unitArr,
-      frequencyArr,
+      /* frequencyArr, */
       classifyOptions: [],
 
       searchOptions: [],
@@ -308,7 +308,10 @@ export default {
 
      ...mapState({
 			eta_lang: state => state.edb.eta_lang,	
-		})
+		}),
+    frequencyArr(){
+        return frequencySelectList(['半年度'])
+    }
   },
 
   mounted() {

src/views/dataEntry_manage/chartSetting.vue

@@ -739,6 +739,17 @@
                         v-if="scope.row.EdbType===2"
                       />
                     </span>
+                    <span v-else-if="item.key==='Frequency'">
+                        {{ currentLang==='en' 
+                            ? (scope.row[item.enKey]||getFrequencyTrans(scope.row[item.key])) 
+                            : getFrequencyTrans(scope.row[item.key]) 
+                        }}
+                    </span>
+                    <span v-else-if="item.key==='Unit'">
+                        {{ 
+                            currentLang==='en' 
+                                ? (scope.row[item.enKey]||getUnitTrans(scope.row[item.key])) 
+                                : getUnitTrans(scope.row[item.key]) }}</span>
                     <span v-else>{{ currentLang==='en' ? (scope.row[item.enKey]||scope.row[item.key]) : scope.row[item.key] }}</span>
                   </template>
                 </el-table-column>

src/views/dataEntry_manage/codecount/index.vue

@@ -53,9 +53,9 @@
 								style="width:220px">
 									<el-option
 										v-for="item in frequencyArr"
-										:key="item"
-										:label="item"
-										:value="item">
+										:key="item.label"
+										:label="item.label"
+										:value="item.value">
 									</el-option>
 								</el-select>
 							</el-form-item>
@@ -175,9 +175,8 @@
 
 <script>
 import { dataBaseInterface } from '@/api/api.js';
-import { unitArr } from '@/utils/defaultOptions';
+import { unitArr,frequencySelectList } from '@/utils/defaultOptions';
 import storage from '@/utils/storage.js';
-import { frequencyArr } from '../databaseComponents/util';
 import codeMirror from './compoments/codeMirror';
 import dataTable from './compoments/dataTable';
 import { mapState } from 'vuex';
@@ -187,7 +186,10 @@ export default {
 	computed: {
 		...mapState({
 			eta_lang: state => state.edb.eta_lang,	
-		})
+		}),
+		frequencyArr(){
+			return frequencySelectList(['半年度'])
+		},
 	},
 	data () {
 		return {
@@ -196,7 +198,7 @@ export default {
 			fromType:"",
 			unitArr,
 			allFromArr:[],//所有指标来源
-			frequencyArr,
+			/* frequencyArr, */
 			menuOptions:[],//目录数组
 
 			search_txt: '',

src/views/dataEntry_manage/components/addMarkerDialog.vue

@@ -22,7 +22,7 @@
           <el-form-item :label="$t('EtaChartAddPage.label_select_serie')" prop="axis">
             <el-select 
               v-model="markerForm.axis"
-              placeholder="请选择日期坐标轴"
+              :placeholder="$t('EtaChartAddPage.label_select_seris_placeholder')"
               style="width:200px;"
               @change="markerForm.axisName=axisLabelMap[markerForm.axis]"
             >
@@ -300,6 +300,13 @@ export default {
     canSelectRightTwoYaxis() {
       return [1,6].includes(this.chartInfo.ChartType) && this.axisInfo.rightTwoIndex!=-1
     },
+    dashOptions(){
+        return [
+        { label: /* '实线' */ this.$t('EtaChartAddPage.section_line'),value: 'Solid',svg:`<g clip-path="url(#clip0_2634_4692)"><rect x="-14" y="4" width="116" height="2" fill="#333333"/></g><defs><clipPath id="clip0_2634_4692"><rect width="88" height="10" fill="white"/></clipPath></defs>` },
+        { label: /* '长虚线点' */this.$t('EtaChartAddPage.section_dash_long'),value: 'LongDashDot',svg:`<g clip-path="url(#clip0_2634_4933)"><circle cy="5" r="1" fill="#333333"/><rect x="2" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="17" cy="5" r="1" fill="#333333"/><rect x="19" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="34" cy="5" r="1" fill="#333333"/><rect x="36" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="51" cy="5" r="1" fill="#333333"/><rect x="53" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="68" cy="5" r="1" fill="#333333"/><rect x="70" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="85" cy="5" r="1" fill="#333333"/><rect x="87" y="4" width="13" height="2" rx="1" fill="#333333"/></g><defs><clipPath id="clip0_2634_4933"><rect width="88" height="10" fill="white"/></clipPath></defs>` },
+        { label: /* '短虚线点' */this.$t('EtaChartAddPage.section_dash_short'),value: 'ShortDashDot',svg:`<g clip-path="url(#clip0_2634_4756)"><rect x="1" y="4" width="2" height="2" fill="#333333"/><rect x="4" y="4" width="5" height="2" fill="#333333"/><rect x="10" y="4" width="2" height="2" fill="#333333"/><rect x="13" y="4" width="5" height="2" fill="#333333"/><rect x="19" y="4" width="2" height="2" fill="#333333"/><rect x="22" y="4" width="5" height="2" fill="#333333"/><rect x="28" y="4" width="2" height="2" fill="#333333"/><rect x="31" y="4" width="5" height="2" fill="#333333"/><rect x="37" y="4" width="2" height="2" fill="#333333"/><rect x="40" y="4" width="5" height="2" fill="#333333"/><rect x="46" y="4" width="2" height="2" fill="#333333"/><rect x="49" y="4" width="5" height="2" fill="#333333"/><rect x="55" y="4" width="2" height="2" fill="#333333"/><rect x="58" y="4" width="5" height="2" fill="#333333"/><rect x="64" y="4" width="2" height="2" fill="#333333"/><rect x="67" y="4" width="5" height="2" fill="#333333"/><rect x="73" y="4" width="2" height="2" fill="#333333"/><rect x="76" y="4" width="5" height="2" fill="#333333"/><rect x="82" y="4" width="2" height="2" fill="#333333"/><rect x="85" y="4" width="5" height="2" fill="#333333"/></g><defs><clipPath id="clip0_2634_4756"><rect width="88" height="10" fill="white"/></clipPath></defs>` },
+      ]
+    }
   },
   data() {
     return {
@@ -328,12 +335,6 @@ export default {
         2: '右二轴',
         3: '横轴',
       },
-
-      dashOptions: [
-        { label: /* '实线' */ this.$t('EtaChartAddPage.section_line'),value: 'Solid',svg:`<g clip-path="url(#clip0_2634_4692)"><rect x="-14" y="4" width="116" height="2" fill="#333333"/></g><defs><clipPath id="clip0_2634_4692"><rect width="88" height="10" fill="white"/></clipPath></defs>` },
-        { label: /* '长虚线点' */this.$t('EtaChartAddPage.section_dash_long'),value: 'LongDashDot',svg:`<g clip-path="url(#clip0_2634_4933)"><circle cy="5" r="1" fill="#333333"/><rect x="2" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="17" cy="5" r="1" fill="#333333"/><rect x="19" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="34" cy="5" r="1" fill="#333333"/><rect x="36" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="51" cy="5" r="1" fill="#333333"/><rect x="53" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="68" cy="5" r="1" fill="#333333"/><rect x="70" y="4" width="13" height="2" rx="1" fill="#333333"/><circle cx="85" cy="5" r="1" fill="#333333"/><rect x="87" y="4" width="13" height="2" rx="1" fill="#333333"/></g><defs><clipPath id="clip0_2634_4933"><rect width="88" height="10" fill="white"/></clipPath></defs>` },
-        { label: /* '短虚线点' */this.$t('EtaChartAddPage.section_dash_short'),value: 'ShortDashDot',svg:`<g clip-path="url(#clip0_2634_4756)"><rect x="1" y="4" width="2" height="2" fill="#333333"/><rect x="4" y="4" width="5" height="2" fill="#333333"/><rect x="10" y="4" width="2" height="2" fill="#333333"/><rect x="13" y="4" width="5" height="2" fill="#333333"/><rect x="19" y="4" width="2" height="2" fill="#333333"/><rect x="22" y="4" width="5" height="2" fill="#333333"/><rect x="28" y="4" width="2" height="2" fill="#333333"/><rect x="31" y="4" width="5" height="2" fill="#333333"/><rect x="37" y="4" width="2" height="2" fill="#333333"/><rect x="40" y="4" width="5" height="2" fill="#333333"/><rect x="46" y="4" width="2" height="2" fill="#333333"/><rect x="49" y="4" width="5" height="2" fill="#333333"/><rect x="55" y="4" width="2" height="2" fill="#333333"/><rect x="58" y="4" width="5" height="2" fill="#333333"/><rect x="64" y="4" width="2" height="2" fill="#333333"/><rect x="67" y="4" width="5" height="2" fill="#333333"/><rect x="73" y="4" width="2" height="2" fill="#333333"/><rect x="76" y="4" width="5" height="2" fill="#333333"/><rect x="82" y="4" width="2" height="2" fill="#333333"/><rect x="85" y="4" width="5" height="2" fill="#333333"/></g><defs><clipPath id="clip0_2634_4756"><rect width="88" height="10" fill="white"/></clipPath></defs>` },
-      ],
     }
   },
   mounted(){

src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -14,8 +14,16 @@
 					<span>{{item.label}}</span>
 				</template>	
 				<template slot-scope="scope">
-					<span v-show="currentLang=='ch'">{{ scope.row[item.key] }}</span> 
-					<span v-show="currentLang=='en'">{{scope.row[item.enKey||item.key] || scope.row[item.key]}}</span>
+					<template v-if="$i18nt.locale==='zh'">
+						<span v-show="currentLang=='ch'">{{ scope.row[item.key] }}</span> 
+						<span v-show="currentLang=='en'">{{scope.row[item.enKey||item.key] || scope.row[item.key]}}</span>
+					</template>
+					<template v-else>
+						<span v-if="item.key==='Frequency'">{{ getFrequencyTrans(scope.row.Frequency||'null') }}</span>
+						<span v-else-if="item.key==='Unit'">{{ getUnitTrans(scope.row.Unit) }}</span>
+						<span v-else>{{ scope.row[item.key] }}</span>
+					</template>
+					
 				</template>
 			</el-table-column>
 		</el-table>

src/views/dataEntry_manage/databaseComponents/util.js

@@ -544,6 +544,32 @@ export const getFormulaTip = ()=>{
         [75,bus.$i18nt.t('Edb.FormulaTips.day_mean')], //日均值
     ])
 }
+//返回预测指标的公式说明
+export const getPredictFormulaTip = ()=>{
+    return new Map([
+        [31,bus.$i18nt.t('Edb.FormulaTips.calculate')], //指标运算
+        [42,bus.$i18nt.t('Edb.FormulaTips.to_month')], //累计转月
+        ['toMonthSeason',bus.$i18nt.t('Edb.FormulaTips.to_month_quarter')], //累计转月、转季
+        [32,bus.$i18nt.t('Edb.FormulaTips.on_year')], //同比
+        [33,bus.$i18nt.t('Edb.FormulaTips.differ')], //同差
+        [39,bus.$i18nt.t('Edb.FormulaTips.n_move_average')], //n数值移动平均 
+        [43,bus.$i18nt.t('Edb.FormulaTips.n_rate')], //n数值环比
+        [44,bus.$i18nt.t('Edb.FormulaTips.n_differ')],//n数值环差
+        [45,bus.$i18nt.t('Edb.FormulaTips.up_conver')], //升频
+        ['joint',bus.$i18nt.t('Edb.FormulaTips.splic')], //指标拼接
+        [46,bus.$i18nt.t('Edb.FormulaTips.time_move')], //时间移位
+        [49,bus.$i18nt.t('Edb.FormulaTips.super_season')], //超季节性
+        [50,bus.$i18nt.t('Edb.FormulaTips.fit_residu')], //拟合残差
+        [55,bus.$i18nt.t('Edb.FormulaTips.annual')], //年化
+        [54,bus.$i18nt.t('Edb.FormulaTips.down_conver')], //降频
+        [56,bus.$i18nt.t('Edb.FormulaTips.diff_index')], //扩散指数
+        ['accumulate',bus.$i18nt.t('Edb.FormulaTips.cumulate_and_toyear')], //累计值、年初至今累计
+        [64,bus.$i18nt.t('Edb.FormulaTips.to_quarter')], //累计转季
+        [65,bus.$i18nt.t('Edb.FormulaTips.cumulate_val')], //累计值
+        [66,bus.$i18nt.t('Edb.FormulaTips.cumulate_to_year')], //年初至今累计值
+        ['alpha',bus.$i18nt.t('Edb.FormulaTips.ex_smooth')], //指数修匀
+    ])
+}
 
 // wind 日期序列常见指标代码
 export const windCommonIndexCodeArr=[

src/views/dataEntry_manage/databaseList.vue

@@ -347,7 +347,7 @@
 							<ul class="value-ul"
 								v-show="showTable&&dataList.length">
 								<li class="value-item" style="background-color: #EBEFF6;">
-									<span style="width:240px">{{$t('Edb.Detail.e_date')}}（{{$t('Edb.Detail.e_fre')}}：{{EdbData.Frequency}}）</span>
+									<span style="width:240px">{{$t('Edb.Detail.e_date')}}（{{$t('Edb.Detail.e_fre')}}：{{getFrequencyTrans(EdbData.Frequency)}}）</span>
 									<span style="flex:1;">{{$t('Edb.Detail.e_value')}}</span>
 								</li>
 								<li class="value-item"
@@ -673,67 +673,6 @@ export default {
 			loading:null,
 			showTable:false,
 			page_no: 1,
-			/*表格列 */
-			tableColumsOne: [
-				{
-					label: '指标ID',
-					key: 'EdbCode',
-					minwidthsty: '150px'
-				},
-				{
-					label: '指标名称',
-					key: 'EdbName',
-					enKey:'EdbNameEn',
-					inputTip:'点击输入英文指标名称',
-					minwidthsty: '200px'
-				},
-				{
-					label: '频度',
-					key: 'Frequency',
-					enKey:'FrequencyEn',
-					widthsty: '100px'
-				},
-				{
-					label: '单位',
-					key: 'Unit',
-					enKey:'UnitEn',
-					inputTip:'英文单位',
-					// minwidthsty: '50px'
-					widthsty: '100px'
-				},
-				{
-					label: '数据来源',
-					key: 'SourceName',
-					widthsty: '160px'
-				},
-			],
-			tableColumsTwo: [
-				{
-					label: '指标目录',
-					key: 'Menu',
-					minwidthsty: '150px',
-				},
-				{
-					label: '起始时间',
-					key: 'StartDate',
-					minwidthsty: '115px',
-				},
-				{
-					label: '更新时间',
-					key: 'ModifyTime',
-					minwidthsty: '120px',
-				},
-				{
-					label:'刷新状态',
-					key:'NoUpdate',
-					widthsty:'100px'
-				},
-				{
-					label: '添加人',
-					key: 'SysUserRealName',
-					widthsty: '160px',
-				}
-			],
 			haveMore: true,
 			selected_edbid: 0,//选中的指标id
 			dataList: [],//指标数值

src/views/dataEntry_manage/editChart.vue

@@ -677,11 +677,13 @@
 									<!-- 奇怪柱状图用别名 -->
 									<el-input 
 										v-model="scope.row.EdbAliasName"
-										placeholder="指标别名"
+										:placeholder="$t('OnlineExcelPage.indicator_alias_lbl')"
 										class="target-other-name"
 										clearable
 									/>
 								</div>
+								<span v-else-if="item.key==='Frequency'">{{ getFrequencyTrans(scope.row.Frequency||'null') }}</span>
+								<span v-else-if="item.key==='Unit'">{{ getUnitTrans(scope.row.Unit) }}</span>
 								<span v-else>{{ scope.row[item.key] }}</span>
 							</template>
 						</el-table-column>

src/views/mychart_manage/components/chartDetailDia.vue

@@ -517,6 +517,17 @@
                       v-if="scope.row.EdbType===2"
                     />
                   </span>
+                  <span v-else-if="item.key==='Frequency'">
+                        {{ currentLang==='en' 
+                            ? (scope.row[item.enKey]||getFrequencyTrans(scope.row[item.key])) 
+                            : getFrequencyTrans(scope.row[item.key]) 
+                        }}
+                    </span>
+                    <span v-else-if="item.key==='Unit'">
+                        {{ 
+                            currentLang==='en' 
+                                ? (scope.row[item.enKey]||getUnitTrans(scope.row[item.key])) 
+                                : getUnitTrans(scope.row[item.key]) }}</span>
                   <span v-else>{{ currentLang==='en' ? (scope.row[item.enKey]||scope.row[item.key]) : scope.row[item.key] }}</span>
                 </template>
               </el-table-column>

src/views/predictEdb_manage/addPredicEdb.vue

@@ -100,7 +100,7 @@
           </el-form-item>
           <el-form-item prop="frequency">
             <div class="item">
-              <span class="label">{{$t('Edb.Detail.e_fre')}}<!-- 频度 -->：{{ formData.frequency }}</span>
+              <span class="label">{{$t('Edb.Detail.e_fre')}}<!-- 频度 -->：{{ getFrequencyTrans(formData.frequency||'null') }}</span>
             </div>
           </el-form-item>
           <el-form-item prop="newdata">
@@ -150,7 +150,7 @@
                   <el-tooltip effect="dark" placement="right">
                     <div
                       slot="content"
-                      v-html="rulesTip"
+                      v-html="$t('PredictEditPage.rule_tip')"
                       style="line-height: 20px;max-width:600px;max-height:550px;overflow-y:auto"
                     ></div>
                     <i class="el-icon-question" style="color: #666" />
@@ -162,7 +162,7 @@
                   @change="changePredictType($event,item,index)"
                 >
                   <el-option
-                    v-for="item in predictTypeOptions"
+                    v-for="item in predictTypeSetting"
                     :key="item.key"
                     :label="item.label"
                     :value="item.key"
@@ -451,6 +451,42 @@ export default {
         }
       }
       return obj
+    },
+    predictTypeSetting(){
+        return [
+        { key: 1, label: /* "最新" */this.$t('PredictEditPage.rule_newset') },
+        { key: 2, label: /* "固定值" */this.$t('PredictEditPage.rule_fix') },
+        { key: 3, label: /* "同比" */this.$t('PredictEditPage.rule_onyear') },
+        { key: 4, label: /* "同差" */this.$t('PredictEditPage.rule_differ') },
+        { key: 5, label: /* "环比" */this.$t('PredictEditPage.rule_mom') },
+        { key: 6, label: /* "环差" */this.$t('PredictEditPage.rule_mom_differ') },
+        { key: 7, label: /* "N期移动均值" */this.$t('PredictEditPage.rule_move_average') },
+        { key: 8, label: /* "N期段线性外推值" */this.$t('PredictEditPage.rule_linear') },
+        { key: 9, label: /* '动态环差' */this.$t('PredictEditPage.rule_dynamic_differ') },
+        { key: 10, label: /* "给定终值后插值" */this.$t('PredictEditPage.rule_inter_end') },
+        { key: 11, label: /* "季节性" */this.$t('PredictEditPage.rule_season') },
+        { key: 12, label: /* "移动平均同比" */this.$t('PredictEditPage.rule_yoy_move') },
+        { key: 13, label: /* "同比增速插值" */this.$t('PredictEditPage.rule_yoy_growth') },
+        { key: 14, label: /* "一元线性拟合" */this.$t('PredictEditPage.rule_linear_reg') },
+        { key: 15, label: /* "N年均值" */this.$t('PredictEditPage.rule_n_year') },
+        { key: 16, label: /* "年度值倒推" */this.$t('PredictEditPage.rule_value_back') },
+      ]
+    },
+    labelMap(){
+        return {
+            2: /* '固定值' */this.$t('PredictEditPage.rule_fix'),
+            3: /* '同比增速' */this.$t('PredictEditPage.label_value_yoy_growth'),
+            4: /* '同比增加值' */this.$t('PredictEditPage.label_value_yoy_add'),
+            5: /* '环比增速' */this.$t('PredictEditPage.label_value_mom_growth'),
+            6: /* '环比增加值' */this.$t('PredictEditPage.label_value_mom_add'),
+            7: /* '期数' */this.$t('PredictEditPage.label_periods'),
+            8: /* '期数' */this.$t('PredictEditPage.label_periods'),
+            10: /* '预测终值' */this.$t('PredictEditPage.label_periods'),
+            11: /* '期数' */this.$t('PredictEditPage.label_periods'),
+            12: /* '期数' */this.$t('PredictEditPage.label_periods'),
+            13: /* '同比增速终值' */this.$t('PredictEditPage.label_value_yoy_end'),
+            16: /* '年度值' */this.$t('PredictEditPage.label_value_year')
+        }
     }
   },
   watch: {
@@ -492,40 +528,8 @@ export default {
         ],
       },
       classifyArr: [],
-      predictTypeSetting: [
-        { key: 1, label: /* "最新" */this.$t('PredictEditPage.rule_newset') },
-        { key: 2, label: /* "固定值" */this.$t('PredictEditPage.rule_fix') },
-        { key: 3, label: /* "同比" */this.$t('PredictEditPage.rule_onyear') },
-        { key: 4, label: /* "同差" */this.$t('PredictEditPage.rule_differ') },
-        { key: 5, label: /* "环比" */this.$t('PredictEditPage.rule_mom') },
-        { key: 6, label: /* "环差" */this.$t('PredictEditPage.rule_mom_differ') },
-        { key: 7, label: /* "N期移动均值" */this.$t('PredictEditPage.rule_move_average') },
-        { key: 8, label: /* "N期段线性外推值" */this.$t('PredictEditPage.rule_linear') },
-        { key: 9, label: /* '动态环差' */this.$t('PredictEditPage.rule_dynamic_differ') },
-        { key: 10, label: /* "给定终值后插值" */this.$t('PredictEditPage.rule_inter_end') },
-        { key: 11, label: /* "季节性" */this.$t('PredictEditPage.rule_season') },
-        { key: 12, label: /* "移动平均同比" */this.$t('PredictEditPage.rule_yoy_move') },
-        { key: 13, label: /* "同比增速插值" */this.$t('PredictEditPage.rule_yoy_growth') },
-        { key: 14, label: /* "一元线性拟合" */this.$t('PredictEditPage.rule_linear_reg') },
-        { key: 15, label: /* "N年均值" */this.$t('PredictEditPage.rule_n_year') },
-        { key: 16, label: /* "年度值倒推" */this.$t('PredictEditPage.rule_value_back') },
-      ], //预测规则
-      predictTypeOptions:[],
-      rulesTip: this.$t('PredictEditPage.rule_tip'),
-      labelMap: {
-        2: /* '固定值' */this.$t('PredictEditPage.rule_fix'),
-        3: /* '同比增速' */this.$t('PredictEditPage.label_value_yoy_growth'),
-        4: /* '同比增加值' */this.$t('PredictEditPage.label_value_yoy_add'),
-        5: /* '环比增速' */this.$t('PredictEditPage.label_value_mom_growth'),
-        6: /* '环比增加值' */this.$t('PredictEditPage.label_value_mom_add'),
-        7: /* '期数' */this.$t('PredictEditPage.label_periods'),
-        8: /* '期数' */this.$t('PredictEditPage.label_periods'),
-        10: /* '预测终值' */this.$t('PredictEditPage.label_periods'),
-        11: /* '期数' */this.$t('PredictEditPage.label_periods'),
-        12: /* '期数' */this.$t('PredictEditPage.label_periods'),
-        13: /* '同比增速终值' */this.$t('PredictEditPage.label_value_yoy_end'),
-        16: /* '年度值' */this.$t('PredictEditPage.label_value_year')
-      },
+      /* predictTypeOptions:[], */
+      /* rulesTip: this.$t('PredictEditPage.rule_tip'), */
       rulesArr: [{ 
         endDate: "",
         predict_type: 1,
@@ -1038,7 +1042,7 @@ export default {
         filterKey = [5,6,11,12]
       }
       //this.predictTypeOptions = this.predictTypeSetting.filter(item=>{return !filterKey.includes(item.key)})
-      this.predictTypeOptions = this.predictTypeSetting
+     /*  this.predictTypeOptions = this.predictTypeSetting */
       //年度指标时，将不支持的规则类型重置
       this.isNeedWatch = false
       this.rulesArr.forEach(item=>{

src/views/predictEdb_manage/components/childData.vue

@@ -17,8 +17,8 @@
           <span>{{ item.label }}</span>
         </template>
         <template slot-scope="{row}">
-          <span v-if="item.key === 'Unit' && lang === 'ch'">{{ row.Unit }}</span>
-          <span v-else-if="item.key === 'Unit' && lang !== 'ch' && row.Unit==='无'"></span>
+          <span v-if="item.key === 'Unit' && lang === 'ch'">{{ getUnitTrans(row.Unit) }}</span>
+          <span v-else-if="item.key === 'Unit' && lang !== 'ch' && row.Unit==='无'">{{ getUnitTrans(row.Unit) }}</span>
           <span 
             v-else-if="item.key === 'Unit' && lang !== 'ch' && row.Unit!=='无'" 
             :style="!row.UnitEn && 'color: #999'"
@@ -26,7 +26,8 @@
           >
             {{ row.UnitEn || '英文单位' }}
           </span>
-          <span v-else-if="item.key === 'Frequency'">{{ lang === 'ch' ? row.Frequency : row.FrequencyEn }}</span>
+          <!-- <span v-else-if="item.key === 'Frequency'">{{ lang === 'ch' ? row.Frequency : row.FrequencyEn }}</span> -->
+          <span v-else-if="item.key === 'Frequency'">{{ lang === 'ch' ? getFrequencyTrans(row.Frequency) : row.FrequencyEn }}</span>
           <span v-else>{{ row[item.key] }}</span>
         </template>
       </el-table-column>

src/views/predictEdb_manage/components/dynamicRingdiffer.vue

@@ -105,8 +105,8 @@
 							v-model="nullValueForm.maxNullWay"
 							placeholder="请选择"
 						>
-							<el-option label="等于0" :value="1" />
-							<el-option label="跳过空值" :value="2" />
+							<el-option :label="$t('EtaBasePage.null_val_deal_4')" :value="1" />
+							<el-option :label="$t('EtaBasePage.max_null_val_2')" :value="2" />
 						</el-select>
 					</div>
 
@@ -239,7 +239,23 @@ export default {
 					key: 'Value',
 				},
       ]
-		} 
+		},
+        formTips(){
+			return {
+				'null-val':this.$t('EtaBasePage.null_val_del_hint'),
+				'max-null-val':this.$t('EtaBasePage.max_null_val_hint'),
+				'formula':this.$t('EtaBasePage.formula_examp_hint')
+			}
+		},
+        nullWayOptions(){
+			return [
+				{ label: this.$t('EtaBasePage.null_val_deal_0'),value: 0 },
+				{ label: this.$t('EtaBasePage.null_val_deal_1'),value: 1 },
+				{ label: this.$t('EtaBasePage.null_val_deal_2'),value: 2 },
+				{ label: this.$t('EtaBasePage.null_val_deal_3'),value: 3 },
+				{ label: this.$t('EtaBasePage.null_val_deal_4'),value: 4 },
+			]
+		},
 	},
 	watch: {
 		isOpenDialog(newval) {
@@ -311,14 +327,14 @@ export default {
 				nullValueWay: 0,
 				maxNullWay: 1
 			},//空值处理
-			nullWayOptions: [
+			/* nullWayOptions: [
 				{ label: '查找前后35天最近值',value: 0 },
 				{ label: '不计算',value: 1 },
 				{ label: '前值填充',value: 2 },
 				{ label: '后值填充',value: 3 },
 				{ label: '等于0',value: 4 },
-			],
-			formTips: {
+			], */
+			/* formTips: {
 				'null-val': `1、查找前后35天最近值：在参与计算的日期序列上某指标无值时，该指标往前/往后找距离最近的值作为当天的值进行计算，遍历允许跨年，往前最多35天，往后最多35天<br>
 				2、不计算：只要有一个指标在某个日期没有值(即空值)，则计算指标在该日期没有值 <br>
 				3、前值填充：空值优先以最近的前值填充，没有前值时，用后值填充 <br>
@@ -331,7 +347,7 @@ export default {
 				'formula':`1、支持新增分段，实现不同分段使用不同的计算公式，若未新增分段，则所有日期序列用统一公式计算<br>
 				2、新增分段需配置新公式和时间节点，在时间节点之前（不含）使用新公式，在时间节点之后（含）使用已配置公式，每个分段公式支持修改<br>
 				3、分段时间节点不允许重复，不允许超出第一个指标的日期区间`
-			},
+			}, */
 
       resultData: [],//
 		};

src/views/predictEdb_manage/components/edbDetail.vue

@@ -17,7 +17,7 @@
                 v-show="showData&&dataList.length"
                 >
                 <li class="value-item" style="background-color: #EBEFF6;">
-                    <span style="width:240px">{{$t('Edb.Detail.e_date')}}（{{$t('Edb.Detail.e_fre')}}：{{EdbData.Frequency}}）</span>
+                    <span style="width:240px">{{$t('Edb.Detail.e_date')}}（{{$t('Edb.Detail.e_fre')}}：{{getFrequencyTrans(EdbData.Frequency||'null')}}）</span>
                     <span style="flex:1;">{{$t('Edb.Detail.e_value')}}<!-- 值 --></span>
                 </li>
                 <li

src/views/predictEdb_manage/predictEdb.vue

@@ -505,7 +505,7 @@ import batchComputedDialog from '@/views/dataEntry_manage/databaseComponents/bat
 import jointTargetDia from '@/views/dataEntry_manage/databaseComponents/jointTargetDia'
 import fittingResidueDia from '@/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue';
 import diffusionIndexDialog from '@/views/dataEntry_manage/databaseComponents/diffusionIndexDia.vue';
-import { formulaTip } from '@/views/dataEntry_manage/databaseComponents/util';
+import { getPredictFormulaTip } from '@/views/dataEntry_manage/databaseComponents/util';
 import dataAssociateChart from '@/views/dataEntry_manage/databaseComponents/dataAssociateChart.vue'
 import dataAssociateComputeData from '@/views/dataEntry_manage/databaseComponents/dataAssociateComputeData.vue'
 import SmoothEdbDialog from '@/views/dataEntry_manage/databaseComponents/smoothEdbDialog.vue';
@@ -601,7 +601,7 @@ export default {
 			calulateList:[],
 			computed_type:0,//打开弹窗的类型
 
-			tips: new Map([
+			/* tips: new Map([
 				[31,formulaTip.get(4)],
 				[42,formulaTip.get(5)],
 				[32,formulaTip.get(6)],
@@ -623,7 +623,7 @@ export default {
 				[65,formulaTip.get(62)],
 				[66,formulaTip.get(63)],
 				['alpha',formulaTip.get('alpha')]
-			]),//公式说明
+			]),//公式说明 */
 
 			isShowRuleDialog: false,
 			showRules: [],
@@ -635,36 +635,6 @@ export default {
 			computed_source: 1,//计算类型 1常规 2批量
 			isBatchComputed: false,//批量计算弹窗
 
-			baseTypes: [
-				{ name: this.$t('Edb.CalculatesAll.calculate')/* '指标运算' */,type: 31 },
-				{ name: this.$t('Edb.CalculatesAll.on_year')/* '同比值' */,type: 32 },
-				{ name: this.$t('Edb.CalculatesAll.differ')/* '同差值' */,type: 33 },
-				{ name: this.$t('Edb.CalculatesAll.n_move_average')/* 'N数值移动平均计算' */,type: 39 },
-				{ name: this.$t('Edb.CalculatesAll.to_month_quarter')/* '累计值转月/季值' */,type: 'toMonthSeason' },
-				{ name: this.$t('Edb.CalculatesAll.n_rate')/* 'N数值环比值' */,type: 43 },
-				{ name: this.$t('Edb.CalculatesAll.n_differ')/* 'N数值环差值' */,type: 44 },
-				{ name: this.$t('Edb.CalculatesAll.up_conver')/* '升频' */,type: 45 },
-				// { name: '指标拼接',type: 'joint' },
-				{ name: this.$t('Edb.CalculatesAll.time_move')/* '时间移位' */,type: 46 },
-				{ name: this.$t('Edb.CalculatesAll.super_season')/* '超季节性' */,type: 49 },
-				{ name: this.$t('Edb.CalculatesAll.fit_residu')/* '拟合残差' */,type: 50 },
-				{  name: this.$t('Edb.CalculatesAll.annual')/* '年化' */,type: 55 },
-				{ name: this.$t('Edb.CalculatesAll.down_conver')/* '降频' */,type: 54 },
-				{ name: this.$t('Edb.CalculatesAll.diff_index')/* '扩散指数' */,type: 56 },
-				{ name: this.$t('Edb.CalculatesAll.cumulate')/* '累计值' */,type: 'accumulate' },
-				{ name: this.$t('Edb.CalculatesAll.ex_smooth')/* '指数修匀' */,type:'alpha'}
-			],
-			batchTypes: [
-				{ name: this.$t('Edb.CalculatesAll.on_year')/* '同比值' */,type: 32 },
-				{ name: this.$t('Edb.CalculatesAll.differ')/* '同差值' */,type: 33 },
-				{ name: this.$t('Edb.CalculatesAll.n_move_average')/* 'N数值移动平均计算' */,type: 39 },
-				{ name: this.$t('Edb.CalculatesAll.n_rate')/* 'N数值环比值' */,type: 43 },
-				{ name: this.$t('Edb.CalculatesAll.n_differ')/* 'N数值环差值' */,type: 44 },
-				{ name: this.$t('Edb.CalculatesAll.up_conver')/* '升频' */,type: 45 },
-				{ name: this.$t('Edb.CalculatesAll.to_month_quarter')/* '累计值转月/季值' */,type: 'toMonthSeason' },
-				{ name: this.$t('Edb.CalculatesAll.cumulate')/* '累计值' */,type: 'accumulate' },
-				{ name: this.$t('Edb.CalculatesAll.ex_smooth')/* '指数修匀' */,type:'alpha'}
-			],
       isOnlyMe:false,//只看我的
 
 			/* 查看历史弹窗 */
@@ -703,7 +673,44 @@ export default {
 			this.isEdbBtnShow('edbPreData_recalcu')||
 			this.edbButton.DeleteButton&&this.isEdbBtnShow('edbPreData_del')||
 			this.isEdbBtnShow('edbPreData_copyData')
-		}
+		},
+		baseTypes(){
+			return [
+				{ name: this.$t('Edb.CalculatesAll.calculate')/* '指标运算' */,type: 31 },
+				{ name: this.$t('Edb.CalculatesAll.on_year')/* '同比值' */,type: 32 },
+				{ name: this.$t('Edb.CalculatesAll.differ')/* '同差值' */,type: 33 },
+				{ name: this.$t('Edb.CalculatesAll.n_move_average')/* 'N数值移动平均计算' */,type: 39 },
+				{ name: this.$t('Edb.CalculatesAll.to_month_quarter')/* '累计值转月/季值' */,type: 'toMonthSeason' },
+				{ name: this.$t('Edb.CalculatesAll.n_rate')/* 'N数值环比值' */,type: 43 },
+				{ name: this.$t('Edb.CalculatesAll.n_differ')/* 'N数值环差值' */,type: 44 },
+				{ name: this.$t('Edb.CalculatesAll.up_conver')/* '升频' */,type: 45 },
+				// { name: '指标拼接',type: 'joint' },
+				{ name: this.$t('Edb.CalculatesAll.time_move')/* '时间移位' */,type: 46 },
+				{ name: this.$t('Edb.CalculatesAll.super_season')/* '超季节性' */,type: 49 },
+				{ name: this.$t('Edb.CalculatesAll.fit_residu')/* '拟合残差' */,type: 50 },
+				{  name: this.$t('Edb.CalculatesAll.annual')/* '年化' */,type: 55 },
+				{ name: this.$t('Edb.CalculatesAll.down_conver')/* '降频' */,type: 54 },
+				{ name: this.$t('Edb.CalculatesAll.diff_index')/* '扩散指数' */,type: 56 },
+				{ name: this.$t('Edb.CalculatesAll.cumulate')/* '累计值' */,type: 'accumulate' },
+				{ name: this.$t('Edb.CalculatesAll.ex_smooth')/* '指数修匀' */,type:'alpha'}
+			]
+		},
+		batchTypes(){
+			return [
+				{ name: this.$t('Edb.CalculatesAll.on_year')/* '同比值' */,type: 32 },
+				{ name: this.$t('Edb.CalculatesAll.differ')/* '同差值' */,type: 33 },
+				{ name: this.$t('Edb.CalculatesAll.n_move_average')/* 'N数值移动平均计算' */,type: 39 },
+				{ name: this.$t('Edb.CalculatesAll.n_rate')/* 'N数值环比值' */,type: 43 },
+				{ name: this.$t('Edb.CalculatesAll.n_differ')/* 'N数值环差值' */,type: 44 },
+				{ name: this.$t('Edb.CalculatesAll.up_conver')/* '升频' */,type: 45 },
+				{ name: this.$t('Edb.CalculatesAll.to_month_quarter')/* '累计值转月/季值' */,type: 'toMonthSeason' },
+				{ name: this.$t('Edb.CalculatesAll.cumulate')/* '累计值' */,type: 'accumulate' },
+				{ name: this.$t('Edb.CalculatesAll.ex_smooth')/* '指数修匀' */,type:'alpha'}
+			]
+		},
+		tips(){
+			return getPredictFormulaTip()
+		},
 	},
 	watch: {
 		/* 设置动态右侧区域宽度 */