Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css
===================================================================
diff -u -r26864 -r31245
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css (.../styleForWaitList.css) (revision 26864)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/styleForWaitList.css (.../styleForWaitList.css) (revision 31245)
@@ -180,7 +180,7 @@
.wait_item .th{ position:absolute; top:50px; height:49px; width:935px}
.wait_item .th td{ font-family:"微软雅黑"; font-size:22px; color:#676767; text-align:center; line-height:49px; padding:0 5px}
.wait_item .th td a{color:#676767;}
-.wait_item .th td .arrow{ background:url(arrow.gif) no-repeat 90px 14px; padding-right:20px;}
+.wait_item .th td .arrow{ background:url(arrow.gif) no-repeat 135px 14px; padding-right:20px;}
.wait_item .th td .down{ background-position:90px -20px;}
.wait_item .scroll{ position:absolute; top:101px; width:950px; height:800px; left:-8px; overflow-y:scroll}
.wait_item .scroll td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; height:69px; font-family:"微软雅黑"; font-size:24px; color:#666; padding:0 5px}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r31242 -r31245
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 31242)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 31245)
@@ -383,24 +383,25 @@
top: 0;
}
.add-form .operator{
- left: 410px;
+ left: 400px;
top: 0;
}
.add-form .recyclingTime{
- left: 800px;
+ left: 806px;
top: 0;
}
.add-form .depart{
left: 25px;
top: 70px;
}
.add-form .appType{
- left: 410px;
+ left: 400px;
top: 70px;
}
.add-form .applyTime{
- left: 800px;
+ left: 760px;
top: 70px;
+ width: 420px;
}
.add-form .remark{
width:1100px;
@@ -447,7 +448,7 @@
}
.communicationUserName {
top: 138px;
- left: 822px;
+ left: 828px;
}
.departmentTemplate{
right: 365px;
@@ -514,7 +515,7 @@
回收时间
科室
类型
- 最后修改时间
+ 最后修改时间
@@ -719,13 +720,13 @@
var height = 1440 - body_height;
$('.mbody').css({'width':'1920px','height':'1440px'});
$('.add-form .name').css({'top':'40px','left':'30px'});
- $('.add-form .operator').css({'top':'40px','left':'410px'});
- $('.add-form .recyclingTime').css({'top':'40px','left':'780px'});
+ $('.add-form .operator').css({'top':'40px','left':'390px'});
+ $('.add-form .recyclingTime').css({'top':'40px','left':'785px'});
$('.add-form .depart').css({'top':'130px','left':'30px'});
- $('.add-form .appType').css({'top':'130px','left':'410px'});
- $('.add-form .applyTime').css({'top':'130px','left':'780px'});
+ $('.add-form .appType').css({'top':'130px','left':'390px'});
+ $('.add-form .applyTime').css({'top':'130px','left':'740px'});
$('.add-form .remark').css({'top':'220px','left':'30px'});
- $('.add-form .communicationUserName').css({'top':'220px','left':'780px'});
+ $('.add-form .communicationUserName').css({'top':'220px','left':'808px'});
$('#divElement').css({'right':'220px','top':'420px'});
$('.data-table').css({'width':'1160px','height':(813-height)+'px','top':'600px'});
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r31242 -r31245
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 31242)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 31245)
@@ -116,7 +116,7 @@
padding-left:4px; padding-right:30px; border:1px solid #333333;
background:url(xjt.png) no-repeat right center;
}
-#divselect{width:300px; margin:0px 190px auto; position:relative; z-index:10000;}
+#divselect{width:300px; margin:0px 230px auto; position:relative; z-index:10000;}
#divselect cite{width:250px;}
#divselect ul{width:284px;max-height:700px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;}
#divselect ul li{height:60px; line-height:60px;}
@@ -130,14 +130,14 @@
#divStatusSelect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
#divStatusSelect ul li a:hover{background-color:#CCC;}
-#divTousseGroup{width:180px; margin:-52px 480px auto; position:relative; z-index:10000;}
+#divTousseGroup{width:180px; margin:-52px 515px auto; position:relative; z-index:10000;}
#divTousseGroup cite{width:180px;}
#divTousseGroup ul{width:230px;max-height:700px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;}
#divTousseGroup ul li{height:60px; line-height:60px;}
#divTousseGroup ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
#divTousseGroup ul li a:hover{background-color:#CCC;}
-#rememberRecycleUser{width:212px; margin:-50px 490px auto; position:relative; z-index:10000;}
+#rememberRecycleUser{width:212px; margin:-50px 515px auto; position:relative; z-index:10000;}
#rememberCheckBox{
width: 60px;
height: 35px;
@@ -1861,10 +1861,10 @@