Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27658 -r27665
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27658)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27665)
@@ -720,14 +720,20 @@
 	height:40px !important;
 	border-top: 1px solid #ccc;
 	border-bottom: 1px solid #ccc;
-	display: flex;
-    align-items: center;
+	display: table;
 }
 
 .remark-box .box .noticetitle{
 	color: red;
 	margin: 0 10px;
+	display: table-cell;
+    vertical-align: middle;
+	width: 85px;
 }
+.remark-box .box .notice{
+	display: table-cell;
+    vertical-align: middle;
+}
 </style>   
 
 
@@ -751,7 +757,7 @@
 						<a href="javascript:void(0)" onclick='loadTousseImage();'>查看包图片</a>
 					</div>
 				   </div>
-				   <div id="tousseOrMaterialImageDiv" style="overflow: auto;display: flex;align-items: center; justify-content: center;position: relative;">
+				   <div id="tousseOrMaterialImageDiv" style="overflow: auto;display:table-cell;vertical-align:middle;text-align: center;position: relative;">
 						<img id="tousseOrMaterialImage" style="vertical-align:middle;text-align:center;position: absolute;"/>
 				   </div>
 			</div>
Index: ssts-web/src/main/webapp/log/loggrid.js
===================================================================
diff -u -r27662 -r27665
--- ssts-web/src/main/webapp/log/loggrid.js	(.../loggrid.js)	(revision 27662)
+++ ssts-web/src/main/webapp/log/loggrid.js	(.../loggrid.js)	(revision 27665)
@@ -226,7 +226,7 @@
         handler: resetSearchCondition
     };
     var tbar,tbar1_array,tbar2_array;
-    if(window.screen.width < 1280){
+    if(window.screen.width >= 1024 && window.screen.width < 1280){
         tbar= [
             deleteAllPart,
             '-',
@@ -236,11 +236,11 @@
             {text: '开始日期:'},
             startDatePart,
             {text: '结束日期:'},
-            endDatePart,
-            {text: '用户姓名:'},
-            userNamePart
+            endDatePart
         ];
         tbar1_array = [
+            {text: '用户姓名:'},
+            userNamePart,
             {text: '操作描述:'},
             operationDescriptionPart,
             {text: '操作类型:'},