Browse Source

修复登录错误提示;侧边栏打开隐藏状态栏改为不隐藏;评卷时间闪烁问题

ting.yin 5 years ago
parent
commit
f9867bd5ee

+ 6 - 8
stmms-web/src/main/webapp/static/common/login.css

@@ -193,18 +193,16 @@ input:-internal-autofill-selected{
 }
 /*point*/
 .point {
-	height: 16px;
-	line-height: 16px;
-	overflow: hidden;
-	font-size: 12px;
-	padding-left: 21px;
-	margin-top: 16px;
+height: 16px;
+    line-height: 16px;
+    font-size: 12px;
+    margin: 16px 0 0 21px;
+    background: url(../images/error.png) no-repeat 0 50%;
+    padding-left: 28px;
 }
 .point em.error {
 	font-style: normal;
 	color: #FF5F5F;
-	padding-left: 28px;
-	background: url(../images/error.png) no-repeat 0 50%;
 }
 /*btn*/
 .login-btn {

+ 1 - 0
stmms-web/src/main/webapp/static/mark-new/js/mark-control.js

@@ -71,6 +71,7 @@ MarkControl.prototype.initHeaderAndAssistant = function() {
     this.container.markTime.hide();
     this.container.clock = this.container.header.find("#mark-clock");
     this.container.clock.mouseover(this, function(event) {
+    	self.container.markTime[0].style.top = this.offsetTop + this.offsetHeight + 'px';
     	self.container.markTime.show();
     });
     this.container.clock.mouseout(this, function(event) {

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

@@ -42,12 +42,12 @@ function MarkStatus(option) {
         this.status = status;
         this.render(status);
     });
-    this.markControl.on('view.sidebar.open', this, function(event, context, eventObject) {
-        this.blockProgress.hide();
-    });
-    this.markControl.on('view.sidebar.close', this, function(event, context, eventObject) {
-        this.blockProgress.show();
-    });
+//    this.markControl.on('view.sidebar.open', this, function(event, context, eventObject) {
+//        this.blockProgress.hide();
+//    });
+//    this.markControl.on('view.sidebar.close', this, function(event, context, eventObject) {
+//        this.blockProgress.show();
+//    });
 }
 
 MarkStatus.prototype.init = function(option) {