Commit 29646a5c by linjinhong

fix:兼容图片链接

parent 2c071741
...@@ -488,6 +488,8 @@ export default { ...@@ -488,6 +488,8 @@ export default {
} }
); );
this.detail = findByPodProductionNo.data; this.detail = findByPodProductionNo.data;
console.log(491, this.detail);
this.imgList = []; this.imgList = [];
let designImagesCanvasJsonList = this.detail.drParam; let designImagesCanvasJsonList = this.detail.drParam;
// this.detail.drParam; // this.detail.drParam;
...@@ -902,20 +904,23 @@ export default { ...@@ -902,20 +904,23 @@ export default {
type="success" type="success"
>生产完成 >生产完成
</el-button> </el-button>
<div class="check"> <!-- <div class="check">
<el-checkbox v-model="isAutoFinish">自动完成上一单</el-checkbox> <el-checkbox v-model="isAutoFinish">自动完成上一单</el-checkbox>
</div> </div> -->
</div> </div>
<div style="margin-left: 10px;"> <div style="margin-left: 10px;">
<el-checkbox v-model="checked">自动裁切素材</el-checkbox> <el-checkbox v-model="isAutoFinish">自动完成上一单</el-checkbox>
</div> </div>
<el-button <div style="margin-left: 10px;">
<el-checkbox v-model="checked">自动裁切</el-checkbox>
</div>
<!-- <el-button
@click="downloadImage" @click="downloadImage"
size="medium" size="medium"
style="margin-left: 15px" style="margin-left: 15px"
type="primary" type="primary"
>下载素材 >下载素材
</el-button> </el-button> -->
</div> </div>
<div class="right-user"> <div class="right-user">
<div <div
...@@ -1027,20 +1032,20 @@ export default { ...@@ -1027,20 +1032,20 @@ export default {
} }
.sure-btn { .sure-btn {
width: 300px; // width: 300px;
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
::v-deep { // ::v-deep {
.el-button { // .el-button {
span { // span {
position: relative; // position: relative;
left: -40px; // // left: -40px;
} // }
} // }
} // }
} }
.check { .check {
......
...@@ -258,9 +258,16 @@ export default { ...@@ -258,9 +258,16 @@ export default {
productDetail(newValue) { productDetail(newValue) {
this.detail = { ...newValue }; this.detail = { ...newValue };
if (typeof this.detail.imageAry == "string") { try {
this.detail.imageAry = JSON.parse(this.detail.imageAry); if (typeof this.detail.imageAry == "string") {
this.detail.imageAry = JSON.parse(this.detail.imageAry);
}
} catch (error) {
console.log(error);
this.detail.imageAry = [{ title: "正", url: this.detail.imageAry }];
} }
this.detail.imageAry = this.detail.imageAry.sort((a, b) => { this.detail.imageAry = this.detail.imageAry.sort((a, b) => {
// 检查 a.title 是否为 '正' 或 'A' // 检查 a.title 是否为 '正' 或 'A'
const isAPriority = a.title === "正" || a.title === "A"; const isAPriority = a.title === "正" || a.title === "A";
...@@ -1169,7 +1176,7 @@ export default { ...@@ -1169,7 +1176,7 @@ export default {
if (value.length > 0) { if (value.length > 0) {
this.selectImgList = value; this.selectImgList = value;
console.log(816, this.selectImgList); console.log(816, this.selectImgList);
console.log(99999, value);
this.selectImgIndex = 0; this.selectImgIndex = 0;
this.getBackFile( this.getBackFile(
{ files: [value[0]], size: this.detail.designImageSize || null }, { files: [value[0]], size: this.detail.designImageSize || null },
......
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