Merge remote-tracking branch 'origin/gzb' into wzl

js/section_1.js

@@ -1,4 +1,4 @@
-function initaveragescoreEcharts() {
+function initAverageScoreEcharts() {
   var itemStyle = {
     normal: {
       label: {
@@ -12,8 +12,9 @@ function initaveragescoreEcharts() {
   var curseries = [{
       name: "满分",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [60, 70],
       itemStyle
@@ -21,8 +22,9 @@ function initaveragescoreEcharts() {
     {
       name: "最高分",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [50, 60],
       itemStyle
@@ -30,8 +32,9 @@ function initaveragescoreEcharts() {
     {
       name: "最低分",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [30, 40],
       itemStyle
@@ -39,14 +42,16 @@ function initaveragescoreEcharts() {
     {
       name: "平均分",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [40, 50],
       itemStyle
     }
   ];
   let option = {
+    animation: false,
     color: ["#5C99FF", "#FF5F56", "#5EC5C8", "#f1982b"],
     title: {
       text: "分",
@@ -54,22 +59,22 @@ function initaveragescoreEcharts() {
       y: "top",
       textStyle: {
         color: "#5F6E82",
-        fontSize: 12,
+        fontSize: $.UnitUtil.mm2px(3),
         fontWeight: 500
       }
     },
     legend: {
-      itemWidth: 6,
-      itemHeight: 6,
+      itemWidth: $.UnitUtil.mm2px(2),
+      itemHeight: $.UnitUtil.mm2px(2),
       top: "bottom",
       data: curlegend
     },
     grid: {
-      top: 30,
-      left: 5,
+      top: $.UnitUtil.mm2px(10),
+      left: 0,
       right: 0,
-      bottom: "10%",
-      containLabel: true
+      bottom: $.UnitUtil.mm2px(8),
+      containLabel: true,
     },
     xAxis: [{
       type: "category",
@@ -118,7 +123,7 @@ function initaveragescoreEcharts() {
   myEcharts.setOption(option);
 }
 
-function initexcellencerateEcharts() {
+function initExcellenceRateEcharts() {
   var itemStyle = {
     normal: {
       label: {
@@ -132,8 +137,9 @@ function initexcellencerateEcharts() {
   var curseries = [{
       name: "优秀率",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [60, 70],
       itemStyle
@@ -141,8 +147,9 @@ function initexcellencerateEcharts() {
     {
       name: "良好率",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [50, 60],
       itemStyle
@@ -150,8 +157,9 @@ function initexcellencerateEcharts() {
     {
       name: "及格率",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [30, 40],
       itemStyle
@@ -159,14 +167,16 @@ function initexcellencerateEcharts() {
     {
       name: "低分率",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [40, 50],
       itemStyle
     }
   ];
   let option = {
+    animation: false,
     color: ["#5C99FF", "#FF5F56", "#5EC5C8", "#f1982b"],
     title: {
       text: "分",
@@ -174,22 +184,22 @@ function initexcellencerateEcharts() {
       y: "top",
       textStyle: {
         color: "#5F6E82",
-        fontSize: 12,
+        fontSize: $.UnitUtil.mm2px(3),
         fontWeight: 500
       }
     },
     legend: {
-      itemWidth: 6,
-      itemHeight: 6,
+      itemWidth: $.UnitUtil.mm2px(2),
+      itemHeight: $.UnitUtil.mm2px(2),
       top: "bottom",
       data: curlegend
     },
     grid: {
-      top: 30,
-      left: 5,
+      top: $.UnitUtil.mm2px(10),
+      left: 0,
       right: 0,
-      bottom: "10%",
-      containLabel: true
+      bottom: $.UnitUtil.mm2px(8),
+      containLabel: true,
     },
     xAxis: [{
       type: "category",
@@ -238,7 +248,7 @@ function initexcellencerateEcharts() {
   myEcharts.setOption(option);
 }
 
-function initexamnumEcharts() {
+function initExamnumEcharts() {
   var itemStyle = {
     normal: {
       label: {
@@ -252,8 +262,9 @@ function initexamnumEcharts() {
   var curseries = [{
       name: "实考人数",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [60, 70],
       itemStyle
@@ -261,14 +272,16 @@ function initexamnumEcharts() {
     {
       name: "缺考人数",
       type: "bar",
-      barWidth: 32,
-      barMinHeight: 16,
+      barWidth: $.UnitUtil.mm2px(5),
+      // 柱状图最小高度
+      barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
       data: [50, 60],
       itemStyle
     }
   ];
   let option = {
+    animation: false,
     color: ["#5C99FF", "#FF5F56", "#5EC5C8", "#f1982b"],
     title: {
       text: "分",
@@ -276,22 +289,22 @@ function initexamnumEcharts() {
       y: "top",
       textStyle: {
         color: "#5F6E82",
-        fontSize: 12,
+        fontSize: $.UnitUtil.mm2px(3),
         fontWeight: 500
       }
     },
     legend: {
-      itemWidth: 6,
-      itemHeight: 6,
+      itemWidth: $.UnitUtil.mm2px(2),
+      itemHeight: $.UnitUtil.mm2px(2),
       top: "bottom",
       data: curlegend
     },
     grid: {
-      top: 30,
-      left: 5,
+      top: $.UnitUtil.mm2px(10),
+      left: 0,
       right: 0,
-      bottom: "10%",
-      containLabel: true
+      bottom: $.UnitUtil.mm2px(8),
+      containLabel: true,
     },
     xAxis: [{
       type: "category",
@@ -354,13 +367,15 @@ function initbzcEcharts() {
   var curseries = [{
     name: "标准差",
     type: "bar",
-    barWidth: 32,
-    barMinHeight: 16,
+    barWidth: $.UnitUtil.mm2px(5),
+    // 柱状图最小高度
+    barMinHeight: $.UnitUtil.mm2px(2),
     barGap: 0,
     data: [60, 70],
     itemStyle
   }];
   let option = {
+    animation: false,
     color: ["#5C99FF", "#FF5F56", "#5EC5C8", "#f1982b"],
     title: {
       text: "分",
@@ -368,22 +383,22 @@ function initbzcEcharts() {
       y: "top",
       textStyle: {
         color: "#5F6E82",
-        fontSize: 12,
+        fontSize: $.UnitUtil.mm2px(3),
         fontWeight: 500
       }
     },
     legend: {
-      itemWidth: 6,
-      itemHeight: 6,
+      itemWidth: $.UnitUtil.mm2px(2),
+      itemHeight: $.UnitUtil.mm2px(2),
       top: "bottom",
       data: curlegend
     },
     grid: {
-      top: 30,
-      left: 5,
+      top: $.UnitUtil.mm2px(10),
+      left: 0,
       right: 0,
-      bottom: "10%",
-      containLabel: true
+      bottom: $.UnitUtil.mm2px(8),
+      containLabel: true,
     },
     xAxis: [{
       type: "category",
@@ -435,8 +450,8 @@ $(function () {
   // outerHeight(true) 高度为 height+margin+padding+border
   var parameter = $(".section_1_html_root").data("page-params");
   console.log("section_1:parameter", parameter);
-  initaveragescoreEcharts();
-  initexcellencerateEcharts();
-  initexamnumEcharts();
+  initAverageScoreEcharts();
+  initExcellenceRateEcharts();
+  initExamnumEcharts();
   initbzcEcharts();
 });