1
0
ting.yin 1 год назад
Родитель
Сommit
66c06156d3

+ 5 - 8
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/libraryList.jsp

@@ -246,14 +246,11 @@
                 </c:if>
             </td>
             <td> ${result.headerLoginName} </td>
-	            		<td>
-			            	<c:if test="${result.headerTime!=null}">
-			                    <fmt:formatDate value="${result.headerTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
-			                </c:if>
-			                <c:if test="${result.headerTime==null}">
-			                    &nbsp;
-			                </c:if>
-			            </td>
+			<td>
+				<c:if test="${result.headerLoginName!=null && result.headerTime!=null}">
+					<fmt:formatDate value="${result.headerTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</c:if>
+			</td>
             <td>
                 <c:if test="${result.status.value==1 || result.status.value==3 ||result.status.value==5 ||result.status.value==6}">
                    <%--  <c:if test="${examType=='MULTI_MEDIA'}">

+ 9 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/paperList.jsp

@@ -249,6 +249,8 @@
     var subjectData = subjectString.split(","); 
     var scoreString = "${totalScoreList}";
     var scoreData = scoreString.split(",");
+    var colorList = ['#7cb5ec', '#90ed7d', '#f7a35c', '#8085e9', '#f15c80', '#e4d354', '#2b908f', '#f45b5b', '#91e8e1', '#058DC7', '#50B432', '#ED561B', '#DDDF00', '#24CBE5', '#64E572', '#FF9655', '#FFF263', '#6AF9C4', '#D47F00', '#00FFFF', '#D4FF55', '#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE', '#DB843D', '#92A8CD', '#A47D7C', '#7FBF55',
+                     '#a5c2d5', '#cbab4f', '#76a871', '#a56f8f', '#c12c44', '#9f7961', '#76a871', '#6f83a5', '0f4fb8', '106dcf', '#b3d74c', '#74aae3', '#5cdec6', '#3526de', '#9d65ee', '#a8b3e3', '#6bc1b7', '549ee2', '#6e98d6'];
     myChart.setOption({
     	title: {
             text: '科目总分统计'
@@ -285,6 +287,13 @@
 				  label: {
     		            show: true,
     		            position: 'top',
+    		          },
+    		      itemStyle:{
+    		            normal:{
+    		              color:function(params){
+    		                return colorList[params.dataIndex%colorList.length]
+    		              }
+    		            }
     		          }
     		    }
     		  ]