指标库-计算指标-频度单位翻译及遗漏翻译处理

src/components/selectUnit.vue

@@ -3,6 +3,7 @@
         <el-autocomplete
             style="width:100%"
             v-model="unit"
+            value-key="label"
             :fetch-suggestions="querySearch"
             :disabled="disabled"
             :placeholder="$t('Edb.InputHolderAll.input_unit')"
@@ -10,13 +11,16 @@
             @change="handleChange"
             @blur.stop="handleChange"
         >
+            <template slot-scope="{ item }">
+                <div>{{ item.label }}</div>
+            </template>
         </el-autocomplete>
     </div>
 </template>
 
 <script>
 // import { unitArr } from '@/utils/defaultOptions';
-const unitArr = [
+/* const unitArr = [
 	'无',
 	'万吨',
 	'亿元',
@@ -31,7 +35,8 @@ const unitArr = [
 	'美元/桶',
 	'美分/加仑',
 	'手'
-]
+] */
+//selectUnit在registryComponents就被初始化,用不了bus
 export default {
     name:"selectUnit",
     props:{
@@ -46,20 +51,23 @@ export default {
     },
     watch:{
         value(){
-            this.unit=this.value
+            if(this.value){
+                this.unit = this.getUnitTrans(this.value)
+            }
         }
     },
     data() {
         return {
-            unit:this.value,
-            unitArr: [],
+            unit:'',
+            /* unitArr: [], */
         }
     },
-    mounted(){
-        this.unitArr=unitArr.map(item=>{
-            return {value:item}
-        })
+    computed:{
+        unitArr(){
+            return this.getUnitArr()
+        }
     },
+    mounted(){},
     methods:{
         querySearch(queryString, cb) {
             const unitArr = this.unitArr;
@@ -69,12 +77,50 @@ export default {
         },
         createFilter(queryString) {
             return (unit) => {
-                return (unit.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1);
+                return (unit.label.toLowerCase().indexOf(queryString.toLowerCase()) !== -1);
             };
         },
-        handleChange(){
+        handleChange(item){
+            //this.unit = item.value
             console.log('单位',this.unit);
-            this.$emit('input',this.unit)
+            this.$emit('input',item.value||this.unit); //若为unitArr内的单位,则存对应的中文,若为自行输入的单位,则输什么存什么
+        },
+        getUnitArr(){
+            return [
+                {value:'无',label:this.$i18nt.t('Edb.UnitAll.u_null')},
+                {value:'万吨',label:this.$i18nt.t('Edb.UnitAll.wanton')},
+                {value:'亿元',label:this.$i18nt.t('Edb.UnitAll.u_bill')},
+                {value:'元',label:this.$i18nt.t('Edb.UnitAll.u_yuan')},
+                {value:'元/吨',label:this.$i18nt.t('Edb.UnitAll.yuan_ton')},
+                {value:'元/湿吨',label:this.$i18nt.t('Edb.UnitAll.yuan_wetton')},
+                {value:'千克',label:this.$i18nt.t('Edb.UnitAll.u_kg')},
+                {value:'吨',label:this.$i18nt.t('Edb.UnitAll.u_ton')},
+                {value:'短吨',label:this.$i18nt.t('Edb.UnitAll.short_ton')},
+                {value:'美元/吨',label:this.$i18nt.t('Edb.UnitAll.doll_ton')},
+                {value:'万平方千米',label:this.$i18nt.t('Edb.UnitAll.wan_skilo')},
+                {value:'美元/桶',label:this.$i18nt.t('Edb.UnitAll.doll_bar')},
+                {value:'美分/加仑',label:this.$i18nt.t('Edb.UnitAll.cent_gal')},
+                {value:'手',label:this.$i18nt.t('Edb.UnitAll.u_hand')},
+            ]
+        },
+        getUnitTrans(unit){
+            const map = {
+                '无':this.$i18nt.t('Edb.UnitAll.u_null'),
+                '万吨':this.$i18nt.t('Edb.UnitAll.wanton'),
+                '亿元':this.$i18nt.t('Edb.UnitAll.u_bill'),
+                '元':this.$i18nt.t('Edb.UnitAll.u_yuan'),
+                '元/吨':this.$i18nt.t('Edb.UnitAll.yuan_ton'),
+                '元/湿吨':this.$i18nt.t('Edb.UnitAll.yuan_wetton'),
+                '千克':this.$i18nt.t('Edb.UnitAll.u_kg'),
+                '吨':this.$i18nt.t('Edb.UnitAll.u_ton'),
+                '短吨':this.$i18nt.t('Edb.UnitAll.short_ton'),
+                '美元/吨':this.$i18nt.t('Edb.UnitAll.doll_ton'),
+                '万平方千米':this.$i18nt.t('Edb.UnitAll.wan_skilo'),
+                '美元/桶':this.$i18nt.t('Edb.UnitAll.doll_bar'),
+                '美分/加仑':this.$i18nt.t('Edb.UnitAll.cent_gal'),
+                '手':this.$i18nt.t('Edb.UnitAll.u_hand'),
+            }
+            return map[unit]||unit //若是自行输入的单位,直接返回
         }
     }
 }

src/lang/modules/EtaBase/En.js

@@ -108,6 +108,7 @@ export default {
     label_move_way: 'Moving Mode',
     label_n_val: 'N equals to',
     label_calendar: 'Calendar',
+    label_calendar_placeholder:'Please select a calendar',
     label_val_type: 'Data Retrieval',
     val_type_end: 'Period-End Value',
     val_type_average: 'Average Value',

src/lang/modules/EtaBase/Zh.js

@@ -108,6 +108,7 @@ export default {
     label_move_way: '移动方式',
     label_n_val: 'N等于',
     label_calendar: '日历',
+    label_calendar_placeholder:'请选择日历',
     label_val_type: '数据取值',
     val_type_end: '期末值',
     val_type_average: '平均值',

src/utils/defaultOptions.js

@@ -164,8 +164,8 @@ export const unitArr = [
 	'美分/加仑',
 	'手'
 ]
-//频度筛选框,支持中英文
-export const frequencySelectList = ()=>{
+//频度筛选框,支持中英文,支持过滤筛选项
+export const frequencySelectList = (filterArr=[])=>{
     return [
         {
             value:'日度',
@@ -195,7 +195,7 @@ export const frequencySelectList = ()=>{
             value:'年度',
             label:bus.$i18nt.t('Edb.FreAll.year')
         }
-    ]
+    ].filter((i)=>{return !filterArr.includes(i.value)})
 }
 //频度label显示,支持中英文
 export const getFrequencyTrans = (frequency)=>{
@@ -211,6 +211,45 @@ export const getFrequencyTrans = (frequency)=>{
     }
     return map[frequency]||''
 }
+//单位筛选框,支持中英文,支持过滤筛选项
+export const unitSelectList = (filterArr=[])=>{
+    return [
+        {value:'无',label:bus.$i18nt.t('Edb.UnitAll.u_null')},
+        {value:'万吨',label:bus.$i18nt.t('Edb.UnitAll.wanton')},
+        {value:'亿元',label:bus.$i18nt.t('Edb.UnitAll.u_bill')},
+        {value:'元',label:bus.$i18nt.t('Edb.UnitAll.u_yuan')},
+        {value:'元/吨',label:bus.$i18nt.t('Edb.UnitAll.yuan_ton')},
+        {value:'元/湿吨',label:bus.$i18nt.t('Edb.UnitAll.yuan_wetton')},
+        {value:'千克',label:bus.$i18nt.t('Edb.UnitAll.u_kg')},
+        {value:'吨',label:bus.$i18nt.t('Edb.UnitAll.u_ton')},
+        {value:'短吨',label:bus.$i18nt.t('Edb.UnitAll.short_ton')},
+        {value:'美元/吨',label:bus.$i18nt.t('Edb.UnitAll.doll_ton')},
+        {value:'万平方千米',label:bus.$i18nt.t('Edb.UnitAll.wan_skilo')},
+        {value:'美元/桶',label:bus.$i18nt.t('Edb.UnitAll.doll_bar')},
+        {value:'美分/加仑',label:bus.$i18nt.t('Edb.UnitAll.cent_gal')},
+        {value:'手',label:bus.$i18nt.t('Edb.UnitAll.u_hand')},
+    ].filter((i)=>{return !filterArr.includes(i.value)})
+}
+//单位label显示,支持中英文
+export const getUnitTrans = (unit)=>{
+    const map = {
+        '无':bus.$i18nt.t('Edb.UnitAll.u_null'),
+        '万吨':bus.$i18nt.t('Edb.UnitAll.wanton'),
+        '亿元':bus.$i18nt.t('Edb.UnitAll.u_bill'),
+        '元':bus.$i18nt.t('Edb.UnitAll.u_yuan'),
+        '元/吨':bus.$i18nt.t('Edb.UnitAll.yuan_ton'),
+        '元/湿吨':bus.$i18nt.t('Edb.UnitAll.yuan_wetton'),
+        '千克':bus.$i18nt.t('Edb.UnitAll.u_kg'),
+        '吨':bus.$i18nt.t('Edb.UnitAll.u_ton'),
+        '短吨':bus.$i18nt.t('Edb.UnitAll.short_ton'),
+        '美元/吨':bus.$i18nt.t('Edb.UnitAll.doll_ton'),
+        '万平方千米':bus.$i18nt.t('Edb.UnitAll.wan_skilo'),
+        '美元/桶':bus.$i18nt.t('Edb.UnitAll.doll_bar'),
+        '美分/加仑':bus.$i18nt.t('Edb.UnitAll.cent_gal'),
+        '手':bus.$i18nt.t('Edb.UnitAll.u_hand'),
+    }
+    return map[unit]||unit //若是自行输入的单位,直接返回
+}
 
 /* 季节性图配置 */
 export const seasonOptions = {

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -318,8 +318,16 @@
                         <el-table-column :label="$t('Edb.Detail.e_latest_date')" align="center" prop="EndDate" width="120px" />
                         <el-table-column :label="$t('Edb.Detail.e_latest_value')" align="center" show-overflow-tooltip prop="EndValue" width="80px"/>
                         <el-table-column :label="$t('EtaBasePage.table_col_creator')" align="center" show-overflow-tooltip prop="SysUserRealName" width="80px"/>
-                        <el-table-column :label="$t('Edb.Detail.e_fre')" align="center" prop="Frequency" width="50px"/>
-                        <el-table-column :label="$t('Edb.Detail.e_unit')" show-overflow-tooltip align="center" prop="Unit" width="50px"/>
+                        <el-table-column :label="$t('Edb.Detail.e_fre')" align="center" prop="Frequency" width="50px">
+                            <template slot-scope="scope">
+                                <span>{{ getFrequencyTrans(scope.row.Frequency) }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column :label="$t('Edb.Detail.e_unit')" show-overflow-tooltip align="center" prop="Unit" width="50px">
+                            <template slot-scope="scope">
+                                <span>{{ getUnitTrans(scope.row.Unit) }}</span>
+                            </template>
+                        </el-table-column>
                     </el-table>
                     <m-page 
                         style="margin-top:10px"
@@ -384,10 +392,11 @@
 
 <script>
 import mPage from '@/components/mPage.vue'
-import {computedBatchTypesV2} from './util'
+import {computedBatchTypesV2,getBatchComputedTypesV2} from './util'
 import { dataBaseInterface,departInterence } from '@/api/api.js';
 import batchComputedSave from './batchComputedSave.vue';
 import {generateSeriesArray} from './util'
+import {getFrequencyTrans,getUnitTrans} from '@/utils/defaultOptions'
 const tag_arr = generateSeriesArray();
 export default {
     components:{mPage,batchComputedSave},
@@ -510,6 +519,9 @@ export default {
 					value: '年度',
 					label: /* '年度' */ this.$t('Edb.FreAll.year'),
 				}]
+        },
+        computedBatchTypes(){
+            return getBatchComputedTypesV2()
         }
     },
     watch: {
@@ -557,7 +569,7 @@ export default {
     data() {
         return {
             showSave:false,//显示结果保存模块
-            computedBatchTypes:computedBatchTypesV2,//计算类型筛选项
+            /* computedBatchTypes:computedBatchTypesV2,//计算类型筛选项 */
             computedType:computedBatchTypesV2[0].type,//当前选中的计算类型
             subComputedType:'',//二级计算类型
             formData:{
@@ -640,6 +652,12 @@ export default {
     },
     
     methods: {
+        getUnitTrans(unit){
+            return getUnitTrans(unit)
+        },
+        getFrequencyTrans(frequency){
+            return getFrequencyTrans(frequency)
+        },
         // 编辑时初始化数据
         initData(){
             this.isEdit=true

src/views/dataEntry_manage/databaseComponents/diffusionIndexDia.vue

@@ -129,9 +129,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>
@@ -161,9 +161,9 @@
 
 <script>
 import { dataBaseInterface } from '@/api/api.js';
-import { formRules,generateSeriesArray,frequencyArr } from './util';
+import { formRules,generateSeriesArray } from './util';
 import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
-import { unitArr } from '@/utils/defaultOptions';
+import { unitArr,frequencySelectList } from '@/utils/defaultOptions';
 const MAXEDBNUM=50//最大可添加的指标数量
 const tag_arr = generateSeriesArray();
 // for(let i=0;i<26;i++) tag_arr.push(String.fromCharCode(65+i));
@@ -242,7 +242,7 @@ export default {
 				children: 'Children',
 				checkStrictly: true
 			},
-			frequencyArr,
+			/* frequencyArr, */
 			fre_options: ['天','周','月','季','年'],
 			loading:false,
 			
@@ -271,6 +271,11 @@ export default {
 			}
 		};
 	},
+	computed:{
+		frequencyArr(){
+			return frequencySelectList(['半年度'])
+		}
+	},
 	methods: {
 		/* 指标列表 */
 		searchTarget(query) {

src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -165,9 +165,9 @@
           clearable>
             <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>
@@ -200,8 +200,8 @@
 <script>
 import { dataBaseInterface } from '@/api/api.js';
 import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
-import { unitArr } from '@/utils/defaultOptions';
-import { frequencyArr } from './util'
+import { unitArr,frequencySelectList } from '@/utils/defaultOptions';
+/* import { frequencyArr } from './util' */
 export default {
 	name:'',
 	props: {
@@ -272,29 +272,6 @@ export default {
 				menu:'',
 				frequency:'',
 			},
-			formRules: {
-        self_variate:[
-					{ required: true, message: this.$t('Edb.Valids.common_msg',{label: this.$t('EtaBasePage.label_self_var')}), trigger: 'change' },
-				],
-        depend_variate:[
-					{ required: true, message: this.$t('Edb.Valids.common_msg',{label: this.$t('EtaBasePage.label_depend_var')}), trigger: 'change' },
-				],
-        date:[
-					{ required: true, message: this.$t('Edb.Valids.common_msg',{label: this.$t('EtaBasePage.label_fit_date')}), trigger: 'change' },
-				],
-        edb_name:[
-					{ required: true, message: this.$t('Edb.Valids.name_msg'), trigger: 'change' },
-				],
-				menu:[
-					{ required: true, message: this.$t('Edb.Valids.menu_msg'), trigger: 'change' },
-				],
-				frequency:[
-					{ required: true, message: this.$t('Edb.Valids.fre_msg'), trigger: 'change' },
-				],
-				unit:[
-					{ required: true, message: this.$t('Edb.Valids.unit_msg'), trigger: ['blur','change'] },
-				]
-      },
 			unitArr,
 			options: [],
 			levelProps: {
@@ -303,7 +280,7 @@ export default {
 				children: 'Children',
 				checkStrictly: true
 			},
-			frequencyArr,
+			/* frequencyArr, */
 			fre_options: ['天','周','月','季','年'],
 			loading:false,
 			
@@ -328,6 +305,45 @@ export default {
 
 		};
 	},
+    computed:{
+        frequencyArr(){
+            return frequencySelectList(['半年度'])
+        },
+        formRules(){
+            return{
+                self_variate:[
+                    { 
+                        required: true, message: this.$t('Edb.Valids.common_msg',{label: this.$t('EtaBasePage.label_self_var')}),
+                        trigger: 'change' 
+                    },
+                ],
+                depend_variate:[
+                    { 
+                        required: true, message: this.$t('Edb.Valids.common_msg',{label: this.$t('EtaBasePage.label_depend_var')}),
+                        trigger: 'change' 
+                    },
+                ],
+                date:[
+                    { 
+                        required: true, message: this.$t('Edb.Valids.common_msg',{label: this.$t('EtaBasePage.label_fit_date')}),
+                        trigger: 'change' 
+                    },
+                ],
+                edb_name:[
+                    { required: true, message: this.$t('Edb.Valids.name_msg'), trigger: 'change' },
+                ],
+                menu:[
+                    { required: true, message: this.$t('Edb.Valids.menu_msg'), trigger: 'change' },
+                ],
+                frequency:[
+                    { required: true, message: this.$t('Edb.Valids.fre_msg'), trigger: 'change' },
+                ],
+                unit:[
+                    { required: true, message: this.$t('Edb.Valids.unit_msg'), trigger: ['blur','change'] },
+                ]
+            }
+        }
+    },
 	methods: {
 		/* 指标列表 */
 		getTarget(query) {

src/views/dataEntry_manage/databaseComponents/jointTargetDia.vue

@@ -218,9 +218,9 @@
 				clearable >
 					<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>
@@ -251,8 +251,7 @@
 <script>
 import { dataBaseInterface } from '@/api/api.js'
 import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
-import { unitArr } from '@/utils/defaultOptions';
-import { frequencyArr } from './util'
+import { unitArr,frequencySelectList } from '@/utils/defaultOptions';
 export default {
 	props: {
 		isShow: {
@@ -364,12 +363,9 @@ export default {
 						7、The new indicator updates alongside indicator B.
 					`],
 				])
-		}
-	},
-	data () {
-		return {
-			default_type: 1,
-			tagList: [
+		},
+		tagList(){
+			return [
 				{
 					label:/*  "直接拼接" */this.$t('EtaBasePage.concat_tab_1'),
 					key: 1
@@ -378,22 +374,13 @@ export default {
 					label: /* "累计值同比拼接" */this.$t('EtaBasePage.concat_tab_2'),
 					key: 2
 				}
-			],
-			formData: {
-				date: '',
-				pre_edb: '',
-				pre_date: '',
-				after_edb: '',
-				after_date: '',
-				old_stay_edb: '',
-				old_stay_date: '',
-				concat_edb: '',
-				edb_name: '',
-				menu: '',
-				frequency: '',
-				unit: '',
-			},
-			formRules: {
+			]
+		},
+		frequencyArr(){
+			return frequencySelectList(['半年度'])
+		},
+		formRules(){
+			return {
 				date:[
 					{ required: true, message: this.$t('Edb.Valids.common_msg',{label: this.$t('EtaBasePage.label_concat_date')}), trigger: 'blur' },
 				],
@@ -421,6 +408,25 @@ export default {
 				unit:[
 					{ required: true, message: this.$t('Edb.Valids.unit_msg'), trigger: ['blur','change'] },
 				],
+			}
+		}
+	},
+	data () {
+		return {
+			default_type: 1,
+			formData: {
+				date: '',
+				pre_edb: '',
+				pre_date: '',
+				after_edb: '',
+				after_date: '',
+				old_stay_edb: '',
+				old_stay_date: '',
+				concat_edb: '',
+				edb_name: '',
+				menu: '',
+				frequency: '',
+				unit: '',
 			},
 			// tips: new Map([
 			// 	[1,`
@@ -447,7 +453,7 @@ export default {
 			searchMonthConcatOptions:[],
 			unitArr,
 			menuOptions: [],
-			frequencyArr,
+			/* frequencyArr, */
 
 			search_page: 1,
 			search_have_more: false,

src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -78,7 +78,9 @@
 						align="center"
 					>
 						<template slot-scope="scope">
-							<span>{{ scope.row[item.key] }}</span>
+							<span v-if="item.key==='Frequency'">{{ getFrequencyTrans(scope.row.Frequency) }}</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>
 					<el-table-column
@@ -122,6 +124,7 @@
 						:rules="formRules"
 						:disabled="operationForm.view"
 					>
+						<!-- 时间移位选项 -->
 						<el-form-item :label="$t('EtaBasePage.label_move_way')" style="display: block;" v-if="type === 22" prop="moveVal">
 							<el-select
 								v-model="formData.moveType"
@@ -156,13 +159,14 @@
 							>
 								<el-option
 									v-for="item in fre_options"
-									:key="item"
-									:label="item"
-									:value="item"
+									:key="item.label"
+									:label="item.label"
+									:value="item.value"
 								>
 								</el-option>
 							</el-select>
 						</el-form-item>
+						<!-- 指标名称 -->
 						<el-form-item :label="$t('Edb.Detail.e_name')" prop="targetName">
 							<el-input
 								v-model="formData.targetName"
@@ -170,6 +174,7 @@
 								:placeholder="$t('Edb.InputHolderAll.input_name')"
 							/>
 						</el-form-item>
+						<!-- 指标单位 -->
 						<el-form-item :label="$t('Edb.Detail.e_unit')" prop="unit">
 							<selectUnit 
 								v-model="formData.unit" 
@@ -177,6 +182,7 @@
 								:disabled="!operationForm.edb_id&&[6,7,75].includes(type)"
 							/>
 						</el-form-item>
+						<!-- 指标目录 -->
 						<el-form-item :label="$t('Edb.Detail.e_menu')" prop="menu">
 							<el-cascader
 								v-model="formData.menu"
@@ -186,6 +192,7 @@
 								:placeholder="$t('Edb.InputHolderAll.input_menu')"
 							/>
 						</el-form-item>
+						<!-- 指标频度 -->
 						<el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
 							<el-select
 								v-model="formData.frequency"
@@ -197,13 +204,14 @@
 							>
 								<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>
+						<!-- N数值 -->
 						<el-form-item :label="$t('EtaBasePage.label_n_val')"  prop="n_num" v-if="[8,12,13,35].includes(type)">
 							<el-input
 								v-model="formData.n_num"
@@ -213,10 +221,11 @@
 								@change="NchangeHandle"
 							/>
 						</el-form-item>
+						<!-- 超季节性 公历农历-->
 						<el-form-item :label="$t('EtaBasePage.label_calendar')" prop="calendar_type" v-if="type===35">
 							<el-select
 								v-model="formData.calendar_type"
-								placeholder="请选择日历"
+								:placeholder="$t('EtaBasePage.label_calendar_placeholder')"
 								style="width: 340px"
 								@change="NchangeHandle"
 							>
@@ -229,6 +238,7 @@
 								</el-option>
 							</el-select>
 						</el-form-item>
+						<!-- 降频 取值类型 -->
 						<el-form-item :label="$t('EtaBasePage.label_val_type')"  prop="value_type" v-if="type===51">
 							<el-select
 								v-model="formData.value_type"
@@ -239,10 +249,11 @@
 								<el-option :label="$t('EtaBasePage.val_type_average')" value="平均值"/>
 							</el-select>
 						</el-form-item>
-						<el-form-item label="最新值处理" prop="new_value" v-if="type===62">
+						<!-- 最新值处理 -->
+						<el-form-item :label="$t('Edb.CalculatesAll.latest_processing')" prop="new_value" v-if="type===62">
 							<el-select v-model="formData.new_value" placeholder="请选择" style="width: 340px">
-								<el-option label="默认" value=""></el-option>
-								<el-option label="均值填充" :value="'均值填充'" v-if="hasNewValueOpt"></el-option> 
+								<el-option :label="$t('EtaBasePage.default_select_text')" value=""></el-option>
+								<el-option :label="$t('EtaBasePage.mean_imputation_select_text')" :value="'均值填充'" v-if="hasNewValueOpt"></el-option> 
 							</el-select>
 						</el-form-item>
 					</el-form>
@@ -271,8 +282,8 @@
 
 <script>
 import { dataBaseInterface } from '@/api/api.js';
-import { formRules,frequencyArr } from './util';
-import { unitArr } from '@/utils/defaultOptions';
+import { formRules} from './util';
+import { unitArr,getFrequencyTrans,getUnitTrans,frequencySelectList } from '@/utils/defaultOptions';
 export default {
 	name:'',
 	props: {
@@ -399,16 +410,8 @@ export default {
 		unitArr() {
 			return unitArr
 		},
-	},
-	data () {
-		return {
-			select_target:'',
-			searchOptions:[],//指标列表
-			haveMore: true,
-			dataList:[],
-      tableData:[],
-			page_no:1,
-			titleMap: new Map([
+		titleMap(){//标题
+			return new Map([
 				[5,this.$t('Edb.CalculatesAll.to_month_quarter')],/* '累计值转月/季值' */
 				[6,this.$t('Edb.CalculatesAll.on_year')],/* '同比值' */
 				[7,this.$t('Edb.CalculatesAll.differ')],/* '同差值' */
@@ -425,8 +428,10 @@ export default {
 				[62,this.$t('Edb.CalculatesAll.cumulate')],/* '累计值' */
 				[63,this.$t('Edb.CalculatesAll.cumulate')],/* '累计值' */
 				[75,this.$t('Edb.CalculatesAll.day_mean')]/* '日均值' */
-			]),//标题
-			saveBtnMap: new Map([
+			])
+		},
+		saveBtnMap(){//保存文案
+			return new Map([
 				[5,this.$t('Edb.CalculateBtns.to_month')],/* '转月值计算' */
 				[6,this.$t('Edb.CalculateBtns.on_year')],/* '同比值计算' */
 				[7,this.$t('Edb.CalculateBtns.differ')],/* '同差值计算' */
@@ -442,7 +447,47 @@ export default {
 				[62,this.$t('Edb.CalculateBtns.cumulate')],/* '累计值计算' */
 				[63,this.$t('Edb.CalculateBtns.cumulate_oneyear')],/* '年初至今计算' */
 				[75,this.$t('Edb.CalculateBtns.day_mean')],/* '日均值计算' */
-			]),//保存文案
+			])
+		},
+		frequencyArr(){//频度筛选
+			return frequencySelectList(['半年度'])
+		},
+		fre_options(){//领先频率
+			return [
+				{label:this.$t('Edb.FreAll.day_min'),value:'天'},
+				{label:this.$t('Edb.FreAll.week_min'),value:'周'},
+				{label:this.$t('Edb.FreAll.month_min'),value:'月'},
+				{label:this.$t('Edb.FreAll.quarter_min'),value:'季'},
+				{label:this.$t('Edb.FreAll.year_min'),value:'年'},
+			]
+		},
+		moveTypeOpions(){
+			return [
+				{
+					label: this.$t('ETableChildren.ahead_lable'),
+					key: 1
+				},
+				{
+					label: this.$t('ETableChildren.lagging_lable'),
+					key: 2
+				},
+			]
+		},
+		calendarOptions(){
+			return [
+				{label: this.$t('Chart.calendar_gre'),key: 1},
+				{label: this.$t('Chart.calendar_lunar'),key: 2},
+			]
+		}
+	},
+	data () {
+		return {
+			select_target:'',
+			searchOptions:[],//指标列表
+			haveMore: true,
+			dataList:[],
+			tableData:[],
+			page_no:1,
 			formData: {
 				targetName:'',
 				unit:'',
@@ -463,9 +508,9 @@ export default {
 				children: 'Children',
 				checkStrictly: true
 			},
-			frequencyArr,
-			fre_options: ['天','周','月','季','年'],
-			moveTypeOpions: [
+			/* frequencyArr, */
+			/* fre_options: ['天','周','月','季','年'], */
+			/* moveTypeOpions: [
 				{
 					label: '领先',
 					key: 1
@@ -474,17 +519,17 @@ export default {
 					label: '滞后',
 					key: 2
 				},
-			],
+			], */
 			loading:false,
 			
 			search_have_more: false,
 			search_page: 1,
 			current_search: '',
 
-			calendarOptions: [
+			/* calendarOptions: [
 				{label: '公历',key: 1},
 				{label: '农历',key: 2},
-			],
+			], */
 
 			sourceList: [],
 
@@ -803,7 +848,14 @@ export default {
                 let {href} = this.$router.resolve({path:`/database`,query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
                 window.open(href,'_blank');
             }
-        }
+        },
+		//频度翻译
+		getFrequencyTrans(frequency){
+			return getFrequencyTrans(frequency)
+		},
+		getUnitTrans(unit){
+			return getUnitTrans(unit)
+		},
 	},
 	created() {},
 	mounted() {},

src/views/dataEntry_manage/databaseComponents/smoothEdbDialog.vue

@@ -75,7 +75,9 @@
                             align="center"
                         >
                             <template slot-scope="scope">
-                                <span>{{ scope.row[item.key] }}</span>
+                                <span v-if="item.key==='Frequency'">{{ getFrequencyTrans(scope.row.Frequency) }}</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>
                         <el-table-column
@@ -150,9 +152,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>
@@ -267,9 +269,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>
@@ -303,7 +305,8 @@
 <script>
 import { dataBaseInterface } from '@/api/api.js';
 import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
-import { formRules,frequencyArr } from './util';
+import { formRules } from './util';
+import { frequencySelectList,getFrequencyTrans,getUnitTrans } from '@/utils/defaultOptions';
 const tag_arr = [];
 for(let i=0;i<26;i++) tag_arr.push(String.fromCharCode(65+i));
 export default {
@@ -363,6 +366,9 @@ export default {
 				},
 			]
 		},
+        frequencyArr(){
+            return frequencySelectList(['半年度'])
+        }
     },
     data() {
         return {
@@ -375,7 +381,7 @@ export default {
                 alphaValue:''
             },
             formRules,
-            frequencyArr,
+           /*  frequencyArr, */
             catalogArr:[],
             levelProps: {
                 label: 'ClassifyName',
@@ -703,6 +709,12 @@ export default {
             this.$emit('cancel');
             type==='cancel' && this.$emit('openPrev');
         },
+        getFrequencyTrans(frequency){
+            return getFrequencyTrans(frequency)
+        },
+        getUnitTrans(unit){
+            return getUnitTrans(unit)
+        }
     },
 };
 </script>

src/views/dataEntry_manage/databaseComponents/updateNewestDia.vue

@@ -38,7 +38,7 @@
           type="date"
           style="width: 140px"
           value-format="yyyy-MM-dd"
-          placeholder="请选择日期"
+          :placeholder="$t('Edb.InputHolderAll.input_date')"
           :picker-options="timePickerOptions"
         />
 			</el-form-item>