修改一些bug

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/InspectedController.java

@@ -75,9 +75,9 @@ public class InspectedController extends BaseExamController {
             @RequestParam(required = false) Double mainEndScore, @RequestParam(required = false) Double questionScore) {
         int examId = getSessionExamId(request);
         Exam exam = examService.findById(examId);
-        if (ExamType.MULTI_MEDIA.equals(exam.getType())) {
-            return "modules/exam/permission";
-        }
+        // if (ExamType.MULTI_MEDIA.equals(exam.getType())) {
+        // return "modules/exam/permission";
+        // }
         WebUser wu = RequestUtils.getWebUser(request);
         query.setExamId(examId);
         List<ExamSubject> subjectList = getExamSubject(examId, wu);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

@@ -185,7 +185,7 @@ public class ReportSubjectRangeController extends BaseExamController {
         }
     }
 
-    @Logging(menu = "客观题统分", type = LogType.UPDATE)
+    @Logging(menu = "科目成绩分析计算", type = LogType.UPDATE)
     @RequestMapping("/report")
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String calculate(HttpServletRequest request, RedirectAttributes redirectAttributes,

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examIndex.jsp

@@ -159,6 +159,9 @@
                                     
                                     <c:if test="${web_user.schoolViewer==true}">
                                         <li><a href="${ctx}/admin/exam/score" target="mainFrame"><i class="icon-search"></i><span data-i18n-text="index.score">成绩查询</span></a></li>
+                                    	<li><a href="${ctx}/admin/exam/reportSubject" target="mainFrame"><i class="icon-signal"></i><span data-i18n-text="index.report.total">总量分析</span></a></li>
+                                        <li><a href="${ctx}/admin/exam/reportSubjectRange" target="mainFrame"><i class="icon-asterisk"></i><span data-i18n-text="index.report.subject">科目分析</span></a></li>
+                                      	<li><a href="${ctx}/admin/operation/log" target="mainFrame"><i class="icon-tasks"></i><span data-i18n-text="index.log">操作日志</span></a></li>
                                     </c:if>
                                     
                                     <c:set var="firstMenu" value="false"/>

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

@@ -129,12 +129,12 @@
             </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'}">
+                   <%--  <c:if test="${examType=='MULTI_MEDIA'}">
                         <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${result.studentId}&groupNumber=${result.groupNumber}" target="_blank">原图</a>
                     </c:if>
-                    <c:if test="${examType!='MULTI_MEDIA'}">
-                      	<a href="${ctx}/web/admin/exam/track/library?libraryId=${result.id}" target="_blank">轨迹图</a>
-                    </c:if>
+                    <c:if test="${examType!='MULTI_MEDIA'}"> --%>
+                      	<a href="${ctx}/web/admin/exam/track/library?libraryId=${result.id}&subjectCode=${result.subjectCode}" target="_blank">轨迹图</a>
+                   <%--  </c:if> --%>
                 </c:if>
                 <c:if test="${result.status.value==1 || result.status.value==5 ||result.status.value==6}">
                     &nbsp;

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/markInfo.jsp

@@ -18,7 +18,9 @@
         <li><a href="${ctx}/admin/exam/arbitrate?subjectCode=${query.code}">仲裁管理</a></li>
         <li><a href="${ctx}/admin/exam/quality?subjectCode=${query.code}">质量监控</a></li>
     </ul>
+     <c:if test="${web_user.schoolAdmin==true}">
     	<div id="main" style="width: 1000px;height:400px;"></div>
+   	</c:if>
 	<form id="searchForm" action="${ctx}/admin/exam/mark" method="post" class="breadcrumb form-search">
 		<input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
 		<input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize }"/>
@@ -112,15 +114,10 @@ var unMarkedCount =${unMarkedCount};
 var finishCount =${finishCount};
 var unFinishCount =${unFinishCount};
 var myChart = echarts.init(document.getElementById('main'));
-var p1=(markedCount+unMarkedCount)==0?0:100*unMarkedCount/(markedCount+unMarkedCount);
-var unMarkedCountTitle="任务待完成"+p1.toFixed(2)+"%";
-var p2= (markedCount+unMarkedCount)==0?0:100*markedCount/(markedCount+unMarkedCount);
-var markedCountTitle="任务已完成"+p2.toFixed(2)+"%";
-
-var p3=(finishCount+unFinishCount)==0?0:100*unFinishCount/(finishCount+unFinishCount);
-var unFinishCountTitle="科目待完成"+p3.toFixed(2)+"%";
-var p4= (finishCount+unFinishCount)==0?0:100*finishCount/(finishCount+unFinishCount);
-var finishCountTitle="科目已完成"+p4.toFixed(2)+"%";
+var unMarkedCountTitle="任务待完成"+unMarkedCount;
+var markedCountTitle="任务已完成"+markedCount;
+var unFinishCountTitle="科目待完成"+unFinishCount;
+var finishCountTitle="科目已完成"+finishCount;
 myChart.setOption({
 	title: [{
         text: '阅卷总进度'
@@ -128,6 +125,10 @@ myChart.setOption({
         text: '科目阅卷进度',
         left: '50%',
      
+    }],
+    tooltip: [{
+        trigger: "item",
+        formatter: "占比:{d}%",
     }],
 	legend: [{
 	    orient: "vertical",
@@ -156,7 +157,7 @@ myChart.setOption({
             alignTo: 'none',
             bleedMargin: 5
         },
-        color:["#db6c69",'#8fc1aa']
+        color:["#7CB5EC",'#FE8463']
     }, {
         type: 'pie',
         radius: '55%',
@@ -171,7 +172,7 @@ myChart.setOption({
             alignTo: 'none',
             bleedMargin: 5
         },
-        color:["#db6c69",'#8fc1aa']
+        color:["#7CB5EC",'#FE8463']
     }]
 })
 

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/scoreList.jsp

@@ -195,7 +195,8 @@
                         <a href="${ctx}/web/admin/exam/track/student?studentId=${student.id}" target="_blank">轨迹图</a>
                     </c:if>
                     <c:if test="${examType=='MULTI_MEDIA'}">
-                        <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${student.id}" target="_blank">原图</a>
+                       <%--  <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${student.id}" target="_blank">原图</a> --%>
+                        <a href="${ctx}/web/admin/exam/track/student?studentId=${student.id}&subjectCode=${student.subjectCode}" target="_blank">轨迹图</a>
                     </c:if>
                 </c:if>
                 <c:if test="${student.packageUrlString!=null && student.packageUrlString!=''}">

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/login.jsp

@@ -33,7 +33,7 @@
             <div class="logo"><img
                     src="${ctxStatic}/images/<c:if test="${indexLogo ==null||indexLogo =='' }">logo@2x.png</c:if><c:if test="${indexLogo !=null }">${indexLogo }</c:if>"/>
             </div>
-            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169武汉启明软件 2012-2020</p></a>
+            <a href="http://www.qmth.com.cn" target="_blank"><p>Copyright &#169启明泰和 2012-2021 v1.3.2</p></a>
         </div>
         <div class="right">
             <div class="title">

stmms-web/src/main/webapp/static/pic-config/css/style.css

@@ -312,7 +312,7 @@ input[type="text"]:focus {
     position: relative;
     width: 100%;
     overflow: hidden;
-    background: #FFF;
+    background: transparent;
     -moz-border-radius: 6px;
     -webkit-border-radius: 6px;
     border-radius: 6px;