分数等级多个科目显示

js/scoreAnalysis/section_2_excellent.js

@@ -131,8 +131,7 @@ $(function () {
   }
   var parameter = $(".section_2_html_root .section_2_excellent_html_root").data("page-params");
   parameter = JSON.parse(parameter);
-  console.log(".section_2_excellent_html_root:parameter", parameter);
-  
+  // console.log(".section_2_excellent_html_root:parameter", parameter);
   var subjectInfo = [];
   for (var sid in parameter) {
     if (sid === "zf") {
@@ -154,7 +153,7 @@ $(function () {
   $(".section_2_excellent_root").html(singleRootHtml);
   $.each(subjectInfo, function (s_index, s_item) {
     var r_data_item = parameter[s_item.subjectid];
-    console.log("r_data_item", r_data_item);
+    // console.log("r_data_item", r_data_item);
     $(".section_2_excellent_" + s_index + " .subjectname").text(
       r_data_item.subjectname
     );

js/scoreAnalysis/section_2_level.js

@@ -1,6 +1,6 @@
 $(function () {
   //各班等级分析
-  function initclassLevelEcharts(list) {
+  function initclassLevelEcharts(s_index, list) {
     var xAxis_data = [],
       series_data = [],
       legend_data = [],
@@ -61,7 +61,7 @@ $(function () {
         data: levelNumObj[item]
       });
     });
-    showgraphicaldata(xAxis_data, legend_data, levelrangeObj, list);
+    showgraphicaldata(xAxis_data, legend_data, levelrangeObj, s_index, list);
     var option = {
       color: ["#5C99FF", "#ff5f56", "#5EC5C8", "#f1982b", "#6e5eff"],
       animation: false,
@@ -131,12 +131,12 @@ $(function () {
       }, ],
       series: series_data
     };
-    var myEcharts = echarts.init(document.querySelector(".section_2_level #classLevelEcharts"));
+    var myEcharts = echarts.init(document.querySelector(".section_2_level.level_" + s_index + " #classLevelEcharts"));
     myEcharts.clear();
     myEcharts.setOption(option);
   }
   //图表数据
-  function showgraphicaldata(xAxis_data, legend_data, levelrangeObj, list) {
+  function showgraphicaldata(xAxis_data, legend_data, levelrangeObj, s_index, list) {
     //图表数据
     var arr = JSON.parse(JSON.stringify(list));
     var goodTableHeadTr1Html = '<th rowspan="2">班级</th>';
@@ -161,9 +161,9 @@ $(function () {
       });
       goodTableTbodyHtml += '<tr>' + trHtml + '</tr>';
     });
-    $(".section_2_level .goodTableHeadTr1").html(goodTableHeadTr1Html);
-    $(".section_2_level .goodTableHeadTr2").html(goodTableHeadTr2Html);
-    $(".section_2_level .goodTableTbody").html(goodTableTbodyHtml);
+    $(".section_2_level.level_" + s_index + " .goodTableHeadTr1").html(goodTableHeadTr1Html);
+    $(".section_2_level.level_" + s_index + " .goodTableHeadTr2").html(goodTableHeadTr2Html);
+    $(".section_2_level.level_" + s_index + " .goodTableTbody").html(goodTableTbodyHtml);
     var totalObj = {};
     var maxObj = {};
     var minObj = {};
@@ -207,32 +207,32 @@ $(function () {
         }
       }
     });
-    $(".section_2_level.level_0 .result_collect").text("A类" + totalObj['A'].stunum + "人（" + totalObj['A'].sturate + "%），B类" + totalObj['B'].stunum + "人（" + totalObj['B'].sturate + "%），C类" + totalObj['C'].stunum + "人（" + totalObj['C'].sturate + "%），D类" + totalObj['D'].stunum + "人（" + totalObj['D'].sturate + "%），E类" + totalObj['E'].stunum + "人（" + totalObj['E'].sturate + "%）");
-    $(".section_2_level.level_0 .A_collect").text("A类上线率最高的班级：" + $.map(maxObj['A'].classidArr, function (classid) {
+    $(".section_2_level.level_" + s_index + " .result_collect").text("A类" + totalObj['A'].stunum + "人（" + totalObj['A'].sturate + "%），B类" + totalObj['B'].stunum + "人（" + totalObj['B'].sturate + "%），C类" + totalObj['C'].stunum + "人（" + totalObj['C'].sturate + "%），D类" + totalObj['D'].stunum + "人（" + totalObj['D'].sturate + "%），E类" + totalObj['E'].stunum + "人（" + totalObj['E'].sturate + "%）");
+    $(".section_2_level.level_" + s_index + " .A_collect").text("A类上线率最高的班级：" + $.map(maxObj['A'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、') + "，A类上线率最低的班级：" + $.map(minObj['A'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、'));
 
-    $(".section_2_level.level_0 .B_collect").text("B类上线率最高的班级：" + $.map(maxObj['B'].classidArr, function (classid) {
+    $(".section_2_level.level_" + s_index + " .B_collect").text("B类上线率最高的班级：" + $.map(maxObj['B'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、') + "，B类上线率最低的班级：" + $.map(minObj['B'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、'));
 
-    $(".section_2_level.level_0 .C_collect").text("C类上线率最高的班级：" + $.map(maxObj['C'].classidArr, function (classid) {
+    $(".section_2_level.level_" + s_index + " .C_collect").text("C类上线率最高的班级：" + $.map(maxObj['C'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、') + "，C类上线率最低的班级：" + $.map(minObj['C'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、'));
 
-    $(".section_2_level.level_0 .D_collect").text("D类上线率最高的班级：" + $.map(maxObj['D'].classidArr, function (classid) {
+    $(".section_2_level.level_" + s_index + " .D_collect").text("D类上线率最高的班级：" + $.map(maxObj['D'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、') + "，D类上线率最低的班级：" + $.map(minObj['D'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、'));
 
-    $(".section_2_level.level_0 .E_collect").text("E类上线率最高的班级：" + $.map(maxObj['E'].classidArr, function (classid) {
+    $(".section_2_level.level_" + s_index + " .E_collect").text("E类上线率最高的班级：" + $.map(maxObj['E'].classidArr, function (classid) {
       return classObj[classid];
     }).join('、') + "，E类上线率最低的班级：" + $.map(minObj['E'].classidArr, function (classid) {
       return classObj[classid];
@@ -240,8 +240,29 @@ $(function () {
   }
   var parameter = $(".section_2_html_root .section_2_level_html_root").data("page-params");
   parameter = JSON.parse(parameter);
-  var list = $.grep(parameter.djfx, function (item) {
-    return item.ranktype == 1 && item.subjectid == 'zf';
-  })[0].ranks;
-  initclassLevelEcharts(list);
+  // console.log(parameter);
+  var subjectInfo = [];
+  for (var sid in parameter) {
+    if (sid === "zf") {
+      subjectInfo.unshift({
+        subjectid: sid,
+        subjectname: "全科",
+        ranks: parameter[sid].ranks
+      });
+    } else {
+      subjectInfo.push({
+        subjectid: sid,
+        subjectname: parameter[sid].subjectname,
+        ranks: parameter[sid].ranks
+      });
+    }
+  }
+  var singleRootHtml = "";
+  $.each(subjectInfo, function (s_index, s_item) {
+    singleRootHtml += '<div class="page_root section_2_level level_' + s_index + '">' + (s_index === 0 ? '<h2 class="section_title_2">2.分数等级对比</h2>' : '') + '<h3 class="section_title_3">2.' + (s_index + 1) + ' ' + s_item.subjectname + '等级对比</h3><h4 class="section_title_4">2.' + (s_index + 1) + '.1 各班等级分析</h4><div id="classLevelEcharts" style="margin: 0 4mm 4mm; height: 80mm"></div><h4 class="section_title_4">2.' + (s_index + 1) + '.2 各班等级比例分布</h4><table border="1" class="my_table"><thead><tr class="goodTableHeadTr1"></tr><tr class="goodTableHeadTr2"></tr></thead><tbody class="goodTableTbody"></tbody></table><div class="echarts_result"><div>上图各等级上线统计结果为：<span class="result_collect"></span>：</div><div class="echarts_result_content"><div><span class="bg_5699FF"></span><i class="A_collect"></i></div><div><span class="bg_FF5F56"></span><i class="B_collect"></i></div><div><span class="bg_5EC5C8"></span><i class="C_collect"></i></div><div><span class="bg_F1982B"></span><i class="D_collect"></i></div><div><span class="bg_F1982B"></span><i class="E_collect"></i></div></div></div></div>';
+  });
+  $(".section_2_level_root").html(singleRootHtml);
+  $.each(subjectInfo, function (s_index, s_item) {
+    initclassLevelEcharts(s_index, s_item.ranks);
+  });
 });

js/scoreAnalysis/section_2_lin.js

@@ -296,7 +296,7 @@ $(function () {
     }
     subjectid_ranktype[sid_4][4] = parameter[4][sid_4];
   }
-  console.log("subjectid_ranktype", subjectid_ranktype);
+  // console.log("subjectid_ranktype", subjectid_ranktype);
   var singleRootHtml = "";
   $.each(subjectInfo, function (s_index, s_item) {
     singleRootHtml +=
@@ -323,7 +323,7 @@ $(function () {
   $(".section_2_lin_root").html(singleRootHtml);
   $.each(subjectInfo, function (s_index, s_item) {
     var r_data_item = subjectid_ranktype[s_item.subjectid][4];
-    console.log("r_data_item", r_data_item);
+    // console.log("r_data_item", r_data_item);
     // 按名次统计
     $(".section_2_lin_" + s_index + " .subjectname").text(
       r_data_item.subjectname
@@ -365,7 +365,7 @@ $(function () {
     );
     // 按分数统计
     var s_data_item = subjectid_ranktype[s_item.subjectid][3];
-    console.log("s_data_item", s_data_item);
+    // console.log("s_data_item", s_data_item);
     $(".section_2_lin_" + s_index + " .lin_score_num").text(
       s_data_item.linescore
     );

js/section_2.js

@@ -57,10 +57,7 @@ $(function () {
     } else if (htmlName === "section_2_class_single") {
       $(".section_2.score_analysis_root ." + htmlName + "_html_root").data("page-params", JSON.stringify(class_single_arr));
     } else if (htmlName === "section_2_level") {
-      $(".section_2.score_analysis_root ." + htmlName + "_html_root").data("page-params", JSON.stringify({
-        cjfx: parameter.cjfx,
-        djfx: parameter.djfx
-      }));
+      $(".section_2.score_analysis_root ." + htmlName + "_html_root").data("page-params", JSON.stringify(djfx_data[1]));
     } else if (htmlName === "section_2_part") {
       $(".section_2.score_analysis_root ." + htmlName + "_html_root").data("page-params", JSON.stringify({
         cjfx: parameter.cjfx,

sections/scoreAnalysis/section_2_level.html

@@ -8,7 +8,8 @@
     <link rel="stylesheet" href="../../css/scoreAnalysis/section_2_level.css" />
   </head>
   <body>
-    <div class="page_root section_2_level level_0">
+    <div class="section_2_level_root"></div>
+    <!-- <div class="page_root section_2_level level_0">
       <h2 class="section_title_2">2.分数等级对比</h2>
       <h3 class="section_title_3">2.1 全科等级对比</h3>
       <h4 class="section_title_4">2.1.1 各班等级分析</h4>
@@ -43,7 +44,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </div> -->
     <script src="../../js/scoreAnalysis/section_2_level.js"></script>
   </body>
 </html>