研报列表，智能ppt，智能研报中英文版本切换关联内容;数据源分类中英文两种字段取值

src/components/chart/chartListWrap.vue

@@ -15,7 +15,7 @@
         <el-card class="sheet-item">
           <div class="chartEn-mark" v-show="chart.IsEnChart" style="top: 0;left: 0;">En</div>
           <div slot="header" class="item-top">
-            <span class="text_oneLine">{{ chart.ChartName }}</span>
+            <span class="text_oneLine">{{ currentLang === 'en' ? (chart.ChartNameEn||chart.ChartName) : chart.ChartName }}</span>
           </div>
           <img
             :src="chart.ChartImage"
@@ -50,6 +50,11 @@
 <script>
 export default {
   props: ['total','list'],
+  computed: {
+    currentLang() {
+			return this.$store.state.lang
+		}
+  },
   data() {
     return {
 

src/lang/modules/systemManage/BaseConfig.js

@@ -28,8 +28,8 @@ export const BaseConfigEn = {
     internal_approval:'ETA Internal Approval',
     third_approval:'Third-party Approval',
     third_approval_tips:"Chinese Research Report(Intelligent Research Report/Research Report List) connected to third-party approval systems via API interface",
-    report_share_title_zh:'Title of Chinese research report sharing',
-    report_share_title_zh_placeholder:'Please Enter Title of English research report sharing',
+    report_share_title_zh:'Title of research report sharing',
+    report_share_title_zh_placeholder:'Please Enter Title of research report sharing',
     report_share_title_en:'Title of English research report sharing',
     report_share_title_en_placeholder:'Please Enter Title of English research report sharing',
     connect_wx:'Associated Public Account',
@@ -41,7 +41,7 @@ export const BaseConfigEn = {
     report_type3:'English Report',
     report_sheet_tip: 'Set the font size for shared tables, time series tables, and mixed tables when inserting into research reports',
 
-    ppt_zh:'Chinese PPT',
+    ppt_zh:'PPT Slides',
     ppt_en:'English PPT',
     ppt_type01:'PPT Cover Image',
     ppt_type02:'PPT Background Image',
@@ -96,8 +96,8 @@ export const BaseConfigZh = {
     internal_approval:'ETA内部审批',
     third_approval:'第三方审批',
     third_approval_tips:'中文研报(智能研报/研报列表)通过API接口对接第三方审批系统',
-    report_share_title_zh:'中文研报分享抬头',
-    report_share_title_zh_placeholder:'请输入中文研报分享抬头',
+    report_share_title_zh:'研报分享抬头',
+    report_share_title_zh_placeholder:'请输入研报分享抬头',
     report_share_title_en:'英文研报分享抬头',
     report_share_title_en_placeholder:'请输入英文研报分享抬头',
     connect_wx:'关联公众号',
@@ -109,7 +109,7 @@ export const BaseConfigZh = {
     report_type3:'英文研报',
     report_sheet_tip: '设置共享表格、时间序列表格、混合表格插入研报的表格字号',
 
-    ppt_zh:'中文PPT',
+    ppt_zh:'智能PPT',
     ppt_en:'英文PPT',
     ppt_type01:'PPT封面图',
     ppt_type02:'PPT背景图',

src/views/chartRelevance_manage/crossVarietyAnalysis/list.vue

@@ -135,7 +135,7 @@
                 <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                 <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                   <div class="chartWrapper" id="chartWrapper">
-                    <h2 class="chart-title">{{ chartInfo.ChartName }}</h2>
+                    <h2 class="chart-title">{{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}</h2>
                     <Chart 
 											:options="options"
 											:chartInfo="chartInfo"
@@ -578,7 +578,7 @@ export default {
 		},
 
 		copyChartHandle:_.debounce(function(type){
-      let chartsName = this.currentLang=='ch'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
+      let chartsName = this.currentLang=='zh'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
       let { heightNum, widthNum , newTitle , dynamic_copyOptions} = this.dynamicWidthAndHeight(type,this.chartInfo.ChartType,chartsName,1)
       const chartType = 'seasonLegend';
       // 英文转SVG设置变动

src/views/chartRelevance_manage/fittingEquation/fittingEquationList.vue

@@ -159,7 +159,7 @@
                 <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                 <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                   <div class="chartWrapper" id="chartWrapper">
-                    <h2 class="chart-title">{{ chartInfo.ChartName }}</h2>
+                    <h2 class="chart-title">{{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}</h2>
                     <Chart 
 											:options="options"
 											:chartInfo="chartInfo"
@@ -583,7 +583,7 @@ export default {
 		},
 
 		copyChartHandle:_.debounce(function(type){
-      let chartsName = this.currentLang=='ch'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
+      let chartsName = this.currentLang=='zh'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
       let { heightNum, widthNum , newTitle , dynamic_copyOptions} = this.dynamicWidthAndHeight(type,this.chartInfo.ChartType,chartsName,1)
       const chartType = 'seasonLegend';
       // 英文转SVG设置变动

src/views/chartRelevance_manage/mixins/classifyMixin.js

@@ -16,7 +16,7 @@ export default {
     /* 图表id */
     select_id(newval) {
       if (newval) {
-        this.currentLang = "ch";
+        // this.currentLang = "ch";
         this.getDetailHandle();
       } else {
         this.chartInfo = {};

src/views/chartRelevance_manage/relevance/list.vue

@@ -164,7 +164,7 @@
               <div class="chart-show-cont" v-if="!chartInfo.WarnMsg">
                 <div class="chartWrapper" id="chartWrapper">
                   <h2 class="chart-title">
-                    {{ chartInfo.ChartName }}
+                    {{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}
                   </h2>
                   <Chart
                     :options="options"
@@ -691,7 +691,7 @@ export default {
     /* 点击复制先用canvas画出 转成图片在放到粘贴板中 */
     copyChartHandle: _.debounce(function (type) {
         let chartsName =
-          this.currentLang == "ch"
+          this.currentLang == "zh"
             ? this.chartInfo.ChartName
             : this.chartInfo.ChartNameEn;
         let { heightNum, widthNum, newTitle, dynamic_copyOptions } =

src/views/chartRelevance_manage/statistic/statisticFeatureList.vue

@@ -145,7 +145,7 @@
                 <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                 <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                   <div class="chartWrapper" id="chartWrapper">
-                    <h2 class="chart-title">{{ chartInfo.ChartName }}</h2>
+                    <h2 class="chart-title">{{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}</h2>
                     <Chart 
 											:options="options"
 											:chartInfo="chartInfo"
@@ -551,7 +551,7 @@ export default {
 		},
 
 		copyChartHandle:_.debounce(function(type){
-      let chartsName = this.currentLang=='ch'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
+      let chartsName = this.currentLang=='zh'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
       let { heightNum, widthNum , newTitle , dynamic_copyOptions} = this.dynamicWidthAndHeight(type,this.chartInfo.ChartType,chartsName,1)
       const chartType = 'seasonLegend';
       // 英文转SVG设置变动

src/views/dataEntry_manage/thirdBase/BAIINFOTargetbase.vue

@@ -78,7 +78,7 @@
                   (node.Nodewidth || data.NodeWidth + 'px')) ||
                 ''
               }`"
-              >{{ data.ClassifyName }}</span
+              >{{ currentLang==='zh' ? data.ClassifyName : (data.ClassifyNameEn||data.ClassifyName) }}</span
             >
             <div v-if="select_node === data.UniqueCode">
               <img
@@ -740,7 +740,7 @@ export default {
           ? {
               title: "添加分类",
               classify_name: "",
-              parent_classify_name: data.ClassifyName,
+              parent_classify_name: this.currentLang==='zh' ? data.ClassifyName : data.ClassifyNameEn,
               parent_classify_id: data.ClassifyId,
             }
           : {
@@ -758,6 +758,7 @@ export default {
       const parentNodeId = parent.data.ClassifyId;
       const {
         ClassifyName,
+        ClassifyNameEn,
         topParentNodeId,
         ClassifyId,
         BaseFromBaiinfoIndexId,
@@ -772,7 +773,7 @@ export default {
       if (level === 2 && parentNodeId !== 0) {
         const { parent } = node;
         tempForm.parent_classify_id = data.ParentId;
-        tempForm.parent_classify_name = parent.data.ClassifyName;
+        tempForm.parent_classify_name = this.currentLang==='zh' ? parent.data.ClassifyName : parent.data.ClassifyNameEn;
       }
       //是指标(三级，或二级，父节点为未分类节点)
       if (level === 3 || (level === 2 && parentNodeId === 0)) {
@@ -790,7 +791,7 @@ export default {
       this.classifyForm = {
         ...{
           title: type === "index" ? "编辑指标" : "编辑分类",
-          classify_name: ClassifyName,
+          classify_name: this.currentLang==='zh' ? ClassifyName : ClassifyNameEn,
           classify_id: ClassifyId,
           type,
           classifys_id,
@@ -1193,6 +1194,9 @@ export default {
       }
       return this.escapeStr(urlStr);
     },
+    currentLang() {
+      return this.$store.state.lang
+    }
   },
   created() {},
   mounted() {

src/views/dataEntry_manage/thirdBase/SCITargetbase.vue

@@ -78,7 +78,7 @@
                   (node.Nodewidth || data.NodeWidth + 'px')) ||
                 ''
               }`"
-              >{{ data.ClassifyName }}</span
+              >{{ currentLang==='zh' ? data.ClassifyName : (data.ClassifyNameEn||data.ClassifyName) }}</span
             >
             <div v-if="select_node === data.UniqueCode">
               <img
@@ -672,7 +672,7 @@ export default {
           ? {
               title: "添加分类",
               classify_name: "",
-              parent_classify_name: data.ClassifyName,
+              parent_classify_name: this.currentLang==='zh' ? data.ClassifyName : data.ClassifyNameEn,
               parent_classify_id: data.ClassifyId,
             }
           : {
@@ -687,7 +687,7 @@ export default {
       //console.log('data',data,'node',node)
       const { level, parent } = node;
       const parentNodeId = parent.data.ClassifyId;
-      const { ClassifyName, topParentNodeId, ClassifyId, BaseFromSciIndexId } =
+      const { ClassifyName,ClassifyNameEn, topParentNodeId, ClassifyId, BaseFromSciIndexId } =
         data;
       let tempForm = {
         parent_classify_name: "",
@@ -699,7 +699,7 @@ export default {
       if (level === 2 && parentNodeId !== 0) {
         const { parent } = node;
         tempForm.parent_classify_id = data.ParentId;
-        tempForm.parent_classify_name = parent.data.ClassifyName;
+        tempForm.parent_classify_name = this.currentLang==='zh' ? parent.data.ClassifyName : parent.data.ClassifyNameEn;
       }
       //是指标(三级，或二级，父节点为未分类节点)
       if (level === 3 || (level === 2 && parentNodeId === 0)) {
@@ -717,7 +717,7 @@ export default {
       this.classifyForm = {
         ...{
           title: type === "index" ? "编辑指标" : "编辑分类",
-          classify_name: ClassifyName,
+          classify_name: this.currentLang==='zh' ? ClassifyName : ClassifyNameEn,
           classify_id: ClassifyId,
           type,
           classifys_id,
@@ -1081,6 +1081,10 @@ export default {
       }
       return this.escapeStr(urlStr);
     },
+
+    currentLang() {
+      return this.$store.state.lang
+    }
   },
   created() {},
   mounted() {

src/views/dataEntry_manage/thirdBase/smmTargetbase.vue

@@ -47,19 +47,7 @@
           </template>
         </el-autocomplete>
       </div>
-      <!-- <ul class="classify-list">
-				<li
-					:class="[
-						'classify-item',
-						{ act: select_classify === item.TypeCode },
-					]"
-					v-for="item in classifyList"
-					:key="item.TypeCode"
-					@click="changeClassify(item.TypeCode)"
-				>
-					{{ item.TypeName }}
-				</li>
-			</ul> -->
+      
       <div class="scroll-wrap">
         <el-tree
           ref="treeRef"
@@ -94,7 +82,7 @@
                   (node.Nodewidth || data.NodeWidth + 'px')) ||
                 ''
               }`"
-              >{{ data.ClassifyName }}</span
+              >{{ currentLang==='zh' ? data.ClassifyName : (data.ClassifyNameEn||data.ClassifyName) }}</span
             >
             <div v-if="select_node === data.UniqueCode">
               <img
@@ -737,7 +725,7 @@ export default {
           ? {
               title: "添加分类",
               classify_name: "",
-              parent_classify_name: data.ClassifyName,
+              parent_classify_name: this.currentLang==='zh' ? data.ClassifyName : data.ClassifyNameEn,
               parent_classify_id: data.ClassifyId,
             }
           : {
@@ -752,7 +740,7 @@ export default {
       //console.log('data',data,'node',node)
       const { level, parent } = node;
       const parentNodeId = parent.data.ClassifyId;
-      const { ClassifyName, topParentNodeId, ClassifyId, BaseFromSmmIndexId } =
+      const { ClassifyName,ClassifyNameEn, topParentNodeId, ClassifyId, BaseFromSmmIndexId } =
         data;
       let tempForm = {
         parent_classify_name: "",
@@ -764,7 +752,7 @@ export default {
       if (level === 2 && parentNodeId !== 0) {
         const { parent } = node;
         tempForm.parent_classify_id = data.ParentId;
-        tempForm.parent_classify_name = parent.data.ClassifyName;
+        tempForm.parent_classify_name = this.currentLang==='zh' ? parent.data.ClassifyName : parent.data.ClassifyNameEn;
       }
       //是指标(三级，或二级，父节点为未分类节点)
       if (level === 3 || (level === 2 && parentNodeId === 0)) {
@@ -782,7 +770,7 @@ export default {
       this.classifyForm = {
         ...{
           title: type === "index" ? "编辑指标" : "编辑分类",
-          classify_name: ClassifyName,
+          classify_name: this.currentLang==='zh' ? ClassifyName : ClassifyNameEn,
           classify_id: ClassifyId,
           type,
           classifys_id,
@@ -1149,6 +1137,9 @@ export default {
       }
       return this.escapeStr(urlStr);
     },
+    currentLang() {
+      return this.$store.state.lang
+    }
   },
   created() {},
   mounted() {

src/views/dataEntry_manage/thirdBase/steelChemicalbase.vue

@@ -88,7 +88,7 @@
               :style="`width:${
                 (select_node === data.UniqueCode && node.Nodewidth) || ''
               }`"
-              >{{ data.ClassifyName }}</span
+              >{{ currentLang==='zh' ? data.ClassifyName : (data.ClassifyNameEn||data.ClassifyName) }}</span
             >
             <div v-if="select_node === data.UniqueCode">
               <img
@@ -557,6 +557,7 @@ export default {
       {
         BaseFromMysteelChemicalClassifyId,
         ClassifyName,
+        ClassifyNameEn,
         ParentId,
         BaseFromMysteelChemicalIndexId,
       },
@@ -580,10 +581,10 @@ export default {
         this.openClassifyDia = true;
         this.classifyForm = {
           title: "编辑分类",
-          classify_name: ClassifyName,
+          classify_name: this.currentLang==='zh' ? ClassifyName : ClassifyNameEn,
           classify_id: BaseFromMysteelChemicalClassifyId,
           parent_classify_name:
-            node.level === 2 ? node.parent.data.ClassifyName : "",
+            node.level === 2 ? (this.currentLang==='zh'?node.parent.data.ClassifyName:node.parent.data.ClassifyNameEn) : "",
           parent_classify_id: node.level === 2 ? ParentId : "",
         };
       }
@@ -638,7 +639,7 @@ export default {
         ? {
             title: "添加分类",
             classify_name: "",
-            parent_classify_name: item.ClassifyName,
+            parent_classify_name: this.currentLang==='zh' ? item.ClassifyName : item.ClassifyNameEn,
             parent_classify_id: item.BaseFromMysteelChemicalClassifyId,
           }
         : {
@@ -722,6 +723,10 @@ export default {
       urlStr += `&BaseFromMysteelChemicalClassifyId=${this.select_classify}`;
       return this.escapeStr(urlStr);
     },
+    
+    currentLang() {
+      return this.$store.state.lang
+    }
   },
   mounted() {
     this.getClassify();

src/views/futures_manage/commodityChartBase.vue

@@ -84,7 +84,7 @@
 									(select_node === data.UniqueCode && node.Nodewidth) || ''
 								}`"
 							>
-								<span>{{ data.ChartClassifyName }}</span>
+								<span>{{ currentLang==='en'?(data.ChartClassifyNameEn||data.ChartClassifyName):data.ChartClassifyName }}</span>
 							</span>
 							<span
 								style="display: flex; align-items: center"
@@ -149,7 +149,7 @@
                 <div class="chartEn-mark" v-show="chartInfo.IsEnChart" style="top: 0;left: 0;">En</div>
                 <div class="chart-show-cont"  v-if="!chartInfo.WarnMsg">
                   <div class="chartWrapper" id="chartWrapper">
-                    <h2 class="chart-title">{{ chartInfo.ChartName }}</h2>
+                    <h2 class="chart-title">{{ currentLang==='en'?(chartInfo.ChartNameEn||chartInfo.ChartName):chartInfo.ChartName }}</h2>
                     <Chart 
 											:options="options"
 											:chartInfo="chartInfo"
@@ -339,7 +339,7 @@ export default {
 		/* 图表id */
 		select_id(newval) {
 			if(newval) {
-				this.currentLang = 'ch';
+				// this.currentLang = 'zh';
 				this.getDetailHandle();
 			}else {
 				this.chartInfo = {};
@@ -455,12 +455,12 @@ export default {
 		},
 
     /* 编辑节点 */
-    editNode(node, { ChartClassifyName,ChartClassifyId }) {
+    editNode(node, { ChartClassifyName,ChartClassifyNameEn, ChartClassifyId }) {
 
       this.dialog_title = this.$t('Table.edit_btn')||'编辑';
       /* 编辑目录 */
       this.classifyForm = {
-        classify_name: ChartClassifyName,
+        classify_name: this.currentLang==='en'?ChartClassifyNameEn:ChartClassifyName,
         classify_id: ChartClassifyId,
       };
       this.classifyDia = true;
@@ -610,7 +610,7 @@ export default {
 
 		 /* 点击复制先用canvas画出 转成图片在放到粘贴板中 */
     copyChartHandle:_.debounce(function(type){{
-      let chartsName = this.currentLang=='ch'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
+      let chartsName = this.currentLang=='zh'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
       let { heightNum, widthNum , newTitle , dynamic_copyOptions} = this.dynamicWidthAndHeight(type,this.chartInfo.ChartType,chartsName,this.commodityChartData.length)
       const chartType = 'seasonLegend';
       // 英文转SVG设置变动

src/views/mychart_manage/components/chartDetailDia.vue

@@ -984,7 +984,7 @@ export default {
     },
     // 英文面板时候的判断
     copyChartConfirm(type){
-        if(this.currentLang=='en'){
+        if(this.currentLang==='en'){
           // 是否所有数据都填写完
           let flag=true
           // 是否有英文表格名称
@@ -1072,11 +1072,11 @@ export default {
     },
     /* 点击复制先用canvas画出 转成图片在放到粘贴板中 */
     copyChartHandle:_.debounce(function(type){
-      let chartsName = this.currentLang=='ch'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
+      let chartsName = this.currentLang==='zh'?this.chartInfo.ChartName:this.chartInfo.ChartNameEn
       let { heightNum, widthNum , newTitle , dynamic_copyOptions} = this.dynamicWidthAndHeight(type,this.chartInfo.ChartType,chartsName, this.chartInfo.Source === 1?this.tableData.length:this.commodityChartData.length)
       const chartType = this.sameOptionType.includes(this.chartInfo.ChartType) ? 'legend' : 'seasonLegend';
       // 英文转SVG设置变动
-      if(this.currentLang == 'en'){
+      if(this.currentLang === 'en'){
         // 散点图 如果横轴单位为'英文单位'，表示客户没填，转成svg时置为空
         if(this.chartInfo.ChartType == 5){
           this.$refs.chartRef.chart.options.xAxis.forEach(it => {

src/views/mychart_manage/index.vue

@@ -390,7 +390,7 @@ export default {
       select_classify_userid: 0,//选中图表的创建人id
       haveMove: false,
 
-      chart_lang: 'ch',
+      // chart_lang: 'ch',
 
       hintDialogShow:false,
       detailArr:[]
@@ -414,6 +414,11 @@ export default {
     //是否显示可见权限
     isShowGroupBtn(){
         return this.permissionBtn.isShowBtn('myETAPermission','myChart_classifyOpt_show')
+    },
+
+    //语言版本
+    chart_lang() {
+      return this.$store.state.lang
     }
   },
   watch: {
@@ -454,7 +459,7 @@ export default {
     getClassify() {
       mychartInterface.classifyList().then((res) => {
         if (res.Ret !== 200) return;
-        this.chart_lang = res.Data&&res.Data.Language === 'EN' ? 'en' : 'ch';
+        // this.chart_lang = res.Data&&res.Data.Language === 'EN' ? 'en' : 'ch';
 
         this.classifyList = res.Data ? res.Data.List.map(item => ({
           ...item,

src/views/ppt_manage/mixins/mixins.js

@@ -1696,30 +1696,30 @@ export default {
     },
 
        /* 拼接动态的指标名称小标签 */
-    concatDynamicTag({ IsAxis,IsOrder,EdbInfoType,LeadValue,LeadUnit },lang='ch') {
+    concatDynamicTag({ IsAxis,IsOrder,EdbInfoType,LeadValue,LeadUnit },lang='zh') {
       // IsAxis左轴1 右轴0 2右2轴 
       //IsOrder正序false 逆序true 
       //EdbInfoType是否是领先指标
       // lang ch 中文 en 英文
-      const axisLabelMap = lang=='ch'?{
+      const axisLabelMap = lang=='zh'?{
         0: '右轴',
         2: '右2轴'
       }:{
         0: 'RHS',
         2: '2-RHS'
       }
-      const orderLabelMap = lang=='ch'?{
+      const orderLabelMap = lang=='zh'?{
         1: '逆序'
       }:{
         1: 'REV'
       }
-      const edbInfoMap = lang=='ch'?{
+      const edbInfoMap = lang=='zh'?{
         0: '领先'
       }:{
         0: 'Lead'
       }
       //英文领先单位转换
-      const leadUnit = lang==='ch' ? LeadUnit : this.leadUnitEnMap[LeadUnit];
+      const leadUnit = lang==='zh' ? LeadUnit : this.leadUnitEnMap[LeadUnit];
 
       let axis_tag = axisLabelMap[IsAxis] || '';
       //逆序拼接

src/views/ppt_manage/mixins/pptMixins.js

@@ -199,7 +199,7 @@ export default {
     * 10 跨品种分析
     */
     //获取图表数据
-    async getchartData(id,lang='ch') {
+    async getchartData(id,lang='zh') {
         console.log('getChartData')
       const currentLang = this.currentLang || lang
       const res = await dataBaseInterface.getChartByCode({
@@ -285,7 +285,7 @@ export default {
 
       //根据图表数据获取配置项
       if(Data.Status){
-        const chartTitle = currentLang==='ch'?this.chartInfo.ChartName
+        const chartTitle = currentLang==='zh'?this.chartInfo.ChartName
                             :this.chartInfo.ChartNameEn?this.chartInfo.ChartNameEn
                             :this.chartInfo.ChartName
         //由于英文PPT复制图表名称时，使用MyChartTitle字段会复制英文名称（如果有），现需要复制中文名称，遂增加了chartTitleCN存储中文名称
@@ -310,9 +310,9 @@ export default {
     setOptionsLang(lang){
       console.log(lang)
       //中文图表不需要下面的设置
-      if(lang==='ch') return 
+      if(lang==='zh') return 
       //当 图表名称、指标名称、指标单位 有其一没有英文名称时，也不需要下面的设置
-      if(!this.checkChartEnData()) return 
+      // if(!this.checkChartEnData()) return 
       const {ChartType} = this.chartInfo
       if(ChartType!=5){
         this.options.yAxis.forEach(item=>{
@@ -355,9 +355,9 @@ export default {
 
     /* 设置价格曲线英文 */
     setCommodityLang(lang) {
-      if(lang==='ch') return 
+      if(lang==='zh') return 
       //当 图表名称、指标名称、指标单位 有其一没有英文名称时，也不需要下面的设置
-      if(!this.checkChartEnData()) return 
+      // if(!this.checkChartEnData()) return 
 
       this.options.yAxis.forEach(item => {
         item.title.text =  item.title.textEn || item.title.textCh
@@ -374,8 +374,8 @@ export default {
 
     /* 切换相关性图中英文 */
     changeRelevanceOptions(lang){
-      if(lang==='ch') return 
-      if(!this.checkChartEnData()) return 
+      if(lang==='zh') return 
+      // if(!this.checkChartEnData()) return 
       console.log(this.options)
         this.options.yAxis.forEach(item => {
           item.title.text = item.title.textEn || item.title.textCh

src/views/ppt_manage/newVersion/components/catalog/pptContent.vue

@@ -64,6 +64,12 @@ export default {
   },
   mixins:[pptmixin,mixins],
   components:{ Cover, addMyClassifyDia, CustomCover },
+  computed: {
+    //语言版本
+    currentLang() {
+      return this.$store.state.lang
+    }
+  },
   data() {
     return {
         pageList:[],//ppt数组

src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -398,7 +398,12 @@ export default {
         { label: this.$t('Slides.share_ppt_tabs'), key: '2' },
         { label: this.$t('Slides.public_ppt_tabs'), key: '3' },
       ]
-    } 
+    },
+
+    //语言版本
+    currentLang() {
+      return this.$store.state.lang
+    }
   },
   watch:{
     searchTitle(newVal){

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -388,7 +388,12 @@ export default {
         {val:'表格', label:this.$t('Slides.table_name')},
         {val:'语义分析插入', label:this.$t('Slides.table_analysis_semantic')},
       ]
-    },
+    },  
+    
+    //语言版本
+    currentLang() {
+      return this.$store.state.lang
+    }
   },
   created() {
     //获取图表,沙盘,表格数据

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -140,8 +140,7 @@
                     <template v-if="chartList.length">
                     <div v-for="(item, index) in chartList" :key="index" @click="chooseChart(item,'chart')" class="chart-item" :style="item.Disabled && 'cursor: not-allowed;'">
                         <div class="chartEn-mark" style="top: 0;left:0;" @click.stop="setEnHandle(item)" v-if="item.HaveOperaAuth">
-                          <span v-if="item.IsEnChart">En</span>
-                          <i class="el-icon-edit" v-else style="font-size:15px"/>
+                          <i class="el-icon-edit" style="font-size:15px"/>
                         </div>
                         <p class="chart_tit" style="word-break: break-all;">{{ chart_source===1 ? (item.ChartNameEn||item.ChartName) : item.ChartName }}</p>
                         <img :src="!item.HaveOperaAuth?$icons.lock_big:item.ChartImage" ref="insert_img" />

src/views/ppt_manage/newVersion/pptPresent.vue

@@ -248,6 +248,11 @@ export default {
       : `Slide${this.currentIndex+1} of ${this.isShowBack?(this.pageList.length+2):(this.pageList.length+1)}`
       return str
     },
+
+    //语言版本
+    currentLang() {
+      return this.$store.state.lang
+    }
   },
   methods: {
     //切换当前显示的页面

src/views/ppt_manage/newVersion/pptPublish.vue

@@ -130,6 +130,11 @@ export default {
     lineClamp(){
         return this.LayoutType===2?2:3
     },
+
+    //语言版本
+    currentLang() {
+      return this.$store.state.lang
+    }
   },
   methods: {
     //计算title的字节数

src/views/report_manage/mixins/reportMixin.js

@@ -47,6 +47,11 @@ export default {
             {key: "语义分析插入",label:this.$t('ReportManage.ReportList.semantic_analysis_tabs')},
           ]
       },
+      
+      //语言版本
+      currentLang() {
+        return this.$store.state.lang
+      }
   },
   data() {
     let that = this;
@@ -265,11 +270,12 @@ export default {
         return this.$message.warning("内部图表，不允许插入报告");
 
       const LINK_CHART_URL = this.$setting.dynamicOutLinks.ChartViewUrl+'/chartshow';
-      let fromPage = this.$route.path === "/reportEnEditor" ? "en" : "";
+      let lang = this.$route.path === "/reportEnEditor" ? "en" : this.currentLang;
+      
       this.$nextTick(() => {
         this.editor.html.insert(
           `<p style='text-align:left; margin-top:10px;'>
-						<iframe src='${LINK_CHART_URL}?code=${item.UniqueCode}&fromPage=${fromPage}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
+						<iframe src='${LINK_CHART_URL}?code=${item.UniqueCode}&lang=${lang}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
 					</p>`
         );
       });

src/views/report_manage/reportEn/reportEditor.vue

@@ -231,8 +231,7 @@
 								class="liststy"
 							>
 								<div class="chartEn-mark" style="top: 0;left:0;" @click="setEnHandle(item)" v-if="item.HaveOperaAuth">
-									<span v-if="item.IsEnChart">En</span>
-									<i class="el-icon-edit" v-else style="font-size:18px"/>
+									<i class="el-icon-edit" style="font-size:18px"/>
 								</div>
 								<p class="color_primary">{{ chart_source===1 ? (item.ChartNameEn||item.ChartName) : item.ChartName }}</p>
 								<img

src/views/smartReport/components/ImportETAChart.vue

@@ -37,6 +37,12 @@ export default {
             loading:false
         }
     },
+    computed: {
+        //语言版本
+        currentLang() {
+            return this.$store.state.lang
+        }
+    },
     created() {
         this.getETAChartList()
     },
@@ -51,7 +57,7 @@ export default {
             const obj={
                 compId:3,
                 compType:'chart',
-                content:`${LINK_CHART_URL}?code=${item.UniqueCode}`
+                content:`${LINK_CHART_URL}?code=${item.UniqueCode}&lang=${this.currentLang}`
             }
             return JSON.stringify(obj)
         },