Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r25412 -r25414
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 25412)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 25414)
@@ -171,7 +171,8 @@
padding:8px 0px;
border:1px solid #ddd;
}
-
+/*Annie* 材料统计*/
+#materials{margin-left:20px;font-size:20px;color:red;}
.clds-box .box .w11{ width:380px;}
.clds-box .box .w22{ width:190px}
.clds-box .box .w33{ width:190px;}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r25412 -r25414
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 25412)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 25414)
@@ -25,10 +25,17 @@
function getTousseMaterial(){
var sumTotal =0;
- var BElement = document.createElement('B');
+ var BElement = document.createElement('b');
var insertText = document.createTextNode(tousseName);
BElement.appendChild(insertText);
document.getElementById("tousseNameID").appendChild(BElement);
+ var BElements = document.createElement('b');
+ BElements.setAttribute("id", "materials");
+ BElements.innerText = "材料汇总: ";
+ document.getElementById("tousseNameID").appendChild(BElements);
+ var materials = document.createElement('b');
+ materials.setAttribute("id", "SumTotal");
+ document.getElementById("materials").appendChild(materials);
var params = "{tousseName:'" + tousseName + "',tousseDefinitionID:'"+tousseDefinitionID+"'}";
TousseDefinitionTableManager.getTousseIncludeMaterialsWithOutDisposableGoods(params,function(result){
var json = JSON.parse(result);
@@ -263,8 +270,8 @@