合并画布

This commit is contained in:
X1627315083
2025-06-23 09:27:29 +08:00
parent fad2c220af
commit 7ab32c9c77
14 changed files with 518 additions and 58 deletions

View File

@@ -25,12 +25,12 @@
</div>
</div>
<div class="print_content_list">
<div class="content_item" v-show="selectTitle == 'current'" v-if="type != 'element'">
<div class="content_item" v-show="selectTitle == 'current'" v-if="type != 'element' && deReconstructionList.length == 0">
<currentList ref="currentList" :level1Type="level1Type" :type="type" @selectImgItem="selectImgItem" :catecoryList="catecoryList"></currentList>
</div>
<div class="content_item" v-show="selectTitle == 'upload'" v-if="type != 'element'">
<uploadList v-if="!isSegmentation" @selectImgItem="selectImgItem" :level1Type="level1Type" :catecoryList="catecoryList"></uploadList>
<uploadSegmentation v-if="isSegmentation" :segmentationType="segmentationType" @selectImgItem="selectImgItem" :level1Type="level1Type" :catecoryList="catecoryList"></uploadSegmentation>
<uploadSegmentation v-if="isSegmentation" :segmentationType="segmentationType" :deReconstructionList=deReconstructionList @selectImgItem="selectImgItem" :level1Type="level1Type" :catecoryList="catecoryList"></uploadSegmentation>
</div>
<div class="content_item" v-show="selectTitle == 'library'">
<libraryList :isSegmentation="isSegmentation" @selectImgItem="selectImgItem" :randomId="randomId" :level1Type="level1Type" :type="type" ref="libraryList" :catecoryList="catecoryList"></libraryList>
@@ -90,6 +90,10 @@ export default defineComponent({
type:Boolean,
default:true,
required:false
},
deReconstructionList:{
type:Array,
default:()=>[]
}
},
emits:['selectImgItem'],

View File

@@ -2,7 +2,6 @@
<template>
<div class="uploadList">
<div class="uploadList_box">
<div class="content_img_item" v-for="(file) in uploadList" :key="file.id">
<div class="content_img_item_block" :class="{active:file?.checked}">
<img v-lazy="file.url" :key="file.url" :alt="file.name" @click.stop="selectImgItem(file)"/>

View File

@@ -2,10 +2,10 @@
<template>
<div class="uploadList">
<div class="uploadList_box">
<div class="content_img_item" v-for="(file) in uploadList" :key="file.id">
<div class="content_img_item_block" :class="{active:file?.checked}">
<img v-lazy="file.url" :key="file.url" :alt="file.name" @click.stop="selectImgItem(file)"/>
<sketchCategory :disignTypeList="deReconstructionList" :generateList="uploadList" :item="file" :isSetSketchCategory="true"></sketchCategory>
</div>
</div>
<div class="upload_item">
@@ -55,6 +55,10 @@ export default defineComponent({
type:String,
default:'' as any,
},
deReconstructionList:{
type:Array,
default:()=>[]
}
},
emits:['selectImgItem'],
setup(props,{emit}) {
@@ -115,6 +119,10 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.imageSegmentation, param, config)
.then((rv: any) => {
rv.forEach((item:any)=>{
item.category = props.deReconstructionList[0].name
item.categoryValue = props.deReconstructionList[0].value
})
detailData.uploadList.unshift(...rv);
detailData.isShowMark = false;
})