fix 和2期的冲突

src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -15,8 +15,7 @@
 				</template>	
 				<template slot-scope="scope">
 					<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>
+						<span>{{ currentLang==='en'?scope.row[item.enKey||item.key] || scope.row[item.key]:scope.row[item.key] }}</span> 
 					</template>
 					<template v-else>
 						<span v-if="item.key==='Frequency'">{{ getFrequencyTrans(scope.row.Frequency||'null') }}</span>

src/views/predictEdb_manage/components/childData.vue

@@ -17,17 +17,9 @@
           <span>{{ item.label }}</span>
         </template>
         <template slot-scope="{row}">
-          <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'"
-            @click="changeEnOptions"
-          >
-            {{ row.UnitEn || '英文单位' }}
-          </span>
+          <span v-if="item.key === 'Unit'">{{ lang === 'en'?row.UnitEn:getUnitTrans(row.Unit) }}</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-if="item.key === 'Frequency'">{{ lang === 'en' ? row.FrequencyEn:getFrequencyTrans(row.Frequency) }}</span>
           <span v-else>{{ row[item.key] }}</span>
         </template>
       </el-table-column>