Commit df3a587f by 朱哲铨

代碼更新

parent b28530b1
...@@ -1313,6 +1313,15 @@ ...@@ -1313,6 +1313,15 @@
"ajv-keywords": "^3.1.0" "ajv-keywords": "^3.1.0"
} }
}, },
"@eggjs/yauzl": {
"version": "2.11.0",
"resolved": "https://registry.npmmirror.com/@eggjs/yauzl/-/yauzl-2.11.0.tgz",
"integrity": "sha512-Jq+k2fCZJ3i3HShb0nxLUiAgq5pwo8JTT1TrH22JoehZQ0Nm2dvByGIja1NYfNyuE4Tx5/Dns5nVsBN/mlC8yg==",
"requires": {
"buffer-crc32": "~0.2.3",
"fd-slicer2": "^1.2.0"
}
},
"@egjs/agent": { "@egjs/agent": {
"version": "2.4.3", "version": "2.4.3",
"resolved": "https://registry.npmmirror.com/@egjs/agent/-/agent-2.4.3.tgz", "resolved": "https://registry.npmmirror.com/@egjs/agent/-/agent-2.4.3.tgz",
...@@ -3361,7 +3370,6 @@ ...@@ -3361,7 +3370,6 @@
"version": "1.2.3", "version": "1.2.3",
"resolved": "https://registry.npmmirror.com/bl/-/bl-1.2.3.tgz", "resolved": "https://registry.npmmirror.com/bl/-/bl-1.2.3.tgz",
"integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
"dev": true,
"requires": { "requires": {
"readable-stream": "^2.3.5", "readable-stream": "^2.3.5",
"safe-buffer": "^5.1.1" "safe-buffer": "^5.1.1"
...@@ -3664,7 +3672,6 @@ ...@@ -3664,7 +3672,6 @@
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmmirror.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz", "resolved": "https://registry.npmmirror.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
"integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
"dev": true,
"requires": { "requires": {
"buffer-alloc-unsafe": "^1.1.0", "buffer-alloc-unsafe": "^1.1.0",
"buffer-fill": "^1.0.0" "buffer-fill": "^1.0.0"
...@@ -3673,20 +3680,17 @@ ...@@ -3673,20 +3680,17 @@
"buffer-alloc-unsafe": { "buffer-alloc-unsafe": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmmirror.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", "resolved": "https://registry.npmmirror.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
"dev": true
}, },
"buffer-crc32": { "buffer-crc32": {
"version": "0.2.13", "version": "0.2.13",
"resolved": "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "resolved": "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
"integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
"dev": true
}, },
"buffer-fill": { "buffer-fill": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmmirror.com/buffer-fill/-/buffer-fill-1.0.0.tgz", "resolved": "https://registry.npmmirror.com/buffer-fill/-/buffer-fill-1.0.0.tgz",
"integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==", "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="
"dev": true
}, },
"buffer-from": { "buffer-from": {
"version": "1.1.2", "version": "1.1.2",
...@@ -4464,6 +4468,32 @@ ...@@ -4464,6 +4468,32 @@
"mime-db": ">= 1.43.0 < 2" "mime-db": ">= 1.43.0 < 2"
} }
}, },
"compressing": {
"version": "1.10.1",
"resolved": "https://registry.npmmirror.com/compressing/-/compressing-1.10.1.tgz",
"integrity": "sha512-XXwUffcVjqv8NGSQu1ttp6eMmuZ3zZEAec28Rt30o/vkXE20jXhowRQ9LXLY4uOgFkxXrNzApLobpam53Dc1AA==",
"requires": {
"@eggjs/yauzl": "^2.11.0",
"flushwritable": "^1.0.0",
"get-ready": "^1.0.0",
"iconv-lite": "^0.5.0",
"mkdirp": "^0.5.1",
"pump": "^3.0.0",
"streamifier": "^0.1.1",
"tar-stream": "^1.5.2",
"yazl": "^2.4.2"
},
"dependencies": {
"iconv-lite": {
"version": "0.5.2",
"resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.5.2.tgz",
"integrity": "sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==",
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
}
}
}
},
"compression": { "compression": {
"version": "1.7.4", "version": "1.7.4",
"resolved": "https://registry.npmmirror.com/compression/-/compression-1.7.4.tgz", "resolved": "https://registry.npmmirror.com/compression/-/compression-1.7.4.tgz",
...@@ -6396,7 +6426,6 @@ ...@@ -6396,7 +6426,6 @@
"version": "1.4.4", "version": "1.4.4",
"resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz", "resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz",
"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
"dev": true,
"requires": { "requires": {
"once": "^1.4.0" "once": "^1.4.0"
} }
...@@ -7210,6 +7239,14 @@ ...@@ -7210,6 +7239,14 @@
"pend": "~1.2.0" "pend": "~1.2.0"
} }
}, },
"fd-slicer2": {
"version": "1.2.0",
"resolved": "https://registry.npmmirror.com/fd-slicer2/-/fd-slicer2-1.2.0.tgz",
"integrity": "sha512-3lBUNUckhMZduCc4g+Pw4Ve16LD9vpX9b8qUkkKq2mgDRLYWzblszZH2luADnJqjJe+cypngjCuKRm/IW12rRw==",
"requires": {
"pend": "^1.2.0"
}
},
"figgy-pudding": { "figgy-pudding": {
"version": "3.5.2", "version": "3.5.2",
"resolved": "https://registry.npmmirror.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz", "resolved": "https://registry.npmmirror.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
...@@ -7378,6 +7415,11 @@ ...@@ -7378,6 +7415,11 @@
"readable-stream": "^2.3.6" "readable-stream": "^2.3.6"
} }
}, },
"flushwritable": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/flushwritable/-/flushwritable-1.0.0.tgz",
"integrity": "sha512-3VELfuWCLVzt5d2Gblk8qcqFro6nuwvxwMzHaENVDHI7rxcBRtMCwTk/E9FXcgh+82DSpavPNDueA9+RxXJoFg=="
},
"follow-redirects": { "follow-redirects": {
"version": "1.5.10", "version": "1.5.10",
"resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.5.10.tgz", "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.5.10.tgz",
...@@ -7539,8 +7581,7 @@ ...@@ -7539,8 +7581,7 @@
"fs-constants": { "fs-constants": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz", "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz",
"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
"dev": true
}, },
"fs-extra": { "fs-extra": {
"version": "7.0.1", "version": "7.0.1",
...@@ -7714,6 +7755,11 @@ ...@@ -7714,6 +7755,11 @@
"hasown": "^2.0.0" "hasown": "^2.0.0"
} }
}, },
"get-ready": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/get-ready/-/get-ready-1.0.0.tgz",
"integrity": "sha512-mFXCZPJIlcYcth+N8267+mghfYN9h3EhsDa6JSnbA3Wrhh/XFpuowviFcsDeYZtKspQyWyJqfs4O6P8CHeTwzw=="
},
"get-stdin": { "get-stdin": {
"version": "6.0.0", "version": "6.0.0",
"resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-6.0.0.tgz", "resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-6.0.0.tgz",
...@@ -10997,8 +11043,7 @@ ...@@ -10997,8 +11043,7 @@
"pend": { "pend": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmmirror.com/pend/-/pend-1.2.0.tgz", "resolved": "https://registry.npmmirror.com/pend/-/pend-1.2.0.tgz",
"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
"dev": true
}, },
"performance-now": { "performance-now": {
"version": "2.1.0", "version": "2.1.0",
...@@ -12703,7 +12748,6 @@ ...@@ -12703,7 +12748,6 @@
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmmirror.com/pump/-/pump-3.0.0.tgz", "resolved": "https://registry.npmmirror.com/pump/-/pump-3.0.0.tgz",
"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
"dev": true,
"requires": { "requires": {
"end-of-stream": "^1.1.0", "end-of-stream": "^1.1.0",
"once": "^1.3.1" "once": "^1.3.1"
...@@ -14318,6 +14362,11 @@ ...@@ -14318,6 +14362,11 @@
"integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==", "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
"dev": true "dev": true
}, },
"streamifier": {
"version": "0.1.1",
"resolved": "https://registry.npmmirror.com/streamifier/-/streamifier-0.1.1.tgz",
"integrity": "sha512-zDgl+muIlWzXNsXeyUfOk9dChMjlpkq0DRsxujtYPgyJ676yQ8jEm6zzaaWHFDg5BNcLuif0eD2MTyJdZqXpdg=="
},
"strict-uri-encode": { "strict-uri-encode": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
...@@ -14602,7 +14651,6 @@ ...@@ -14602,7 +14651,6 @@
"version": "1.6.2", "version": "1.6.2",
"resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-1.6.2.tgz", "resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-1.6.2.tgz",
"integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
"dev": true,
"requires": { "requires": {
"bl": "^1.0.0", "bl": "^1.0.0",
"buffer-alloc": "^1.2.0", "buffer-alloc": "^1.2.0",
...@@ -14971,8 +15019,7 @@ ...@@ -14971,8 +15019,7 @@
"to-buffer": { "to-buffer": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmmirror.com/to-buffer/-/to-buffer-1.1.1.tgz", "resolved": "https://registry.npmmirror.com/to-buffer/-/to-buffer-1.1.1.tgz",
"integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==", "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
"dev": true
}, },
"to-fast-properties": { "to-fast-properties": {
"version": "2.0.0", "version": "2.0.0",
...@@ -17196,8 +17243,7 @@ ...@@ -17196,8 +17243,7 @@
"xtend": { "xtend": {
"version": "4.0.2", "version": "4.0.2",
"resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz", "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
"dev": true
}, },
"y18n": { "y18n": {
"version": "4.0.3", "version": "4.0.3",
...@@ -17266,6 +17312,14 @@ ...@@ -17266,6 +17312,14 @@
"fd-slicer": "~1.1.0" "fd-slicer": "~1.1.0"
} }
}, },
"yazl": {
"version": "2.5.1",
"resolved": "https://registry.npmmirror.com/yazl/-/yazl-2.5.1.tgz",
"integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
"requires": {
"buffer-crc32": "~0.2.3"
}
},
"yorkie": { "yorkie": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz", "resolved": "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz",
......
...@@ -18,10 +18,12 @@ ...@@ -18,10 +18,12 @@
"@gausszhou/vue-drag-resize-rotate": "^2.0.15", "@gausszhou/vue-drag-resize-rotate": "^2.0.15",
"@vue/composition-api": "^0.3.4", "@vue/composition-api": "^0.3.4",
"axios": "^0.19.2", "axios": "^0.19.2",
"compressing": "^1.10.1",
"core-js": "^3.6.4", "core-js": "^3.6.4",
"electron-store": "^4.0.0", "electron-store": "^4.0.0",
"element-ui": "^2.13.0", "element-ui": "^2.13.0",
"express": "^4.17.1", "express": "^4.17.1",
"lodash": "^4.17.21",
"lodash-id": "^0.14.0", "lodash-id": "^0.14.0",
"lowdb": "^1.0.0", "lowdb": "^1.0.0",
"morgan": "^1.10.0", "morgan": "^1.10.0",
......
GTXproCMD.exe print -X "Profile\CO12.xml" -I "Input\sample.png" -A "Output\pO12.arxp" -S 01000200 -L 02540254
echo %errorlevel%
\ No newline at end of file
GTXproCMD.exe print -X "Profile\CO12.xml" -I "Input\sample.png" -A "Output\pO12.arxp" -S 01000200 -L 02540254
echo %errorlevel%
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bDivide>false</bDivide>
<bTransColor>false</bTransColor>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<bUniPrint>false</bUniPrint>
<byResolution>1</byResolution>
<byInk>1</byInk>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<GTOPTION xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<szFileName />
<uiCopies>1</uiCopies>
<byPlatenSize>1</byPlatenSize>
<bEcoMode>false</bEcoMode>
<byInk>2</byInk>
<bMaterialBlack>false</bMaterialBlack>
<bMultiple>false</bMultiple>
<byHighlight>1</byHighlight>
<byMask>3</byMask>
<bFastMode>false</bFastMode>
<bDivide>false</bDivide>
<bPause>false</bPause>
<bTransColor>false</bTransColor>
<byChoke>2</byChoke>
<byMinWhite>1</byMinWhite>
<bySaturation>5</bySaturation>
<byBrightness>5</byBrightness>
<byContrast>5</byContrast>
<iCyanBalance>0</iCyanBalance>
<bUniPrint>false</bUniPrint>
<iMagentaBalance>0</iMagentaBalance>
<iYellowBalance>0</iYellowBalance>
<iBlackBalance>0</iBlackBalance>
<byResolution>1</byResolution>
</GTOPTION>
\ No newline at end of file
import {downloadImage, toSend, writeProfileXml} from "@/backend/webserver/utils"; import {downloadImage, toSend, writeProfileXml} from "@/backend/webserver/utils";
const compressing = require('compressing');
var uuid = require("uuid"); var uuid = require("uuid");
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
...@@ -70,7 +71,7 @@ fn.completeDelivery = async (req, res) => { ...@@ -70,7 +71,7 @@ fn.completeDelivery = async (req, res) => {
const company = req.headers["company"] const company = req.headers["company"]
const q = req.body const q = req.body
try { try {
let {data} = await axios.post(`https://${company}/api/pod/podProductionInfo/completeDelivery`, q,{ let {data} = await axios.post(`https://${company}/api/pod/podProductionInfo/completeDelivery`, q, {
headers: {'jwt-token': token} headers: {'jwt-token': token}
}) })
res.json(data) res.json(data)
...@@ -80,34 +81,40 @@ fn.completeDelivery = async (req, res) => { ...@@ -80,34 +81,40 @@ fn.completeDelivery = async (req, res) => {
} }
fn.downloadByDesignId = async (req, res) => { fn.downloadByDesignId = async (req, res) => {
const token = req.headers["jwt-token"] let q = req.body
const company = req.headers["company"]
try { try {
let downloadByDesignId = await axios.post(`https://${company}/api/podDesignCenter/downloadByDesignId`, req.body, { let dir = path.join(os.homedir(), '/Desktop/' + q.productionNo+'.zip')
headers: {'jwt-token': token, responseType: 'blob',} const zipStream = new compressing.zip.Stream();
})
console.log(downloadByDesignId.headers) for(let k in q.imgList){
const dispositionStr = downloadByDesignId.headers['content-disposition'] const p = path.join(process.cwd(),'./print/Input/'+q.imgList[k].fileName)
if (dispositionStr == null || dispositionStr === '') { zipStream.addEntry(p);
return res.json({code: 500, msg: '下载失败'})
} }
let dispositionArr = dispositionStr.split(';')[1].split('filename=')[1]
let fileName = decodeURIComponent(dispositionArr) const destStream = fs.createWriteStream(dir);
let dir = path.join(os.homedir(), '/Desktop/' + fileName) zipStream.pipe(destStream)
console.log(dir,'dir') .on('finish', () => {
let ws=fs.createWriteStream(dir ); console.log('success');
ws.write(downloadByDesignId.data); res.json({code: 200, msg: q.productionNo+'.zip' + '已下载到桌面'})
ws.on('drain',function () { })
console.log("内存干了"); .on('error', () => {
});
ws.on('error',function (err) {
res.json({code: 500, msg: '文件下载失败'}) res.json({code: 500, msg: '文件下载失败'})
}); });
ws.on('close',function (err) { // let ws=fs.createWriteStream(dir );
// console.log(downloadByDesignId)
//
// ws.write(downloadByDesignId.data);
// ws.on('drain',function () {
// console.log("内存干了");
// });
// ws.on('error',function (err) {
// res.json({code: 500, msg: '文件下载失败'})
// });
// ws.on('close',function (err) {
//
// });
// ws.end()
});
ws.end()
res.json({code: 200, msg: fileName + '已下载到桌面'})
} catch (err) { } catch (err) {
console.log(err) console.log(err)
res.json({code: 500, msg: err}) res.json({code: 500, msg: err})
......
import {exec} from "child_process"; import {exec, execSync} from "child_process";
var fs = require("fs"); var fs = require("fs");
var path = require("path"); var path = require("path");
...@@ -61,23 +61,21 @@ export const toSend = (body) => { ...@@ -61,23 +61,21 @@ export const toSend = (body) => {
body.print_cmd, body.print_cmd,
{cwd: path.join(process.cwd(), 'print'), shell: true}, {cwd: path.join(process.cwd(), 'print'), shell: true},
(err2, stdout2, stderr2) => { (err2, stdout2, stderr2) => {
console.log(stdout2, 1) console.log(err2)
console.log(stderr2, 2)
console.log(err2, 4)
if (!err2) { if (!err2) {
// 成功后删除 素材图,xml,output文件 // 成功后删除 素材图,xml,output文件
fs.unlinkSync(path.join(process.cwd(), 'print/Input/' + body.fileName)) // fs.unlinkSync(path.join(process.cwd(), 'print/Input/' + body.fileName))
fs.unlinkSync(path.join(process.cwd(), 'print/Profile/' + body.fileName.replace('.png', '') + '.xml')) // fs.unlinkSync(path.join(process.cwd(), 'print/Profile/' + body.fileName.replace('.png', '') + '.xml'))
fs.unlinkSync(path.join(process.cwd(), 'print/Output/' + body.fileName.replace('.png', '') + '.arxp')) // fs.unlinkSync(path.join(process.cwd(), 'print/Output/' + body.fileName.replace('.png', '') + '.arxp'))
resolve('操作成功') resolve('操作成功')
} else { } else {
reject('操作出现问题') reject('打印机参数错误')
} }
}) })
} else { } else {
reject('操作出现问题') reject('生成arxp文件失败')
} }
}) })
......
...@@ -37,25 +37,19 @@ const router = new VueRouter({ ...@@ -37,25 +37,19 @@ const router = new VueRouter({
base: process.env.BASE_URL, base: process.env.BASE_URL,
routes routes
}); });
// router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
// let user = Vue.prototype.$dataStore.get('user') let user = Vue.prototype.$dataStore.get('user')
// if (to.name === 'login') { if (to.name === 'login') {
// if (user) { if (user) {
// console.log(1) console.log(1)
// return next({path:'/design'}) return next({path:'/design'})
// } else { } else {
// console.log(2) return next( )
// return next( ) }
// }
// } else {
// } else { return next()
// if (user) { }
// if(!to.name) return next({path:'/design'})
// return next() })
// } else {
// return next('/login')
// }
// }
//
// })
export default router; export default router;
...@@ -26,6 +26,7 @@ export default { ...@@ -26,6 +26,7 @@ export default {
showPrintDialog: false, showPrintDialog: false,
productionNo: '', productionNo: '',
setting: {}, setting: {},
imgList: [],
detail: null, detail: null,
selectBgColor: '#ececec', selectBgColor: '#ececec',
predefineColors: [ predefineColors: [
...@@ -143,7 +144,7 @@ export default { ...@@ -143,7 +144,7 @@ export default {
}, },
async sureData() { async sureData() {
if (!this.detail || Object.keys(this.detail).length <= 1) { if (!this.detail || Object.keys(this.detail).length <= 1) {
return this.$message.warning('请扫生产单号') return this.$message.warning('请扫生产单号')
} }
this.$confirm( this.$confirm(
`确定生产完成?`, `确定生产完成?`,
...@@ -158,9 +159,10 @@ export default { ...@@ -158,9 +159,10 @@ export default {
}) })
}, },
async downloadImage() { async downloadImage() {
if (!this.detail || Object.keys(this.detail).length === 0) return this.$message.warning('请输入生产单号') if (!this.detail || Object.keys(this.detail).length === 0) return this.$message.warning('请扫描生产单号')
let params = { let params = {
productionNo: this.detail.podProductionNo productionNo: this.detail.podProductionNo,
imgList: this.imgList
} }
let res = await this.$api.post('/downloadByDesignId', params) let res = await this.$api.post('/downloadByDesignId', params)
...@@ -189,7 +191,7 @@ export default { ...@@ -189,7 +191,7 @@ export default {
res.data[i].file = new File([r], res.data[i].fileName, {type: 'image/png'}) res.data[i].file = new File([r], res.data[i].fileName, {type: 'image/png'})
if (i === res.data.length - 1) { if (i === res.data.length - 1) {
this.imgList = res.data
bus.$emit('busEmit', {type: 'sendFile', value: res.data}) bus.$emit('busEmit', {type: 'sendFile', value: res.data})
} }
}) })
...@@ -267,7 +269,7 @@ export default { ...@@ -267,7 +269,7 @@ export default {
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
<el-dropdown trigger="click" @command="command" :hide-on-click="false"> <el-dropdown trigger="click" @command="command" :hide-on-click="false">
<el-button style="height: 100%;margin-right: 8px" size="small">{{ grid[selectGridIndex].label }}</el-button> <el-button style="height: 100%;margin-right: 0px" size="small">{{ grid[selectGridIndex].label }}</el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="i" v-for="(it,i) in grid" :key="i"> <el-dropdown-item :command="i" v-for="(it,i) in grid" :key="i">
{{ it.label }} {{ it.label }}
...@@ -282,7 +284,7 @@ export default { ...@@ -282,7 +284,7 @@ export default {
<el-tooltip content="图片"> <el-tooltip content="图片">
<el-upload accept=".png" action="" :show-file-list="false" :before-upload="uploadImage"> <el-upload accept=".png" action="" :show-file-list="false" :before-upload="uploadImage">
<el-button style="height: 100%;margin:0 8px" size="small"> <el-button style="height: 100%;margin:0 8px" size="small">
<img style="width: 14px;height: 14px" src="@/static/icon/tupian.png" alt=""> <i class="el-icon-picture" style="font-size: 15px;"></i>
</el-button> </el-button>
</el-upload> </el-upload>
</el-tooltip> </el-tooltip>
...@@ -302,6 +304,7 @@ export default { ...@@ -302,6 +304,7 @@ export default {
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
<el-tooltip content="背景色"> <el-tooltip content="背景色">
<el-color-picker <el-color-picker
style="margin-right: 3px"
v-model="selectBgColor" v-model="selectBgColor"
@change="setBg" @change="setBg"
color-format="hex" color-format="hex"
...@@ -361,7 +364,7 @@ export default { ...@@ -361,7 +364,7 @@ export default {
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
</div> </div>
<div class="center-input"> <div class="center-input">
<el-input @keyup.enter.native="getDataInfo" style="width: 40%;" size="medium" placeholder="请输入生产单号" <el-input @keyup.enter.native="getDataInfo" style="width: 40%;" size="medium" placeholder="请扫描生产单号"
ref="searchRef" v-model="productionNo"></el-input> ref="searchRef" v-model="productionNo"></el-input>
<el-button @click="getDataInfo" size="medium" style="margin-left: 10px" type="primary">查询</el-button> <el-button @click="getDataInfo" size="medium" style="margin-left: 10px" type="primary">查询</el-button>
<div class="sure-btn"> <div class="sure-btn">
...@@ -446,7 +449,7 @@ export default { ...@@ -446,7 +449,7 @@ export default {
.center-input { .center-input {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: center;
flex: 1; flex: 1;
flex-shrink: 0; flex-shrink: 0;
overflow: hidden; overflow: hidden;
......
...@@ -10,13 +10,11 @@ export default { ...@@ -10,13 +10,11 @@ export default {
axios, axios,
fieldDescription, fieldDescription,
printerList: [], printerList: [],
printSettingList: [],
printSettingVal: 0,
description: '', description: '',
defaultList: [ printer: '',
{ settingName: '',
label: 'default',
value: 'default'
}
],
printInkList: [ printInkList: [
{ {
label: '仅彩色油墨', label: '仅彩色油墨',
...@@ -33,6 +31,7 @@ export default { ...@@ -33,6 +31,7 @@ export default {
], ],
detailShow: false, detailShow: false,
showPopover: false,
printSetting: { printSetting: {
printer: '', printer: '',
byInk: 2, byInk: 2,
...@@ -57,10 +56,8 @@ export default { ...@@ -57,10 +56,8 @@ export default {
iMagentaBalance: 0, iMagentaBalance: 0,
iBlackBalance: 0, iBlackBalance: 0,
iYellowBalance: 0, iYellowBalance: 0,
byMinWhite: 1, byMinWhite: 1,
bMultiple: false, bMultiple: false,
default: 'default',
} }
} }
}, },
...@@ -74,6 +71,9 @@ export default { ...@@ -74,6 +71,9 @@ export default {
type: Number type: Number
} }
}, },
mounted() {
this.$dataStore.set('default-print-setting', this.printSetting)
},
computed: { computed: {
inkNum() { inkNum() {
return 200 + (Number(this.printSetting.byHighlight) * 50) - 50 return 200 + (Number(this.printSetting.byHighlight) * 50) - 50
...@@ -98,12 +98,60 @@ export default { ...@@ -98,12 +98,60 @@ export default {
}, },
created() { created() {
this.getPrinter() this.getPrinter()
this.getPrintSettingList()
}, },
methods: { methods: {
delSetting() {
this.$confirm(
`确定删除该预设?`,
'提示',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
this.$dataStore.delete(this.printSettingList[this.printSettingVal].label + '-print-setting')
this.getPrintSettingList()
this.printSettingVal = 0
})
},
getPrintSettingList() {
let arr = []
for (let k in this.$dataStore.store) {
if (k.includes('print-setting')) {
arr.push({
label: k.replace('-print-setting', ''),
value: this.$dataStore.get(k)
})
}
}
this.printSettingList = arr
},
printSettingChange(v) {
this.printSetting = JSON.parse(JSON.stringify(this.printSettingList[v].value))
},
saveSetting() {
if (this.settingName.trim() === '') {
return this.$message.warning('预设名称不能为空')
}
if (this.printSettingList.find(el => el.label === this.settingName)) {
return this.$message.warning('预设名称不能重复')
}
this.$dataStore.set(`${this.settingName}-print-setting`, this.printSetting)
this.showPopover = false
this.printSettingVal = this.printSettingList.length
this.getPrintSettingList()
},
openPopover() {
this.showPopover = true
this.settingName = ''
},
singleStr(str) { singleStr(str) {
// 不足四位前面用0补齐 // 不足四位前面用0补齐
str = Number(str).toString().replace('.', '') str = str.toString().replace('.', '')
if (str.length >= 4) { if (str.length >= 4) {
str = str.slice(0, 5) str = str.slice(0, 5)
} else if (str.length === 3) { } else if (str.length === 3) {
...@@ -113,31 +161,45 @@ export default { ...@@ -113,31 +161,45 @@ export default {
} else if (str.length === 1) { } else if (str.length === 1) {
str = '000' + str str = '000' + str
} }
console.log(str)
return str return str
}, },
async getPrintCmd() { async getPrintCmd() {
if (this.imgList.length === 0) return this.$message.warning('素材不能为空') if (this.imgList.length === 0) return this.$message.warning('素材不能为空')
console.log(this.imgList[0]) console.log(this.imgList[0])
let {x, y, r, w, h} = this.imgList[0] let {x, y, r, w, h} = this.imgList[0]
let f = JSON.parse(JSON.stringify(this.printSetting))
let x_mm = Number((x * 0.84).toFixed(1).replace('.00', '').split('.')[0]) let x_mm = Number(x * 0.84)
let w_mm = Number((w * 0.84).toFixed(1).replace('.00', '')) let w_mm = Number(w * 0.84).toFixed(1)
let h_mm = Number((h * 0.84).toFixed(1).replace('.00', '')) let h_mm = Number(h * 0.84).toFixed(1)
let y_mm = Number((y * 0.84).toFixed(1).replace('.00', '').split('.')[0]) let y_mm = Number(y * 0.84)
console.log(x_mm, y_mm)
r = Number(r).toFixed(0)
const imgFileName = this.imgList[0].fileName const imgFileName = this.imgList[0].fileName
let position = '' // 位置 let position = '' // 位置
let size = '' // 图像大小 let size = '' // 图像大小
if (Number(x_mm) < 0 || Number(y_mm) < 0) { if (Number(x_mm) < 0 || Number(y_mm) < 0) {
if(Number(x_mm)>=0){
x_mm = this.singleStr(Number(x_mm).toFixed(1))
y_mm = Number(y_mm).toFixed(0)
}else{
y_mm = this.singleStr(Number(y_mm).toFixed(1))
x_mm = Number(x_mm).toFixed(0)
}
position = `"${x_mm},${y_mm}"` position = `"${x_mm},${y_mm}"`
} else { } else {
position = `${this.singleStr(x_mm)}${this.singleStr(y_mm)}` position = `${this.singleStr(x_mm.toFixed(1))}${this.singleStr(y_mm.toFixed(1))}`
} }
size = `${this.singleStr(w_mm)}${this.singleStr(h_mm)}` size = `${this.singleStr(w_mm)}${this.singleStr(h_mm)}`
const bigNum = '0031131' // 图像放大倍数 -R const bigNum = '0031131' // 图像放大倍数 -R
const whitePrint = '0' // 白色打印 const whitePrint = [1, 2].includes(this.printSetting.byInk) ? 1 : 0 // 白色打印
let cmd = `GTXproCMD.exe print -X "${`Profile\\${imgFileName.replace('.png', '')}.xml`}" -I "${'Input\\' + imgFileName}" -A "Output\\${imgFileName.replace('.png', '')}.arxp" -S ${size} -L ${position} -W ${whitePrint} -D ${r}` let cmd = `GTXproCMD.exe print -X "${`Profile\\${imgFileName.replace('.png', '')}.xml`}" -I "${'Input\\' + imgFileName}" -A "Output\\${imgFileName.replace('.png', '')}.arxp" -S ${size} -L ${position} -D ${r} -W ${whitePrint}`
let print_cmd = `GTXproCMD.exe send -A "Output\\${imgFileName.replace('.png', '')}.arxp" -P "${f.printer}" -D 1` let print_cmd = `GTXproCMD.exe send -A "Output\\${imgFileName.replace('.png', '')}.arxp" -P "${this.printer}`
let data = { let data = {
...this.printSetting, ...this.printSetting,
...{ ...{
...@@ -156,7 +218,7 @@ export default { ...@@ -156,7 +218,7 @@ export default {
console.log(data, 996) // data就是返回的打印机数据列表 console.log(data, 996) // data就是返回的打印机数据列表
this.printerList = data this.printerList = data
if (this.printerList.length > 0) { if (this.printerList.length > 0) {
this.printSetting.printer = this.printerList[0].name this.printer = this.printerList[0].name
} }
}) })
}, },
...@@ -179,28 +241,44 @@ export default { ...@@ -179,28 +241,44 @@ export default {
<el-form label-width="170px" label-position="left" size="mini" :model="printSetting"> <el-form label-width="170px" label-position="left" size="mini" :model="printSetting">
<el-form-item label-width="55px" label="打印机"> <el-form-item label-width="55px" label="打印机">
<div class="flex-row"> <div class="flex-row">
<el-select v-model="printSetting.printer" clearable> <el-select v-model="printer" clearable>
<el-option v-for="(it,i) in printerList" :key="i" :label="it.name" :value="it.name"></el-option> <el-option v-for="(it,i) in printerList" :key="i" :label="it.name" :value="it.name"></el-option>
</el-select> </el-select>
<el-button title="刷新" @click="getPrinter" style="margin-left: 10px" icon="el-icon-refresh"></el-button> <el-button title="刷新" @click="getPrinter" style="margin-left: 10px" icon="el-icon-refresh"></el-button>
</div> </div>
</el-form-item> </el-form-item>
<!-- <el-form-item label-width="50px" label="预设">--> <el-form-item label-width="50px" label="预设">
<!-- <div class="flex-row">--> <div class="flex-row">
<!-- <el-select v-model="printSetting.default" clearable>--> <el-select @change="printSettingChange" filterable v-model="printSettingVal" clearable>
<!-- <el-option v-for="(it,i) in defaultList" :key="i" :value="it.label" :label="it.label"></el-option>--> <el-option v-for="(it,i) in printSettingList" :key="i" :value="i" :label="it.label"></el-option>
<!-- </el-select>--> </el-select>
<!-- <div style="margin-left: 15px" class="save-btn">--> <div style="margin-left: 15px;display: flex" class="save-btn">
<!-- <el-button type="primary">保存预设</el-button>--> <el-popover
<!-- <el-button type="danger">删除</el-button>--> placement="bottom"
<!-- </div>--> width="200"
<!-- </div>--> v-model="showPopover"
<!-- </el-form-item>--> trigger="manual">
<el-button style="margin-right: 10px" @click="openPopover" slot="reference" type="primary">保存预设
</el-button>
<div class="save-setting">
<el-input size="large" maxlength="10" v-model="settingName" placeholder="预设名称:"></el-input>
<div class="save-footer">
<el-button size="medium" @click="showPopover=false">取消</el-button>
<el-button @click="saveSetting" :disabled="settingName===''" size="medium" type="primary">保存
</el-button>
</div>
</div>
</el-popover>
<el-button :disabled="printSettingVal===0" @click="delSetting" type="danger">删除</el-button>
</div>
</div>
</el-form-item>
<div class="detail-setting"> <div class="detail-setting">
<div class="setting-left"> <div class="setting-left">
<div class="left-block-item"> <div class="left-block-item">
<b class="setting-title">基本设置</b> <b class="setting-title">基本设置</b>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byInk'] || ''"></div> <div v-html="fieldDescription['byInk'] || ''"></div>
</template> </template>
...@@ -210,7 +288,7 @@ export default { ...@@ -210,7 +288,7 @@ export default {
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bEcoMode'] || ''"></div> <div v-html="fieldDescription['bEcoMode'] || ''"></div>
</template> </template>
...@@ -222,7 +300,7 @@ export default { ...@@ -222,7 +300,7 @@ export default {
</el-form-item> </el-form-item>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bMaterialBlack'] || ''"></div> <div v-html="fieldDescription['bMaterialBlack'] || ''"></div>
</template> </template>
...@@ -234,7 +312,7 @@ export default { ...@@ -234,7 +312,7 @@ export default {
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bMultiple'] || ''"></div> <div v-html="fieldDescription['bMultiple'] || ''"></div>
</template> </template>
...@@ -251,7 +329,7 @@ export default { ...@@ -251,7 +329,7 @@ export default {
</div> </div>
<div class="left-block-item" v-if="[0,3].includes(printSetting.byInk)"> <div class="left-block-item" v-if="[0,3].includes(printSetting.byInk)">
<b class="setting-title">彩色油墨设置</b> <b class="setting-title">彩色油墨设置</b>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byInkVolume'] || ''"></div> <div v-html="fieldDescription['byInkVolume'] || ''"></div>
</template> </template>
...@@ -264,7 +342,7 @@ export default { ...@@ -264,7 +342,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byDoublePrint'] || ''"></div> <div v-html="fieldDescription['byDoublePrint'] || ''"></div>
</template> </template>
...@@ -281,7 +359,7 @@ export default { ...@@ -281,7 +359,7 @@ export default {
</div> </div>
<div class="left-block-item" v-if="[1,2].includes(printSetting.byInk)"> <div class="left-block-item" v-if="[1,2].includes(printSetting.byInk)">
<b class="setting-title">白色油墨设置</b> <b class="setting-title">白色油墨设置</b>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byHighlight'] || ''"></div> <div v-html="fieldDescription['byHighlight'] || ''"></div>
</template> </template>
...@@ -294,7 +372,7 @@ export default { ...@@ -294,7 +372,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byMask'] || ''"></div> <div v-html="fieldDescription['byMask'] || ''"></div>
</template> </template>
...@@ -308,7 +386,7 @@ export default { ...@@ -308,7 +386,7 @@ export default {
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bFastMode'] || ''"></div> <div v-html="fieldDescription['bFastMode'] || ''"></div>
</template> </template>
...@@ -319,7 +397,7 @@ export default { ...@@ -319,7 +397,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bDivide'] || ''"></div> <div v-html="fieldDescription['bDivide'] || ''"></div>
</template> </template>
...@@ -330,7 +408,7 @@ export default { ...@@ -330,7 +408,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bPause'] || ''"></div> <div v-html="fieldDescription['bPause'] || ''"></div>
</template> </template>
...@@ -342,7 +420,7 @@ export default { ...@@ -342,7 +420,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bTransColor'] || ''"></div> <div v-html="fieldDescription['bTransColor'] || ''"></div>
</template> </template>
...@@ -352,7 +430,7 @@ export default { ...@@ -352,7 +430,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byChoke'] || ''"></div> <div v-html="fieldDescription['byChoke'] || ''"></div>
</template> </template>
...@@ -367,7 +445,7 @@ export default { ...@@ -367,7 +445,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byMinWhite'] || ''"></div> <div v-html="fieldDescription['byMinWhite'] || ''"></div>
</template> </template>
...@@ -393,7 +471,7 @@ export default { ...@@ -393,7 +471,7 @@ export default {
</div> </div>
<div v-show="detailShow" class="left-block-item"> <div v-show="detailShow" class="left-block-item">
<b class="setting-title">画质设置</b> <b class="setting-title">画质设置</b>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bySaturation'] || ''"></div> <div v-html="fieldDescription['bySaturation'] || ''"></div>
</template> </template>
...@@ -406,7 +484,7 @@ export default { ...@@ -406,7 +484,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byBrightness'] || ''"></div> <div v-html="fieldDescription['byBrightness'] || ''"></div>
</template> </template>
...@@ -419,7 +497,7 @@ export default { ...@@ -419,7 +497,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['byContrast'] || ''"></div> <div v-html="fieldDescription['byContrast'] || ''"></div>
</template> </template>
...@@ -433,7 +511,7 @@ export default { ...@@ -433,7 +511,7 @@ export default {
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bUniPrint'] || ''"></div> <div v-html="fieldDescription['bUniPrint'] || ''"></div>
</template> </template>
...@@ -449,7 +527,7 @@ export default { ...@@ -449,7 +527,7 @@ export default {
</div> </div>
<div v-if="detailShow && ![1].includes(printSetting.byInk)" class="left-block-item"> <div v-if="detailShow && ![1].includes(printSetting.byInk)" class="left-block-item">
<b class="setting-title">彩色平衡</b> <b class="setting-title">彩色平衡</b>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['iCyanBalance'] || ''"></div> <div v-html="fieldDescription['iCyanBalance'] || ''"></div>
</template> </template>
...@@ -463,7 +541,7 @@ export default { ...@@ -463,7 +541,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['iMagentaBalance'] || ''"></div> <div v-html="fieldDescription['iMagentaBalance'] || ''"></div>
</template> </template>
...@@ -477,7 +555,7 @@ export default { ...@@ -477,7 +555,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['iYellowBalance'] || ''"></div> <div v-html="fieldDescription['iYellowBalance'] || ''"></div>
</template> </template>
...@@ -491,7 +569,7 @@ export default { ...@@ -491,7 +569,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['iBlackBalance'] || ''"></div> <div v-html="fieldDescription['iBlackBalance'] || ''"></div>
</template> </template>
...@@ -504,7 +582,7 @@ export default { ...@@ -504,7 +582,7 @@ export default {
</el-form-item> </el-form-item>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['bUniPrint'] || ''"></div> <div v-html="fieldDescription['bUniPrint'] || ''"></div>
</template> </template>
...@@ -527,7 +605,7 @@ export default { ...@@ -527,7 +605,7 @@ export default {
</el-form> </el-form>
<div class="bottom-info flex-row"> <div class="bottom-info flex-row">
<div class="info"> <div class="info">
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['printTime'] || ''"></div> <div v-html="fieldDescription['printTime'] || ''"></div>
</template> </template>
...@@ -536,7 +614,7 @@ export default { ...@@ -536,7 +614,7 @@ export default {
<b>×{{ defaultTime }}</b> <b>×{{ defaultTime }}</b>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip placement="top-start"> <el-tooltip placement="left" popper-class="my-popper">
<template slot="content"> <template slot="content">
<div v-html="fieldDescription['whiteInk'] || ''"></div> <div v-html="fieldDescription['whiteInk'] || ''"></div>
</template> </template>
...@@ -548,7 +626,9 @@ export default { ...@@ -548,7 +626,9 @@ export default {
</div> </div>
<div class="btn"> <div class="btn">
<el-input-number v-model="printSetting.printNum" size="small"></el-input-number> <el-input size="small" style="width: 100px;" oninput="value=value.replace(/[^\-?\d]/g,'')"
v-model="printSetting.printNum"></el-input>
<span></span> <span></span>
</div> </div>
</div> </div>
...@@ -640,7 +720,7 @@ export default { ...@@ -640,7 +720,7 @@ export default {
} }
.info { .info {
width: 57%; width: 62%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
...@@ -651,6 +731,17 @@ export default { ...@@ -651,6 +731,17 @@ export default {
} }
.save-setting {
display: flex;
flex-direction: column;
}
.save-footer {
display: flex;
justify-content: space-between;
margin-top: 15px;
}
.print-div { .print-div {
background: #ececec; background: #ececec;
border-left: 1px solid gray; border-left: 1px solid gray;
...@@ -663,4 +754,10 @@ export default { ...@@ -663,4 +754,10 @@ export default {
height: calc(100% - 51px); height: calc(100% - 51px);
width: 430px; width: 430px;
} }
</style>
<style>
.my-popper{
background: rgba(0, 0, 0, 0.5) !important;
}
</style> </style>
\ No newline at end of file
...@@ -6,6 +6,8 @@ export default { ...@@ -6,6 +6,8 @@ export default {
form: { form: {
x: 0, x: 0,
sx: 0, sx: 0,
sh: 0,
sw: 0,
sy: 0, sy: 0,
y: 0, y: 0,
w: 0, w: 0,
...@@ -36,15 +38,19 @@ export default { ...@@ -36,15 +38,19 @@ export default {
item: { item: {
handler() { handler() {
if (this.item) { if (this.item) {
let x_mm = Number((this.item.x * 0.84).toFixed(2).replace('.00', '')) // let x_mm = Number((this.item.x * 0.84).toFixed(2).replace('.00', ''))
let w_mm = Number((this.item.w * 0.84).toFixed(2).replace('.00', '')) // let w_mm = Number((this.item.w * 0.84).toFixed(2).replace('.00', ''))
let h_mm = Number((this.item.h * 0.84).toFixed(2).replace('.00', '')) // let h_mm = Number((this.item.h * 0.84).toFixed(2).replace('.00', ''))
let y_mm = Number((this.item.y * 0.84).toFixed(2).replace('.00', '')) // let y_mm = Number((this.item.y * 0.84).toFixed(2).replace('.00', ''))
// return // return
this.form.x = x_mm this.form.x = this.item.x
this.form.y = y_mm this.form.y = this.item.y
this.form.h = h_mm this.form.w = this.item.w
this.form.w = w_mm this.form.h = this.item.h
// this.form.sx = x_mm
// this.form.sy = y_mm
// this.form.sh = h_mm
// this.form.sw = w_mm
this.form.r = this.item.r this.form.r = this.item.r
} }
}, },
...@@ -53,32 +59,17 @@ export default { ...@@ -53,32 +59,17 @@ export default {
} }
}, },
methods: { methods: {
conversion_getDPI() {
var arrDPI = new Array;
if (window.screen.deviceXDPI) {
arrDPI[0] = window.screen.deviceXDPI;
arrDPI[1] = window.screen.deviceYDPI;
} else {
var tmpNode = document.createElement("DIV");
tmpNode.style.cssText = "width:1in;height:1in;position:absolute;left:0px;top:0px;z-index:99;visibility:hidden";
document.body.appendChild(tmpNode);
arrDPI[0] = parseInt(tmpNode.offsetWidth);
arrDPI[1] = parseInt(tmpNode.offsetHeight);
tmpNode.parentNode.removeChild(tmpNode);
}
return arrDPI;
},
formChange() { formChange() {
this.$emit('change', this.form) this.$emit('change', this.form)
}, },
addValue(f) { addValue(f) {
if (!this.form[f]) this.$set(this.form, f, 0)
let nw = Number(this.form[f]) + 1 let nw = Number(this.form[f]) + 1
this.$set(this.form, f, nw) this.$set(this.form, f, nw)
this.formChange() this.formChange()
}, },
reduceValue(f) { reduceValue(f) {
if (!this.form[f]) this.$set(this.form, f, 0)
let nw = Number(this.form[f]) - 1 let nw = Number(this.form[f]) - 1
this.$set(this.form, f, nw) this.$set(this.form, f, nw)
this.formChange() this.formChange()
...@@ -88,7 +79,7 @@ export default { ...@@ -88,7 +79,7 @@ export default {
</script> </script>
<template> <template>
<div class="drawer" :style="{animation:visible?`ltr-drawer-in .3s 1ms`:`ltr-drawer-out .3s 1ms`}" v-show="visible"> <div class="drawer" :style="{animation:`ltr-drawer-in .3s 1ms`}" v-show="visible">
<div class="title"> <div class="title">
图片编辑 图片编辑
</div> </div>
...@@ -96,7 +87,7 @@ export default { ...@@ -96,7 +87,7 @@ export default {
<el-form size="small" style="" :model="form" label-position="left" label-width="30px"> <el-form size="small" style="" :model="form" label-position="left" label-width="30px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="x:" prop="sx"> <el-form-item label="x:" prop="x">
<div class="form-content"> <div class="form-content">
<el-input @blur="formChange" v-model="form.x"></el-input> <el-input @blur="formChange" v-model="form.x"></el-input>
<div class="set-value"> <div class="set-value">
......
...@@ -3,6 +3,7 @@ import VueDragResizeRotate from "@gausszhou/vue-drag-resize-rotate"; ...@@ -3,6 +3,7 @@ import VueDragResizeRotate from "@gausszhou/vue-drag-resize-rotate";
import ImgSetting from './imgSetting.vue' import ImgSetting from './imgSetting.vue'
import bus from '@/bus' import bus from '@/bus'
import PrintDialog from "@/views/design/head/printDialog.vue"; import PrintDialog from "@/views/design/head/printDialog.vue";
import {debounce} from 'lodash'
const img = require('../../../assets/bg_tshirt_shadow.png') const img = require('../../../assets/bg_tshirt_shadow.png')
export default { export default {
...@@ -24,6 +25,7 @@ export default { ...@@ -24,6 +25,7 @@ export default {
const num = getter.gridSpacing.slice(0, 2) const num = getter.gridSpacing.slice(0, 2)
return 10 + 'px' return 10 + 'px'
}, },
returnItem() { returnItem() {
return this.imgList[this.selectIndex] return this.imgList[this.selectIndex]
} }
...@@ -50,6 +52,7 @@ export default { ...@@ -50,6 +52,7 @@ export default {
} }
}, },
watch: { watch: {
imgList: { imgList: {
handler() { handler() {
this.$store.commit('changeImgList', this.imgList) this.$store.commit('changeImgList', this.imgList)
...@@ -68,6 +71,7 @@ export default { ...@@ -68,6 +71,7 @@ export default {
} }
}, },
methods: { methods: {
debounce,
indexChange(v) { indexChange(v) {
console.log(v) console.log(v)
if (this.imgList.length === 0) return; if (this.imgList.length === 0) return;
...@@ -104,6 +108,7 @@ export default { ...@@ -104,6 +108,7 @@ export default {
this.getBackFile([it]) this.getBackFile([it])
}, },
ev(type) { ev(type) {
if(this.selectIndex===-1) this.selectIndex = 0
if (!this.imgList[this.selectIndex]) return if (!this.imgList[this.selectIndex]) return
let w = document.getElementById('line').clientWidth / 2 let w = document.getElementById('line').clientWidth / 2
...@@ -131,12 +136,13 @@ export default { ...@@ -131,12 +136,13 @@ export default {
} }
}, },
formChange(form) { formChange(form) {
if(this.selectIndex===-1) this.selectIndex = 0
if (!this.imgList[this.selectIndex]) return if (!this.imgList[this.selectIndex]) return
let f = JSON.parse(JSON.stringify(form)) let f = JSON.parse(JSON.stringify(form))
let x_mm = f.x / 0.84 let x_mm = f.x
let w_mm = f.w / 0.84 let w_mm = f.w
let h_mm = f.h / 0.84 let h_mm = f.h
let y_mm = f.y / 0.84 let y_mm = f.y
this.$set(this.imgList[this.selectIndex], 'x', x_mm) this.$set(this.imgList[this.selectIndex], 'x', x_mm)
this.$set(this.imgList[this.selectIndex], 'y', y_mm) this.$set(this.imgList[this.selectIndex], 'y', y_mm)
this.$set(this.imgList[this.selectIndex], 'w', w_mm) this.$set(this.imgList[this.selectIndex], 'w', w_mm)
...@@ -146,14 +152,20 @@ export default { ...@@ -146,14 +152,20 @@ export default {
close() { close() {
this.showImgSetting = false this.showImgSetting = false
}, },
onDrag(left, top) { onDragDebounce(left, top) {
if (!this.imgList[this.selectIndex]) return // console.log(left,top,'2')
this.$set(this.imgList[this.selectIndex], 'x', left) // if (!this.imgList[this.selectIndex]) return
this.$set(this.imgList[this.selectIndex], 'y', top) // this.imgList[this.selectIndex].x = left
// this.imgList[this.selectIndex].y = top
// this.$set(this.imgList[this.selectIndex], 'x', left)
// this.$set(this.imgList[this.selectIndex], 'y', top)
}, },
dragStop(left, top) { dragStop(left, top) {
if(this.selectIndex===-1) this.selectIndex = 0
if (!this.imgList[this.selectIndex]) return if (!this.imgList[this.selectIndex]) return
this.$set(this.imgList[this.selectIndex], 'x', left)
this.$set(this.imgList[this.selectIndex], 'y', top)
this.actionList.unshift({ this.actionList.unshift({
t: 'drag', t: 'drag',
x: left, x: left,
...@@ -162,7 +174,14 @@ export default { ...@@ -162,7 +174,14 @@ export default {
this.$store.commit('changeActionList', this.actionList) this.$store.commit('changeActionList', this.actionList)
}, },
resizeStop(x, y, w, h) { resizeStop(x, y, w, h) {
if(this.selectIndex===-1) this.selectIndex = 0
if (!this.imgList[this.selectIndex]) return if (!this.imgList[this.selectIndex]) return
this.$set(this.imgList[this.selectIndex], 'w', w)
this.$set(this.imgList[this.selectIndex], 'h', h)
this.$set(this.imgList[this.selectIndex], 'x', x)
this.$set(this.imgList[this.selectIndex], 'y', y)
this.actionList.unshift({ this.actionList.unshift({
t: 'resize', t: 'resize',
x, x,
...@@ -173,14 +192,10 @@ export default { ...@@ -173,14 +192,10 @@ export default {
this.$store.commit('changeActionList', this.actionList) this.$store.commit('changeActionList', this.actionList)
}, },
resizing(x, y, w, h) { resizing(x, y, w, h) {
if (!this.imgList[this.selectIndex]) return
this.$set(this.imgList[this.selectIndex], 'x', x)
this.$set(this.imgList[this.selectIndex], 'y', y)
this.$set(this.imgList[this.selectIndex], 'w', w)
this.$set(this.imgList[this.selectIndex], 'h', h)
}, },
rotating(angle) { rotating(angle) {
if(this.selectIndex===-1) this.selectIndex = 0
if (!this.imgList[this.selectIndex]) return if (!this.imgList[this.selectIndex]) return
this.$set(this.imgList[this.selectIndex], 'r', angle) this.$set(this.imgList[this.selectIndex], 'r', angle)
}, },
...@@ -362,7 +377,8 @@ export default { ...@@ -362,7 +377,8 @@ export default {
}; };
return img; return img;
} }
}, }
,
mounted() { mounted() {
this.imgHeight = window.screen.height + 'px' this.imgHeight = window.screen.height + 'px'
...@@ -452,7 +468,7 @@ export default { ...@@ -452,7 +468,7 @@ export default {
:draggable="true" :draggable="true"
:resizable="true" :resizable="true"
:rotatable="true" :rotatable="true"
@dragging="onDrag" @dragging="onDragDebounce"
@dragstop="dragStop" @dragstop="dragStop"
@resizing="resizing" @resizing="resizing"
@resizestop="resizeStop" @resizestop="resizeStop"
......
...@@ -20,14 +20,14 @@ export default { ...@@ -20,14 +20,14 @@ export default {
} }
}, },
created() { created() {
let user = this.$dataStore.get('user')
this.company = this.$dataStore.get('company') this.company = this.$dataStore.get('company')
if (this.company) { if (this.company) {
this.form.company = this.company.domain this.form.company = this.company.domain
} }
if (user) { // if (user) {
return this.$router.push('/design') // return this.$router.push('/design')
} // }
this.getCompanyList() this.getCompanyList()
}, },
mounted() { mounted() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment