chrislee 11 月之前
父節點
當前提交
2615b2db4b

文件差異過大導致無法顯示
+ 1 - 0
src/utils/print-js/encodeToGb2312.min.js


+ 8 - 7
src/utils/print-js/tsc.js

@@ -150,18 +150,18 @@ export function createNew () {
     jpPrinter.addCommand(data)
   }
 
-  jpPrinter.setBox = function (x_start, y_start, x_end, y_end, thickness) { // 绘制方框
-    data = 'BOX ' + x_start + ',' + y_start + ',' + x_end + ',' + y_end + ',' + thickness + '\r\n'
+  jpPrinter.setBox = function (xStart, yStart, xEnd, yEnd, thickness) { // 绘制方框
+    data = 'BOX ' + xStart + ',' + yStart + ',' + xEnd + ',' + yEnd + ',' + thickness + '\r\n'
     jpPrinter.addCommand(data)
   }
 
-  jpPrinter.setErase = function (x_start, y_start, x_width, y_height) { // 清除指定区域的数据
-    data = 'ERASE ' + x_start + ',' + y_start + ',' + x_width + ',' + y_height + '\r\n'
+  jpPrinter.setErase = function (xStart, yStart, xWidth, yHeight) { // 清除指定区域的数据
+    data = 'ERASE ' + xStart + ',' + yStart + ',' + xWidth + ',' + yHeight + '\r\n'
     jpPrinter.addCommand(data)
   }
 
-  jpPrinter.setReverse = function (x_start, y_start, x_width, y_height) { // 将指定的区域反相打印
-    data = 'REVERSE ' + x_start + ',' + y_start + ',' + x_width + ',' + y_height + '\r\n'
+  jpPrinter.setReverse = function (xStart, yStart, xWidth, yHeight) { // 将指定的区域反相打印
+    data = 'REVERSE ' + xStart + ',' + yStart + ',' + xWidth + ',' + yHeight + '\r\n'
     jpPrinter.addCommand(data)
   }
 
@@ -194,7 +194,7 @@ export function createNew () {
       console.log(temp)
       for (var j = 0; j < width; ++j) {
         for (var k = 0; k < 32; k += 4) {
-          if (res.data[temp] == 0 && res.data[temp + 1] == 0 && res.data[temp + 2] == 0 && res.data[temp + 3] == 0) {
+          if (res.data[temp] === 0 && res.data[temp + 1] === 0 && res.data[temp + 2] === 0 && res.data[temp + 3] === 0) {
             pointList.push(1)
           } else {
             pointList.push(0)
@@ -205,6 +205,7 @@ export function createNew () {
       time++
       temp = res.data.length - width * 32 * time
     }
+    // eslint-disable-next-line no-redeclare
     for (var i = 0; i < pointList.length; i += 8) {
       var p = pointList[i] * 128 + pointList[i + 1] * 64 + pointList[i + 2] * 32 + pointList[i + 3] * 16 + pointList[i + 4] * 8 + pointList[i + 5] * 4 + pointList[i + 6] * 2 + pointList[i + 7]
       command.push(p)

+ 4 - 4
src/views/modules/production/components/print-label.vue

@@ -60,7 +60,7 @@
 
 <script>
 import {createNew} from '@/utils/print-js/tsc'
-import {hexStringToByteArray, getDataView} from '@/utils/print-js/function'
+import {getDataView} from '@/utils/print-js/function'
 export default {
   name: 'print-label',
   data () {
@@ -68,7 +68,7 @@ export default {
       visible: false,
       activeNames: ['1', '2'],
       dataForm: { },
-      conModel: '',
+      conModel: 'USB',
       isPortModel: true,
       connected: false,
       /** 网口配置 */
@@ -83,7 +83,7 @@ export default {
         socketPort: 8003,
         printData: ''
       },
-      models: [],
+      models: [{ 'value': 'USB', 'label': 'USB', 'disabled': false }],
       dataRule: { }
     }
   },
@@ -97,7 +97,7 @@ export default {
         mapNumber: row.mapNumber ? row.mapNumber : '/',
         cnt: row.cnt ? row.cnt : 0
       }
-      this.models.push({ 'value': 'USB', 'label': 'USB', 'disabled': false })
+      // this.models.push({ 'value': 'USB', 'label': 'USB', 'disabled': false })
     },
     validateField (type) {
       this.$refs.dataForm.validateField(type)

部分文件因文件數量過多而無法顯示