Merge branch 'fix_eta1.7.3'

src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -15,10 +15,11 @@
 				</template>	
 				<template slot-scope="scope">
 
-						<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>{{ currentLang==='en'?scope.row[item.enKey||item.key]:scope.row[item.key] }}</span>
-					
+						<span v-if="item.key === 'Unit'">{{ currentLang === 'en'?scope.row.UnitEn||getUnitTrans(scope.row.Unit):getUnitTrans(scope.row.Unit) }}</span>
+						<span v-else-if="item.key === 'Frequency'">{{ currentLang === 'en' ? scope.row.FrequencyEn||getFrequencyTrans(scope.row.Frequency):getFrequencyTrans(scope.row.Frequency) }}</span>
+						<span v-else-if="item.key === 'EdbName'">{{ currentLang==='en' ? (scope.row.EdbNameEn||scope.row.EdbName) : scope.row.EdbName }}</span>
+
+						<span v-else>{{ scope.row[item.key] }}</span>
 				</template>
 			</el-table-column>
 		</el-table>

src/views/predictEdb_manage/components/childData.vue

@@ -19,6 +19,8 @@
         <template slot-scope="{row}">
           <span v-if="item.key === 'Unit'">{{ lang === 'en'?row.UnitEn||getUnitTrans(row.Unit):getUnitTrans(row.Unit) }}</span>
           <span v-else-if="item.key === 'Frequency'">{{ lang === 'en' ? row.FrequencyEn||getFrequencyTrans(row.Frequency):getFrequencyTrans(row.Frequency) }}</span>
+          <span v-else-if="item.key === 'EdbName'">{{ lang==='en' ? (row.EdbNameEn||row.EdbName) : row.EdbName }}</span>
+          
           <span v-else>{{ row[item.key] }}</span>
         </template>
       </el-table-column>