Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r17015 -r17169
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 17015)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 17169)
@@ -2050,8 +2050,8 @@
var offsetTop = 100;
var heightExtra = 10;
if(resolution == '1980'){
- width = 1080;
- height = 770;
+ width = 1380;
+ height = 830;
}
var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r16131 -r17169
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 16131)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 17169)
@@ -139,10 +139,22 @@
}
-
+
+
- Q
- W
- E
@@ -153,7 +165,9 @@
- I
- O
- P
- - A
+
+
+ - A
- S
- D
- F
@@ -162,7 +176,9 @@
- J
- K
- L
- - Z
+
+
+ - Z
- X
- C
- V
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r17111 -r17169
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 17111)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 17169)
@@ -219,19 +219,30 @@
.selblog ul.tag_options li.open_hover{color:#F00}
.selblog ul.tag_options li.open_selected{color:#900}
-.add-bao{ width:915px; margin:0 auto; border:1px solid #ccc; background:url(bao_bg.jpg) repeat-x; padding:20px 0; margin-top:20px}
-.add-bao .num{ width:850px; margin:0 auto}
+.add-bao{ width:975px; margin:0 auto; border:1px solid #ccc; background:url(bao_bg.jpg) repeat-x; padding:20px 0; margin-top:2px; margin-left: 75px;}
+.add-bao .num{ width:990px; margin:0 auto; margin-left: 1px;}
.add-bao .num li{ float:left; width:94px; margin-bottom:8px;}
.add-bao .num li a{ display:block;background:url(pic_bg.jpg) no-repeat -319px -545px; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:62px; text-align:center; color:#2e6271; margin:0 auto; font-family:Tahoma, Geneva, sans-serif}
.add-bao .num li a:hover{ color:#F00}
+
+.add-bao .num2{ width:990px; margin:0 auto; margin-left: 50px;}
+.add-bao .num2 li{ float:left; width:94px; margin-bottom:8px;}
+.add-bao .num2 li a{ display:block;background:url(pic_bg.jpg) no-repeat -319px -545px; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:62px; text-align:center; color:#2e6271; margin:0 auto; font-family:Tahoma, Geneva, sans-serif}
+.add-bao .num2 li a:hover{ color:#F00}
+
+.add-bao .num3{ width:990px; margin:0 auto; margin-left: 140px;}
+.add-bao .num3 li{ float:left; width:94px; margin-bottom:8px;}
+.add-bao .num3 li a{ display:block;background:url(pic_bg.jpg) no-repeat -319px -545px; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:62px; text-align:center; color:#2e6271; margin:0 auto; font-family:Tahoma, Geneva, sans-serif}
+.add-bao .num3 li a:hover{ color:#F00}
+
.add-bao .search td{ font-size:40px;}
.add-bao .search .input{ background:url(pic_bg.jpg) no-repeat 0 -545px; width:291px; height:62px; line-height:45px; overflow:hidden; padding:0 10px; border:none; font-size:26px;}
.add-bao .search .btn{background:url(pic_bg.jpg) no-repeat -177px -417px; width:143px; height:62px; border:none}
.add-bao .search .btn:hover{ background-position:-177px -480px;}
.add-bao .search table{ margin:0 auto}
.add-bao .title{ width:890px; margin:65px 15px 15px 15px}
.add-bao .list-item{ width:890px; margin:5px 10px 0px 55px}
-.add-bao .list-item li{ float:left; width:400px; padding-right:10px; margin-bottom:3px;}
+.add-bao .list-item li{ float:left; width:400px; padding-right:10px; margin-bottom:6px;}
.add-bao .list-item li a{ background:url(pic_li.jpg) no-repeat 0 0; width:395px; height:54px; line-height:62px; overflow:hidden; padding:0 10px;font-size:22px; display:block}
.num-ten{ width:575px; margin:0 auto; border:1px solid #ccc; background:url(bao_bg.jpg) repeat-x; padding:30px 0; margin-top:20px}