Merge branch 'master' of http://119.23.72.7/sunlong_v5/note-library

resources/views/web/prints.blade.php

@@ -33,11 +33,20 @@
         if($(".edit-con").height()==280){
         if($(".edit-con").height()==280){
             $(".print").css({"height":"301px"})
             $(".print").css({"height":"301px"})
         }
         }
-        $(".huabuitem[type='6'],.huabuitem[type='7']").each(function(){
+        $(".huabuitem[type='5'],.huabuitem[type='6'],.huabuitem[type='7']").each(function(){
             var urlo_=$(this).css("backgroundImage").replace('url(','').replace(')','');
             var urlo_=$(this).css("backgroundImage").replace('url(','').replace(')','');
             $(this).css({"background":""})
             $(this).css({"background":""})
             $(this).html("<img src='"+urlo_.substring(1,urlo_.length-1)+"' />");
             $(this).html("<img src='"+urlo_.substring(1,urlo_.length-1)+"' />");
-            $(this).find("img").css({width:"100%",height:"100%"})
+            if($(this).attr("name")=="yiweimait"){
+                var max_width=$(this).width();
+                var width_=$(this).find("img").width();
+                if(width_>max_width){
+                    width_=max_width
+                }
+                $(this).find("img").css({height:"100%",width:width_});
+            }else{
+                $(this).find("img").css({width:"100%",height:"100%"})
+            }
         })
         })
         setTimeout(function(){
         setTimeout(function(){
             window.print();
             window.print();