Ver Fonte

bug 修复

lilei há 3 anos atrás
pai
commit
1502eee1cd
2 ficheiros alterados com 2 adições e 11 exclusões
  1. 2 2
      src/components/tools/UserMenu.vue
  2. 0 9
      src/libs/JGPrint.js

+ 2 - 2
src/components/tools/UserMenu.vue

@@ -8,7 +8,7 @@
       <!-- 通知 -->
       <notice-icon class="action"/>
       <!-- 皮肤设置 -->
-      <!-- <a-popover trigger="click">
+      <a-popover trigger="click">
         <div slot="content" :style="{width: fontSize=='small'?'200px':'250px'}">
           <a-form-model :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
             <a-form-model-item label="主题">
@@ -40,7 +40,7 @@
           <a-icon style="font-size: 15px; padding: 0 3px 0 0" type="skin" />
           设置
         </span>
-      </a-popover> -->
+      </a-popover>
       <a-dropdown>
         <span class="action ant-dropdown-link user-dropdown-menu">
           <!-- <a-avatar class="avatar" size="small" :src="avatar==''?defaultAvatar:avatar"/> -->

+ 0 - 9
src/libs/JGPrint.js

@@ -151,11 +151,6 @@ export const jGPrint = function (data, type, printerType) {
     LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
     // LODOP.SET_PRINT_MODE('POS_BASEON_PAPER', true) // 可使输出以纸张边缘为基点
     if (type == 'preview') { //  预览
-      // blobToBaseByPdf(data,function(result){
-      //     LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', result.split('base64,')[1])
-      //     LODOP.SET_PRINT_PAGESIZE(3,2090,65,"");
-      //     LODOP.PREVIEW()
-      // })
       const dlen = data.data.length
       if(dlen > 1){
         LODOP.SET_SHOW_MODE("HIDE_PBUTTIN_PREVIEW",1);//隐藏打印按钮
@@ -169,10 +164,6 @@ export const jGPrint = function (data, type, printerType) {
         LODOP.PRINT_INIT("")
         LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data.data[i])
         LODOP.SET_PRINT_PAGESIZE(3, 2090, (i==dlen-1)?50:0, '')
-        // LODOP.SET_PRINT_MODE("CATCH_PRINT_STATUS",true);
-        // LODOP.On_Return=function(TaskID,Value){
-        //   console.log(TaskID,Value)
-        // }
         LODOP.PRINT()
       }
     }