Merge remote-tracking branch 'origin/master' into ljh

config/env.json

 {
 {
-    "apiApiHost":"http://10.168.31.142:8060/api",
-    "fileApiUrl":"http://10.168.31.142:80/upload/factory",
-    "visionUrl":"https://console.jomalls.com"
+   "apiApiHost":"http://10.168.31.142:8060/api",
+   "fileApiUrl":"http://10.168.31.142:80/upload/factory",
+   "visionUrl":"https://console.jomalls.com"
 }
 }
 
 

package.json

@@ -2,7 +2,7 @@
   "name": "JomallProductionAssistant",
   "name": "JomallProductionAssistant",
   "productName": "JomallProductionAssistant",
   "productName": "JomallProductionAssistant",
   "description": "",
   "description": "",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "private": true,
   "private": true,
   "scripts": {
   "scripts": {
     "serve": "vue-cli-service serve",
     "serve": "vue-cli-service serve",

src/views/design/head/index.vue

@@ -260,7 +260,7 @@ export default {
           bus.$emit("busEmit", {
           bus.$emit("busEmit", {
             type: "sendFile",
             type: "sendFile",
             value: res.data,
             value: res.data,
-            size: { width: 35, height: 39 },
+            // size: { width: this.detail.mssWidth || 500, height: this.detail.mssHeight || 500 },
           });
           });
         }
         }
 
 

src/views/design/head/printDialog.vue

@@ -299,7 +299,7 @@ export default {
       // 获取图片的宽高
       // 获取图片的宽高
       let w = image.clientWidth; // 图片宽
       let w = image.clientWidth; // 图片宽
       let h = image.clientHeight; // 图片高
       let h = image.clientHeight; // 图片高
-      console.log(w,h,'w,h');
+      console.log(w, h, "w,h");
       const x = relativeX;
       const x = relativeX;
       const y = relativeY;
       const y = relativeY;
       const r = this.imgList[0].r;
       const r = this.imgList[0].r;
@@ -375,7 +375,12 @@ export default {
       const imgFileName = this.imgList[0].fileName;
       const imgFileName = this.imgList[0].fileName;
       let position = ""; // 位置
       let position = ""; // 位置
       let size = ""; // 图像大小
       let size = ""; // 图像大小
-      position = `${x},${y}`;
+      if (Number(x) < 0 || Number(y) < 0) {
+        position = `"${x},${y}"`;
+      } else {
+        position = `${x}${y}`;
+      }
+
       size = `${w}${h}`;
       size = `${w}${h}`;
       console.log(position, size);
       console.log(position, size);
       await this.sendCmd(imgFileName, size, position, r);
       await this.sendCmd(imgFileName, size, position, r);