指标库，图库，预测指标库所有中英文字段的根据版本显示对应内容

src/lang/modules/EtaBase/commonLang.js

@@ -33,8 +33,8 @@ export default {
     en: 'More Operation'
   },
   detail_en_btn:{
-    zh:'设置英文名称',
-    en:'Set English name'
+    zh:'编辑信息',
+    en:'Edit Information'
   },
   detail_recalculate_btn:{
     zh:'重新计算',

src/views/chartRelevance_manage/components/selectTarget.vue

@@ -69,7 +69,7 @@
                 style="vertical-align:middle" 
                 v-if="!item.HaveOperaAuth"
               />
-              {{item.EdbName}}
+              {{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
             </div>
           </edbDetailPopover>
         </el-option>
@@ -105,7 +105,7 @@
               style="vertical-align:middle" 
               v-if="!item.HaveOperaAuth"
             />
-            {{item.EdbName}}
+            {{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
           </div>
         </edbDetailPopover>
       </el-option>
@@ -158,6 +158,10 @@ export default {
                     val:'2'
                 },
             ]
+      },
+
+      currentLang() {
+        return this.$store.state.lang
       }
     },
     data() {

src/views/dataEntry_manage/addChart.vue

@@ -204,7 +204,7 @@
           <el-collapse v-model="activeNames" class="target-list" v-if="tableData.length&&![7,10,11].includes(chartInfo.ChartType)">
             <el-collapse-item v-for="(item,index) in tableData" :key="item.EdbInfoId" :disabled="[2,5].includes(chartInfo.ChartType)">
               <template slot="title">
-                <span class="text_oneLine">{{item.EdbName}}</span>
+                <span class="text_oneLine">{{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}</span>
 								<i class="el-icon-delete del-icon" @click.stop="delTarget(item)"></i>
               </template>
               <ul class="setting-cont" v-if="sameOptionType.includes(chartInfo.ChartType)">
@@ -622,83 +622,17 @@
 							><!-- 作者 -->{{$t('Chart.Detail.author')}}:{{ chartInfo.SysUserRealName || roleName }}</span
 						>
 					</div>
-					<el-table
-						:data="tableData"
-						ref="tableRef"
-						highlight-current-row
-						border
-					>
-						<el-table-column type="expand" v-if="![10,11].includes(chartInfo.ChartType)">
-							<template slot-scope="{row,$index}">
-								<div class="expand-wrap">
-									<div class="data-change">
-										<el-checkbox v-model="updateData[$index].IsConvert">数据转换</el-checkbox>
-										<el-select v-model="updateData[$index].ConvertType">
-											<el-option label="乘以" :value="1"></el-option>
-											<el-option label="除以" :value="2"></el-option>
-											<el-option label="对数" :value="3"></el-option>
-										</el-select>
-									<el-input type="number" v-model="updateData[$index].ConvertValue"></el-input>
-									</div>
-									<div class="unit-change">
-										<label>单位</label>
-										<el-input v-model="updateData[$index].ConvertUnit"></el-input>
-										<label>英文单位</label>
-										<el-input v-model="updateData[$index].ConvertEnUnit"></el-input>
-									</div>
-									<!--柱形图-->
-									<div class="use-change" v-if="chartInfo.ChartType===7">
-										<el-radio v-model="useUnit" :label="$index">设置为图表单位</el-radio>
-									</div>
-									<div class="confirm-btn">
-										<el-button type="text" @click="changeTableData($index)">保存</el-button>
-									</div>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column
-							v-for="item in tableColums"
-							:key="item.label"
-							:label="item.label"
-							:width="item.widthsty"
-							:min-width="item.minwidthsty"
-							align="center"
-						>
-							<template slot-scope="scope">
-								<div v-if="item.key === 'EdbName' && [1,4,6,7,11].includes(chartInfo.ChartType)">
-									<!-- 柱状图用别名 -->
-									<el-input 
-										v-model="scope.row.EdbAliasName"
-										placeholder="指标别名"
-										class="target-other-name"
-										clearable
-									/>
-								</div>
-								<span v-else>{{ scope.row[item.key] }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column
-							:label="$t('Table.column_operations')"
-							key="Copy"
-							align="center"
-							width="140"
-						>
-							<template slot-scope="scope" v-if="scope.row.HaveOperaAuth">
-								<span @click="delTarget(scope.row)" class="deletesty"><!-- 删除 -->{{$t('Table.delete_btn')}}&nbsp;</span>
-								<span v-permission="permissionBtn.chartLibPermission.chartLib_copyData"
-									class="editsty" @click="copyCode(scope.row)">
-									<i class="el-icon-document-copy" />&nbsp;<!-- 复制数据 -->{{$t('Edb.detail_copydata_btn')}}</span
-								><br>
-								<span v-permission="permissionBtn.chartLibPermission.chartLib_viewData"
-									class="editsty"
-									@click="viewTarget(scope.row)"
-								><!-- 查看数据 -->{{$t('Edb.detail_lookdata_btn')}}</span>
-							</template>
-						</el-table-column>
-						<div slot="empty">
-							 <tableNoData :text="$t('Table.no_edb_msg')" size="mini"/>
-						</div>
-					</el-table>
+					
+					<!-- 关联指标 -->
+					<chartRelationEdbList
+						:chartInfo="chartInfo"
+						:tableData="tableData"
+						:updateData="updateData"
+						@changeTableData="changeTableData"
+						@delTarget="delTarget"
+						@copyCode="copyCode"
+						@viewTarget="viewTarget"
+					/>
 				</div>
       </div>
 			<div class="nodata" v-else>
@@ -744,8 +678,9 @@ import sectionalScatterOption from './components/sectionalScatterOption.vue';
 import LegendEditDia from './components/LegendEditDia.vue';
 import markersSection from './components/markersSection.vue';
 import chartSourceEditDia from './components/chartSourceEditDialog.vue';
+import chartRelationEdbList from './components/chartReleationEdbTable.vue';
 export default {
-  components: { Chart,DateChooseDia,barOption,sectionalScatterOption,LegendEditDia,markersSection,chartSourceEditDia},
+  components: { Chart,DateChooseDia,barOption,sectionalScatterOption,LegendEditDia,markersSection,chartSourceEditDia,chartRelationEdbList},
 	directives: {
     drag(el, bindings) {
       el.onmousedown = function (e) {
@@ -785,7 +720,11 @@ export default {
 				
 					}else {
 						//拼接标题
-						this.chartInfo.ChartName =  this.sameOptionType.includes(this.chartInfo.ChartType) ? newval.map((item,index) => index === newval.length-1 ? item.EdbName : `${item.EdbName}和`).join('') : `${newval[0].EdbName}季节性`;
+						this.chartInfo.ChartName =  this.sameOptionType.includes(this.chartInfo.ChartType) 
+							? newval.map((item,index) => index === newval.length-1 
+								? (this.currentLang==='en'?item.EdbNameEn:item.EdbName) 
+								: `${(this.currentLang==='en'?item.EdbNameEn:item.EdbName)}和`).join('') 
+							: `${this.currentLang==='en'?newval[0].EdbNameEn:newval[0].EdbName}季节性`;
 						this.EdbAxisChange()
 						this.setAddChartDefault();
 						this.setChartOptionHandle(newval);

src/views/dataEntry_manage/adjustdata/adjustData.vue

@@ -22,7 +22,7 @@
               <el-option
                 v-for="item in searchOptions"
                 :key="item.EdbInfoId"
-                :label="eta_lang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
+                :label="currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
                 :value="item.EdbInfoId"
                 :disabled="!item.HaveOperaAuth"
               >
@@ -34,7 +34,7 @@
 										style="vertical-align:middle" 
 										v-if="!item.HaveOperaAuth"
 									/>
-									{{eta_lang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
+									{{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
 								</div>
               </el-option>
             </el-select>
@@ -307,7 +307,7 @@ export default {
     },
 
      ...mapState({
-			eta_lang: state => state.edb.eta_lang,	
+			currentLang: state => state.lang,	
 		})
   },
 
@@ -347,10 +347,10 @@ export default {
       let arr = res.Data.Item.DataList ||[];
       this.old_edb_data = arr;
       this.formData = {
-        targetName: res.Data.Item.EdbName,
+        targetName: this.currentLang==='en'?res.Data.Item.EdbNameEn:res.Data.Item.EdbName,
         menu: res.Data.ClassifyList[0].ClassifyId,
         frequency: res.Data.Item.Frequency,
-        unit: res.Data.Item.Unit
+        unit: this.currentLang==='en'?res.Data.Item.UnitEn:res.Data.Item.Unit
       }
       this.resetData()
     },

src/views/dataEntry_manage/chartSetting.vue

@@ -204,7 +204,7 @@
           <el-collapse v-model="activeNames" class="target-list" v-if="tableData.length">
             <el-collapse-item v-for="(item,index) in tableData" :key="item.EdbInfoId" :disabled="![1,4,6].includes(chartInfo.ChartType)">
               <template slot="title">
-                <span class="text_oneLine">{{item.EdbName}}</span>
+                <span class="text_oneLine">{{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}</span>
               </template>
               <ul class="setting-cont">
                 <!-- 堆叠图 或组合图中的堆叠类型 非第一项隐藏配置 -->
@@ -402,68 +402,12 @@
                           color:${JSON.parse(chartInfo.ChartThemeStyle).titleOptions.style.color}
                         `"
                       >
-                        {{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}
+                        {{ currentLang==='en'?chartInfo.ChartNameEn:chartInfo.ChartName }}
                       </h2>
 
                       <Chart :options="options" :chartInfo="chartInfo" ref="chartRef"/>
 
-                    <!--  <div class="range-cont left" v-if="leftIndex != -1">
-                        <el-input
-                          style="width: 60px; display: block"
-                          size="mini"
-                          type="number"
-                          :placeholder="$t('Chart.up_limit')"
-                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
-                          v-model="tableData[leftIndex].MaxData"
-                        />
-                        <el-input
-                          class="min-data-input"
-                          size="mini"
-                          type="number"
-                          :placeholder="$t('Chart.low_limit')"
-                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
-                          v-model="tableData[leftIndex].MinData"
-                        />
-                      </div>
-                      <div 
-                        class="range-cont right" 
-                        v-if="rightIndex != -1"
-                      >
-                        <el-input
-                          style="width: 60px; display: block"
-                          size="mini"
-                          type="number"
-                          :placeholder="$t('Chart.up_limit')"
-                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
-                          v-model="tableData[rightIndex].MaxData"
-                        />
-                        <el-input
-                          class="min-data-input"
-                          size="mini"
-                          type="number"
-                          :placeholder="$t('Chart.low_limit')"
-                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
-                          v-model="tableData[rightIndex].MinData"
-                        />
-                      </div>
-                      <div class="range-cont rightTwo" v-if="rightTwoIndex != -1">
-                        <el-input
-                          style="width: 60px; display: block"
-                          size="mini"
-                          type="number"
-                          :placeholder="$t('Chart.up_limit')"
-                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
-                          v-model="tableData[rightTwoIndex].MaxData"
-                        />
-                        <el-input
-                          class="min-data-input"
-                          size="mini"
-                          type="number"
-                          :placeholder="$t('Chart.low_limit')"
-                          :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
-                          v-model="tableData[rightTwoIndex].MinData"
-                        />
-                      </div> -->
+
                       <template v-if="![7,10,11].includes(chartInfo.ChartType)">
                           <div class="range-cont left" v-if="leftIndex != -1">
                               <el-input
@@ -1210,7 +1154,7 @@ export default {
       //目录名称可以双击修改 指标不能
       if (!data.ChartInfoId && data.Button.OpButton&&this.permissionBtn.isShowBtn('chartLibPermission','chartLib_classifyOpt_add')) {
         this.$set(data, 'isEdit', true);
-        this.new_label = data.ChartClassifyName;
+        this.new_label = this.currentLang==='en'?data.ChartClassifyNameEn:data.ChartClassifyName;
         this.$nextTick(() => {
           this.$refs.editVal.focus();
         });
@@ -1220,8 +1164,7 @@ export default {
     changeValue(node, data) {
       if (this.new_label) {
         this.$set(data, 'isEdit', false);
-        this.new_label !== data.ChartClassifyName &&
-          dataBaseInterface
+        dataBaseInterface
             .editChartClassify({
               ChartClassifyId: data.ChartClassifyId,
               ChartClassifyName: this.new_label,
@@ -1257,16 +1200,16 @@ export default {
       this.dialogForm = {
         level_1:
           node.level === 1
-            ? data.ChartClassifyName
+            ? (this.currentLang==='en'?data.ChartClassifyNameEn:data.ChartClassifyName)
             : node.level === 2
-            ? node.parent.data.ChartClassifyName
-            : node.parent.parent.data.ChartClassifyName,
+            ? (this.currentLang==='en'?node.parent.data.ChartClassifyNameEn:node.parent.data.ChartClassifyName)
+            : (this.currentLang==='en'?node.parent.parent.data.ChartClassifyNameEn:node.parent.parent.data.ChartClassifyName),
         level_2:
           node.level === 1
             ? ''
             : node.level === 2
-            ? data.ChartClassifyName
-            : node.parent.data.ChartClassifyName,
+            ? (this.currentLang==='en'?data.ChartClassifyNameEn:data.ChartClassifyName)
+            : (this.currentLang==='en'?node.parent.data.ChartClassifyNameEn:node.parent.data.ChartClassifyName),
         // level_3: node.level === 3 ? data.ChartClassifyName : '',
         parent_id: data.ChartClassifyId,
         level: node.level,
@@ -1283,16 +1226,16 @@ export default {
       this.dialogForm = {
         level_1:
           node.level === 1
-            ? data.ChartClassifyName
+            ? (this.currentLang==='en'?data.ChartClassifyNameEn:data.ChartClassifyName)
             : node.level === 2
-            ? node.parent.data.ChartClassifyName
-            : node.parent.parent.data.ChartClassifyName,
+            ? (this.currentLang==='en'?node.parent.data.ChartClassifyNameEn:node.parent.data.ChartClassifyName)
+            : (this.currentLang==='en'?node.parent.parent.data.ChartClassifyNameEn:node.parent.parent.data.ChartClassifyName),
         level_2:
           node.level === 1
             ? ''
             : node.level === 2
-            ? data.ChartClassifyName
-            : node.parent.data.ChartClassifyName,
+            ? (this.currentLang==='en'?data.ChartClassifyNameEn:data.ChartClassifyName)
+            : (this.currentLang==='en'?node.parent.data.ChartClassifyNameEn:node.parent.data.ChartClassifyName),
         level_3: node.level === 3 ? data.ChartClassifyName : '',
         classify_id: data.ChartClassifyId,
         level: node.level,

src/views/dataEntry_manage/codecount/index.vue

@@ -125,7 +125,7 @@
 									<el-option
 										v-for="item in searchOptions"
 										:key="item.EdbInfoId"
-										:label="eta_lang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
+										:label="currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
 										:value="item.EdbInfoId"
 										:disabled="!item.HaveOperaAuth"
 									>
@@ -137,7 +137,7 @@
 												style="vertical-align:middle" 
 												v-if="!item.HaveOperaAuth"
 											/>
-											{{eta_lang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
+											{{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
 										</div>
 									</el-option>
 								</el-select>
@@ -186,7 +186,7 @@ export default {
 	components: { codeMirror,dataTable },
 	computed: {
 		...mapState({
-			eta_lang: state => state.edb.eta_lang,	
+			currentLang: state => state.lang,	
 		})
 	},
 	data () {
@@ -282,13 +282,13 @@ export default {
 				if(res.Ret !== 200) return
 				
 				const { EdbInfoDetail,PythonCode } = res.Data;
-				const { EdbName,ClassifyId,Frequency,Unit } = EdbInfoDetail;
+				const { EdbName,EdbNameEn,ClassifyId,Frequency,Unit,UnitEn } = EdbInfoDetail;
 
 				this.formData = {
-					edb_name: EdbName,
+					edb_name: this.currentLang==='en'?EdbNameEn:EdbName,
 					menu: ClassifyId,
 					frequency: Frequency,
-					unit: Unit
+					unit: this.currentLang==='en'?UnitEn:Unit
 				}
 				this.runCode = PythonCode
 				

src/views/dataEntry_manage/components/chartReleationEdbTable.vue

@@ -0,0 +1,177 @@
+<template>
+  <el-table
+    :data="tableData"
+    ref="tableRef"
+    highlight-current-row
+    border
+  >
+    <el-table-column type="expand" v-if="![10,11].includes(chartInfo.ChartType)">
+      <template slot-scope="{row,$index}">
+        <div class="expand-wrap">
+          <div class="data-change">
+            <el-checkbox v-model="updateData[$index].IsConvert">数据转换</el-checkbox>
+            <el-select v-model="updateData[$index].ConvertType">
+              <el-option label="乘以" :value="1"></el-option>
+              <el-option label="除以" :value="2"></el-option>
+              <el-option label="对数" :value="3"></el-option>
+            </el-select>
+          <el-input type="number" v-model="updateData[$index].ConvertValue"></el-input>
+          </div>
+          <div class="unit-change">
+            <label>单位</label>
+            <el-input v-model="updateData[$index].ConvertUnit"></el-input>
+            <label>英文单位</label>
+            <el-input v-model="updateData[$index].ConvertEnUnit"></el-input>
+          </div>
+          <!--柱形图-->
+          <div class="use-change" v-if="chartInfo.ChartType===7">
+            <el-radio v-model="useUnit" :label="$index">设置为图表单位</el-radio>
+          </div>
+          <div class="confirm-btn">
+            <el-button type="text" @click="changeTableData($index)">保存</el-button>
+          </div>
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column
+      v-for="item in tableColums"
+      :key="item.label"
+      :label="item.label"
+      :width="item.widthsty"
+      :min-width="item.minwidthsty"
+      align="center"
+    >
+      <template slot-scope="scope">
+        <div v-if="item.key === 'EdbName' && [1,4,6,7,11].includes(chartInfo.ChartType)">
+          <!-- 柱状图用别名 -->
+          <el-input 
+            v-model="scope.row.EdbAliasName"
+            placeholder="指标别名"
+            class="target-other-name"
+            clearable
+          />
+        </div>
+        <span v-else>{{ scope.row[item.key] }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      :label="$t('Table.column_operations')"
+      key="Copy"
+      align="center"
+      width="140"
+    >
+      <template slot-scope="scope" v-if="scope.row.HaveOperaAuth">
+        <span @click="delTarget(scope.row)" class="deletesty"><!-- 删除 -->{{$t('Table.delete_btn')}}&nbsp;</span>
+        <span v-permission="permissionBtn.chartLibPermission.chartLib_copyData"
+          class="editsty" @click="copyCode(scope.row)">
+          <i class="el-icon-document-copy" />&nbsp;<!-- 复制数据 -->{{$t('Edb.detail_copydata_btn')}}</span
+        ><br>
+        <span v-permission="permissionBtn.chartLibPermission.chartLib_viewData"
+          class="editsty"
+          @click="viewTarget(scope.row)"
+        ><!-- 查看数据 -->{{$t('Edb.detail_lookdata_btn')}}</span>
+      </template>
+    </el-table-column>
+    <div slot="empty">
+        <tableNoData :text="$t('Table.no_edb_msg')" size="mini"/>
+    </div>
+  </el-table>
+</template>
+<script>
+export default {
+  props: {
+    tableData: {
+      type: Array,
+      required:true
+    },
+    chartInfo: {
+      type: Object,
+      required:true
+    },
+    updateData: {
+      type:Array
+    }
+  },
+  computed:{
+    tableColums(){
+      return [
+        {
+          label: this.$t('Edb.Detail.e_name'),
+          key: 'EdbName',
+          enKey:'EdbNameEn',
+          inputTip:'点击输入英文指标名称',
+          minwidthsty: '150px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_id'),
+          key: 'EdbCode',
+          widthsty: '120px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_fre'),
+          key: 'Frequency',
+          enKey:'FrequencyEn',
+          minwidthsty: '60px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_unit'),
+          key: 'Unit',
+          enKey:'UnitEn',
+          inputTip:'英文单位',
+          minwidthsty: '50px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_start_time'),
+          key: 'StartDate',
+          minwidthsty: '100px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_latest_date'),
+          key: 'LatestDate',
+          minwidthsty: '90px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_latest_value'),
+          key: 'LatestValue',
+          minwidthsty: '90px',
+        },
+        {
+          label: this.$t('Edb.Detail.e_recent_time'),
+          key: 'ModifyTime',
+          minwidthsty: '100px',
+        },
+        {
+          label: this.$t('Edb.Detail.source'),
+          key: 'SourceName',
+        },
+      ]
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  mounted(){
+  },
+  methods:{
+    changeTableData(index) {
+      this.$emit('changeTableData',index)
+    },
+    
+    delTarget(row) {
+      this.$emit('delTarget',row)
+    },
+
+    copyCode(row) {
+      this.$emit('copyCode',row)
+    },
+
+    viewTarget(row) {
+      this.$emit('viewTarget',row)
+    }
+  },
+}
+</script>
+<style scoped lang='scss'>
+
+</style>

src/views/dataEntry_manage/databaseComponents/batchComptedDialog.vue

@@ -508,13 +508,15 @@ export default {
 		NchangeHandle(tag) {
 			let obj = this.targetList.find(item => item.tag === tag);
 			const edbInfo = this.searchOptions.find(item => item.EdbInfoId === obj.target);
+			let edbName = this.$parent.currentLang==='en'?edbInfo.EdbNameEn:edbInfo.EdbName;
+
 			const name_map = {
-				8: edbInfo.EdbName,
-				12: `${edbInfo.EdbName}${obj.n_num}${obj.frequency.slice(0,1)}环比`,
-				13: `${edbInfo.EdbName}${obj.n_num}${obj.frequency.slice(0,1)}环差`,
-				39: edbInfo.EdbName,
-				43: `${edbInfo.EdbName}${obj.n_num}${obj.frequency.slice(0,1)}环比`,
-				44: `${edbInfo.EdbName}${obj.n_num}${obj.frequency.slice(0,1)}环差`,
+				8: edbName,
+				12: `${edbName}${obj.n_num}${obj.frequency.slice(0,1)}环比`,
+				13: `${edbName}${obj.n_num}${obj.frequency.slice(0,1)}环差`,
+				39: edbName,
+				43: `${edbName}${obj.n_num}${obj.frequency.slice(0,1)}环比`,
+				44: `${edbName}${obj.n_num}${obj.frequency.slice(0,1)}环差`,
 			}
       obj.targetName = name_map[this.type] || '';
 		},
@@ -528,81 +530,83 @@ export default {
 		转月 平均计算 升频默认指标名称同步
 		*/
 		setDefaultOption(obj,list) {
+			let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+			let unit = this.$parent.currentLang ==='en'?obj.UnitEn:obj.Unit;
 
 			switch (this.type) {
 				case 6:
 				case 32: 
 					return {
-						targetName: `${obj.EdbName}同比`,
+						targetName: `${edbName}同比`,
 						unit: '无',
 						frequency: obj.Frequency
 					}
 				case 7: 
 				case 33: 
 					return {
-						targetName: `${obj.EdbName}同差`,
-						unit: obj.Unit,
+						targetName: `${edbName}同差`,
+						unit,
 						frequency: obj.Frequency
 					}
 				case 8: 
 				case 39: 
 					return {
-						targetName: obj.EdbName,
-						unit: obj.Unit,
+						targetName: edbName,
+						unit,
 						frequency: obj.Frequency
 					}
 				case 14:
 				case 45: return {
-									targetName: obj.EdbName,
-									unit: obj.Unit,
+									targetName: edbName,
+									unit,
 									frequency: '日度'
 								}
 				case 12:
 				case 43: 
 					return{
-						targetName: `${obj.EdbName}${list.n_num}${obj.Frequency.slice(0,1)}环比`,
+						targetName: `${edbName}${list.n_num}${obj.Frequency.slice(0,1)}环比`,
 						unit: '无',
 						frequency: obj.Frequency
 					}
 				case 13: 
 				case 44: 
 					return {
-						targetName: `${obj.EdbName}${list.n_num}${obj.Frequency.slice(0,1)}环差`,
+						targetName: `${edbName}${list.n_num}${obj.Frequency.slice(0,1)}环差`,
 						unit: '无',
 						frequency: obj.Frequency
 					}
 				case 5:
 				case 42: 
 					return {
-						targetName: obj.EdbName,
-						unit: obj.Unit,
+						targetName: edbName,
+						unit,
 						frequency: obj.Frequency
 					}
 				case 61:
 				case 64: 
 					return {
-						targetName: obj.EdbName,
+						targetName: edbName,
 						unit: '无',
 						frequency: '季度'
 					}
 				case 62:
 				case 65: 
 					return {
-						targetName: obj.EdbName,
+						targetName: edbName,
 						unit: '无',
 						frequency: obj.Frequency
 					}
 				case 63:
 				case 66: 
 					return {
-						targetName: obj.EdbName,
+						targetName: edbName,
 						unit: '无',
 						frequency: obj.Frequency
 					}
 				case 75: 
 					return {
-						targetName: `${obj.EdbName}日均值`,
-						unit: obj.Unit,
+						targetName: `${edbName}日均值`,
+						unit,
 						frequency: obj.Frequency,
 						menu: obj.ClassifyId,
 					}

src/views/dataEntry_manage/databaseComponents/batchComputedSave.vue

@@ -5,7 +5,7 @@
             border 
             height="500px"
         >
-            <el-table-column label="指标全称" align="center" prop="EdbName"/>
+            <el-table-column label="指标全称" align="center" :prop="$parent.currentLang==='en'?'EdbNameEn':'EdbName'"/>
             <el-table-column label="生成指标名称" align="center">
                 <template slot-scope="scope">
                     <el-input :disabled="operationForm.view" v-model="scope.row.name" placeholder="请填写指标名称" style="width:100%"/>
@@ -80,7 +80,10 @@ export default {
             if(!this.computedType) return 0
             if(this.subComputedType) return this.subComputedType
             return ['withNum','withEDB'].includes(this.computedType)?4:this.computedType
-        }
+        },
+        currentLang() {
+			return this.$store.state.lang
+		}
     },
     data() {
         return {
@@ -117,11 +120,14 @@ export default {
                 this.computedArr=this.selectList
                 // 如果是编辑时
                 if(this.isEdit){
+                    let EdbName = this.currentLang==='en'?this.operationForm.EdbInfoDetail.EdbNameEn:this.operationForm.EdbInfoDetail.EdbName;
+                    let unit = this.currentLang==='en'?this.operationForm.EdbInfoDetail.UnitEn:this.operationForm.EdbInfoDetail.Unit;
+
                     this.list=[{
-                        EdbName:this.operationForm.EdbInfoDetail.EdbName,
+                        EdbName,
                         EdbInfoId:this.operationForm.EdbInfoDetail.EdbInfoId,
-                        name:this.operationForm.EdbInfoDetail.EdbName,
-                        unit:this.operationForm.EdbInfoDetail.Unit,
+                        name:EdbName,
+                        unit,
                         frequency:this.operationForm.EdbInfoDetail.Frequency,
                         classify:this.operationForm.EdbInfoDetail.ClassifyId
                     }]
@@ -140,8 +146,11 @@ export default {
         },
         // 设置默认值
         setDefaultVal(item){
+            let EdbName = this.currentLang==='en'?item.EdbNameEn:item.EdbName;
+            let unit = this.currentLang==='en'?item.UnitEn:item.Unit;
+
             const obj={
-                EdbName:item.EdbName,
+                EdbName:EdbName,
                 EdbInfoId:item.EdbInfoId,
                 name:'',
                 unit:'',
@@ -157,24 +166,24 @@ export default {
 				['年度','Y'],
 			])
 			const name_map = {
-                4:item.EdbName,
-				5: `${item.EdbName}转月值`,
-				8: `${item.EdbName}/${this.formData.nNum}${tMap.get(item.Frequency)}MA`,
-				14: `${item.EdbName}/日频`,
-				6: `${item.EdbName}同比`,
-				7: `${item.EdbName}同差`,
-				12: `${item.EdbName}${this.formData.nNum}${item.Frequency.slice(0,1)}环比`,
-				13: `${item.EdbName}${this.formData.nNum}${item.Frequency.slice(0,1)}环差`,
-				35: `${item.EdbName}超季节性/${this.formData.nNum}年${this.formData.calendarType==='公历'?'':'/'+this.formData.calendarType}`,
-				52: `${item.EdbName}年化值`,
-				51: `${item.EdbName}/${this.formData.frequency.substr(0,1)}频`,
-				61:  `${item.EdbName}转季值`,
-				62:  `${item.EdbName}累计值/${this.formData.frequency}`,
-				63:  `${item.EdbName}年初至今累计值`,
-                72:`${item.EdbName}指数修匀`,
-				75: `${item.EdbName}日均值`,
-                81:item.EdbName,
-                82:item.EdbName,
+                4:EdbName,
+				5: `${EdbName}转月值`,
+				8: `${EdbName}/${this.formData.nNum}${tMap.get(item.Frequency)}MA`,
+				14: `${EdbName}/日频`,
+				6: `${EdbName}同比`,
+				7: `${EdbName}同差`,
+				12: `${EdbName}${this.formData.nNum}${item.Frequency.slice(0,1)}环比`,
+				13: `${EdbName}${this.formData.nNum}${item.Frequency.slice(0,1)}环差`,
+				35: `${EdbName}超季节性/${this.formData.nNum}年${this.formData.calendarType==='公历'?'':'/'+this.formData.calendarType}`,
+				52: `${EdbName}年化值`,
+				51: `${EdbName}/${this.formData.frequency.substr(0,1)}频`,
+				61:  `${EdbName}转季值`,
+				62:  `${EdbName}累计值/${this.formData.frequency}`,
+				63:  `${EdbName}年初至今累计值`,
+                72:`${EdbName}指数修匀`,
+				75: `${EdbName}日均值`,
+                81:EdbName,
+                82:EdbName,
 			}
 			
 			let frequerncyMap = {
@@ -189,7 +198,7 @@ export default {
             obj.classify=item.ClassifyId||''
 
             if([5,8,14,7,35,75].includes(this.sourceTypeVal)){
-                obj.unit=item.Unit
+                obj.unit=unit
             }else if([4].includes(this.sourceTypeVal)){
                 obj.unit=''
             }else{
@@ -203,9 +212,11 @@ export default {
 		handleFrequencyChange(e){
 			if(!this.sourceTypeVal||![51,62].includes(this.sourceTypeVal)) return;
             const obj=this.list[e.$index]
+            let EdbName = this.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+
 			const name_map = {
-				51: `${obj.EdbName}/${obj.frequency.substr(0,1)}频`,
-				62:  `${obj.EdbName}累计值/${obj.frequency}`,
+				51: `${EdbName}/${obj.frequency.substr(0,1)}频`,
+				62:  `${EdbName}累计值/${obj.frequency}`,
 			}
 			this.list[e.$index].name=name_map[this.sourceTypeVal]
 		},

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -293,12 +293,12 @@
                         v-loading="listLoading"
                     >
                         <el-table-column type="selection" min-width="50" align="center" :selectable="filterEdbAuth"/>
-                        <el-table-column label="指标全称" show-overflow-tooltip align="center" prop="EdbName"/>
+                        <el-table-column label="指标全称" show-overflow-tooltip align="center" :prop="$parent.currentLang==='en'?'EdbNameEn':'EdbName'"/>
                         <el-table-column label="最新日期" align="center" prop="EndDate" width="120px" />
                         <el-table-column label="最新值" align="center" show-overflow-tooltip prop="EndValue" width="80px"/>
                         <el-table-column label="创建人" align="center" show-overflow-tooltip prop="SysUserRealName" width="80px"/>
                         <el-table-column label="频度" align="center" prop="Frequency" width="50px"/>
-                        <el-table-column label="单位" show-overflow-tooltip align="center" prop="Unit" width="50px"/>
+                        <el-table-column label="单位" show-overflow-tooltip align="center" :prop="$parent.currentLang==='en'?'UnitEn':'Unit'" width="50px"/>
                     </el-table>
                     <m-page 
                         style="margin-top:10px"
@@ -325,7 +325,7 @@
                                 {{scope.$index|getNoText}}
                             </template>
                         </el-table-column>
-                        <el-table-column label="指标全称" show-overflow-tooltip align="center" prop="EdbName"/>
+                        <el-table-column label="指标全称" show-overflow-tooltip align="center" :prop="$parent.currentLang==='en'?'EdbNameEn':'EdbName'"/>
                         <el-table-column width="50px" align="center" v-if="!operationForm.view">
                             <template slot="header" slot-scope="scope">
                                 <img @click="handleDelSelect('all')" style="width:15px;height:15px;cursor: pointer;" src="~@/assets/img/ai_m/delete.png" alt="">

src/views/dataEntry_manage/databaseComponents/fittingResidueDia.vue

@@ -349,12 +349,11 @@ export default {
 				CurrentIndex: page,
 				FilterSource: this.type === 5 ? 2 : this.type === 14 ? 3 : 1
 			}
-			const res=this.isPredict?await preDictEdbInterface.edbSearch(params):await dataBaseInterface.targetSearchByPage(params)
-			// dataBaseInterface.targetSearchByPage({
-			// 	KeyWord:query,
-			// 	CurrentIndex: page,
-			// 	FilterSource: this.type === 5 ? 2 : this.type === 14 ? 3 : 1
-			// }).then(res => {
+			const res=this.isPredict
+				? await preDictEdbInterface.edbSearch(params)
+				: await dataBaseInterface.targetSearchByPage(params)
+
+
 				if(res.Ret !== 200) return
 
 				const { List,Paging } = res.Data;
@@ -363,7 +362,6 @@ export default {
 
 				this.searchOptions = this.operationForm.edb_id ? arr.filter(item => item.EdbInfoId !== this.operationForm.edb_id) : arr;
 					
-			// })
 		},
 
 		searchLoad() {
@@ -373,15 +371,16 @@ export default {
 
 		/* 获取目录结构 */
 		async getMenu() {
-			const res=this.isPredict?await preDictEdbInterface.classifyListV2():await dataBaseInterface.menuListV3()
-			// dataBaseInterface.menuList().then((res) => {
+			const res=this.isPredict
+				?await preDictEdbInterface.classifyListV2()
+				:await dataBaseInterface.menuListV3()
+
 				if (res.Ret === 200) {
 					
 					this.filterNodes(res.Data.AllNodes);
 					this.options = res.Data.AllNodes || [];
 					
 				}
-			// });
 		},
 		// 递归改变第三级目录结构
 		filterNodes(arr) {
@@ -402,7 +401,12 @@ export default {
 		/* 选择指标时同步日期 */
 		changeTarget(type,val) {
 			const choose_obj = this.searchOptions.find(item => item.EdbInfoId === val);
-			type === 'depend' ? this.depend_edb_name =  choose_obj && choose_obj.EdbName : this.self_edb_name = choose_obj&&choose_obj.EdbName||'';
+
+			if(type==='depend') {
+				this.depend_edb_name =  choose_obj && (this.$parent.currentLang==='en'?choose_obj.EdbNameEn:choose_obj.EdbName)
+			}else {
+				this.self_edb_name = choose_obj&&(this.$parent.currentLang==='en'?choose_obj.EdbNameEn:choose_obj.EdbName)
+			}
 			//默认拼接名称
 			if(this.formData.depend_variate && this.formData.self_variate) {
 				this.formData.edb_name = `${this.depend_edb_name}拟合残差/${this.self_edb_name}`
@@ -416,7 +420,7 @@ export default {
 				// 设置目录、频度、单位
 				if(type==='self'){
 					this.formData.menu=choose_obj.ClassifyId
-					this.formData.unit=choose_obj.Unit
+					this.formData.unit=this.$parent.currentLang==='en'?choose_obj.UnitEn:choose_obj.Unit
 					this.formData.frequency=choose_obj.Frequency
 				}
 				

src/views/dataEntry_manage/databaseComponents/jointTargetDia.vue

@@ -451,11 +451,14 @@ export default {
 			if(!val) return
 			const arr=key==='searchMonthOptions'?this.searchMonthOptions:this.searchOptions
 			let obj = arr.find(item => item.EdbInfoId === val);
-			console.log(obj);
-			this.formData.edb_name=`${obj.EdbName}/拼接`
+			
+			let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+			let unit = this.$parent.currentLang==='en'?obj.UnitEn:obj.Unit;
+			
+			this.formData.edb_name=`${edbName}/拼接`
 			this.formData.menu=obj.ClassifyId||''
 			this.formData.frequency=obj.Frequency
-			this.formData.unit=obj.Unit
+			this.formData.unit=unit
 		},
 
 		/* 搜索 */

src/views/dataEntry_manage/databaseComponents/openDialog.vue

@@ -113,7 +113,7 @@ export default {
 		getParentName(){
 			const arr=this.formData.parentArr||[]
 			let strArr=arr.reverse().map(item=>{
-				return item.classifyName
+				return this.currentLang==='en'?item.classifyNameEn:item.classifyName
 			})
 			
 			return strArr.join('/')

src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -367,7 +367,7 @@ export default {
 				},
 				{
 					label: /* '指标名称' */this.$t('Edb.Detail.e_name'),
-					key: 'EdbName',
+					key: this.$parent.currentLang==='en'?'EdbNameEn':'EdbName',
 				},
 				{
 					label: /* '频度' */ this.$t('Edb.Detail.e_fre'),
@@ -375,7 +375,7 @@ export default {
 				},
 				{
 					label: /* '单位' */this.$t('Edb.Detail.e_unit'),
-					key: 'Unit',
+					key: this.$parent.currentLang==='en'?'UnitEn':'Unit',
 				},
 				{
 					label: /* '起始时间' */this.$t('Edb.Detail.e_start_time'),
@@ -699,6 +699,7 @@ export default {
 		NchangeHandle() {
 			if(!this.select_target) return;
 			let obj = this.searchOptions.find(item => item.EdbInfoId === this.select_target);
+			let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
 			const tMap=new Map([
 				['日度','D'],
 				['周度','W'],
@@ -708,10 +709,10 @@ export default {
 				['年度','Y'],
 			])
 			const name_map = {
-				8: `${obj.EdbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
-				12: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
-				13: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
-				35: `${obj.EdbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`
+				8: `${edbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
+				12: `${edbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
+				13: `${edbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
+				35: `${edbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`
 			}
 			this.formData.targetName = name_map[this.type] || '';
 		},
@@ -720,9 +721,11 @@ export default {
 		handleFrequencyChange(){
 			if(!this.select_target||this.operationForm.edb_id) return;
 			let obj = this.searchOptions.find(item => item.EdbInfoId === this.select_target);
+			let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+
 			const name_map = {
-				51: `${obj.EdbName}/${this.formData.frequency.substr(0,1)}频`,
-				62:  `${obj.EdbName}累计值/${this.formData.frequency}`,
+				51: `${edbName}/${this.formData.frequency.substr(0,1)}频`,
+				62:  `${edbName}累计值/${this.formData.frequency}`,
 			}
 			this.formData.targetName=name_map[this.type] || ''
 		},
@@ -732,7 +735,9 @@ export default {
 			if(this.type==22){
 				if(!this.select_target||this.operationForm.edb_id) return;
 				let obj = this.searchOptions.find(item => item.EdbInfoId === this.select_target);
-				this.formData.targetName=`${obj.EdbName}${this.moveTypeOpions.filter(item=>item.key===this.formData.moveType)[0].label}${this.formData.moveVal}${this.formData.moveUnit}`
+				let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+
+				this.formData.targetName=`${edbName}${this.moveTypeOpions.filter(item=>item.key===this.formData.moveType)[0].label}${this.formData.moveVal}${this.formData.moveUnit}`
 			}
 		},
 
@@ -756,22 +761,25 @@ export default {
 				['季度','Q'],
 				['年度','Y'],
 			])
+
+			let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+			let unit = this.$parent.currentLang ==='en'?obj.UnitEn:obj.Unit;
 			const name_map = {
-				5: `${obj.EdbName}转月值`,
-				8: `${obj.EdbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
-				14: `${obj.EdbName}/日频`,
-				6: `${obj.EdbName}同比`,
-				7: `${obj.EdbName}同差`,
-				12: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
-				13: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
-				35: `${obj.EdbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`,
-				52: `${obj.EdbName}年化值`,
-				51: `${obj.EdbName}/${obj.Frequency.substr(0,1)}频`,
-				61:  `${obj.EdbName}转季值`,
-				62:  `${obj.EdbName}累计值/${obj.Frequency}`,
-				63:  `${obj.EdbName}年初至今累计值`,
-				75: `${obj.EdbName}日均值`,
-				22:	`${obj.EdbName}${this.moveTypeOpions.filter(item=>item.key===this.formData.moveType)[0].label}${this.formData.moveVal}${this.formData.moveUnit}`
+				5: `${edbName}转月值`,
+				8: `${edbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
+				14: `${edbName}/日频`,
+				6: `${edbName}同比`,
+				7: `${edbName}同差`,
+				12: `${edbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
+				13: `${edbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
+				35: `${edbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`,
+				52: `${edbName}年化值`,
+				51: `${edbName}/${obj.Frequency.substr(0,1)}频`,
+				61:  `${edbName}转季值`,
+				62:  `${edbName}累计值/${obj.Frequency}`,
+				63:  `${edbName}年初至今累计值`,
+				75: `${edbName}日均值`,
+				22:	`${edbName}${this.moveTypeOpions.filter(item=>item.key===this.formData.moveType)[0].label}${this.formData.moveVal}${this.formData.moveUnit}`
 			}
 			
 			let frequerncyMap = {
@@ -783,7 +791,7 @@ export default {
 			this.formData = {
 				targetName: name_map[this.type] || '',
 				frequency: frequerncyMap[this.type] || obj.Frequency,
-				unit: [5,8,14,7,35,75].includes(this.type) ? obj.Unit : '无',
+				unit: [5,8,14,7,35,75].includes(this.type) ? unit : '无',
 				menu: obj.ClassifyId || '',
 				n_num: 1,
 				moveType: 1,

src/views/dataEntry_manage/databaseComponents/smoothEdbDialog.vue

@@ -337,7 +337,7 @@ export default {
 				},
 				{
 					label: /* '指标名称' */this.$t('Edb.Detail.e_name'),
-					key: 'EdbName',
+					key: this.$parent.currentLang==='en'?'EdbNameEn':'EdbName',
 				},
 				{
 					label: /* '频度' */ this.$t('Edb.Detail.e_fre'),
@@ -345,7 +345,7 @@ export default {
 				},
 				{
 					label: /* '单位' */this.$t('Edb.Detail.e_unit'),
-					key: 'Unit',
+					key: this.$parent.currentLang==='en'?'UnitEn':'Unit',
 				},
 				{
 					label: /* '起始时间' */this.$t('Edb.Detail.e_start_time'),
@@ -425,7 +425,6 @@ export default {
                 }
                 if(this.computedSource===2){
                     this.addTargetHandle()
-                    this.addTargetHandle()
                 }
             }
         }
@@ -506,17 +505,23 @@ export default {
         chooseTargetList(val,index){
             if(val){
                 const obj = this.searchOptions.find(item => item.EdbInfoId === val);
-                this.targetList[index].targetName = `${obj.EdbName}指数修匀`
-                this.targetList[index].unit = obj.Unit
+                let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+			    let unit = this.$parent.currentLang ==='en'?obj.UnitEn:obj.Unit;
+
+                this.targetList[index].targetName = `${edbName}指数修匀`
+                this.targetList[index].unit = unit
                 this.targetList[index].frequency = obj.Frequency
                 this.targetList[index].menu = obj.ClassifyId||''
                 this.targetList[index].alphaValue =obj.Formula||''
             }
         },
         setDefaultOption(obj,type){
+            let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+			let unit = this.$parent.currentLang ==='en'?obj.UnitEn:obj.Unit;
+
             this.formData = {
-                targetName:`${obj.EdbName}${type==='edit'?'':'指数修匀'}`,
-                unit:obj.Unit,
+                targetName:`${edbName}${type==='edit'?'':'指数修匀'}`,
+                unit,
                 frequency:obj.Frequency,
                 menu:obj.ClassifyId||'',
                 alphaValue:obj.Formula||''

src/views/dataEntry_manage/databaseList.vue

@@ -292,8 +292,8 @@
 									<el-button 
 										v-if="isEdbBtnShow('setEn')"
 										type="text" 
-										@click="openEnNameDia"
-									>{{$t('Edb.detail_en_btn')}}<!-- 设置英文名称 --></el-button>
+										@click="openLangInfoDia"
+									>{{$t('Edb.detail_en_btn')}}<!-- 编辑信息 --></el-button>
 									<el-button 
 										v-if="EdbData.Button.InsertNewDataButton&&isEdbBtnShow('newValue')"
 										type="text" 
@@ -1315,7 +1315,7 @@ export default {
 			//目录名称可以双击修改 指标不能
 			if(!data.EdbCode && this.role === 'admin'&&this.isEdbBtnShow('editCatalog')) {
 				this.$set(data,'isEdit',true)
-				this.new_label = data.ClassifyName;
+				this.new_label = this.currentLang==='en' ? data.ClassifyNameEn : data.ClassifyName;
 				this.$nextTick(() => {
 					this.$refs.editVal.focus();
 				});
@@ -1325,7 +1325,7 @@ export default {
 		changeValue(node, data) {
 			if(this.new_label) {
 				this.$set(data,'isEdit',false)
-				this.new_label !== data.ClassifyName && dataBaseInterface.nodeEdit({
+				dataBaseInterface.nodeEdit({
 						ClassifyId: data.ClassifyId,
 						ClassifyName: this.new_label
 					}).then(res => {
@@ -1350,7 +1350,7 @@ export default {
 		// 递归节点
 		getNodeParentData(data,arr){
 			if(data.level===0) return
-			arr.push({classifyName:data.data.ClassifyName,classifyId:data.data.ClassifyId})
+			arr.push({classifyName:this.currentLang==='en'?data.data.ClassifyNameEn:data.data.ClassifyName,classifyId:data.data.ClassifyId})
 			this.getNodeParentData(data.parent,arr)
 			return arr
 		},
@@ -1392,11 +1392,11 @@ export default {
 						this.dialogForm = {
 							parentArr:[],
 							level: 0,
-							levelVal: res.Data.EdbName,
+							levelVal: this.currentLang==='en'?res.Data.EdbNameEn:res.Data.EdbName,
 							level_menu:menuArrId||[],
 							edbinfo_id: res.Data.EdbInfoId,
 							frequency:res.Data.Frequency,
-							unit:res.Data.Unit,
+							unit:this.currentLang==='en'?res.Data.UnitEn:res.Data.Unit,
 							isEDB:true
 						}
 						this.isOpenDialog = true;
@@ -1452,7 +1452,7 @@ export default {
 				this.dialogForm = {
 					isEDB:false,
 					parentArr:arr,
-					levelVal: data.ClassifyName||'',
+					levelVal: this.currentLang==='en'?data.ClassifyNameEn:data.ClassifyName,
 					classify_id: data.ClassifyId,
 					level: node.level-1
 				}
@@ -1864,14 +1864,14 @@ export default {
 						end_date: item.EndDate
 					}
 				})
-				const { EdbInfoId,CalculateFormula,EdbName,Unit,Frequency,EmptyType,MaxEmptyType,Extra } = res.EdbInfoDetail;
+				const { EdbInfoId,CalculateFormula,EdbName,EdbNameEn,Unit,UnitEn,Frequency,EmptyType,MaxEmptyType,Extra } = res.EdbInfoDetail;
 				/* 公式和表单 */
 				this.calulateForm =  {
 					edb_id: EdbInfoId,
 					formula: CalculateFormula,
 					menu: menuArrId||[],
-					targetName: EdbName,
-					unit: Unit,
+					targetName: this.currentLang==='en'?EdbNameEn:EdbName,
+					unit: this.currentLang==='en'?UnitEn:Unit,
 					frequency: Frequency,
 					emptyType: EmptyType,
 					maxEmptyType: MaxEmptyType,
@@ -1892,9 +1892,9 @@ export default {
 
 				let public_params = {
 					edb_id: dataInfo.EdbInfoId,
-					targetName: dataInfo.EdbName,
+					targetName: this.currentLang==='en'?dataInfo.EdbNameEn:dataInfo.EdbName,
 					frequency: dataInfo.Frequency,
-					unit: dataInfo.Unit,
+					unit: this.currentLang==='en'?dataInfo.UnitEn:dataInfo.Unit,
 					menu: menuArrId||[],
 					Extra:dataInfo.Extra,
 					view
@@ -1924,12 +1924,16 @@ export default {
 					}
 
 				if([72,73].includes(type)){
-					const {EdbName,EdbInfoId,Frequency,Unit,ClassifyId,CalculateFormula} = dataInfo
+					const {EdbName,EdbNameEn,EdbInfoId,Frequency,Unit,UnitEn,ClassifyId,CalculateFormula} = dataInfo
 					this.operationForm = {
 						edb_id: EdbInfoId,
 						oldedb_id: old_edb[0].FromEdbInfoId,
 						oldEdb_name: old_edb[0].FromEdbName,
-						EdbName,Frequency,Unit,ClassifyId,Formula:CalculateFormula,
+						EdbName: this.currentLang==='en'?EdbNameEn:EdbName,
+						Frequency,
+						Unit:this.currentLang==='en'?UnitEn:Unit,
+						ClassifyId,
+						Formula:CalculateFormula,
 						view
 					}
 				}

src/views/dataEntry_manage/editChart.vue

@@ -211,7 +211,7 @@
           <el-collapse v-model="activeNames" class="target-list" v-if="tableData.length&&![7,10,11].includes(chartInfo.ChartType)">
             <el-collapse-item v-for="(item,index) in tableData" :key="item.EdbInfoId" :disabled="[2,5].includes(chartInfo.ChartType)">
               <template slot="title">
-                <span class="text_oneLine">{{item.EdbName}}</span>
+                <span class="text_oneLine">{{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}</span>
 								<i class="el-icon-delete del-icon" @click.stop="delTarget(item)"></i>
               </template>
               <ul class="setting-cont">
@@ -626,83 +626,17 @@
 
 					<!-- 异常显示 -->
           <p class="error-tip" style="min-height: 400px" v-if="chartInfo.WarnMsg">{{chartInfo.WarnMsg}}</p>
-					<el-table
-						:data="tableData"
-						ref="tableRef"
-						highlight-current-row
-						border
-					>
-						<el-table-column type="expand" v-if="![10,11].includes(chartInfo.ChartType)">
-							<template slot-scope="{row,$index}">
-								<div class="expand-wrap">
-									<div class="data-change">
-										<el-checkbox v-model="updateData[$index].IsConvert">数据转换</el-checkbox>
-										<el-select v-model="updateData[$index].ConvertType">
-											<el-option label="乘以" :value="1"></el-option>
-											<el-option label="除以" :value="2"></el-option>
-											<el-option label="对数" :value="3"></el-option>
-										</el-select>
-									<el-input type="number" v-model="updateData[$index].ConvertValue"></el-input>
-									</div>
-									<div class="unit-change">
-										<label>单位</label>
-										<el-input v-model="updateData[$index].ConvertUnit"></el-input>
-										<label>英文单位</label>
-										<el-input v-model="updateData[$index].ConvertEnUnit"></el-input>
-									</div>
-									<!--柱形图-->
-									<div class="use-change" v-if="chartInfo.ChartType===7">
-										<el-radio v-model="useUnit" :label="$index">设置为图表单位</el-radio>
-									</div>
-									<div class="confirm-btn">
-										<el-button type="text" @click="changeTableData($index)">保存</el-button>
-									</div>
-								</div>
-							</template>
-						</el-table-column>
-						<el-table-column
-							v-for="item in tableColums"
-							:key="item.label"
-							:label="item.label"
-							:width="item.widthsty"
-							:min-width="item.minwidthsty"
-							align="center"
-						>
-							<template slot-scope="scope">
-								<div v-if="item.key === 'EdbName' && [1,4,6,7,11].includes(chartInfo.ChartType)">
-									<!-- 奇怪柱状图用别名 -->
-									<el-input 
-										v-model="scope.row.EdbAliasName"
-										placeholder="指标别名"
-										class="target-other-name"
-										clearable
-									/>
-								</div>
-								<span v-else>{{ scope.row[item.key] }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column
-							:label="$t('Table.column_operations')"
-							key="Copy"
-							align="center"
-							width="140"
-						>
-							<template slot-scope="scope" v-if="scope.row.HaveOperaAuth">
-								<span @click="delTarget(scope.row)" class="deletesty"><!-- 删除 -->{{$t('Table.delete_btn')}}&nbsp;</span>
-								<span v-permission="permissionBtn.chartLibPermission.chartLib_copyData"
-									class="editsty" @click="copyCode(scope.row)">
-									<i class="el-icon-document-copy" />&nbsp;<!-- 复制数据 -->{{$t('Edb.detail_copydata_btn')}}</span
-								><br>
-								<span v-permission="permissionBtn.chartLibPermission.chartLib_viewData"
-									class="editsty"
-									@click="viewTarget(scope.row)"
-								><!-- 查看数据 -->{{$t('Edb.detail_lookdata_btn')}}</span>
-							</template>
-						</el-table-column>
-						<div slot="empty">
-							<tableNoData :text="$t('Table.no_edb_msg')" size="mini"/>
-						</div>
-					</el-table>
+					
+					<!-- 关联指标 -->
+					<chartRelationEdbList
+						:chartInfo="chartInfo"
+						:tableData="tableData"
+						:updateData="updateData"
+						@changeTableData="changeTableData"
+						@delTarget="delTarget"
+						@copyCode="copyCode"
+						@viewTarget="viewTarget"
+					/>
 				</div>
       </div>
 			<div class="nodata" v-else>
@@ -755,8 +689,9 @@ import sectionalScatterOption from './components/sectionalScatterOption.vue';
 import LegendEditDia from './components/LegendEditDia.vue';
 import markersSection from './components/markersSection.vue';
 import chartSourceEditDia from './components/chartSourceEditDialog.vue';
+import chartRelationEdbList from './components/chartReleationEdbTable.vue';
 export default {
-  components: { Chart,DateChooseDia,SaveChartOther,barOption,sectionalScatterOption,LegendEditDia,markersSection,chartSourceEditDia },
+  components: { Chart,DateChooseDia,SaveChartOther,barOption,sectionalScatterOption,LegendEditDia,markersSection,chartSourceEditDia,chartRelationEdbList },
 	directives: {
     drag(el, bindings) {
       el.onmousedown = function (e) {
@@ -840,8 +775,11 @@ export default {
 
           this.chartInfo = {
 						...ChartInfo,
+						ChartName: this.currentLang==='en'?ChartInfo.ChartNameEn:ChartInfo.ChartName,
 						classify: [ChartInfo.ChartClassify[0].ParentId,...ChartInfo.ChartClassify.map(item => item.ChartClassifyId)],
-						Unit: ChartInfo.ChartType===7 ? BarChartInfo.Unit : ChartInfo.Unit,
+						Unit: ChartInfo.ChartType===7 
+							? (this.currentLang==='en'?BarChartInfo.UnitEn:BarChartInfo.Unit) 
+							: (this.currentLang==='en'?ChartInfo.UnitEn:ChartInfo.Unit),
 						SourcesFromVisable: ChartInfo.SourcesFrom ? JSON.parse(ChartInfo.SourcesFrom).isShow : true
 					};
 					//处理下历史默认来源

src/views/futures_manage/chartEditor.vue

@@ -48,7 +48,7 @@
 									style="vertical-align:middle" 
 									v-if="!item.HaveOperaAuth"
 								/>
-								{{item.EdbName}}
+								{{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
 							</div>
 						</el-option>
 					</el-select>

src/views/predictEdb_manage/addPredicEdb.vue

@@ -62,7 +62,7 @@
                         v-if="!item.HaveOperaAuth"
                       />
 
-                      {{item.EdbName}}
+                      {{currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
                     </div>
                   </edbDetailPopover>
                 </el-option>
@@ -451,7 +451,11 @@ export default {
         }
       }
       return obj
-    }
+    },
+
+    currentLang() {
+			return this.$store.state.lang
+		}
   },
   watch: {
     showChart(n, o) {
@@ -597,6 +601,7 @@ export default {
             ClassifyId,
             ClassifyList,
             EdbName,
+            EdbNameEn,
             Frequency,
             LatestValue,
             RuleList,
@@ -610,7 +615,7 @@ export default {
             classify: classifyArr||[],
             oldEdb: res.Data.CalculateList[0].FromEdbInfoId,
             oldEdbName: res.Data.CalculateList[0].FromEdbName,
-            edbName: EdbName,
+            edbName: this.currentLang==='en'?EdbNameEn:EdbName,
             frequency: Frequency,
             newdata:  res.Data.CalculateList[0].EndValue,
             lasetDate: res.Data.CalculateList[0].EndDate,
@@ -735,7 +740,7 @@ export default {
         const { Data } = await dataBaseInterface.targetDetail({
           EdbInfoId: val,
         });
-        this.formData.edbName = `${Data.EdbName}(预测)`;
+        this.formData.edbName = `${this.currentLang==='en'?Data.EdbNameEn:Data.EdbName}(预测)`;
         this.formData.frequency = Data.Frequency;
         this.formData.newdata = Data.LatestValue;
         this.formData.lasetDate = Data.LatestDate;

src/views/predictEdb_manage/components/chartInfo.vue

@@ -166,7 +166,7 @@ export default {
         }
     },
     mounted() {
-        this.changeLanguage(this.lang)
+        // this.changeLanguage(this.lang)
     },
     methods: {
         handleInitData(){

src/views/predictEdb_manage/components/classifyDia.vue

@@ -70,7 +70,7 @@ export default {
 		getParentName(){
 			const arr=this.formData.parentArr||[]
 			let strArr=arr.reverse().map(item=>{
-				return item.classifyName
+				return this.currentLang==='en'?item.classifyNameEn:item.classifyName
 			})
 			
 			return strArr.join('/')

src/views/predictEdb_manage/components/dynamicRingdiffer.vue

@@ -47,7 +47,7 @@
 										style="vertical-align:middle" 
 										v-if="!item.HaveOperaAuth"
 									/>
-									{{item.EdbName}}
+									{{ $parent.currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName}}
 								</div>
 							</edbDetailPopover>
 						</el-option>

src/views/predictEdb_manage/components/operationDialog.vue

@@ -341,7 +341,7 @@ export default {
 				},
 				{
 					label: /* '指标名称' */this.$t('Edb.Detail.e_name'),
-					key: 'EdbName',
+					key: this.$parent.currentLang==='en'?'EdbNameEn':'EdbName',
 				},
 				{
 					label: /* '频度' */ this.$t('Edb.Detail.e_fre'),
@@ -349,7 +349,7 @@ export default {
 				},
 				{
 					label: /* '单位' */this.$t('Edb.Detail.e_unit'),
-					key: 'Unit',
+					key: this.$parent.currentLang==='en'?'UnitEn':'Unit',
 				},
 				{
 					label: /* '起始时间' */this.$t('Edb.Detail.e_start_time'),
@@ -665,25 +665,28 @@ export default {
 				['季度','Q'],
 				['年度','Y'],
 			])
+			let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+			let unit = this.$parent.currentLang ==='en'?obj.UnitEn:obj.Unit;
+
 			const name_map = {
-				42: obj.EdbName,
-				32: `${obj.EdbName}同比`,
-				33: `${obj.EdbName}同差`,
-				39: `${obj.EdbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
-				45: `${obj.EdbName}/${obj.Frequency}升频`,
-				43: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
-				44: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
-				49: `${obj.EdbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`,
-				55: `${obj.EdbName}年化`,
-				54: `${obj.EdbName}/${obj.Frequency}降频`,
-				64:  obj.EdbName,
-				65:  obj.EdbName,
-				66:  obj.EdbName,
+				42: edbName,
+				32: `${edbName}同比`,
+				33: `${edbName}同差`,
+				39: `${edbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
+				45: `${edbName}/${obj.Frequency}升频`,
+				43: `${edbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
+				44: `${edbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
+				49: `${edbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`,
+				55: `${edbName}年化`,
+				54: `${edbName}/${obj.Frequency}降频`,
+				64:  edbName,
+				65:  edbName,
+				66:  edbName,
 			}
 			this.formData = {
 				targetName: name_map[this.type] || '',
 				frequency: this.type === 45 ? '日度' : this.type === 64 ? '季度': this.type === 65 ? '': obj.Frequency,
-				unit: [33,39,42,45,49].includes(this.type) ?  obj.Unit : '无',
+				unit: [33,39,42,45,49].includes(this.type) ?  unit : '无',
 				menu:'',
 				n_num: 1,
 				moveType: 1,
@@ -698,6 +701,8 @@ export default {
 		NchangeHandle() {
 			if(!this.select_target) return;
 			let obj = this.searchOptions.find(item => item.EdbInfoId === this.select_target);
+			let edbName = this.$parent.currentLang==='en'?obj.EdbNameEn:obj.EdbName;
+
 			const tMap=new Map([
 				['日度','D'],
 				['周度','W'],
@@ -707,10 +712,10 @@ export default {
 				['年度','Y'],
 			])
 			const name_map = {
-				43: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
-				44: `${obj.EdbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
-				49: `${obj.EdbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`,
-				39: `${obj.EdbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
+				43: `${edbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环比`,
+				44: `${edbName}${this.formData.n_num}${obj.Frequency.slice(0,1)}环差`,
+				49: `${edbName}超季节性/${this.formData.n_num}年${this.formData.calendar_type==='公历'?'':'/'+this.formData.calendar_type}`,
+				39: `${edbName}/${this.formData.n_num}${tMap.get(obj.Frequency)}MA`,
 			}
 			this.formData.targetName = name_map[this.type] || '';
 		},

src/views/predictEdb_manage/mixins/mixin.js

@@ -85,7 +85,7 @@ export default {
       //目录名称可以双击修改
       if(data.EdbInfoId || this.role !== 'admin' ) return
       this.$set(data,'isEdit',true)
-      this.new_label = data.ClassifyName;
+      this.new_label = this.currentLang==='en'?data.ClassifyNameEn:data.ClassifyName;
       this.$nextTick(() => {
         this.$refs.editVal.focus();
       });
@@ -96,7 +96,7 @@ export default {
         if(!this.new_label) return this.$message.warning('名称不能为空');
         this.$set(data,'isEdit',false)
   
-        this.new_label !== data.ClassifyName && preDictEdbInterface.classifyEdit({
+        preDictEdbInterface.classifyEdit({
           ClassifyId: data.ClassifyId,
           ClassifyName: this.new_label
         }).then(res => {

src/views/predictEdb_manage/predictEdb.vue

@@ -239,10 +239,9 @@
 									<el-button 
 										v-permission="permissionBtn.predictEdbPermission.edbPreData_enNameSetting"
 										type="text" 
-										@click="clickEdbNameHandle" 
-										v-if="currentLang==='zh'||!edb_nameEn"
+										@click="openLangInfoDia"
 									>
-										{{$t('Edb.detail_en_btn')}}<!-- 设置英文名称 -->
+										{{$t('Edb.detail_en_btn')}}<!-- 编辑信息 -->
 									</el-button>
 									<el-button 
 										v-permission="permissionBtn.predictEdbPermission.edbPreData_recalcu"
@@ -923,7 +922,7 @@ export default {
 		// 递归节点
 		getNodeParentData(data,arr){
 			if(data.level===0) return
-			arr.push({classifyName:data.data.ClassifyName,classifyId:data.data.ClassifyId})
+			arr.push({classifyName: this.currentLang==='en'?data.data.ClassifyNameEn:data.data.ClassifyName,classifyId:data.data.ClassifyId})
 			this.getNodeParentData(data.parent,arr)
 			return arr
 		},
@@ -941,19 +940,20 @@ export default {
 			this.classifyDia = true;
 		},
     /* 编辑节点 */
-    editNode(node, { ClassifyName,ClassifyId,Level,ParentId}) {
+    editNode(node, { ClassifyName,ClassifyNameEn,ClassifyId,Level,ParentId}) {
 
       this.dialog_title = '编辑';
-	  let arr=[]
-	  arr=this.getNodeParentData(node.parent,arr)
-      /* 编辑目录 */
-      this.classifyForm = {
-        classify_name: ClassifyName,
-        classify_id: ClassifyId,
-        Level:node.level-1,
-        ParentId:ParentId,
-        parentArr:arr,
-      };
+			let arr=[]
+			arr=this.getNodeParentData(node.parent,arr)
+
+				/* 编辑目录 */
+				this.classifyForm = {
+					classify_name: this.currentLang==='en'?ClassifyNameEn:ClassifyName,
+					classify_id: ClassifyId,
+					Level:node.level-1,
+					ParentId:ParentId,
+					parentArr:arr,
+				};
       this.classifyDia = true;
     },
 
@@ -1187,7 +1187,7 @@ export default {
 		},
 
 		/* 计算指标回显 */
-		setComputedDialogForm({Source,CalculateList,CalculateFormula,EdbInfoId,EdbName,Unit,Frequency,ClassifyId,ClassifyList,MoveType,MoveFrequency,Calendar,CorrelationStr,EmptyType,MaxEmptyType},type='') {
+		setComputedDialogForm({Source,CalculateList,CalculateFormula,EdbInfoId,EdbName,EdbNameEn,Unit,UnitEn,Frequency,ClassifyId,ClassifyList,MoveType,MoveFrequency,Calendar,CorrelationStr,EmptyType,MaxEmptyType},type='') {
 			//找到指标的父级
 			const parentNodes = ClassifyList.length&&ClassifyList.map(item=>item.ClassifyId)
 			//指标运算 or 其他计算类型指标
@@ -1207,22 +1207,27 @@ export default {
 					edb_id:EdbInfoId,
 					formula: CalculateFormula,
 					menu: parentNodes,
-					targetName: EdbName,
-					unit: Unit,
+					targetName: this.currentLang==='en'?EdbNameEn:EdbName,
+					unit: this.currentLang==='en'?UnitEn:Unit,
 					frequency: Frequency,
 					emptyType: EmptyType,
 					maxEmptyType: MaxEmptyType,
 					view: type === 'view'
 				};
 			} else  {
-				if([47,48,50,56].includes(Source)){//拟合残差
-					this.operationForm={
-						edb_id:EdbInfoId,
-						targetName: EdbName,
+
+				let public_params = {
+						edb_id: EdbInfoId,
+						targetName: this.currentLang==='en'?EdbNameEn:EdbName,
 						frequency: Frequency,
-						unit: Unit,
+						unit: this.currentLang==='en'?UnitEn:Unit,
 						menu: parentNodes,
 						view: type === 'view',
+				}
+
+				if([47,48,50,56].includes(Source)){//拟合残差
+					this.operationForm={
+						...public_params,
 						source: Source,
 						date: CalculateFormula,
 						pre_edb: Source === 47 ? CalculateList.find(item => item.FromTag === 'A').FromEdbInfoId : '', //俺也不懂为什么这么定义都是江西老表的锅
@@ -1235,15 +1240,11 @@ export default {
 					return
 				}
 				this.operationForm = {
+					...public_params,
 					oldedb_id: CalculateList[0].FromEdbInfoId,
 					oldEdb_name: CalculateList[0].FromEdbName,
-					edb_id: EdbInfoId,
-					targetName: EdbName,
-					unit: Unit,
 					menu: parentNodes.reverse(),
-					frequency: Frequency,
 					formula: CalculateFormula || '',
-					view: type === 'view',
 					moveType: MoveType,
 					moveUnit: MoveFrequency,
 					moveVal: Source === 46 ? CalculateFormula : '',