la 2 년 전
부모
커밋
38c22f87a5
4개의 변경된 파일57개의 추가작업 그리고 45개의 파일을 삭제
  1. 7 2
      src/pages/ksfx/cjfx_fsdtj.vue
  2. 0 3
      src/pages/ksfx/cjfx_jstj.vue
  3. 33 30
      src/pages/ksfx/cjfx_pjflcfx.vue
  4. 17 10
      src/pages/ksfx/sjfx_kgtfx.vue

+ 7 - 2
src/pages/ksfx/cjfx_fsdtj.vue

@@ -105,8 +105,13 @@ let school_list = [{
   label: '学校2'
 }]
 
+let echartData = {
+  xAxis_data: ['[0-10]', '[10-20]', '[20-30]', '[30-40]', '[40-50]', '[50-60]', '[60-70]'],
+  series_data:[120,200,200,150,80,70,110,130]
+}
 
 onMounted(() => {
+
   initChart()
 })
 
@@ -123,7 +128,7 @@ const initChart = () => {
       containLabel: true
     },
     xAxis: {
-      data: ['[0-10]', '[10-20]', '[20-30]', '[30-40]', '[40-50]', '[50-60]', '[60-70]']
+      data: echartData.xAxis_data
     },
     yAxis: {
       type: 'value',
@@ -149,7 +154,7 @@ const initChart = () => {
             }
           }
         },
-        data: [120,200,200,150,80,70,110,130],
+        data: echartData.series_data,
       }
     ]
   });

+ 0 - 3
src/pages/ksfx/cjfx_jstj.vue

@@ -61,9 +61,6 @@
 
       </div>
 
-
-
-
     </div>
 
     <commonFooter />

+ 33 - 30
src/pages/ksfx/cjfx_pjflcfx.vue

@@ -83,7 +83,6 @@ let subject_list = [{
   label: '数学'
 }]
 
-
 let school_list = [{
   value: '1',
   label: '学校1'
@@ -92,6 +91,37 @@ let school_list = [{
   label: '学校2'
 }]
 
+let ecahrtData = {
+  xAxis_data: ['蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学'],
+  series:[
+    {
+      name: 'Income',
+      type: 'bar',
+      stack: 'Total',
+      label: {
+        show: true
+      },
+      emphasis: {
+        focus: 'series'
+      },
+      data: [1.23, 1.23, 1.23, 1.23, 1.23, 1.23, 1.23]
+    },
+    {
+      name: 'Expenses',
+      type: 'bar',
+      stack: 'Total',
+      label: {
+        show: true,
+        position: 'left'
+      },
+      emphasis: {
+        focus: 'series'
+      },
+      data: [-1.23, -1.23, -1.23, -1.23, -1.23, -1.23, -1.23]
+    }
+  ]
+}
+
 onMounted(() => {
   initChart()
 })
@@ -121,7 +151,7 @@ const initChart = () => {
       axisTick: {
         show: false
       },
-      data: ['蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学', '蒙阴县市级中小学']
+      data: ecahrtData.xAxis_data
     }
   ],
   yAxis: [
@@ -130,34 +160,7 @@ const initChart = () => {
     }
 
   ],
-  series: [
-
-    {
-      name: 'Income',
-      type: 'bar',
-      stack: 'Total',
-      label: {
-        show: true
-      },
-      emphasis: {
-        focus: 'series'
-      },
-      data: [1.23, 1.23, 1.23, 1.23, 1.23, 1.23, 1.23]
-    },
-    {
-      name: 'Expenses',
-      type: 'bar',
-      stack: 'Total',
-      label: {
-        show: true,
-        position: 'left'
-      },
-      emphasis: {
-        focus: 'series'
-      },
-      data: [-1.23, -1.23, -1.23, -1.23, -1.23, -1.23, -1.23]
-    }
-  ]
+  series: ecahrtData.series
 });
 }
 

+ 17 - 10
src/pages/ksfx/sjfx_kgtfx.vue

@@ -107,7 +107,19 @@ let school_list = [{
   label: '学校2'
 }]
 
-
+let barChartData = {
+  xAxis_data: ['选项A', '选项B', '选项C', '选项D'],
+  series_data:[120,200,200,150]
+}
+let circleChartData = {
+  series_name: '客观题分析',
+  series_data: [
+      { value: 1048, name: '选项A' },
+      { value: 735, name: '选项B' },
+      { value: 580, name: '选项C' },
+      { value: 484, name: '选项D' },
+    ]
+}
 
 
 onMounted(() => {
@@ -128,7 +140,7 @@ const initbarChart = () => {
       containLabel: true
     },
     xAxis: {
-      data: ['选项A', '选项B', '选项C', '选项D']
+      data: barChartData.xAxis_data
     },
     yAxis: {
       type: 'value',
@@ -154,7 +166,7 @@ const initbarChart = () => {
             }
           }
         },
-        data: [120,200,200,150],
+        data: barChartData.series_data,
       }
     ]
   });
@@ -180,7 +192,7 @@ const initcircleChart = () => {
   },
   series: [
     {
-      name: '客观题分析',
+      name: circleChartData.series_name,
       type: 'pie',
       radius: ['40%', '70%'],
       avoidLabelOverlap: false,
@@ -198,12 +210,7 @@ const initcircleChart = () => {
       labelLine: {
         show: false
       },
-      data: [
-        { value: 1048, name: '选项A' },
-        { value: 735, name: '选项B' },
-        { value: 580, name: '选项C' },
-        { value: 484, name: '选项D' },
-      ]
+      data: circleChartData.series_data
     }
   ]
 });