fix bug

src/views/dataEntry_manage/editChart.vue

@@ -563,7 +563,7 @@
 							align="center"
 						>
 							<template slot-scope="scope">
-								<div v-if="item.key === 'EdbName' && [1,4,6,7].includes(chartInfo.ChartType)">
+								<div v-if="item.key === 'EdbName' && [1,4,6,7,11].includes(chartInfo.ChartType)">
 									<!-- 奇怪柱状图用别名 -->
 									<el-input 
 										v-model="scope.row.EdbAliasName"
@@ -682,9 +682,12 @@ export default {
 		tableData: {
       handler(newval, oldval) {
 				if(newval) {
-					if([7,10].includes(this.chartInfo.ChartType)) {
+					if([7,10,11].includes(this.chartInfo.ChartType)) {
 						// 奇怪柱形图
 						this.chartInfo.ChartType === 7 && this.barDateList.length && this.$refs.BarOptRef && this.$refs.BarOptRef.getBarData();
+
+						//雷达图
+						this.chartInfo.ChartType === 11 && this.$refs.BarOptRef && this.$refs.BarOptRef.getBarData();
 					}else {
 						this.setAddChartDefault();
 						newval.length && !this.chartInfo.WarnMsg && this.setChartOptionHandle(newval);

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -324,15 +324,10 @@ export default {
 			if(res.Ret!==200) return 
 
 			const { DataResp,EdbInfoList,ChartInfo } = res.Data;
-
-			console.log(JSON.parse(this.chartInfo.ChartThemeStyle))
-			//默认来源搞一下
-			this.chartInfo.SourcesFrom = JSON.stringify({
-				isShow: true,
-				text: ChartInfo.ChartSource,
-				color: JSON.parse(this.chartInfo.ChartThemeStyle).markerOptions.style.color,
-				fontSize: JSON.parse(this.chartInfo.ChartThemeStyle).markerOptions.style.fontSize
-			});
+			this.chartInfo = {
+				...this.chartInfo,
+				ChartSource: ChartInfo.ChartSource
+			}
 			
 			this.radarChartData = {
 				YDataList: DataResp.YDataList,
@@ -349,9 +344,10 @@ export default {
 				}
 			}
 
-			this.setRadarChart()
-
+			//默认来源搞一下
+			this.setDefaultSourceFrom();
 
+			this.setRadarChart()
 		},
 
 		/* 曲线图切换筛选项时请求数据 */

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -1835,6 +1835,7 @@ export const chartSetMixin = {
         labels: {
           allowOverlap: true,
           autoRotationLimit: 40,
+          distance: 10,
           style: {
             ...chartTheme&&chartTheme.xAxisOptions.style
           }

src/views/ppt_manage/mixins/mixins.js

@@ -1525,6 +1525,7 @@ export default {
         labels: {
           allowOverlap: true,
           autoRotationLimit: 40,
+          distance: 10,
           style: {
             ...chartTheme&&chartTheme.xAxisOptions.style
           }
@@ -1601,7 +1602,6 @@ export default {
         yAxis,
         xAxis
       }
-      this.currentLang=='en' && this.changeOptions();
     },
 
     /* 查询范围为1年内 x轴显示为月/日 否则默认年/月 */