Commit ad10ecc2 by linjinhong

fix:修改切换压板的图片尺寸问题

parent d0aa18ae
...@@ -274,11 +274,6 @@ export default { ...@@ -274,11 +274,6 @@ export default {
this.selectImgList = []; this.selectImgList = [];
this.selectIndex = -1; this.selectIndex = -1;
this.selectImgIndex = 0; this.selectImgIndex = 0;
console.log("this.gridWH", this.gridWH);
console.log("this.grid", this.grid);
console.log("gridSpacing", this.gridSpacing);
console.log("WHproportion", this.WHproportion);
console.log("this.systemSetting", this.systemSetting);
}, },
desktoVersion(newValue) { desktoVersion(newValue) {
if (newValue) { if (newValue) {
...@@ -385,6 +380,8 @@ export default { ...@@ -385,6 +380,8 @@ export default {
this.systemSetting.gridValue = 5; this.systemSetting.gridValue = 5;
} else { } else {
this.systemSetting.gridValue = 0; this.systemSetting.gridValue = 0;
this.$store.commit("setWHproportion", 1.7);
this.$store.commit("setGrid");
} }
}, },
immediate: true, immediate: true,
...@@ -770,7 +767,7 @@ export default { ...@@ -770,7 +767,7 @@ export default {
this.isView = false; this.isView = false;
// bw = Number(bw.replsace("px", "")); // bw = Number(bw.replsace("px", ""));
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
files[i].url = files[i].productionFile || files[i].url; files[i].url = files[i]?.productionFile || files[i].url;
that.$nextTick(async () => { that.$nextTick(async () => {
let w = bw / 2; let w = bw / 2;
let h = bh / 2; let h = bh / 2;
...@@ -832,6 +829,8 @@ export default { ...@@ -832,6 +829,8 @@ export default {
that.showImgSetting = true; that.showImgSetting = true;
if (this.newDesktopDevice != 3) { if (this.newDesktopDevice != 3) {
if (size && !files[i].isCut) { if (size && !files[i].isCut) {
console.log(7898);
that.ev("cover"); that.ev("cover");
} else { } else {
that.ev("x_center"); that.ev("x_center");
...@@ -1282,6 +1281,31 @@ export default { ...@@ -1282,6 +1281,31 @@ export default {
case "grid": case "grid":
this.row = value.row; this.row = value.row;
this.col = value.col; this.col = value.col;
if (
this.detail &&
this.detail.mssWidth &&
this.detail.adjustable &&
this.detail.mssHeight
) {
this.detail.designImageSize = {
width: this.detail.mssWidth,
height: this.detail.mssHeight,
};
}
if (this.selectImgIndex != -1 && this.selectImgList.length) {
this.getBackFile(
{
files: [this.selectImgList[this.selectImgIndex]],
size: this.detail.designImageSize || null,
},
() => {
this.imgHistoryList.push(
JSON.parse(JSON.stringify(this.imgList)),
);
},
);
}
break; break;
case "index": case "index":
this.indexChange(value); this.indexChange(value);
...@@ -1321,8 +1345,8 @@ export default { ...@@ -1321,8 +1345,8 @@ export default {
} else { } else {
this.selectImgIndex = 0; this.selectImgIndex = 0;
} }
console.log(777, this.selectImgIndex);
console.log("selectImgList", this.selectImgList); console.log("designImageSize", this.detail.designImageSize);
if (this.selectImgIndex != -1) { if (this.selectImgIndex != -1) {
this.getBackFile( this.getBackFile(
...@@ -1546,7 +1570,7 @@ export default { ...@@ -1546,7 +1570,7 @@ export default {
class="div-item" class="div-item"
style="flex: 100%;" style="flex: 100%;"
> >
<div>素材规格:</div> <div>规格:</div>
<div class="item-value"> <div class="item-value">
mm:&nbsp;(&nbsp; w: mm:&nbsp;(&nbsp; w:
...@@ -1560,7 +1584,7 @@ export default { ...@@ -1560,7 +1584,7 @@ export default {
class="div-item" class="div-item"
style="flex: 100%;" style="flex: 100%;"
> >
<div style="opacity: 0;">素材规格:</div> <div style="opacity: 0;">规格:</div>
<div class="item-value"> <div class="item-value">
inch:&nbsp;(&nbsp;w: inch:&nbsp;(&nbsp;w:
{{ (Number(detail.mssWidth) / 25.4).toFixed(1) }} {{ (Number(detail.mssWidth) / 25.4).toFixed(1) }}
......
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