同步eta1.6.3改动,另存为目录

src/hooks/chart/render.js

@@ -481,11 +481,11 @@ function setChartLang(changeLangIsCheck){
     }
     if([2,3,4].includes(Source)){
         options.value.yAxis.forEach(item => {
-            item.title.text =  LangType.value == 'zh' ? item.title.textZh: item.title.textEn
+            item.title.text =  LangType.value == 'zh' ? item.title.textZh: item.title.textEn||item.title.textZh
         });
         //图例
         options.value.series.forEach(item => {
-            item.name = LangType.value == 'en' ?item.nameEn : item.nameZh 
+            item.name = LangType.value == 'en' ?(item.nameEn||item.nameZh) : item.nameZh 
         });
         //tooltip
         options.value.tooltip.formatter = LangType.value == 'en'?options.value.tooltip.formatterEn:options.value.tooltip.formatterZh
@@ -496,7 +496,7 @@ function setChartLang(changeLangIsCheck){
             });
         }
         if([3].includes(Source)){
-            options.value.xAxis.title.text=LangType.value == 'en'?options.value.xAxis.title.textEn:options.value.xAxis.title.textZh
+            options.value.xAxis.title.text=LangType.value == 'en'?(options.value.xAxis.title.textEn||options.value.xAxis.title.textZh):options.value.xAxis.title.textZh
         }
     }
 }
@@ -1807,9 +1807,9 @@ function initRelevanceChart(data){
           type: (chartTheme&&chartTheme.lineOptionList[index].lineType) || 'spline',
           dashStyle: (chartTheme&&chartTheme.lineOptionList[index].dashStyle)||'Solid',
           yAxis: 0,
-          name: data.ChartInfo.ChartName,
-          nameZh: data.ChartInfo.ChartName,
-          nameEn: data.ChartInfo.ChartNameEn,
+          name: item.Name||data.ChartInfo.ChartName,
+          nameZh: item.Name||data.ChartInfo.ChartName,
+          nameEn: item.NameEn||data.ChartInfo.ChartNameEn,
           color: item.Color,
           chartType: 'linear',
           lineWidth: (chartTheme&&chartTheme.lineOptionList[index].lineWidth) || 3,

src/views/myETA/components/ChartSaveOther.vue

@@ -148,6 +148,14 @@ async function handleConfirmSave(){
                         >{{item.ChartClassifyName}}</li>
                     </ul>
                 </template>
+                <!-- <template v-else-if="[3].includes(source)">
+                    <van-cascader
+                        v-model="activeIds"
+                        :options="opts"
+                        :closeable="false"
+                        :field-names="{text:'ChartClassifyName',value:'ChartClassifyId',children:'Children'}"
+                    />
+                </template> -->
                 <template v-else-if="source===10">
                     <div class="item">
                         图表名称: {{chartInfo.ChartName+'(1)'}}