Commit 5ea87d55 by linjinhong

fix:修改问题

parent 1fa9964a
...@@ -175,10 +175,9 @@ export default { ...@@ -175,10 +175,9 @@ export default {
return res.json(data); return res.json(data);
} }
console.log("data", data); console.log("data", data);
let path, processDesign, processDesignA, processDesignB; let path, processDesignA, processDesignB;
if (data.data) { if (data.data) {
path = data.data.path; path = data.data.path;
processDesign = data.data.processDesign;
processDesignA = data.data.processDesignA; processDesignA = data.data.processDesignA;
processDesignB = data.data.processDesignB; processDesignB = data.data.processDesignB;
} else { } else {
...@@ -197,7 +196,6 @@ export default { ...@@ -197,7 +196,6 @@ export default {
const downloadFunc = const downloadFunc =
params.device === 2 ? downloadOtherImage : downloadImage; params.device === 2 ? downloadOtherImage : downloadImage;
const result = await downloadFunc(files, { const result = await downloadFunc(files, {
processDesign,
processDesignA, processDesignA,
processDesignB, processDesignB,
}); });
......
...@@ -156,12 +156,19 @@ export const downloadImage = (list, isForcedProduction) => { ...@@ -156,12 +156,19 @@ export const downloadImage = (list, isForcedProduction) => {
// 处理普通图片文件 // 处理普通图片文件
if (!item.list) item.list = []; if (!item.list) item.list = [];
const originalName = item.url.split("/").pop(); const originalName = item.url.split("/").pop();
if (isForcedProduction.processDesign) { if (
isForcedProduction.processDesignA ||
isForcedProduction.processDesignB
) {
item.list.push({ item.list.push({
fileName, fileName,
productionFile: filePath, productionFile: filePath,
designId: originalName.split("_GCPS")[0], designId: originalName.split("_GCPS")[0],
isForcedProduction: isForcedProduction.processDesign, isForcedProduction: originalName
.split("_GCPS")[0]
.includes("A")
? isForcedProduction.processDesignA || false
: isForcedProduction.processDesignB || false,
}); });
} else { } else {
item.list.push({ item.list.push({
......
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