Merge branch 'dev_190520' of http://git.qmth.com.cn/luoshi/stmms-ft into dev_190520

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubjectTeacher.java

@@ -114,9 +114,9 @@ public class ReportSubjectTeacher implements Serializable {
     private Double avgScore;
 
     /**
-     * 相对平均分
+     * 平均相对分
      */
-    @ExcelField(title = "相对平均分", align = 2, sort = 120)
+    @ExcelField(title = "平均相对分", align = 2, sort = 120)
     @Column(name = "relative_avg_score")
     private Double relativeAvgScore;
 

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

@@ -73,7 +73,19 @@ function MarkBoard(option) {
             } else if (code == 80 && this.enableSkip) {
                 //P键，跳过当前任务
                 this.markControl.trigger('task.pass.success');
-            }else if (code == 37) {
+            }
+        }
+    });
+    this.markControl.on('key.up', this, function(e, context, event) {
+        var code = event.keyCode;
+        //console.log('key up:' + code);
+        if (this.currentStep != undefined && this.task != undefined) {
+            if (code == 32) {
+                //空格键提交步骤分
+                this.onNumberSubmit();
+                event.preventDefault();
+                return false;
+            } else if (code == 37) {
                 //←按键，切换到上一个步骤
                 if (this.currentStep.number > 1) {
                     this.resetCurrentStep();
@@ -92,18 +104,6 @@ function MarkBoard(option) {
             }
         }
     });
-    this.markControl.on('key.up', this, function(e, context, event) {
-        var code = event.keyCode;
-        //console.log('key up:' + code);
-        if (this.currentStep != undefined && this.task != undefined) {
-            if (code == 32) {
-                //空格键提交步骤分
-                this.onNumberSubmit();
-                event.preventDefault();
-                return false;
-            }
-        }
-    });
 
 }
 

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

@@ -83,9 +83,9 @@ function MarkBoard(option) {
             }
         }
     });
-	this.markControl.on('key.down', this, function(e, context, event) {
+	this.markControl.on('key.up', this, function(e, context, event) {
         var code = event.keyCode;
-        //console.log('key down:' + code);
+        //console.log('key up:' + code);
         var self = this;
         if (this.currentStep != undefined && this.task != undefined) {
         	if (code == 37) {