bug-fix

src/lang/modules/EtaBase/En.js

@@ -54,6 +54,9 @@ export default {
     complate_info: 'Complete Information',
     no_companyid_msg: 'Please input Company ID',
     no_edbid_msg: 'Please input Indicator ID',
+    no_source_msg:'Please select a source',
+    no_database_msg:'Please select database',
+    search_hint:'Searching data...',
     
     /* 替换指标弹窗 */
     origin_edb: 'Original Indicator',

src/lang/modules/EtaBase/Zh.js

@@ -54,6 +54,9 @@ export default {
     complate_info: '完善信息',
     no_companyid_msg: '请输入公司ID',
     no_edbid_msg: '请输入指标ID',
+    no_source_msg:'请选择来源',
+    no_database_msg:'请选择数据库',
+    search_hint:'搜索数据中...',
 
     /* 替换指标弹窗 */
     origin_edb: '原指标',

src/views/dataEntry_manage/databaseComponents/addTargetDiaBase.vue

@@ -10,12 +10,12 @@
 				<div class="dialog-top" >
 					<div>
 						<span>{{$t('Edb.Detail.source')}}</span>
-						<el-select v-model="fromType" placeholder="请选择来源" style="width:240px;margin-left:10px" @change="changeTrade"
+						<el-select v-model="fromType" :placeholder="$t('EtaBasePage.no_source_msg')" style="width:240px;margin-left:10px" @change="changeTrade"
 							:disabled="haveResult">
 							<el-option v-for="item in fromArr" :key="item.value" :label="item.label" :value="item.value">
 							</el-option>
 						</el-select>
-						<el-select v-model="fromDatabase" placeholder="请选择数据库" style="width:240px;margin-left:10px"
+						<el-select v-model="fromDatabase" :placeholder="$t('EtaBasePage.no_database_msg')" style="width:240px;margin-left:10px"
 							:disabled="haveResult" v-if="hasDateSequence">
 							<el-option v-for="item in databaseType" :key="item.value" :label="item.label" :value="item.value">
 							</el-option>
@@ -24,8 +24,8 @@
 
 					<!-- 路透增加频度选择 -->
 					<el-select v-model="rtrFromFrequency" placeholder="请选择频度" v-if="fromType==='路透'">
-						<el-option :label="item" :value="item"
-						v-for="item in frequencyArr" :key="item"></el-option>
+						<el-option :label="item.label" :value="item.value"
+						v-for="item in frequencySelectList" :key="item.value"></el-option>
 					</el-select>
 
 					<el-input v-show="isCompanyCode" :placeholder="$t('EtaBasePage.complany_pholder')" v-model="search_company_txt" style="maxWidth:340px;"
@@ -146,8 +146,8 @@
 									</template>
 									<template v-else-if="item === 'Frequency'">
 										<el-select v-model="data[item]" :placeholder="$t('Edb.InputHolderAll.input_fre')" size="mini" :disabled="!data.Source">
-											<el-option :label="item" :value="item"
-											v-for="item in frequencyArr" :key="item"></el-option>
+											<el-option :label="item.label" :value="item.value"
+											v-for="item in frequencySelectList" :key="item.label"></el-option>
 										</el-select>
 									</template>
 									<template v-else-if="item === 'EdbName'">
@@ -200,6 +200,7 @@
 <script>
 import { dataBaseInterface,dataInterence } from '@/api/api.js'
 import { frequencyArr,windCommonIndexCodeArr,THSCommonIndexStockCodeArr,THSCommonIndexFuturesCodeArr} from './util';
+import { frequencySelectList } from '@/utils/defaultOptions';
 export default {
 	name: '',
 	props: {
@@ -234,6 +235,9 @@ export default {
 			}else if(this.fromType=='同花顺'){
 				return this.$t('EtaBasePage.edb_ifind_tip')
 			}
+		},
+		frequencySelectList(){
+			return frequencySelectList(['半年度'])
 		}
 	},
 	data() {
@@ -377,7 +381,7 @@ export default {
 				this.loading = this.$loading({
 					lock: true,
 					target: '.dialog-main',
-					text: '搜索数据中...',
+					text: /* '搜索数据中...' */this.$t('EtaBasePage.search_hint'),
 					spinner: 'el-icon-loading',
 					background: 'rgba(255, 255, 255, 0.8)'
 				});

src/views/system_manage/mixin/departManageMixin.js

@@ -13,22 +13,27 @@ export default {
     data() {
         const validatePass = (rule,value,callback)=>{
             if(value===''){
-                callback(new Error('请输入新密码'))
+                callback(new Error(/* '请输入新密码' */this.$t('SystemManage.DepartManage.use_add_valid_msg02')))
             }
             if(this.resetForm.check!==''){
                 this.$refs.resetForm.validateField('check')
             }
             if(!checkPassWord(value)){
-                callback(new Error('密码要求8位及以上，包含数字、大写字母、小写字母、特殊字符中的三个类型'))
+                callback(
+                    new Error(
+                        /* '密码要求8位及以上，包含数字、大写字母、小写字母、特殊字符中的三个类型' */ 
+                        this.$t('SystemManage.DepartManage.use_add_valid_msg03')
+                    )
+                )
             }else{
                 callback()
             }
         }
         const validateCheck = (rule,value,callback)=>{
             if(value===''){
-                callback(new Error('请输入确认密码'))
+                callback(new Error(/* '请输入确认密码' */this.$t('ResetPwdPage.vaild_new')))
             }else if(value!==this.resetForm.password){
-                callback(new Error('两次输入的密码不一致'))
+                callback(new Error(/* '两次输入的密码不一致' */this.$t('ResetPwdPage.vaild_same')))
             }else{
                 callback()
             }