Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r29513 -r29516
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 29516)
@@ -10,6 +10,7 @@
+
@@ -150,12 +151,18 @@
var htmlResultCode = "
";
num = tousseArray.length>countOfLI?countOfLI:tousseArray.length;
for(var i = 0 ; i < num ; i++){
+ var textWidth = textSize("22px","微软雅黑",tousseArray[i].tousseName).width || 0;
+ var lineHeight = '';
+ if(textWidth > 360){
+ lineHeight = 27;
+ }else {
+ lineHeight = 54;
+ }
htmlResultCode += "- "
- + tousseArray[i].tousseName + "
";
+ +tousseArray[i].spelling+"','"+tousseArray[i].spelling+"');\">" + tousseArray[i].tousseName + "";
}
if(tousseArray.length < countOfLI){
for(var i = tousseArray.length ; i < countOfLI ; i++){