中英文版统一 zh,en;不再校验英文是否完整

src/hooks/chart/useChartRender.ts

@@ -87,7 +87,7 @@ const routeQuery = ref<any>({});//路由参
 watch(() => router.currentRoute.value.query,(nval) => {
   routeQuery.value = nval
 })
-export const useChartRender = (Data,lang='ch',) => {
+export const useChartRender = (Data,lang='zh',) => {
 
   state.chartInfo = Data.ChartInfo
   state.dataList = Data.ChartInfo.Source === 1 ? Data.EdbInfoList : [Data.EdbInfoList[0]];
@@ -192,7 +192,7 @@ const setDefaultLineOptions = () => {
         }
       },
       title: {
-        text:language.value=='ch'?sameSideIndex !== index ? '' : `${textZh}`:textEn,
+        text:language.value=='zh'?sameSideIndex !== index ? '' : `${textZh}`:textEn,
         style:{
           ...chartTheme&&chartTheme.yAxisOptions.style
         },
@@ -228,7 +228,7 @@ const setDefaultLineOptions = () => {
           ? `${item.EdbAliasName||item.EdbName}(${item.SourceName})${dynamic_tag}`
           : `${item.EdbAliasName||item.EdbName}${dynamic_tag}`
     let nameEn:String=item.EdbNameEn?`${item.EdbNameEn}${dynamic_tag_en}`:''
-    let name :String=language.value == 'ch'?nameCh:nameEn
+    let name :String=language.value == 'zh'?nameCh:nameEn
 
     //预测指标配置
     let predict_params = item.EdbInfoCategoryType === 1 ? getPredictParams(item) : {};
@@ -305,7 +305,7 @@ const setDefaultLineOptions = () => {
         let that:any = this;
         let str = '';
         
-        if(language.value=='ch'){
+        if(language.value=='zh'){
           str = `${Highcharts.dateFormat('%Y/%m/%d',that.x)}<br><p>相关性系数：${that.y.toFixed(4)}</p><br><p>领先${LeadValue+LeadUnit}</p>`
         }else{
           str = `${Highcharts.dateFormat('%Y/%m/%d',that.x)}<br><p>Correlation coefficient：${that.y.toFixed(4)}</p><br><p>lead${LeadValue+relevanceUnitEnMap[LeadUnit]}</p>`
@@ -380,7 +380,7 @@ const setSeasonOptions = () => {
       }
     },
     title: {
-      text:language.value=='ch'?`${textZh}`:textEn,
+      text:language.value=='zh'?`${textZh}`:textEn,
       align: 'high',
       rotation: 0,
       y: -12,
@@ -512,7 +512,7 @@ const setStackOrCombinChart = () => {
         },
       },
       title: {
-        text:language.value=='ch'?sameSideIndex !== index ? '' : `${textZh}`:textEn,
+        text:language.value=='zh'?sameSideIndex !== index ? '' : `${textZh}`:textEn,
         // text: null,
         align: 'high',
         rotation: 0,
@@ -549,7 +549,7 @@ const setStackOrCombinChart = () => {
           ? `${item.EdbAliasName||item.EdbName}(${item.SourceName})${dynamic_tag}`
           : `${item.EdbAliasName||item.EdbName}${dynamic_tag}`
     let nameEn:String=item.EdbNameEn?`${item.EdbNameEn}${dynamic_tag_en}`:''
-    let name :String=language.value == 'ch'?nameCh:nameEn
+    let name :String=language.value == 'zh'?nameCh:nameEn
 
     //预测指标配置
     let predict_params = item.EdbInfoCategoryType === 1 ? getPredictParams(item,chartStyle) : {};
@@ -652,7 +652,7 @@ const setScatterChartOptions = () => {
   let tooltip = {
     formatter: function() {
       const that: any = this;
-      return language.value=='ch'?
+      return language.value=='zh'?
       `<strong>${ tmpData_date[that.x+'_'+that.y].length > 4 ? tmpData_date[that.x+'_'+that.y].slice(0,4).join()+'...' : tmpData_date[that.x+'_'+that.y].join() }</strong><br>
       ${dataList[0].EdbName}: <span style="font-weight: 600">	${that.x}</span><br>
       ${dataList[1].EdbName}: <span style="font-weight: 600">	${that.y}</span>
@@ -677,7 +677,7 @@ const setScatterChartOptions = () => {
   //y轴
   let yAxis = {
     title: {
-      text: language.value=='ch'?`${textYZh}`:textYEn,
+      text: language.value=='zh'?`${textYZh}`:textYEn,
       // text: null,
       align: 'high',
       rotation: 0,
@@ -723,7 +723,7 @@ const setScatterChartOptions = () => {
   let series: any = {
     data: [],
     type: 'scatter',
-    name: language.value == 'ch'?`${chartInfo.ChartName}${IsOrder ? '(逆序)' : ''}`:`${chartInfo.ChartNameEn}${IsOrder ? '(reserve)' : ''}`,
+    name: language.value == 'zh'?`${chartInfo.ChartName}${IsOrder ? '(逆序)' : ''}`:`${chartInfo.ChartNameEn}${IsOrder ? '(reserve)' : ''}`,
     color: ChartColor,
     chartType: 'linear',
     marker: {
@@ -743,7 +743,7 @@ const setScatterChartOptions = () => {
     xAxis: {
       ...scatterXAxis,
       title: {
-        text: language.value=='ch'?`${textX}`:textXEn,
+        text: language.value=='zh'?`${textX}`:textXEn,
         align: 'high',
         rotation: 0,
         x: 0,
@@ -793,7 +793,7 @@ const setBarChart = () => {
    /* 主题样式*/
   const chartTheme =  chartInfo.ChartThemeStyle ? JSON.parse(chartInfo.ChartThemeStyle) : null;
 
-  let categories = language.value==='ch' 
+  let categories = language.value==='zh' 
     ? barXIdData.map((_:number) => barEdbData.find((edb: { EdbInfoId: number; }) => edb.EdbInfoId===_).EdbAliasName)
     : barXIdData.map((_:number) => barEdbData.find((edb: { EdbInfoId: number; }) => edb.EdbInfoId===_).EdbNameEn)
 
@@ -815,7 +815,7 @@ const setBarChart = () => {
   let yAxis = {
     ...basicYAxis,
     title: {
-      text:  language.value==='ch' ? chartInfo.Unit : chartInfo.UnitEn,
+      text:  language.value==='zh' ? chartInfo.Unit : (chartInfo.UnitEn||chartInfo.Unit),
       align: 'high',
       rotation: 0,
       y: -12,
@@ -850,7 +850,7 @@ const setBarChart = () => {
       data: item.Value,
       type: 'column',
       yAxis: 0,
-      name: language.value==='ch' ? (item.Name || item.Date) : item.Date,
+      name: language.value==='zh' ? (item.Name || item.Date) : item.Date,
       color: item.Color,
       chartType: 'linear'
     };
@@ -884,16 +884,16 @@ const initSectionScatterData = (data: { DataResp:any,EdbInfoList:any[] }) => {
   state.chartLimit.x_max=Number(data.DataResp.XMaxValue)
 
   //校验英文名称是否完整
-  if(routeQuery.value.fromPage === 'en' && language.value==='en') {
-    const { XNameEn,XUnitNameEn,YNameEn,YUnitNameEn } = data.DataResp;
-    // DataList可能是null
-    const DataList = data.DataResp.DataList||[]
-    let isAllEn = true;
-    if(!XNameEn || !XUnitNameEn || !YNameEn || !YUnitNameEn) isAllEn = false;
-    if(DataList.some(_ => !_.NameEn)) isAllEn = false;
-    console.log(isAllEn)
-    language.value = isAllEn ? 'en' : 'ch';
-  }
+  // if(routeQuery.value.fromPage === 'en' && language.value==='en') {
+  //   const { XNameEn,XUnitNameEn,YNameEn,YUnitNameEn } = data.DataResp;
+  //   // DataList可能是null
+  //   const DataList = data.DataResp.DataList||[]
+  //   let isAllEn = true;
+  //   if(!XNameEn || !XUnitNameEn || !YNameEn || !YUnitNameEn) isAllEn = false;
+  //   if(DataList.some(_ => !_.NameEn)) isAllEn = false;
+  //   console.log(isAllEn)
+  //   language.value = isAllEn ? 'en' : 'zh';
+  // }
   return setSectionScatterChart()
 }
 /* 截面散点图设置 sectionScatterData */
@@ -914,7 +914,7 @@ const setSectionScatterChart = () => {
     let yAxis = {
         ...basicYAxis,
         title: {
-            text: language.value === 'ch' ? YName : YNameEn,
+            text: language.value === 'zh' ? YName : YNameEn,
             align: 'middle',
             style:{
               ...chartTheme&&chartTheme.yAxisOptions.style
@@ -938,7 +938,7 @@ const setSectionScatterChart = () => {
     let xAxis = {
         ...scatterXAxis,
         title: {
-            text: language.value === 'ch' ? XName : XNameEn,
+            text: language.value === 'zh' ? XName : XNameEn,
             align: 'middle',
             style: {
               ...chartTheme&&chartTheme.xAxisOptions.style
@@ -962,7 +962,7 @@ const setSectionScatterChart = () => {
         let series_item = {
             data: [] as any[],
             type: 'scatter',
-            name: language.value === 'ch' ? item.Name : item.NameEn,
+            name: language.value === 'zh' ? item.Name : item.NameEn,
             color: item.Color,
             lineWidth: 0,
             chartType: 'linear',
@@ -980,7 +980,7 @@ const setSectionScatterChart = () => {
                 enabled: _.IsShow,
                 allowOverlap: true,
                 align: 'left',
-                format: language.value === 'ch' ? _.Name : _.NameEn
+                format: language.value === 'zh' ? _.Name : _.NameEn
             }
             })
         })
@@ -1042,7 +1042,7 @@ const setSectionScatterChart = () => {
         formatter: function() {
             const that:any = this;
             let str = '';
-            if(language.value === 'ch') {
+            if(language.value === 'zh') {
               let series_obj = DataList.find(_ => _.Name === that.series.name);
               let ponit_obj = series_obj.EdbInfoList.find(_ => _.XValue ===that.x && _.YValue===that.y);
 
@@ -1114,7 +1114,7 @@ const setCommodityChart = () => {
   //x轴
   let xAxis = {
     ...scatterXAxis,
-    categories: commodityXData.map(_ => language.value === 'ch' ? _.Name:_.NameEn),
+    categories: commodityXData.map(_ => language.value === 'zh' ? _.Name:_.NameEn),
     tickWidth: 1,
     labels: {
       style: {
@@ -1128,7 +1128,7 @@ const setCommodityChart = () => {
   let yAxis = {
     ...basicYAxis,
     title: {
-      text: language.value === 'ch' ? commodityEdbList[0].Unit : commodityEdbList[0].UnitEn,
+      text: language.value === 'zh' ? commodityEdbList[0].Unit : commodityEdbList[0].UnitEn,
       align: 'high',
       rotation: 0,
       y: -12,
@@ -1164,7 +1164,7 @@ const setCommodityChart = () => {
       type: (chartTheme&&chartTheme.lineOptions.lineType) || 'spline',
       dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
       yAxis: 0,
-      name: language.value === 'ch' ? item.Name : item.NameEn,
+      name: language.value === 'zh' ? item.Name : item.NameEn,
       color: item.Color,
       chartType: 'linear',
       lineWidth: (chartTheme&&chartTheme.lineOptions.lineWidth) || 3,
@@ -1181,7 +1181,7 @@ const setCommodityChart = () => {
       const ctx: any = this;
       let str: string = '';
 
-      if(language.value === 'ch') {
+      if(language.value === 'zh') {
         
         ctx.points.forEach((item: { series:{name: string},y: number,color: string }) => {
           let obj_item = data.find((_:any) => _.Name === item.series.name);
@@ -1281,7 +1281,7 @@ const initRelevanceChartData=(data)=>{
     categories: data.ChartInfo.Source===3 ? data.XEdbIdValue : data.DataResp.XDateTimeValue,
     tickWidth: 1,
     title: {
-      text: data.ChartInfo.Source===3 ? (language.value=='ch'?`期数（${data.CorrelationChartInfo.LeadUnit}）`:`stage（${relevanceUnitEnMap[data.CorrelationChartInfo.LeadUnit]}）`):null,
+      text: data.ChartInfo.Source===3 ? (language.value=='zh'?`期数（${data.CorrelationChartInfo.LeadUnit}）`:`stage（${relevanceUnitEnMap[data.CorrelationChartInfo.LeadUnit]}）`):null,
       align: 'high',
       rotation: 0,
       style: {
@@ -1302,7 +1302,7 @@ const initRelevanceChartData=(data)=>{
   let yAxis={
     ...basicYAxis,
     title: {
-      text: language.value=='ch'?'相关性系数':'Correlation coefficient',
+      text: language.value=='zh'?'相关性系数':'Correlation coefficient',
       align: 'high',
       rotation: 0,
       y: -12,
@@ -1334,7 +1334,7 @@ const initRelevanceChartData=(data)=>{
       type: (chartTheme&&chartTheme.lineOptions.lineType) || 'spline',
       dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
       yAxis: 0,
-      name: language.value=='ch'?data.ChartInfo.ChartName:data.ChartInfo.ChartNameEn,
+      name: language.value=='zh'?data.ChartInfo.ChartName:data.ChartInfo.ChartNameEn,
       color: item.Color,
       chartType: 'linear',
       lineWidth: (chartTheme&&chartTheme.lineOptions.lineWidth) || 3,
@@ -1351,7 +1351,7 @@ const initRelevanceChartData=(data)=>{
     formatter: function() {
       const that:any = this;
       let str='';
-      if(language.value=='ch'){
+      if(language.value=='zh'){
         str = `<p>相关性系数：${that.y.toFixed(4)}</p><br><p>领先${ data.ChartInfo.Source===3 ?that.x+'期' : LeadValue+LeadUnit}</p>`
       }else{
         str = `<p>Correlation coefficient：${that.y.toFixed(4)}</p><br><p>lead${ data.ChartInfo.Source===3 ? that.x+'stage' : LeadValue+relevanceUnitEnMap[LeadUnit]}</p>`
@@ -1417,7 +1417,7 @@ const setStatisticFrequency = () => {
     let y_item = {
       ...basicYAxis,
       title: {
-        text: language.value === 'ch' ? item.Unit : item.UnitEn,
+        text: language.value === 'zh' ? item.Unit : item.UnitEn,
         align: 'high',
         rotation: 0,
         y: -12,
@@ -1442,7 +1442,7 @@ const setStatisticFrequency = () => {
       dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
       type: (chartTheme&&chartTheme.lineOptions.lineType) || 'spline',
       yAxis: index,
-      name: language.value === 'ch' ? item.Name : item.NameEn,
+      name: language.value === 'zh' ? item.Name : item.NameEn,
       color: item.Color,
       lineWidth: (chartTheme&&chartTheme.lineOptions.lineWidth)||3,
       chartType: 'linear',
@@ -1501,14 +1501,14 @@ const initCrossVarietyChartData = (data:{ DataResp:any,ChartInfo:any,EdbInfoList
   state.chartLimit.x_max=data.ChartInfo.XMax?Number(data.ChartInfo.XMax):Number(data.DataResp.XMaxValue)
 
   //二次校验英文配置是否完整
-  if(routeQuery.value.fromPage === 'en' && language.value==='en') {
-    const { XNameEn,YNameEn,DataList } = data.DataResp;
+  // if(routeQuery.value.fromPage === 'en' && language.value==='en') {
+  //   const { XNameEn,YNameEn,DataList } = data.DataResp;
 
-    let isAllEn = true;
-    let haveOneNoEn = DataList.some(_ => !_.NameEn);
-    if(!XNameEn || !YNameEn || haveOneNoEn) isAllEn = false;
-    language.value = isAllEn ? 'en' : 'ch';
-  }
+  //   let isAllEn = true;
+  //   let haveOneNoEn = DataList.some(_ => !_.NameEn);
+  //   if(!XNameEn || !YNameEn || haveOneNoEn) isAllEn = false;
+  //   language.value = isAllEn ? 'en' : 'zh';
+  // }
 
   return setCrossVarietyChart()
 }
@@ -1527,7 +1527,7 @@ const setCrossVarietyChart = () => {
   let yAxis = {
     ...basicYAxis,
     title: {
-      text: language.value === 'ch' ? YName : YNameEn,
+      text: language.value === 'zh' ? YName : YNameEn,
       align: 'middle',
       style: {
         ...chartTheme&&chartTheme.xAxisOptions.style
@@ -1549,7 +1549,7 @@ const setCrossVarietyChart = () => {
   let xAxis = {
     ...scatterXAxis,
     title: {
-      text: language.value === 'ch' ? XName : XNameEn,
+      text: language.value === 'zh' ? XName : XNameEn,
       align: 'middle',
       style: {
         ...chartTheme&&chartTheme.xAxisOptions.style
@@ -1575,7 +1575,7 @@ const setCrossVarietyChart = () => {
     let series_item = {
       data: [] as any[],
       type: 'scatter',
-      name: language.value === 'ch' ? item.Name : item.NameEn,
+      name: language.value === 'zh' ? item.Name : item.NameEn,
       color: item.Color,
       lineWidth: 0,
       chartType: 'linear',
@@ -1601,7 +1601,7 @@ const setCrossVarietyChart = () => {
 
       let that:any = this;
       let str = '';
-      if(language.value === 'ch') {
+      if(language.value === 'zh') {
         let series_obj = DataList.find(_ => _.Name === that.series.name);
         let ponit_obj = series_obj.CoordinatePointData.find(_ => _.X ===that.x && _.Y===that.y);
         
@@ -1661,7 +1661,7 @@ const setRadarChart = () => {
     /* 主题样式*/
     const chartTheme =  chartInfo.ChartThemeStyle ? JSON.parse(chartInfo.ChartThemeStyle) : null;
 
-    let categories = language.value==='ch' 
+    let categories = language.value==='zh' 
     ? XDataList.map(_ => _.EdbAliasName||_.EdbName)
     : XDataList.map(_ => _.EdbNameEn)
 
@@ -1692,7 +1692,7 @@ const setRadarChart = () => {
       showLastLabel: true,
       // tickAmount:4,
       title: {
-        text:  language.value==='ch' ? chartInfo.Unit : chartInfo.UnitEn,
+        text:  language.value==='zh' ? chartInfo.Unit : chartInfo.UnitEn,
         align: 'high',
         rotation: 0,
         y: 5,
@@ -1722,7 +1722,7 @@ const setRadarChart = () => {
         type: (chartTheme&&chartTheme.lineOptions.lineType) || 'line',
         dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
         yAxis: 0,
-        name: language.value==='ch' ? (item.Name || item.Date) : item.Date,
+        name: language.value==='zh' ? (item.Name || item.Date) : item.Date,
         color: item.Color,
         lineWidth: (chartTheme&&chartTheme.lineOptions.lineWidth) || 1,
         chartType: 'linear'
@@ -1792,13 +1792,13 @@ const changeEdbOrder = (data: any[]) => {
 /* 拼接动态的指标名称小标签 */
 const concatDynamicTag = (
   { IsAxis, IsOrder, EdbInfoType, LeadValue, LeadUnit }: IDataProps,
-  lang: String = "ch"
+  lang: String = 'zh'
 ): string => {
   // IsAxis左轴1 右轴0 2右2轴
   //IsOrder正序false 逆序true
   //EdbInfoType是否是领先指标
   const axisLabelMap: any =
-    lang == "ch"
+    lang == 'zh'
       ? {
           0: "右轴",
           2: "右2轴",
@@ -1808,7 +1808,7 @@ const concatDynamicTag = (
           2: "2-RHS",
         };
   const orderLabelMap: any =
-    lang == "ch"
+    lang == 'zh'
       ? {
           1: "逆序",
         }
@@ -1816,7 +1816,7 @@ const concatDynamicTag = (
           1: "REV",
         };
   const edbInfoMap: any =
-    lang == "ch"
+    lang == 'zh'
       ? {
           0: "领先",
         }
@@ -1832,7 +1832,7 @@ const concatDynamicTag = (
     天: "D",
   };
   //英文领先单位转换
-  const edbLeadUnit = lang == "ch" ? LeadUnit : leadUnitEnMap[LeadUnit];
+  const edbLeadUnit = lang == 'zh' ? LeadUnit : leadUnitEnMap[LeadUnit];
 
   let axis_tag = axisLabelMap[IsAxis] || "";
   //逆序拼接

src/views/chartShow/index.vue

@@ -12,7 +12,7 @@
           color:${JSON.parse(chartInfo.ChartThemeStyle).titleOptions.style.color}
         `:''"
       >
-        {{ language === 'ch'?chartInfo.ChartName: chartInfo.ChartNameEn}}
+        {{ language === 'en'?(chartInfo.ChartNameEn||chartInfo.ChartName): chartInfo.ChartName}}
       </span>
 
     </header>
@@ -118,7 +118,7 @@ export default defineComponent({
     const code = ref(route.query.code);
     const isShare = ref(route.query.fromType === 'share');
     // 语言 中英文 ch en  默认中文
-    const language = ref(route.query.lang || 'ch');
+    const language = ref(route.query.lang || 'zh');
     const getChartInfo = async (type='') => {
 
       if(!code.value) {
@@ -136,8 +136,8 @@ export default defineComponent({
         state.dataList = Data.ChartInfo.Source === 1 ? Data.EdbInfoList : [Data.EdbInfoList[0]];
 
         //处理英文研报英文设置不全就展示中文
-        setLangFromEnReport();
-        document.title = language.value==='ch'?Data.ChartInfo.ChartName:Data.ChartInfo.ChartNameEn;
+        // setLangFromEnReport();
+        document.title = language.value==='zh'?Data.ChartInfo.ChartName:Data.ChartInfo.ChartNameEn;
 
         state.options = useChartRender(Data,language.value)
         
@@ -160,11 +160,11 @@ export default defineComponent({
     //处理英文研报的图表英文设置不全的情况
     const setLangFromEnReport = () => {
       //来源于英文研报
-      if(route.query.fromPage !== 'en') return
+      // if(route.query.fromPage !== 'en') return
       let is_name_en = state.chartInfo.ChartNameEn ? true : false;//名称是否有英文
       let is_target_en = [2,9,10].includes(state.chartInfo.ChartType) ? true : state.dataList.every(_ => _.EdbNameEn);//指标是否有英文
       console.log(is_name_en,is_target_en)
-      language.value = (is_name_en && is_target_en) ? 'en' : 'ch';
+      language.value = (is_name_en && is_target_en) ? 'en' : 'zh';
     }
 
     /* 复制标题 */