分段改为百分比显示；增加多数量下的统计图表的显示

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubject.jsp

@@ -45,7 +45,7 @@
 				<th>最高分</th>
 				<th>最低分</th>
 				<th>及格人数</th>
-				<th>及格率(%)</th>
+				<th>及格率</th>
 			</tr>
 		</thead>
 		<tbody>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectClass.jsp

@@ -102,6 +102,13 @@
                     excellentRates.push($(this).text()*100);
                 }
             });
+            var width = 800;
+            if(i>40){
+            	width = 18*i;
+            }
+            if(i = $('tbody tr').length-1){
+            	$("#echart-content").width(width+"px") ;
+            }
         });
 
         var title = '';
@@ -142,7 +149,7 @@
             xAxis: {
                 axisLabel: {
                     interval:0,
-                    rotate:40
+                    rotate:60
                 },
                 data: classs
             },
@@ -221,7 +228,7 @@
     });
 </script>
 <div id="echart-view-content" class="container-fluid" style="display:none" align="center">
-    <div id="echart-content" style="width: 100%;height:520px;"/>
+    <div id="echart-content" style="width: 100%;height:700px;"/>
 </div>
 </body>
 </html>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectCollege.jsp

@@ -108,6 +108,13 @@ $("#export-button").click(function(){
                     excellentRates.push($(this).text()*100);
                 }
             });
+            var width = 800;
+            if(i>40){
+            	width = 18*i;
+            }
+            if(i = $('tbody tr').length-1){
+            	$("#echart-content").width(width+"px") ;
+            }
         });
 
         var title = '';
@@ -148,7 +155,7 @@ $("#export-button").click(function(){
             xAxis: {
                 axisLabel: {
                     interval:0,
-                    rotate:40
+                    rotate:60
                 },
                 data: colleges
             },
@@ -213,7 +220,7 @@ $("#export-button").click(function(){
 </script>
 
 <div id="echart-view-content" class="container-fluid" style="display:none" align="center">
-    <div id="echart-content" style="width: 100%;height:520px;"/>
+    <div id="echart-content" style="width: 100%;height:700px;"/>
 </div>
 </body>
 </html>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectGroup.jsp

@@ -139,6 +139,13 @@ $('#subject-select').trigger('change');
                     sds.push($(this).text());
                 }
             });
+            var width = 800;
+            if(i>40){
+            	width = 18*i;
+            }
+            if(i = $('tbody tr').length-1){
+            	$("#echart-content").width(width+"px") ;
+            }
         });
 
         var title = '';
@@ -179,7 +186,7 @@ $('#subject-select').trigger('change');
             xAxis: {
                 axisLabel: {
                     interval: 0,
-                    rotate: 40
+                    rotate: 60
                 },
                 data: groupNames
             },
@@ -239,7 +246,7 @@ $('#subject-select').trigger('change');
 </script>
 
 <div id="echart-view-content" class="container-fluid" style="display:none" align="center">
-    <div id="echart-content" style="width: 100%;height:520px;"/>
+    <div id="echart-content" style="width: 100%;height:700px;"/>
 </div>
 </body>
 </html>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectQuestion.jsp

@@ -150,6 +150,14 @@ $("#export-button").click(function(){
                     fullScoreRates.push($(this).text()*100);
                 }
             });
+            var width = 800;
+            if(i>40){
+            	width = 15*i;
+            }
+            if(i = $('tbody tr').length-1){
+            	$("#echart-content").width(width+"px") ;
+            }
+            
         });
 
         var title = '';
@@ -190,7 +198,7 @@ $("#export-button").click(function(){
             xAxis: {
                 axisLabel: {
                     interval:0,
-                    rotate:40
+                    rotate:60
                 },
                 data: questions
             },
@@ -241,7 +249,7 @@ $("#export-button").click(function(){
     });
 </script>
 <div id="echart-view-content" class="container-fluid" style="display:none" align="center">
-    <div id="echart-content" style="width: 100%;height:520px;"/>
+    <div id="echart-content" style="width: 800;height:700px;"/>
 </div>
 </body>
 </html>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectRange.jsp

@@ -72,21 +72,21 @@
             </td>
             <td>${subject.level}</td>
             <td>${subject.count0_49}</td>
-            <td><fmt:formatNumber type="number" value="${subject.percent0_49}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${subject.percent0_49 * 100}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${subject.count50_59}</td>
-            <td><fmt:formatNumber type="number" value="${subject.percent50_59}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${subject.percent50_59 * 100}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${subject.count60_69}</td>
-            <td><fmt:formatNumber type="number" value="${subject.percent60_69}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${subject.percent60_69 * 100}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${subject.count70_79}</td>
-            <td><fmt:formatNumber type="number" value="${subject.percent70_79}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${subject.percent70_79 * 100}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${subject.count80_89}</td>
-            <td><fmt:formatNumber type="number" value="${subject.percent80_89}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${subject.percent80_89 * 100}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${subject.count90_100}</td>
-            <td><fmt:formatNumber type="number" value="${subject.percent90_100}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${subject.percent90_100 * 100}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${subject.lt60}</td>
-            <td><fmt:formatNumber type="number" value="${subject.percent_lt60}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${subject.percent_lt60 * 100}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${subject.mte60}</td>
-            <td><fmt:formatNumber type="number" value="${subject.percent_mte60}" pattern="0.00" maxFractionDigits="2"/></td>
+            <td><fmt:formatNumber type="number" value="${subject.percent_mte60 * 100}" pattern="0.00" maxFractionDigits="2"/></td>
             <td>${subject.totalCount}</td>
             <td><a href="#" onclick="viewEcharts('${subject.subjectCode}','${subject.subjectName}',${subject.percent0_49},${subject.percent50_59},${subject.percent60_69},${subject.percent70_79},${subject.percent80_89},${subject.percent90_100})">分段图</a>
             </td>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectTeacher.jsp

@@ -118,6 +118,13 @@ $("#export-button").click(function(){
                     relativeAvgScore.push($(this).text());
                 }
             });
+            var width = 800;
+            if(i>40){
+            	width = 18*i;
+            }
+            if(i = $('tbody tr').length-1){
+            	$("#echart-content").width(width+"px") ;
+            }
         });
 
         var title = '';
@@ -158,7 +165,7 @@ $("#export-button").click(function(){
             xAxis: {
                 axisLabel: {
                     interval:0,
-                    rotate:40
+                    rotate:60
                 },
                 data: tearchers
             },
@@ -235,7 +242,7 @@ $("#export-button").click(function(){
     });
 </script>
 <div id="echart-view-content" class="container-fluid" style="display:none" align="center">
-    <div id="echart-content" style="width: 100%;height:520px;"/>
+    <div id="echart-content" style="width: 100%;height:700px;"/>
 </div>
 </body>
 </html>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectTeacherClass.jsp

@@ -94,6 +94,13 @@ $("#export-button").click(function(){
                     relativeAvgScore.push($(this).text());
                 }
             });
+            var width = 800;
+            if(i>40){
+            	width = 18*i;
+            }
+            if(i = $('tbody tr').length-1){
+            	$("#echart-content").width(width+"px") ;
+            }
         });
 
         var title = '';
@@ -134,7 +141,7 @@ $("#export-button").click(function(){
             xAxis: {
                 axisLabel: {
                     interval:0,
-                    rotate:40
+                    rotate:60
                 },
                 data: classs
             },
@@ -159,7 +166,7 @@ $("#export-button").click(function(){
                 type: 'bar',
                 data: avgScores
             },{
-                name: '相对平均分',
+                name: '平均相对分',
                 type: 'line',
                 yAxisIndex : 1,
                 data: relativeAvgScore
@@ -179,7 +186,7 @@ $("#export-button").click(function(){
 
 </script>
 <div id="echart-view-content" class="container-fluid" style="display:none" align="center">
-    <div id="echart-content" style="width: 100%;height:520px;"/>
+    <div id="echart-content" style="width: 100%;height:700px;"/>
 </div>
 </body>
 </html>