merge

src/views/chartShow/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="chart-show">
     <header class="chart-header" @click="openNew">
-      <span class="chart-title" @click.stop @dblclick="copyText">{{ chartInfo.ChartType === 7 ? chartInfo.ChartName : language == 'ch'?chartInfo.ChartName: chartInfo.ChartNameEn}}</span>
+      <span class="chart-title" @click.stop @dblclick="copyText">{{ language === 'ch'?chartInfo.ChartName: chartInfo.ChartNameEn}}</span>
     </header>
     <template v-if="haveData">
       <div
@@ -95,7 +95,7 @@ export default defineComponent({
 
       /* 奇怪柱形图 */
       barDateList: [],//柱形图的绘图数据
-      barXData: [],//柱形图的x轴
+      barXIdData: [],//柱形图的x轴id
       barEdbData: [],//柱形图的表格数据 只用于取值
       barLimit: {},
       
@@ -152,9 +152,7 @@ export default defineComponent({
 
         //处理英文研报英文设置不全就展示中文
         setLangFromEnReport();
-        document.title = state.chartInfo.ChartType === 7 
-          ? Data.ChartInfo.ChartName 
-          : language.value==='ch'?Data.ChartInfo.ChartName:Data.ChartInfo.ChartNameEn;
+        document.title = language.value==='ch'?Data.ChartInfo.ChartName:Data.ChartInfo.ChartNameEn;
 
         if(Data.ChartInfo.Source === 1) {
           state.chartInfo.ChartType === 7 ? initBarData(Data) : setOptions();
@@ -176,11 +174,8 @@ export default defineComponent({
     const initBarData = (data: { XEdbIdValue: number[]; YDataList: any; EdbInfoList: any; ChartInfo: any; }) => {
       const { XEdbIdValue,YDataList,EdbInfoList,ChartInfo } = data;
 
-      let xData = XEdbIdValue.map((_:number) => EdbInfoList.find((edb: { EdbInfoId: number; }) => edb.EdbInfoId===_).EdbAliasName)
-      console.log(xData)
-
       state.barDateList = YDataList;
-      state.barXData = xData;
+      state.barXIdData = XEdbIdValue;
       state.barEdbData = EdbInfoList;
       state.barLimit = {
         min: Number(ChartInfo.LeftMin),
@@ -554,8 +549,8 @@ export default defineComponent({
     /* 季节图 */
     const setSeasonOptions = () => {
       const chartData = state.dataList[0];
-      let seasonYdata = [],
-        seasonData = [],
+      let seasonYdata:any[] = [],
+        seasonData:any[] = [],
         chart = {
           spacing: [5, 8, 2, 8],
         };
@@ -865,14 +860,18 @@ export default defineComponent({
       x轴为指标名称的柱形图 以日期作为series
     */
     const setBarChart = () => {
-      const {barDateList,barXData,barLimit} = state;
+      const {barDateList,barXIdData,barLimit,barEdbData} = state;
       let seriesData: { data: any; type: string; yAxis: number; name: any; color: any; chartType: string; }[] = [];
       const data = _.cloneDeep(barDateList);
 
+      let categories = language.value==='ch' 
+        ? barXIdData.map((_:number) => barEdbData.find((edb: { EdbInfoId: number; }) => edb.EdbInfoId===_).EdbAliasName)
+        : barXIdData.map((_:number) => barEdbData.find((edb: { EdbInfoId: number; }) => edb.EdbInfoId===_).EdbNameEn)
+
       //x轴
       let xAxis = {
         ...scatterXAxis,
-        categories: barXData,
+        categories,
         tickWidth: 1,
         title: {
           text:  ``,
@@ -914,7 +913,7 @@ export default defineComponent({
           data: item.Value,
           type: 'column',
           yAxis: 0,
-          name: item.Name || item.Date,
+          name: language.value==='ch' ? (item.Name || item.Date) : item.Date,
           color: item.Color,
           chartType: 'linear'
         };

src/views/chartShow/typing.ts

@@ -11,7 +11,7 @@ export interface IState {
 	dataList: any[];
 	sourceName: string;
 	barDateList: any[];
-	barXData: string[];
+	barXIdData: number[];
 	barEdbData: any[];
 	barLimit: BarLimitProps;
 	commodityChartData: any[];