Commit 330de292 by zhuzhequan

添加自动打印逻辑

parent 7daef452
{ {
"apiApiHost":"http://10.168.31.142:8060/api", "apiApiHost":"http://10.168.31.230:8060/api",
"fileApiUrl":"http://10.168.31.142:80/upload/factory", "fileApiUrl":"http://10.168.31.230:80/upload/factory",
"visionUrl":"https://console.jomalls.com" "visionUrl":"https://console.jomalls.com"
} }
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
"log4js": "^6.9.1", "log4js": "^6.9.1",
"moment": "^2.30.1", "moment": "^2.30.1",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"multer": "^1.4.5-lts.2",
"multiparty": "^4.2.3", "multiparty": "^4.2.3",
"nodemon": "^3.1.4", "nodemon": "^3.1.4",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
......
...@@ -362,8 +362,16 @@ export default { ...@@ -362,8 +362,16 @@ export default {
// this.selectImgIndexList.push(i) // this.selectImgIndexList.push(i)
let item = this.imgList.find((img) => img.fileName === it.fileName); let item = this.imgList.find((img) => img.fileName === it.fileName);
if (item) return; if (item) return;
console.log(this.detail.designImageSize);
let size = null
if(this.detail.mssWidth && this.detail.mssHeight){
size = {
width: this.detail.mssWidth,
height: this.detail.mssHeight,
}
}
// this.selectImgIndexList = Array.from(new Set(this.selectImgIndexList)) // this.selectImgIndexList = Array.from(new Set(this.selectImgIndexList))
this.getBackFile({ files: [it], size: null }, (file) => { this.getBackFile({ files: [it], size }, (file) => {
this.imgHistoryList.push(JSON.parse(JSON.stringify(this.imgList))); this.imgHistoryList.push(JSON.parse(JSON.stringify(this.imgList)));
}); });
}, },
...@@ -554,11 +562,11 @@ export default { ...@@ -554,11 +562,11 @@ export default {
url: files[i].url, url: files[i].url,
fileName: files[i].fileName, fileName: files[i].fileName,
rate, rate,
w: width_px, w: width_px * that.WHproportion,
zIndex: that.imgList.length, zIndex: that.imgList.length,
x: w, x: w * that.WHproportion,
y: height_px / 2, y: (height_px / 2) * that.WHproportion,
h: height_px, h: height_px * that.WHproportion,
r: 0, r: 0,
}); });
that.selectIndex = that.imgList.length - 1; that.selectIndex = that.imgList.length - 1;
...@@ -764,6 +772,7 @@ export default { ...@@ -764,6 +772,7 @@ export default {
bus.$on("busEmit", (v) => { bus.$on("busEmit", (v) => {
let { type, value, size } = v; let { type, value, size } = v;
switch (type) { switch (type) {
case "grid": case "grid":
this.row = value.row; this.row = value.row;
...@@ -793,6 +802,7 @@ export default { ...@@ -793,6 +802,7 @@ export default {
this.hasSize = false; this.hasSize = false;
} }
this.detail.designImageSize = size; this.detail.designImageSize = size;
console.log(this.detail,'this.detail');
this.imgList = []; this.imgList = [];
this.selectIndex = -1; this.selectIndex = -1;
if (value.length > 0) { if (value.length > 0) {
......
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