Merge branch 'eta_1.9.0'

src/views/hzyb/chart/Detail.vue

@@ -520,18 +520,18 @@ const initRelevanceChart=(data)=>{
 
     //处理series
     let seriesData=[]
-    data.YDataList.forEach(item=>{
+    data.YDataList.forEach((item,index)=>{
         let serie_item = {
           data: item.Value,
-          type: (chartTheme&&chartTheme.lineOptions.lineType) || 'spline',
-          dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
+          type: (chartTheme&&chartTheme.lineOptionList[index].lineType) || 'spline',
+          dashStyle: (chartTheme&&chartTheme.lineOptionList[index].dashStyle)||'Solid',
           yAxis: 0,
           name: data.ChartInfo.ChartName,
           nameCh: data.ChartInfo.ChartName,
           nameEn: data.ChartInfo.ChartName,
           color: '#00f',
           chartType: 'linear',
-          lineWidth: (chartTheme&&chartTheme.lineOptions.lineWidth) || 3,
+          lineWidth: (chartTheme&&chartTheme.lineOptionList[index].lineWidth) || 3,
           visible:true,
           marker: {
             enabled: false
@@ -749,19 +749,19 @@ const setCommodityChart = () => {
     }
 
     //数据列
-    data.forEach(item => {
+    data.forEach((item,index) => {
         //处理首或/尾全是无效数据的以null填充
         let filterData = filterInvalidData(item)
 
         let serie_item = {
             data: filterData,
-            type: (chartTheme&&chartTheme.lineOptions.lineType) || 'spline',
-            dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
+            type: (chartTheme&&chartTheme.lineOptionList[index].lineType) || 'spline',
+            dashStyle: (chartTheme&&chartTheme.lineOptionList[index].dashStyle)||'Solid',
             yAxis: 0,
             name: item.Name,
             color: item.Color,
             chartType: 'linear',
-            lineWidth: (chartTheme&&chartTheme.lineOptions.lineWidth) || 3,
+            lineWidth: (chartTheme&&chartTheme.lineOptionList[index].lineWidth) || 3,
             visible: true,
             marker: {
                 enabled: false
@@ -902,7 +902,7 @@ const setSectionScatterChart = () => {
 
     //数据列
     let series = [];
-    DataList.forEach(item => {
+    DataList.forEach((item,index) => {
         //数据列
         let series_item = {
             data: [],
@@ -913,7 +913,7 @@ const setSectionScatterChart = () => {
             chartType: 'linear',
             zIndex:1,
             marker: {
-                radius: (chartTheme&&chartTheme.lineOptions.radius)||5,
+                radius: (chartTheme&&chartTheme.lineOptionList[index].radius)||5,
             },
             visible: true
         }
@@ -1056,12 +1056,12 @@ const setStatisticFrequency = () => {
 
     let series_item = {
         data: item.Value.map(_ =>[_.X,_.Y]),
-        dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
-        type: (chartTheme&&chartTheme.lineOptions.lineType) || 'spline',
+        dashStyle: (chartTheme&&chartTheme.lineOptionList[index].dashStyle)||'Solid',
+        type: (chartTheme&&chartTheme.lineOptionList[index].lineType) || 'spline',
         yAxis: index,
         name: item.Name,
         color: item.Color,
-        lineWidth: (chartTheme&&chartTheme.lineOptions.lineWidth)||3,
+        lineWidth: (chartTheme&&chartTheme.lineOptionList[index].lineWidth)||3,
         chartType: 'linear',
         visible: true,
         zIndex:1
@@ -1302,16 +1302,16 @@ const setRadarChart = () => {
 
     //系列
     let series = [];
-    YDataList.forEach(item => {
+    YDataList.forEach((item,index) => {
       let serie_item = {
         data: item.Value,
         pointPlacement: 'on',
-        type: (chartTheme&&chartTheme.lineOptions.lineType) || 'line',
-        dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
+        type: (chartTheme&&chartTheme.lineOptionList[index].lineType) || 'line',
+        dashStyle: (chartTheme&&chartTheme.lineOptionList[index].dashStyle)||'Solid',
         yAxis: 0,
         name: item.Name || item.Date,
         color: item.Color,
-        lineWidth: (chartTheme&&chartTheme.lineOptions.lineWidth) || 1,
+        lineWidth: (chartTheme&&chartTheme.lineOptionList[index].lineWidth) || 1,
         chartType: 'linear',
         visible: true
       };
@@ -1419,8 +1419,8 @@ const setSplineOpt=(data)=>{
             dataGrouping:{
                 enabled:false
             },
-            type: (chartTheme&&chartTheme.lineOptions.lineType) || 'spline',
-            dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
+            type: (chartTheme&&chartTheme.lineOptionList[index].lineType) || 'spline',
+            dashStyle: (chartTheme&&chartTheme.lineOptionList[index].dashStyle)||'Solid',
             yAxis:index,
             name:temName,
             color: item.ChartColor,
@@ -1428,6 +1428,12 @@ const setSplineOpt=(data)=>{
             visible:true,
             LatestDate:item.LatestDate,
             LatestValue:item.LatestValue,
+            marker: chartTheme && chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none'?{
+                enabled:true,
+                symbol: chartTheme.lineOptionList[index].markType || 'circle',
+                fillColor:chartTheme.lineOptionList[index].markColor,
+                radius: chartTheme.lineOptionList[index].markSize
+            }:{},
             ...predict_params
         }
         item.DataList = item.DataList || [];
@@ -1846,12 +1852,18 @@ const setSeasonOpt=(data)=>{
                 dataGrouping:{
                     enabled:false
                 },
-                type: (chartTheme&&chartTheme.lineOptions.lineType) || data.ChartStyle,
-                dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
+                type: (chartTheme&&chartTheme.lineOptionList[index].lineType) || data.ChartStyle,
+                dashStyle: (chartTheme&&chartTheme.lineOptionList[index].dashStyle)||'Solid',
                 yAxis:0,
                 name:item.ChartLegend,
                 color:colorsArr.slice(-chartDataHandle.length)[index],                
                 visible:true,
+                marker: chartTheme && chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none'?{
+                    enabled:true,
+                    symbol: chartTheme.lineOptionList[index].markType || 'circle',
+                    fillColor:chartTheme.lineOptionList[index].markColor,
+                    radius: chartTheme.lineOptionList[index].markSize
+                }:{},
                 ...predict_params
             }
             item.DataList=item.DataList||[]
@@ -2090,7 +2102,7 @@ const setScatterOptions = (dataList) => {
         visible:true,
         chartType: 'linear',
         marker: {
-          radius: (chartTheme&&chartTheme.lineOptions.radius)||5,
+          radius: (chartTheme&&chartTheme.lineOptionList[0].radius)||5,
         },
     }
     real_data.forEach(_ => {
@@ -2725,7 +2737,7 @@ const myChartPageChange=(type)=>{
                 v-if="resData.ChartInfo.SourcesFrom&&JSON.parse(resData.ChartInfo.SourcesFrom).isShow"
                 :style="`
                     color: ${ JSON.parse(resData.ChartInfo.SourcesFrom).color };
-                    fontSize: ${ JSON.parse(resData.ChartInfo.SourcesFrom).fontSize }px;
+                    font-size: ${ JSON.parse(resData.ChartInfo.SourcesFrom).fontSize }px;
                 `"
             >
                 数据来源：{{ JSON.parse(resData.ChartInfo.SourcesFrom).text}}
@@ -2761,7 +2773,7 @@ const myChartPageChange=(type)=>{
                 v-if="resData.ChartInfo.SourcesFrom&&JSON.parse(resData.ChartInfo.SourcesFrom).isShow"
                 :style="`
                     color: ${ JSON.parse(resData.ChartInfo.SourcesFrom).color };
-                    fontSize: ${ JSON.parse(resData.ChartInfo.SourcesFrom).fontSize }px;
+                    font-size: ${ JSON.parse(resData.ChartInfo.SourcesFrom).fontSize }px;
                 `"
             >
                 数据来源：{{ JSON.parse(resData.ChartInfo.SourcesFrom).text}}

src/views/hzyb/hooks/chartBase.js

@@ -228,8 +228,8 @@ export const setSplineOpt=(data,resData)=>{
             dataGrouping:{
                 enabled:false
             },
-            type: (chartTheme&&chartTheme.lineOptions.lineType) || 'spline',
-            dashStyle: (chartTheme&&chartTheme.lineOptions.dashStyle)||'Solid',
+            type: (chartTheme&&chartTheme.lineOptionList[index].lineType) || 'spline',
+            dashStyle: (chartTheme&&chartTheme.lineOptionList[index].dashStyle)||'Solid',
             yAxis:index,
             name:temName,
             color: item.ChartColor,