Explorar o código

修复评卷状态栏换行问题

ting.yin %!s(int64=6) %!d(string=hai) anos
pai
achega
fae708308d

+ 2 - 2
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubject.java

@@ -141,9 +141,9 @@ public class ReportSubject implements Serializable {
     private String discriminationLevel;
 
     /**
-     * 高低分段统计
+     * 一分一段分段统计
      */
-    @Column(name = "score_range", nullable = true)
+    @Column(name = "score_range", nullable = true, columnDefinition = "text")
     private String scoreRange;
 
     /**

+ 2 - 2
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/model/ReportSubjectClass.java

@@ -143,9 +143,9 @@ public class ReportSubjectClass implements Serializable {
     private String discriminationLevel;
 
     /**
-     * 高低分段统计
+     * 一分一段分段统计
      */
-    @Column(name = "score_range", nullable = true)
+    @Column(name = "score_range", nullable = true,columnDefinition = "text")
     private String scoreRange;
 
     /**

+ 12 - 16
stmms-web/src/main/webapp/static/mark-new/css/style.css

@@ -806,17 +806,12 @@ i,em {
 .center-content .header {
 	background: #5d6d7d;
 	color: #fff;
-	height: 21px;
-	padding: 10px;
+	padding: 0 10px;
 }
 
 .center-content .header .text {
-	color: #fff;
-	font-size: 16px;
-	font-weight: bold;
-	text-overflow: ellipsis;
-	white-space: nowrap;
 	float: left;
+    padding: 10px 0;
 }
 
 .center-content .header .text i {
@@ -834,12 +829,12 @@ i,em {
 }
 
 .center-content .header .btn {
-	background: #cbd0d3;
-	padding: 3px 6px 3px 6px;
-	margin: -3px 2px 2px 1px;
-	color: #4b555e;
-	font-weight: bold;
-	float: left;
+    background: #cbd0d3;
+    padding: 3px 6px 3px 6px;
+    margin: 0px 3px 0 0;   
+    color: #4b555e;
+    font-weight: bold;
+    float: left;
 }
 /*.center-content .header .fraction{ font-size:36px; font-family:Arial, Helvetica, sans-serif; font-weight:bold; color:#008f58; text-align:right; float:right;}
 */
@@ -849,9 +844,10 @@ i,em {
 }
 
 .center-content .tips {
-	word-wrap: break-word;
-	text-align: left;
-	float: right;
+    word-wrap: break-word;
+    text-align: left;
+    float: right;
+    margin-top: 6px;
 }
 /*.center-content .tips .help{ width:25%;color:#fff; padding:0 5px 0 5px; float:left;}
 */

+ 14 - 18
stmms-web/src/main/webapp/static/mark-track/css/style.css

@@ -832,19 +832,14 @@ i,em {
 }
 
 .center-content .header {
-	background: #5d6d7d;
-	color: #fff;
-	height: 21px;
-	padding: 10px;
+    background: #5d6d7d;
+    color: #fff;
+    padding: 0 10px;
 }
 
 .center-content .header .text {
-	color: #fff;
-	font-size: 16px;
-	font-weight: bold;
-	text-overflow: ellipsis;
-	white-space: nowrap;
 	float: left;
+    padding: 10px 0;
 }
 
 .center-content .header .text i {
@@ -862,12 +857,12 @@ i,em {
 }
 
 .center-content .header .btn {
-	background: #cbd0d3;
-	padding: 3px 6px 3px 6px;
-	margin: -3px 2px 2px 1px;
-	color: #4b555e;
-	font-weight: bold;
-	float: left;
+    background: #cbd0d3;
+    padding: 3px 6px 3px 6px;
+    margin: 0px 3px 0 0;   
+    color: #4b555e;
+    font-weight: bold;
+    float: left;
 }
 /*.center-content .header .fraction{ font-size:36px; font-family:Arial, Helvetica, sans-serif; font-weight:bold; color:#008f58; text-align:right; float:right;}
 */
@@ -877,9 +872,10 @@ i,em {
 }
 
 .center-content .tips {
-	word-wrap: break-word;
-	text-align: left;
-	float: right;
+    word-wrap: break-word;
+    text-align: left;
+    float: right;
+    margin-top: 6px;
 }
 /*.center-content .tips .help{ width:25%;color:#fff; padding:0 5px 0 5px; float:left;}
 */