Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mapper/config/mybatis-config.xml

@@ -6,6 +6,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
         <setting name="callSettersOnNulls" value="true"/>
-        <setting name="logImpl" value="STDOUT_LOGGING" />
+        <!--<setting name="logImpl" value="STDOUT_LOGGING" />-->
     </settings>
 </configuration>
\ No newline at end of file

src/main/resources/static/index.html

@@ -79,7 +79,6 @@
         <!-- Logo -->
         <a href="index.html" class="logo" style="line-height: 50px;">
             <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><span><img src="newTheme/dist/img/logo.jpg" style="width:25px;height:25px;"></span></span>
             <!-- logo for regular state and mobile devices -->
             <span class="logo-lg">
                 <img src="newTheme/dist/img/logo.jpg" style="width:25px;height:25px;">

src/main/resources/static/views/tagPrint/tagPrint.js

@@ -209,7 +209,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     var LODOP = getLodop();
                     LODOP = getLodop(document.getElementById('LODOP1'), document.getElementById('LODOP_EM'));
                     if (!LODOP) { alert("请先安装控件！"); return; }
-                    // LODOP.SET_LICENSES("民软网(www.minsoft.cn)", "158703810611011350109107113120", "", "");
+                    LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
                     //初始化
                     LODOP.PRINT_INIT("打印封口签");
                     //设置纸张大小
@@ -217,7 +217,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     LODOP.SET_PRINT_PAGESIZE(1, "80mm", "50mm", "");
                     // LODOP.SET_PRINT_STYLE("FontName", "黑体");
                     //设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】
-                    LODOP.ADD_PRINT_BARCODE(15,9, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.substring(0,8));
+                    LODOP.ADD_PRINT_BARCODE(15,9, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
                     LODOP.SET_PRINT_STYLEA(0, "FontSize", 14);
                     LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
 
@@ -238,8 +238,8 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
                     LODOP.SET_PRINT_STYLEA(0, "FontSize", 15);
 
-                    // LODOP.PREVIEW();
-                    LODOP.PRINT();
+                    LODOP.PREVIEW();
+                    // LODOP.PRINT();
                 })
             })
         };