Commit 8c24a6ce by linjinhong

fix:修改问题

parent 7abbdad4
......@@ -1206,6 +1206,8 @@ export default {
title="警告:无法直接生产"
:visible.sync="dialogVisible"
width="30%"
@close="closeDialog"
:close-on-click-modal="false"
>
<div>
素材效果已经超出台版范围,无法直接打印。请更换打印设
......
......@@ -749,7 +749,7 @@ export default {
);
return img?.productionFile;
},
getBackFile({ files, size }, callback, imgType) {
getBackFile({ files, size }, callback) {
const isCp = this.productMark == "custom_part" ? true : false;
let that = this;
let bw = document.getElementById("line");
......@@ -768,14 +768,8 @@ export default {
const isCut = files[i].isCut;
if (size && !isCut) {
if (isCp) {
width_px =
this.newDesktopDevice == 3
? HLCMmToPxFn(size.width)
: newMmToPxFn(size.width);
height_px =
this.newDesktopDevice == 3
? HLCMmToPxFn(size.height)
: newMmToPxFn(size.height);
width_px = newMmToPxFn(size.width);
height_px = newMmToPxFn(size.height);
} else {
width_px = mmToPx(size.width);
height_px = mmToPx(size.height);
......@@ -825,11 +819,7 @@ export default {
that.selectIndex = that.imgList.length - 1;
that.showImgSetting = true;
isCp
? imgType == true
? that.ev("cover")
: that.ev("x_center")
: that.ev("cover");
isCp ? that.ev("x_center") : that.ev("cover");
if (isCut) that.ev("cover");
this.$nextTick(async () => {
const {
......@@ -1272,12 +1262,6 @@ export default {
},
async forcedProductionFN(bool) {
if (bool) this.isForcedProduction = true;
const params = {
orderType: this.orderType,
subOrderNumber: this.detail.factorySubOrderNumber,
url: "",
};
},
},
mounted() {
......@@ -1285,7 +1269,7 @@ export default {
this.systemSetting = this.$dataStore.get("setting");
bus.$on("busEmit", (v) => {
let { type, value, size, productMark, urls, imgeType } = v;
let { type, value, size, productMark } = v;
switch (type) {
case "completeMessage":
......@@ -1353,8 +1337,6 @@ export default {
}
if (this.selectImgIndex != -1) {
console.log("urls", urls);
this.getBackFile(
{
files: [value[this.selectImgIndex]],
......@@ -1365,8 +1347,6 @@ export default {
JSON.parse(JSON.stringify(this.imgList)),
);
},
urls,
imgeType,
);
}
}
......@@ -1827,6 +1807,7 @@ export default {
v-if="
productMark == 'custom_part' &&
selectImgList.length &&
!selectImgList.some((el) => el.isCut) &&
isOver &&
newDesktopDevice !== 3
"
......
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