xhkjedu
/
schoolReportPDF
Watch 8
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

临界生

wzl_h
wangzl 2 years ago
parent
a96c388177
commit
1f42754dfa
5 changed files with 53 additions and 15 deletions
Unified View Show Diff Stats
  1. 2
    2
      css/scoreAnalysis/section_2_lin.css
  2. 41
    4
      js/scoreAnalysis/section_2_lin.js
  3. 2
    2
      js/section_2.js
  4. 1
    1
      notes.txt
  5. 7
    6
      sections/scoreAnalysis/section_2_lin.html

css/scoreAnalysis/section_2_lin_all.css → css/scoreAnalysis/section_2_lin.css View File

1 
-.section_2_lin_all .echarts_result_content {
1 
+.section_2_lin .echarts_result_content {
2 
   margin-top: 3mm;
 2 
   margin-top: 3mm;
3 
   padding: 2mm 3mm;
 3 
   padding: 2mm 3mm;
4 
   line-height: 7mm;
 4 
   line-height: 7mm;
5 
   background-color: #fff;
 5 
   background-color: #fff;
6 
 }
 6 
 }
7 
-.section_2_lin_all .echarts_result_content .dot {
7 
+.section_2_lin .echarts_result_content .dot {
8 
   display: inline-block;
 8 
   display: inline-block;
9 
   margin-right: 2mm;
 9 
   margin-right: 2mm;
10 
   width: 2mm;
 10 
   width: 2mm;

js/scoreAnalysis/section_2_lin_all.js → js/scoreAnalysis/section_2_lin.js View File

120 
         }
 120 
         }
121 
       ]
 121 
       ]
122 
     };
 122 
     };
123 
-    var myEcharts = echarts.init(document.querySelector(".section_2_lin_all #classCriticalRankEcharts"));
123 
+    var myEcharts = echarts.init(document.querySelector(".section_2_lin #classCriticalRankEcharts"));
124 
     myEcharts.clear();
 124 
     myEcharts.clear();
125 
     myEcharts.setOption(option);
 125 
     myEcharts.setOption(option);
126 
   }
 126 
   }
245 
         }
 245 
         }
246 
       ]
 246 
       ]
247 
     };
 247 
     };
248 
-    var myEcharts = echarts.init(document.querySelector(".section_2_lin_all #classCriticalScoreEcharts"));
248 
+    var myEcharts = echarts.init(document.querySelector(".section_2_lin #classCriticalScoreEcharts"));
249 
     myEcharts.clear();
 249 
     myEcharts.clear();
250 
     myEcharts.setOption(option);
 250 
     myEcharts.setOption(option);
251 
   }
 251 
   }
252 
-  var parameter = $(".section_2_html_root .section_2_lin_all_html_root").data("page-params");
252 
+  var parameter = $(".section_2_html_root .section_2_lin_html_root").data("page-params");
253 
   parameter = JSON.parse(parameter);
 253 
   parameter = JSON.parse(parameter);
254 
-  console.log(".section_2_lin_all_html_root:parameter", parameter);
254 
+  var subjectInfo = [];
255 
+  var subjectid_ranktype = {};
256 
+  for(var sid_3 in parameter[3]) {
257 
+    if (sid_3 === "zf") {
258 
+      subjectInfo.unshift({
259 
+        subjectid: sid_3,
260 
+        subjectname: "全科"
261 
+      });
262 
+    } else {
263 
+      subjectInfo.push({
264 
+        subjectid: sid_3,
265 
+        subjectname: parameter[3][sid_3].subjectname
266 
+      });
267 
+    }
268 
+    if (!subjectid_ranktype[sid_3]) {
269 
+      subjectid_ranktype[sid_3] = {};
270 
+    }
271 
+    subjectid_ranktype[sid_3][3] = parameter[3][sid_3];
272 
+  }
273 
+  for(var sid_4 in parameter[4]) {
274 
+    if (!subjectid_ranktype[sid_4]) {
275 
+      subjectid_ranktype[sid_4] = {};
276 
+    }
277 
+    subjectid_ranktype[sid_4][4] = parameter[4][sid_4];
278 
+  }
279 
+  console.log("subjectid_ranktype", subjectid_ranktype);
280 
+  var singleRootHtml = "";
281 
+  $.each(subjectInfo, function(s_index, s_item) {
282 
+    if (s_index === 0) {
283 
+      console.log("s_index", s_index);
284 
+      console.log("s_item", s_item);
285 
+
286 
+
287 
+
288 
+
289 
+    }
290 
+  });
291 
+  $(".section_2_lin_root").html(singleRootHtml);
255 
   initClassCriticalRankEcharts();
 292 
   initClassCriticalRankEcharts();
256 
   initClassCriticalScoreEcharts();
 293 
   initClassCriticalScoreEcharts();
257 
 });
 294 
 });

+ 2
- 2
js/section_2.js View File

6 
     // "section_2_class_single",
6 
     // "section_2_class_single",
7 
     // "section_2_level",
7 
     // "section_2_level",
8 
     // "section_2_part",
8 
     // "section_2_part",
9 
-    "section_2_lin_all",
9 
+    "section_2_lin",
10 
     "section_2_lin_single",
10 
     "section_2_lin_single",
11 
     // "section_2_excellent_all"
11 
     // "section_2_excellent_all"
12 
   ];
12 
   ];
59 
         cjfx: parameter.cjfx,
59 
         cjfx: parameter.cjfx,
60 
         djfx: parameter.djfx
60 
         djfx: parameter.djfx
61 
       }));
61 
       }));
62 
-    } else if (htmlName === "section_2_lin_all") {
62 
+    } else if (htmlName === "section_2_lin") {
63 
       $(".section_2.score_analysis_root ." + htmlName + "_html_root").data("page-params", JSON.stringify({
63 
       $(".section_2.score_analysis_root ." + htmlName + "_html_root").data("page-params", JSON.stringify({
64 
         3: djfx_data[3],
64 
         3: djfx_data[3],
65 
         4: djfx_data[4]
65 
         4: djfx_data[4]

+ 1
- 1
notes.txt View File

8 
         班级成绩对比-单科 section_2_class_single
8 
         班级成绩对比-单科 section_2_class_single
9 
         分数等级对比-全科（分数等级对比-单科）section_2_level
9 
         分数等级对比-全科（分数等级对比-单科）section_2_level
10 
         分数分段对比-全科（分数分段对比-单科）section_2_part
10 
         分数分段对比-全科（分数分段对比-单科）section_2_part
11 
-        临界生对比-全科 （按名次）临界生对比-全科 （按分数）section_2_lin_all
11 
+        临界生对比-全科 （按名次）临界生对比-全科 （按分数）section_2_lin
12 
         临界生对比-单科 （按名次）临界生对比-单科 （按分数）section_2_lin_single
12 
         临界生对比-单科 （按名次）临界生对比-单科 （按分数）section_2_lin_single
13 
         优秀生、学困生对比-全科 section_2_excellent_all
13 
         优秀生、学困生对比-全科 section_2_excellent_all
14 
         优秀生、学困生对比-单科 section_2_excellent_single
14 
         优秀生、学困生对比-单科 section_2_excellent_single

sections/scoreAnalysis/section_2_lin_all.html → sections/scoreAnalysis/section_2_lin.html View File

5 
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
 5 
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 6 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
7 
   <title>校本PDF报告-第二章 成绩分析</title>
 7 
   <title>校本PDF报告-第二章 成绩分析</title>
8 
-  <link rel="stylesheet" href="../../css/scoreAnalysis/section_2_lin_all.css">
8 
+  <link rel="stylesheet" href="../../css/scoreAnalysis/section_2_lin.css">
9 
 </head>
 9 
 </head>
10 
 <body>
 10 
 <body>
11 
-  <div class="page_root section_2_lin_all">
11 
+  <!-- <div class="section_2_lin_root"></div> -->
12 
+  <div class="page_root section_2_lin">
12 
     <h2 class="section_title_2">4.临界生对比</h2>
 13 
     <h2 class="section_title_2">4.临界生对比</h2>
13 
     <h3 class="section_title_3">4.1 全科临界生对比</h3>
 14 
     <h3 class="section_title_3">4.1 全科临界生对比</h3>
14 
     <h4 class="section_title_4">4.1.1 各班临界生对比分析</h4>
 15 
     <h4 class="section_title_4">4.1.1 各班临界生对比分析</h4>
21 
     </div>
 22 
     </div>
22 
     <div id="classCriticalRankEcharts" style="margin: 0 4mm 4mm; height: 120mm"></div>
 23 
     <div id="classCriticalRankEcharts" style="margin: 0 4mm 4mm; height: 120mm"></div>
23 
   </div>
 24 
   </div>
24 
-  <div class="page_root section_2_lin_all">
25 
+  <div class="page_root section_2_lin">
25 
     <h4 class="section_title_4">4.1.2 各班名次整体分析</h4>
 26 
     <h4 class="section_title_4">4.1.2 各班名次整体分析</h4>
26 
     <table border="1" class="my_table">
 27 
     <table border="1" class="my_table">
27 
       <thead>
 28 
       <thead>
61 
       </div>
 62 
       </div>
62 
     </div>
 63 
     </div>
63 
   </div>
 64 
   </div>
64 
-  <div class="page_root section_2_lin_all">
65 
+  <div class="page_root section_2_lin">
65 
     <div class="echarts_result">
 66 
     <div class="echarts_result">
66 
       <div>按分数统计</div>
 67 
       <div>按分数统计</div>
67 
       <div class="echarts_result_content">
 68 
       <div class="echarts_result_content">
71 
     </div>
 72 
     </div>
72 
     <div id="classCriticalScoreEcharts" style="margin: 0 4mm 4mm; height: 120mm"></div>
 73 
     <div id="classCriticalScoreEcharts" style="margin: 0 4mm 4mm; height: 120mm"></div>
73 
   </div>
 74 
   </div>
74 
-  <div class="page_root section_2_lin_all">
75 
+  <div class="page_root section_2_lin">
75 
     <h4 class="section_title_4">4.1.3 各班分数整体分析</h4>
 76 
     <h4 class="section_title_4">4.1.3 各班分数整体分析</h4>
76 
     <table border="1" class="my_table">
 77 
     <table border="1" class="my_table">
77 
       <thead>
 78 
       <thead>
111 
       </div>
 112 
       </div>
112 
     </div>
 113 
     </div>
113 
   </div>
 114 
   </div>
114 
-  <script src="../../js/scoreAnalysis/section_2_lin_all.js"></script>
115 
+  <script src="../../js/scoreAnalysis/section_2_lin.js"></script>
115 
 </body>
 116 
 </body>
116 
 </html>
 117 
 </html>

Write Preview
Loading…
Cancel
Save