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

js/index.js

@@ -1,10 +1,10 @@
 $(function () {
   function loadSectionHtml(sectionsData) {
     var loadHtmlArr = [
-      // "cover",
-      // "preface",
-      // "section_1",
-      "section_2",
+      // "cover",  //封面
+      // "preface",  //前言
+      "section_1",
+      // "section_2",
       // "section_3",
       // "section_4",
     ];

js/preface.js

@@ -2,4 +2,10 @@ $(function() {
   // outerHeight(true) 高度为 height+margin+padding+border
   var parameter = $(".preface_html_root").data("page-params");
   console.log("preface:parameter", JSON.parse(parameter));
+  $(".gradename").text(4);
+  $(".examtype").text(4);
+  $(".classnum").text(4);
+  $(".subjectnum").text(4);
+  $(".allscore").text(4);
+
 });

js/section_1.js

@@ -1,5 +1,5 @@
 $(function () {
-  function initAverageScoreEcharts() {
+  function initAverageScoreEcharts(list,xAxis_data) {
     var itemStyle = {
       normal: {
         label: {
@@ -8,8 +8,15 @@ $(function () {
         }
       }
     };
-    var xAxis_data = ["一般", "二班"]
+    var score=[],maxscore=[],minscore=[],avgscore=[];
     var curlegend = ["满分", "最高分", "最低分", "平均分"];
+    for(var i=0;i<list.length;i++){
+      var item = list[i];
+      score.push(item.score);
+      maxscore.push(item.maxscore);
+      minscore.push(item.minscore);
+      avgscore.push(item.avgscore);
+    }
     var curseries = [{
       name: "满分",
       type: "bar",
@@ -17,7 +24,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [60, 70],
+      data: score,
       itemStyle: itemStyle
     },
     {
@@ -27,7 +34,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [50, 60],
+      data: maxscore,
       itemStyle: itemStyle
     },
     {
@@ -37,7 +44,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [30, 40],
+      data: minscore,
       itemStyle: itemStyle
     },
     {
@@ -47,7 +54,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [40, 50],
+      data: avgscore,
       itemStyle: itemStyle
     }
     ];
@@ -124,7 +131,7 @@ $(function () {
     myEcharts.setOption(option);
   }
 
-  function initExcellenceRateEcharts() {
+  function initExcellenceRateEcharts(list,xAxis_data) {
     var itemStyle = {
       normal: {
         label: {
@@ -133,16 +140,24 @@ $(function () {
         }
       }
     };
-    var xAxis_data = ["一般", "二班"]
+    var yxrate=[],lhrate=[],jgrate=[],dfrate=[];
     var curlegend = ["优秀率", "良好率", "及格率", "低分率"];
-    var curseries = [{
+    for(var i=0;i<list.length;i++){
+      var item = list[i];
+      yxrate.push(item.yxrate);
+      lhrate.push(item.lhrate);
+      jgrate.push(item.jgrate);
+      dfrate.push(item.dfrate);
+    }
+    var curseries = [
+      {
       name: "优秀率",
       type: "bar",
       barWidth: $.UnitUtil.mm2px(5),
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [60, 70],
+      data: yxrate,
       itemStyle: itemStyle
     },
     {
@@ -152,7 +167,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [50, 60],
+      data: lhrate,
       itemStyle: itemStyle
     },
     {
@@ -162,7 +177,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [30, 40],
+      data: jgrate,
       itemStyle: itemStyle
     },
     {
@@ -172,7 +187,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [40, 50],
+      data: dfrate,
       itemStyle: itemStyle
     }
     ];
@@ -249,7 +264,7 @@ $(function () {
     myEcharts.setOption(option);
   }
 
-  function initExamnumEcharts() {
+  function initExamnumEcharts(list,xAxis_data) {
     var itemStyle = {
       normal: {
         label: {
@@ -258,8 +273,13 @@ $(function () {
         }
       }
     };
-    var xAxis_data = ["一般", "二班"]
+    var stunum = [],missnum=[];
     var curlegend = ["实考人数", "缺考人数"];
+    for(var i=0;i<list.length;i++){
+      var item = list[i];
+      stunum.push(item.stunum);
+      missnum.push(item.missnum);
+    }
     var curseries = [{
       name: "实考人数",
       type: "bar",
@@ -267,7 +287,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [60, 70],
+      data: stunum,
       itemStyle: itemStyle
     },
     {
@@ -277,7 +297,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [50, 60],
+      data: missnum,
       itemStyle: itemStyle
     }
     ];
@@ -354,7 +374,7 @@ $(function () {
     myEcharts.setOption(option);
   }
 
-  function initbzcEcharts() {
+  function initbzcEcharts(list,xAxis_data) {
     var itemStyle = {
       normal: {
         label: {
@@ -363,8 +383,12 @@ $(function () {
         }
       }
     };
-    var xAxis_data = ["一般", "二班"]
+    var bzc = [];
     var curlegend = ["标准差"];
+    for(var i=0;i<list.length;i++){
+      var item = list[i];
+      bzc.push(item.bzc);
+    }
     var curseries = [{
       name: "标准差",
       type: "bar",
@@ -372,7 +396,7 @@ $(function () {
       // 柱状图最小高度
       barMinHeight: $.UnitUtil.mm2px(2),
       barGap: 0,
-      data: [60, 70],
+      data: bzc,
       itemStyle: itemStyle
     }];
     var option = {
@@ -447,10 +471,44 @@ $(function () {
     myEcharts.clear();
     myEcharts.setOption(option);
   }
-  var parameter = $(".section_1_html_root").data("page-params");
-  console.log("section_1:parameter", JSON.parse(parameter));
-  initAverageScoreEcharts();
-  initExcellenceRateEcharts();
-  initExamnumEcharts();
-  initbzcEcharts();
+  var parameter = JSON.parse($(".section_1_html_root").data("page-params"));
+  $(".section1 .classnum").text(parameter.classnum);
+  $(".section1 .stunum").text(parameter.stunum);
+  $(".section1 .missnum").text(parameter.missnum);
+  $(".section1 .subjectnum").text(parameter.subjectnum);
+  $(".section1 .maxscore").text(parameter.maxscore);
+  $(".section1 .avgscore").text(parameter.avgscore);
+  $(".section1 .mixscore").text(parameter.mixscore);
+  var xAxis_data = [];
+  for(var i=0;i<parameter.subjects.length;i++){
+    var item = parameter.subjects[i];
+    var str = "";
+    if(item.subjectname == "总分"){
+      item.subjectname = "全部班级";
+    }else{
+      str += `<tr>
+      <td><div class="my_cell">${item.subjectname}</div></td>
+      <td><div class="my_cell">${item.stunum}</div></td>
+      <td><div class="my_cell">${item.missnum}</div></td>
+      <td><div class="my_cell">${item.score}</div></td>
+      <td><div class="my_cell">${item.maxscore}</div></td>
+      <td><div class="my_cell">${item.minscore}</div></td>
+      <td><div class="my_cell">${item.avgscore}</div></td>
+      <td><div class="my_cell">${item.yxrate}</div></td>
+      <td><div class="my_cell">${item.lhrate}</div></td>
+      <td><div class="my_cell">${item.jgrate}</div></td>
+      <td><div class="my_cell">${item.dfrate}</div></td>
+      <td><div class="my_cell">${item.bzc}</div></td>
+      </tr>`
+    }
+    $(".section1 .tbody").html(str);
+    xAxis_data.push(item.subjectname);
+  }
+  console.log(parameter.subjects);
+  $(".section1 .mfnummax").text(123);
+  initAverageScoreEcharts(parameter.subjects,xAxis_data);
+  initExcellenceRateEcharts(parameter.subjects,xAxis_data);
+  initExamnumEcharts(parameter.subjects,xAxis_data);
+  initbzcEcharts(parameter.subjects,xAxis_data);
+  console.log($(".section1 .tbody"));
 });

sections/preface.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="zh-cn">
+
 <head>
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -7,11 +8,15 @@
   <title>校本PDF报告-前言</title>
   <link rel="stylesheet" href="../css/preface.css">
 </head>
+
 <body>
   <div class="page_root">
     <h1 class="preface_title_1">前言</h1>
     <div class="preface_title_2">INTRODUCTION</div>
-    <div class="preface_content_line">本次考试为高一年级期中考试，共4个班级、8个学科，总分值为750分。</div>
+    <div class="preface_content_line">本次考试为<span class="gradename">高一年级</span>
+      <span class="examtype">期中考试</span>，共<span class="classnum"></span>个班级、<span
+        class="subjectnum"></span>个学科，总分值为<span class="allscore"></span>分。
+    </div>
     <div class="preface_content_line">计划240名考生，缺考20人，实际考生50人，最高分749分，平均分569.03分；</div>
     <div class="preface_content_line">本次考试A类上线分值[650，750]，上线率19.93%，上线人数 10人；</div>
     <div class="preface_content_line">本次考试B类上线分值[650，750]，上线率19.93%，上线人数 10人；</div>
@@ -62,4 +67,5 @@
   </div>
   <script src="./js/preface.js"></script>
 </body>
+
 </html>

sections/section_1.html

@@ -25,31 +25,31 @@
       <h2 class="section_title_2">1.总览</h2>
       <div class="section_list">
         <div class="section_item">
-          <div class="item_num"><span>6</span>个</div>
+          <div class="item_num"><span class="classnum"></span>个</div>
           <div class="item_title">班级数量</div>
         </div>
         <div class="section_item">
-          <div class="item_num"><span>456</span>人</div>
+          <div class="item_num"><span class="stunum"></span>人</div>
           <div class="item_title">学生数量</div>
         </div>
         <div class="section_item">
-          <div class="item_num"><span>6</span>人</div>
+          <div class="item_num"><span class="missnum"></span>人</div>
           <div class="item_title">缺考人数</div>
         </div>
         <div class="section_item">
-          <div class="item_num"><span>6</span>科</div>
+          <div class="item_num"><span class="subjectnum"></span>科</div>
           <div class="item_title">科目数量</div>
         </div>
         <div class="section_item">
-          <div class="item_num"><span>600</span>分</div>
+          <div class="item_num"><span class="maxscore"></span>分</div>
           <div class="item_title">最高分</div>
         </div>
         <div class="section_item">
-          <div class="item_num"><span>512</span>分</div>
+          <div class="item_num"><span class="avgscore"></span>分</div>
           <div class="item_title">平均分</div>
         </div>
         <div class="section_item" style="margin-right: 0">
-          <div class="item_num"><span>456</span>分</div>
+          <div class="item_num"><span class="mixscore"></span>分</div>
           <div class="item_title">最低分</div>
         </div>
       </div>
@@ -64,7 +64,7 @@
       <div class="echarts_result">
         <div>上图统计结果表示：</div>
         <div class="echarts_result_content">
-          <span style="background-color: #ff5d41"></span>满分人数最多科目：英语
+          <span style="background-color: #ff5d41"></span>满分人数最多科目：<span class="mfnummax"></span>
         </div>
       </div>
     </div>
@@ -79,13 +79,13 @@
       <div class="echarts_result">
         <div>上图统计结果表示：</div>
         <div class="echarts_result_content">
-          <span style="background-color: #5c99ff"></span>优秀率最高的科目：英语
+          <span style="background-color: #5c99ff"></span>优秀率最高的科目：<span class="yx"></span>
         </div>
         <div
           class="echarts_result_content"
           style="margin-top: 0; padding-top: 0"
         >
-          <span style="background-color: #ff5f56"></span>优秀率最高的科目：英语
+          <span style="background-color: #ff5f56"></span>及格率最低的科目：<span class="jg"></span>
         </div>
       </div>
       <h3 class="section_title_3">2.3 各科实考人数、缺考人数分析</h3>
@@ -94,14 +94,14 @@
         <div>上图统计结果表示：</div>
         <div class="echarts_result_content">
           <span style="background-color: #5c99ff"></span
-          >实考人数最多的科目：英语
+          >实考人数最多的科目：<span class="sk"></span>
         </div>
         <div
           class="echarts_result_content"
           style="margin-top: 0; padding-top: 0"
         >
           <span style="background-color: #ff5d41"></span
-          >缺考人数最多的科目：英语
+          >缺考人数最多的科目：<span class="qk"></span>
         </div>
       </div>
     </div>
@@ -126,8 +126,8 @@
             <th class="w12mm">标准差</th>
           </tr>
         </thead>
-        <tbody>
-          <tr>
+        <tbody class="tbody">
+          <!-- <tr>
             <td><div class="my_cell">语文</div></td>
             <td><div class="my_cell">5</div></td>
             <td><div class="my_cell">4%</div></td>
@@ -182,7 +182,7 @@
             <td><div class="my_cell">5</div></td>
             <td><div class="my_cell">4%</div></td>
             <td><div class="my_cell">4%</div></td>
-          </tr>
+          </tr> -->
         </tbody>
       </table>
     </div>