修复轨迹模式下评卷数问题

stmms-web/src/main/webapp/static/mark-new/js/modules/mark-status.js

@@ -115,7 +115,7 @@ MarkStatus.prototype.render = function(status) {
             this.blockProgress.find('#marked-percent').html(markedPercent + '%');
         }
 
-        if (status.totalCount > 0 && status.totalCount == status.markedCount) {
+        if (status.totalCount > 0 && status.leftCount == 0) {
             this.markControl.context.isFinish = true;
         }
     }

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

@@ -76,7 +76,7 @@ MarkStatus.prototype.init = function(option) {
 
 MarkStatus.prototype.checkTopCount = function(task) {
     //任务限额提示
-    if (task != undefined && task.previous != true && this.status != undefined && this.status.topCount > 0 && this.status.markedCount >= this.status.topCount && this.ignoreTopCount != true) {
+    if (task != undefined && task.previous != true && this.status != undefined && this.status.topCount > 0 && this.status.personCount >= this.status.topCount && this.ignoreTopCount != true) {
         this.popover.show();
     } else {
         this.popover.hide();
@@ -86,14 +86,15 @@ MarkStatus.prototype.checkTopCount = function(task) {
 MarkStatus.prototype.render = function(status) {
     if (status != undefined && status.valid === true) {
         var topCount = status.topCount;
-        this.topStatus.find('#mark-count').html(status.personCount);
-
+        this.topStatus.find('#mark-count').html(status.markedCount);
+        this.topStatus.find('#person-count').html(status.personCount);
         //大题进度信息区域
         if (this.blockProgress != undefined) {
             var totalCount = status.totalCount;
             var markedCount = status.markedCount;
             var exceptionCount = status.exceptionCount;
-            var leftCount = totalCount > (markedCount + exceptionCount) ? (totalCount - markedCount - exceptionCount) : 0;
+            var personCount = status.personCount;
+            var leftCount = leftCount;
             var markedPercent = totalCount > 0 ? new Number((totalCount - leftCount) * 100 / totalCount).toFixed(0) : '0';
             if (markedPercent == '100' && leftCount > 0) {
                 markedPercent = '99';
@@ -108,12 +109,13 @@ MarkStatus.prototype.render = function(status) {
               }
             this.blockProgress.find('#total-count').html(totalCount);
             this.blockProgress.find('#marked-count').html(markedCount);
+            this.blockProgress.find('#person-count').html(personCount);
             this.blockProgress.find('#todo-count').html(leftCount);
             this.blockProgress.find('#exception-count').html(exceptionCount);
             this.blockProgress.find('#marked-percent').html(markedPercent + '%');
         }
 
-        if (status.totalCount > 0 && status.totalCount == status.markedCount) {
+        if (status.totalCount > 0 && status.leftCount == 0) {
             this.markControl.context.isFinish = true;
         }
     }
@@ -130,6 +132,7 @@ MarkStatus.prototype.status_dom = '<p class="text">\
 MarkStatus.prototype.progress_dom = '<p class="text">\
 <i>未评<em id="todo-count"></em></i>\
 <i>进度<em id="marked-percent"></em></i>\
+<i>总评<em id="person-count"></em></i>\
 </p>';
 
 MarkStatus.prototype.block_progress_bak_dom = '<p class="text">\
@@ -138,6 +141,7 @@ MarkStatus.prototype.block_progress_bak_dom = '<p class="text">\
 <i>未评<em id="todo-count"></em></i>\
 <i>异常<em id="exception-count"></em></i>\
 <i>进度<em id="marked-percent"></em></i>\
+<i>总评<em id="person-count"></em></i>\
 </p>';
 
 MarkStatus.prototype.popover_dom = '<div class="warning-popover">\