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

css/section_1.css

@@ -35,7 +35,7 @@
     padding: 3mm;
     background-color: #F5F7F9;
 }
-.echarts_result_content>span {
+.echarts_result_content:nth-child(1) {
     display: inline-block;
     margin-right: 2mm;
     width: 2mm;

js/index.js

@@ -2,7 +2,7 @@ $(function () {
   function loadSectionHtml(sectionsData) {
     var loadHtmlArr = [
       // "cover",  //封面
-      // "preface",  //前言
+      "preface",  //前言
       "section_1",
       // "section_2",
       // "section_3",

js/preface.js

@@ -1,4 +1,59 @@
 $(function() {
+  function getGradeName (gradeid) {
+    let gradename = "";
+    if (gradeid == 1) {
+      gradename = "一年级";
+    } else if (gradeid == 2) {
+      gradename = "二年级";
+    } else if (gradeid == 3) {
+      gradename = "三年级";
+    } else if (gradeid == 4) {
+      gradename = "四年级";
+    } else if (gradeid == 5) {
+      gradename = "五年级";
+    } else if (gradeid == 6) {
+      gradename = "六年级";
+    } else if (gradeid == 7) {
+      gradename = "七年级";
+    } else if (gradeid == 8) {
+      gradename = "八年级";
+    } else if (gradeid == 9) {
+      gradename = "九年级";
+    } else if (gradeid == 10) {
+      gradename = "高一";
+    } else if (gradeid == 11) {
+      gradename = "高二";
+    } else if (gradeid == 12) {
+      gradename = "高三";
+    }
+    return gradename;
+  };
+  // 考试类型 10期末20期中30月考40周考
+  var examTypeInfo = [
+  {
+    label: "期末",
+    value: 10
+  },
+  {
+    label: "期中",
+    value: 20
+  },
+  {
+    label: "月考",
+    value: 30
+  },
+  {
+    label: "周考",
+    value: 40
+  }
+];
+function getExamTypeName (type) {
+  let info = examTypeInfo.filter((v) => v.value === type);
+  if (info.length > 0) {
+    return info[0].label;
+  }
+  return "";
+};
   // outerHeight(true) 高度为 height+margin+padding+border
   var parameter = $(".preface_html_root").data("page-params");
   console.log("preface:parameter", JSON.parse(parameter));

js/section_1.js

@@ -16,7 +16,7 @@ $(function () {
       maxscore.push(item.maxscore);
       minscore.push(item.minscore);
       avgscore.push(item.avgscore);
-    }
+    } 
     var curseries = [{
       name: "满分",
       type: "bar",
@@ -479,14 +479,59 @@ $(function () {
   $(".section1 .maxscore").text(parameter.maxscore);
   $(".section1 .avgscore").text(parameter.avgscore);
   $(".section1 .mixscore").text(parameter.mixscore);
-  var xAxis_data = [];
+  var xAxis_data = [],html = "";
+  var mfclass = {
+    num: 0,
+    classname: ""
+  },yxclass = {
+    num: 0,
+    classname: ""
+  },jgclass = {
+    num: 100,
+    classname: ""
+  },skclass = {
+    num: 0,
+    classname: ""
+  },qkclass = {
+    num: 0,
+    classname: ""
+  };
   for(var i=0;i<parameter.subjects.length;i++){
     var item = parameter.subjects[i];
-    var str = "";
     if(item.subjectname == "总分"){
       item.subjectname = "全部班级";
     }else{
-      str += `<tr>
+      if (mfclass.num < item.score) {
+        mfclass = {
+          num: item.score,
+          classname: item.subjectname
+        };
+      }
+      if (yxclass.num < item.yxrate) {
+        yxclass = {
+          num: item.yxrate,
+          classname: item.subjectname
+        };
+      }
+      if (jgclass.num > item.jgrate) {
+        jgclass = {
+          num: item.jgrate,
+          classname: item.subjectname
+        };
+      }
+      if (skclass.num < item.stunum) {
+        skclass = {
+          num: item.stunum,
+          classname: item.subjectname
+        };
+      }
+      if (qkclass.num < item.missnum) {
+        qkclass = {
+          num: item.missnum,
+          classname: item.subjectname
+        };
+      }
+      html += `<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>
@@ -501,14 +546,16 @@ $(function () {
       <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);
+  $(".section1 .mfclass").text(mfclass.classname);
+  $(".section1 .yxclass").text(yxclass.classname);
+  $(".section1 .jgclass").text(jgclass.classname);
+  $(".section1 .skclass").text(skclass.classname);
+  $(".section1 .qkclass").text(qkclass.classname);
+  $(".section1 .tbody").html(html);
   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/section_1.html

@@ -64,7 +64,7 @@
       <div class="echarts_result">
         <div>上图统计结果表示：</div>
         <div class="echarts_result_content">
-          <span style="background-color: #ff5d41"></span>满分人数最多科目：<span class="mfnummax"></span>
+          <span style="background-color: #ff5d41"></span>满分人数最多科目：<span class="mfclass"></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 class="yx"></span>
+          <span style="background-color: #5c99ff"></span>优秀率最高的科目：<span class="yxclass"></span>
         </div>
         <div
           class="echarts_result_content"
           style="margin-top: 0; padding-top: 0"
         >
-          <span style="background-color: #ff5f56"></span>及格率最低的科目：<span class="jg"></span>
+          <span style="background-color: #ff5f56"></span>及格率最低的科目：<span class="jgclass"></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>
+          >实考人数最多的科目：<span class="skclass"></span>
         </div>
         <div
           class="echarts_result_content"
           style="margin-top: 0; padding-top: 0"
         >
           <span style="background-color: #ff5d41"></span
-          >缺考人数最多的科目：<span class="qk"></span>
+          >缺考人数最多的科目：<span class="qkclass"></span>
         </div>
       </div>
     </div>
@@ -127,62 +127,6 @@
           </tr>
         </thead>
         <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>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <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>
-            <td><div class="my_cell">英语</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <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>
-            <td><div class="my_cell">数学</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <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>
-            <td><div class="my_cell">政治</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <td><div class="my_cell">5</div></td>
-            <td><div class="my_cell">4%</div></td>
-            <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> -->
         </tbody>
       </table>
     </div>