默认lineWidth

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -652,7 +652,7 @@ export const chartSetMixin = {
           : `${item.EdbAliasName||item.EdbName}${dynamic_tag}`,
           nameEn:item.EdbNameEn?`${item.EdbNameEn}${dynamic_tag_en}`:`${item.EdbAliasName||item.EdbName}${dynamic_tag}`,
           color: item.ChartColor,
-          lineWidth: Number(item.ChartWidth),
+          lineWidth: Number(item.ChartWidth)||(chartTheme&&chartTheme.lineOptions.lineWidth),
           ...predict_params
         };
         item.DataList = item.DataList || [];
@@ -828,7 +828,7 @@ export const chartSetMixin = {
           : `${item.EdbAliasName||item.EdbName}${dynamic_tag}`,
           nameEn:item.EdbNameEn?`${item.EdbNameEn}${dynamic_tag_en}`:`${item.EdbAliasName||item.EdbName}${dynamic_tag}`,
           color: item.ChartColor,
-          lineWidth:  Number(item.ChartWidth),
+          lineWidth: Number(item.ChartWidth)||(chartTheme&&chartTheme.lineOptions.lineWidth),
           fillColor: (this.chartInfo.ChartType === 3 || (this.chartInfo.ChartType === 6 && item.ChartStyle === 'areaspline')) ? item.ChartColor : undefined,
           borderWidth: 1,
           borderColor: item.ChartColor,

src/views/ppt_manage/mixins/mixins.js

@@ -165,8 +165,8 @@ export default {
 
         //中英文名称
         const nameCh = dynamic_arr.length > 1
-        ? `${item.EdbName}(${item.SourceName})${dynamic_tag}`
-        : `${item.EdbName}${dynamic_tag}`
+        ? `${item.EdbAliasName||item.EdbName}(${item.SourceName})${dynamic_tag}`
+        : `${item.EdbAliasName||item.EdbName}${dynamic_tag}`
         const nameEn = item.EdbNameEn?`${item.EdbNameEn}${dynamic_tag_en}`:''
         //数据列
         let obj = {
@@ -326,8 +326,8 @@ export default {
         
         //中英文名称
         const nameCh = dynamic_arr.length > 1
-        ? `${item.EdbName}(${item.SourceName})${dynamic_tag}`
-        : `${item.EdbName}${dynamic_tag}`
+        ? `${item.EdbAliasName||item.EdbName}(${item.SourceName})${dynamic_tag}`
+        : `${item.EdbAliasName||item.EdbName}${dynamic_tag}`
         const nameEn = item.EdbNameEn?`${item.EdbNameEn}${dynamic_tag_en}`:''
 
         //数据列