소스 검색

switch branch

Karsa 10 달 전
부모
커밋
5a2b4b4c4d
2개의 변경된 파일33개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 0
      src/views/dataEntry_manage/components/chart.vue
  2. 31 2
      src/views/dataEntry_manage/mixins/chartPublic.js

+ 2 - 0
src/views/dataEntry_manage/components/chart.vue

@@ -5,9 +5,11 @@
 
 <script>
 import Highcharts from 'highcharts/highstock';
+import HighchartsMore from 'highcharts/highcharts-more';
 import HightchartsExport from 'highcharts/modules/exporting';
 import HighchartszhCN  from '@/utils/highcahrts-zh_CN'
 HighchartszhCN(Highcharts)
+HighchartsMore(Highcharts)
 HightchartsExport(Highcharts)
 const elementResizeDetectorMaker = require("element-resize-detector");//引入监听dom变化的组件
 const erd = elementResizeDetectorMaker();

+ 31 - 2
src/views/dataEntry_manage/mixins/chartPublic.js

@@ -1803,14 +1803,42 @@ export const chartSetMixin = {
     setRadarChart() {
       const {} = this.radarChartData;
 
+      /* 主题样式*/
+      const chartTheme =  this.chartInfo.ChartThemeStyle ? JSON.parse(this.chartInfo.ChartThemeStyle) : null;
+
+      //x轴
       let xAxis = {
 
       }
 
+      //y轴
       let yAxis = {
-        
+        gridLineInterpolation: 'polygon',
+        lineWidth: 0,
+        endOnTick: false,
+        startOnTick: false,
+        showLastLabel: true,
       }
 
+      //系列
+      let series = [];
+
+      this.options = {
+        chart: {
+          ...defaultOpts.chart,
+					...chartTheme.drawOption,
+          spacing: chartTheme.legendOptions.verticalAlign==='bottom' ? [23,10,2,10] : [2,10,2,10],
+          polar:true,
+        },
+        title: {
+          text:''
+        },
+        series,
+        yAxis,
+        xAxis
+      }
+      this.currentLang=='en' && this.changeOptions();
+
     },
 
 
@@ -2339,7 +2367,8 @@ export const chartSetMixin = {
       //source1 eta图库的类型对应
       const typeMap = {
         7: this.setBarChart,
-        10: this.setSectionScatterChart
+        10: this.setSectionScatterChart,
+        11: this.setRadarChart
       }
       //其他source
       const sourceMap = {