fix bug

src/views/chartRelevance_manage/components/selectTarget.vue

@@ -56,7 +56,7 @@
         <el-option
           v-for="item in searchOptions"
           :key="item.EdbInfoId"
-          :label="item.EdbName"
+          :label="currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
           :value="item.EdbInfoId"
           :disabled="!item.HaveOperaAuth"
         >
@@ -92,7 +92,7 @@
       <el-option
         v-for="item in searchOptions"
         :key="item.EdbInfoId"
-        :label="item.EdbName"
+        :label="currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
         :value="item.EdbInfoId"
         :disabled="!item.HaveOperaAuth"
       >

src/views/futures_manage/chartEditor.vue

@@ -36,7 +36,7 @@
 						<el-option
 							v-for="item in searchOptions"
 							:key="item.EdbInfoId"
-							:label="item.EdbName"
+							:label="currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
 							:value="item.EdbInfoId"
 							:disabled="!item.HaveOperaAuth"
 						>
@@ -83,6 +83,14 @@
 					</el-form-item>
 					<el-form-item :label="$t('ToolBox.CommodityPriceChart.chart_name')" prop="ChartName">
 						<el-input
+							v-if="currentLang==='en'"
+							v-model="chartInfo.ChartNameEn"
+							style="width: 90%"
+							:placeholder="$t('Dialog.require_vaild')"
+							clearable
+						/>
+						<el-input
+							v-else
 							v-model="chartInfo.ChartName"
 							style="width: 90%"
 							:placeholder="$t('Dialog.require_vaild')"
@@ -286,7 +294,7 @@ export default {
 						ProfitNameEn: DataResp.ProfitNameEn,
 						ProfitName: DataResp.ProfitName,
 					} : {
-						...ChartInfo, 
+						...ChartInfo,
 						classify: ChartInfo.ChartClassifyId,
 						futures_id: BarChartInfo.EdbInfoIdList.find(_ => _.Source===2).EdbInfoId
 					};
@@ -482,7 +490,7 @@ export default {
 
 			let public_param = {
 				ChartClassifyId: this.chartInfo.classify || 0,
-				ChartName: this.chartInfo.ChartName,
+				ChartName: this.currentLang==='en'?this.chartInfo.ChartNameEn:this.chartInfo.ChartName,
 				ChartType:8,
 				DateType: 6,
 			}

src/views/predictEdb_manage/addPredicEdb.vue

@@ -48,7 +48,7 @@
                 <el-option
                   v-for="item in searchOptions"
                   :key="item.EdbInfoId"
-                  :label="item.EdbName"
+                  :label="currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
                   :value="item.EdbInfoId"
                   :disabled="!item.HaveOperaAuth"
                 >
@@ -282,7 +282,7 @@
                     <el-option
                       v-for="item in searchOptions"
                       :key="item.EdbInfoId"
-                      :label="item.EdbName"
+                      :label="currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
                       :value="item.EdbInfoId"
                       :disabled="!item.HaveOperaAuth"
                     >
@@ -294,7 +294,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/components/dynamicRingdiffer.vue

@@ -34,7 +34,7 @@
 						<el-option
 							v-for="item in searchOptions"
 							:key="item.EdbInfoId"
-							:label="item.EdbName"
+							:label="$parent.currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
 							:value="item.EdbInfoId"
 							:disabled="!item.HaveOperaAuth"
 						>

src/views/sandbox_manage/sandFlowNew/components/addLInkDia.vue

@@ -22,7 +22,7 @@
             <el-option
               v-for="item in dataBaseOptions"
               :key="item.EdbInfoId"
-              :label="item.EdbName"
+              :label="currentLang==='en'?(item.EdbNameEn||item.EdbName):item.EdbName"
               :value="item.EdbInfoId"
               :disabled="!item.HaveOperaAuth"
             >
@@ -54,7 +54,7 @@
             <el-option
               v-for="item in dataBaseOptions"
               :key="item.ChartInfoId"
-              :label="item.ChartName"
+              :label="currentLang==='en'?(item.ChartNameEn||item.ChartName):item.ChartName"
               :value="item.ChartInfoId"
               :disabled="!item.HaveOperaAuth"
             >

src/views/system_manage/dataOperaAuth.vue

@@ -156,6 +156,10 @@
             align="center"
           >
             <template slot-scope="{row}">
+              <span v-if="item.key==='Name'">
+                {{ currentLang==='en' ? (row.NameEn||row.Name) : row.Name }}
+              </span>
+
               <template v-if="item.key==='handle'">
                 <span 
                   class="editsty" 
@@ -348,6 +352,10 @@ export default {
 
     filterDuplicateChecked() {
       return Array.from(new Set(this.checkedList))
+    },
+
+    currentLang() {
+      return this.$store.state.lang
     }
   },
 

src/views/system_manage/etaBaseConfig.vue

@@ -253,7 +253,7 @@
                 <div class="part" v-if="isShowPPT||isShowEnPPT" v-show="partType===3">
                     <el-radio-group v-model="pptLang" style="margin-bottom: 22px;">
                         <el-radio-button label="cn">{{$t('SystemManage.BaseConfig.ppt_zh')}}</el-radio-button>
-                        <el-radio-button label="en">{{$t('SystemManage.BaseConfig.ppt_en')}}</el-radio-button>
+                        <el-radio-button label="en" v-permission="permissionBtn.enPPTPermission.pptEn_visible">{{$t('SystemManage.BaseConfig.ppt_en')}}</el-radio-button>
                     </el-radio-group>
                     <div v-if="isShowPPT" v-show="pptLang === 'cn'" class="ppt-form-item-wrap">
                         <!-- <div class="inner-input-wrap">