Merge branch 'chart14.7.1'

src/views/hzyb/chart/Detail.vue

@@ -1130,7 +1130,7 @@ const setStackOrCombinChart = data => {
         let temName= setDyncmicSerieName(item,dynamic_arr)  
 
         //预测指标配置
-        let predict_params = item.EdbInfoCategoryType === 1 ? getPredictParams(item) : {};
+        let predict_params = item.EdbInfoCategoryType === 1 ? getPredictParams(item,chartStyle) : {};
 
         let seriesItemObj={
             data:[],
@@ -1146,6 +1146,8 @@ const setStackOrCombinChart = data => {
             visible:true,
             LatestDate:item.LatestDate,
             LatestValue:item.LatestValue,
+            borderWidth: 1,
+            borderColor: item.ChartColor,
             ...predict_params
         }
         item.DataList = item.DataList || [];
@@ -1532,14 +1534,14 @@ const setSeasonOpt=(data)=>{
 }
 
 /* 预测配置 分区 */
-const getPredictParams = ({LatestDate,PredictChartColor}) => {
+const getPredictParams = ({LatestDate,PredictChartColor,ChartStyle},chartStyle) => {
     return {
     zoneAxis: 'x',
     zones: [{
         value: new Date(LatestDate).getTime()+1
     }, {
         dashStyle: 'ShortDot',
-        color: PredictChartColor
+        color: (ChartStyle==='column' || chartStyle==='column') ? 'transparent' : PredictChartColor
     }]
     }
 }