Merge remote-tracking branch 'origin/stmms_ft_dev' into test_20181225

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

@@ -97,8 +97,8 @@
 				<th>是否上传</th>
 				<th>是否违纪</th>
 				<th>标记卷类型</th>
-				<th>阅卷账号</th>
-				<th>阅卷姓名</th>
+<!-- 				<th>阅卷账号</th> -->
+<!-- 				<th>阅卷姓名</th> -->
 				<th>查看图片</th>
 			</tr>
 		</thead>
@@ -187,8 +187,8 @@
                         违纪<br>
                     </c:if>
 				</td>
-				<td>${student.markLogin}</td>
-				<td>${student.markName}</td>
+<%-- 				<td ><div style="width:120px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;" title="${student.markLogin}">${student.markLogin}</div></td> --%>
+<%-- 				<td>${student.markName}</td> --%>
 				<td>
 					<a class="sheet-link" href="##" data-sheet-url="${student.sheetUrlString}" data-answer-url="<c:if test="${student.answerUrl!=null}">${cardServer}${student.answerUrl}</c:if>" data-title="${student.examNumber}&nbsp;&nbsp;${student.name}&nbsp;&nbsp;客观总分${student.objectiveScoreString}&nbsp;&nbsp;主观总分${student.subjectiveScoreString}&nbsp;&nbsp;全卷总分${student.totalScoreString}">原图</a>
 <%-- 					<a class="track-link" href="##" data-image-url="${ctx}/admin/exam/track?studentId=${student.id}" data-title="${student.examNumber}&nbsp;&nbsp;${student.name}">阅卷轨迹</a> --%>

stmms-web/src/main/webapp/static/mark-track/js/modules/mark-board.js

@@ -11,10 +11,7 @@ function MarkBoard(option) {
 	this.needConfirm = option.needConfirm === true ? true : false;
 	this.autoSubmit = option.autoSubmit === false ? false : true;
 	this.enableSkip = option.enableSkip === true ? true : false;
-    //显分板上是否显示合分样式
-    this.showObjectScoreAndSubjectScore = option.showTotalScore === true ? true : false;
-    
-	this.init();
+	this.init(this.markControl.option.forceSpecialTag);
 	this.markControl.on('task.get.before', this, function(event, context, eventObject) {
 		this.task = undefined;
 		this.stepList = undefined;
@@ -84,7 +81,7 @@ function MarkBoard(option) {
     });
 }
 
-MarkBoard.prototype.init = function() {
+MarkBoard.prototype.init = function(forceSpecialTag) {
 	var self = this;
 	this.stepBoard = getDom(this.step_board_dom, this.markControl).appendTo(this.markControl.container.centerContainer);
 	this.stepBoard.height(this.markControl.container.centerContent.height());
@@ -100,6 +97,10 @@ MarkBoard.prototype.init = function() {
 	this.stepBoard.find('.task-submit-button').click(this, function(event) {
 		self.onTaskSubmit();
 	});
+	//给分板上是否显示全零分
+	if(forceSpecialTag===true){
+		this.stepBoard.find('.all-zero-button').attr("type","hidden");
+	}
 	this.stepBoard.find('.all-zero-button').click(this, function(event) {
 		self.allZeroSubmit();
 	});
@@ -128,15 +129,6 @@ MarkBoard.prototype.init = function() {
 			self.refreshTrack();
 		}
 	});
-    var dom5 = this.stepBoard.find(".sublist");
-    var dom6 = this.stepBoard.find(".newSubListCss");
-    if(this.showObjectScoreAndSubjectScore){
-      dom6.show();
-      dom5.hide();
-    }else {
-      dom6.hide();
-      dom5.show();
-    }
 
 }
 
@@ -181,13 +173,9 @@ MarkBoard.prototype.render = function(task) {
 
 		if(task.markFinish === true) {
 			this.stepBoard.find('#total-score').html(task.totalScore + '');
-            this.stepBoard.find('#subject-score').html(task.totalScore);
-            this.stepBoard.find('#ObjectiveAndSubjectScore').html((task.totalScore+task.objectiveScore) + '');
  
 		} else {
 			this.stepBoard.find('#total-score').html('');
-            this.stepBoard.find('#subject-score').html('');
-            this.stepBoard.find('#ObjectiveAndSubjectScore').html(task.objectiveScore);
 		}
 
 		for( var i in task.markStepList) {
@@ -390,10 +378,6 @@ MarkBoard.prototype.updateTotalScore = function() {
 		this.task.markFinish = finish;
 		this.stepBoard.find('#total-score').html(totalScore);
 		
-        this.stepBoard.find('#subject-score').html(totalScore);
-        var ObjectiveAndSubjectScore = this.task.totalScore+this.task.objectiveScore;
-        this.stepBoard.find('#ObjectiveAndSubjectScore').html(ObjectiveAndSubjectScore);
-
 	}
 }
 
@@ -447,10 +431,9 @@ MarkBoard.prototype.onTaskSubmit = function() {
 }
 
 MarkBoard.prototype.step_board_dom = '<div class="span3 mark-steps"><div class="step-board">\
-	<div class="newSubListCss"><span class="fraction" style="margin-right: 10px;">主观分<i class="red" id="subject-score"></i></span>\
-	<span class="fraction">总分<i class="red" id="ObjectiveAndSubjectScore"></i></span></div>\
 	<div class="sublist"><p class="fraction">总分 <i id="total-score">5</i></p></div>\
-<div class="button"><input type="submit" value="全零分" class="btn1 all-zero-button"/>\
+<div class="button">\
+<input type="submit" value="全零分" class="btn1 all-zero-button"/>\
 <input type="submit" value="提&nbsp;交" class="btn2 task-submit-button"/></div>\
 <div class="step-list"><div class="number"><ul></ul></div></div>\
 <div class="score_board"><div class="score"><ul></ul></div></div>\