Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js
===================================================================
diff -u -r26854 -r26864
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 26854)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 26864)
@@ -17,35 +17,12 @@
var actualHeight = window.screen.availHeight;
var windowH = window.screen.height;
var windowW = window.screen.width;
-
- if(windowW == 1024 && windowH == 768){
- $(".mbody_02,.mbody,#mbody").addClass("on_1024");
- }
-
if(windowW == 1280 && windowH == 1024){
$(".mbody_02,.mbody,#mbody").addClass("on");
}
-
- if(windowW == 1280 && windowH == 720){
- $(".mbody_02,.mbody").addClass("on1280_7");
+ if(windowW == 1024 && windowH == 768){
+ $(".mbody_02,.mbody,#mbody").addClass("on_1024");
}
-
- if(windowW == 1280 && windowH == 800){
- $(".mbody_02,.mbody").addClass("on1280_8");
- }
-
- if(windowW == 1366 && windowH == 768){
- $(".mbody_02,.mbody").addClass("on_1366");
- }
-
- if(windowW == 1600 && windowH == 900){
- $(".mbody_02,.mbody").addClass("on_1600");
- }
-
- if(windowW == 1920 && windowH == 1080){
- $(".mbody_02,.mbody").addClass("on_1920");
- }
-
if(_actualWidth != undefined){
actualWidth = _actualWidth;
}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r26854 -r26864
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 26854)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 26864)
@@ -457,7 +457,7 @@
recyclingRecordStr += '' + result.data[i].packingTaskSerialNumber + ' | ';
}
- recyclingRecordStr+=''
+ recyclingRecordStr+=' | '
+' '+departName
+' | '+dateObjFormat(result.data[i].recyclingTime)
+' | '+result.data[i].operator
@@ -1697,7 +1697,7 @@
申请时间
|
- 申请人 |
+ 申请人 |
|