接入画布

2025-06-09 10:25:54 +08:00
parent 87a08f5f8f
commit c266967f16
157 changed files with 43833 additions and 1571 deletions
--- a/src/component/home/batchGeneration/createCloud.vue
+++ b/src/component/home/batchGeneration/createCloud.vue
@@ -38,6 +38,26 @@
 					@change="changeBuildType"
 				></a-select>
 			</div>
+			<div class="admin_state_item">
+				<span>Project <span v-show="buildType == 'SERIES_DESIGN' || buildType == 'SINGLE_DESIGN'">*</span></span>
+				<a-select
+					v-model:value="projectData"
+					show-search
+					allowClear
+					:show-arrow="false"
+						:default-active-first-option="false"
+					:not-found-content="null"
+					:filter-option="false"
+					style="width: 16rem"
+					placeholder="Please select"
+					:options="objectList"
+					@search="getHistoryProjectList"
+				>
+				<template #option="{ value: val, label, icon,updateTime }">
+					<span :title="updateTime.replace('T', ' ')">{{ label }}</span>
+				</template>
+				</a-select>
+			</div>
 			<div class="admin_state_item" v-show="buildType">
 				<span>Quantity <span>*</span></span>
 				<input
@@ -49,24 +69,24 @@
 				/>
 			</div>
 			<!-- toProductimg -->
-			 <div v-show="buildType == 'toProductImage'" class="admin_state_item ">
+			 <div v-show="buildType == 'TO_PRODUCT_IMAGE'" class="admin_state_item ">
 				<span>{{$t('ProductImg.Similarity')}}</span>
 				<div class="sliderAndImput" style="width: 200px">
 					<a-slider class="system_silder"
 						v-model:value="similarity"
-						:tooltipVisible="false"
+						range
 						:step="5"
 						
 					>
 					</a-slider>
-					<input type="number" readonly v-model="similarity">
+					<!-- <input type="number" readonly v-model="similarity"> -->
 				</div>
 			</div>
-			 <div v-show="buildType == 'relight'" class="admin_state_item ">
+			 <div v-show="buildType == 'RELIGHT'" class="admin_state_item ">
 				<span>{{$t('ProductImg.RelightDirection')}}</span>
 				<a-select  style="width: 200px" v-model:value="relightDirection" :options="relightDirectionList"></a-select>
 			</div>
-			<div v-show="buildType == 'relight'" class="admin_state_item ">
+			<div v-show="buildType == 'RELIGHT'" class="admin_state_item ">
 				<span>{{$t('ProductImg.Highlight')}}</span>
 				<div class="sliderAndImput" style="width: 200px">
 					<a-slider class="system_silder"
@@ -81,7 +101,7 @@
 					<input type="number" readonly v-model="brightenValue">
 				</div>
 			</div>
-			<div v-show="buildType == 'toProductImage' || buildType == 'relight'" class="admin_state_item">
+			<div v-show="buildType == 'TO_PRODUCT_IMAGE' || buildType == 'relight'" class="admin_state_item">
 				<span>Keyword</span>
 				<input
 					v-model="generateText"
@@ -91,12 +111,55 @@
 				/>
 			</div>
 			
-			<div class="selectImgList generalScroll" v-mousewheel v-show="exhibitionImgList.length>0">
+			<!-- <div class="selectImgList generalScroll" v-mousewheel v-show="exhibitionImgList.length>0">
 				<div v-for="item in exhibitionImgList" class="item">
 					<img :src="item.designOutfitUrl||item.url" alt="">
 				</div>
-			</div>
+			</div> -->
+			<div class="productImg_content_item_imgBox generalScroll upload_item" v-if="buildType && buildType != 'SERIES_DESIGN' && buildType != 'SINGLE_DESIGN'" v-mousewheel>
+				<div class="content_item_imgBox_itemImg" v-for="(file, index) in fileList" :key="file">
+					<div class="upload_file_item_content" v-show="file?.status === 'uploading'" >
+						<a-spin
+							:indicator="indicator"
+							tip="Uploading..."
+						/>
+					</div>
+					<div
+						class="imgBox"
+						v-show="file?.status === 'done'"
+						@click="()=>file.isChecked = !file.isChecked"
+					>
+						<img :class="[file?.isChecked?'active':'']" :src="file?.imgUrl" class="upload_img"/>
+						<a-checkbox v-model:checked="file.isChecked"></a-checkbox>
+					</div>
+				</div>
+				<div class="upload_file_item upload_component">
+				<!-- :action="uploadUrl + '/api/history/toProductImageElementUpload'" -->
+					<a-upload
+						:action="getUploadUrl() + '/api/history/toProductImageElementUpload'"
+						list-type="picture-card"
+						:capture="null"
+						:headers="{ Authorization: getCookie('token') }"
+						:before-upload="beforeUpload"
+						:data="{
+							projectId:2061,
+						}"
+						v-model:file-list="fileList"
+						:multiple="true"
+						:maxCount="8"
+						accept=".jpg,.png,.jpeg,.bmp"
+						@change="(file) => fileUploadChange(file)"
+					>
+						<div
+							class="upload_tip_block"
+						>
+							<i class="fi fi-br-upload"></i>
+							<!-- <img class="upload_img_icon" src="@/assets/images/homePage/add_file.png"> -->
+						</div>
+					</a-upload>
+				</div>

+			</div>
 			<!-- <div class="admin_state_item" style="width: 100%;">
 				<span style="margin: 0;">Generation time：19min</span>
 			</div> -->
@@ -119,11 +182,13 @@
 	</div>
 </template>
 <script>
-import { defineComponent, computed, reactive, watch, onMounted, nextTick, toRefs } from "vue";
+import { defineComponent, computed, reactive, watch, onMounted, h, nextTick, toRefs } from "vue";
+import { LoadingOutlined } from "@ant-design/icons-vue";
 import { Https } from "@/tool/https";
 import { Modal, message } from "ant-design-vue";
+import { getCookie,setCookie } from "@/tool/cookie";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import { formatTime,isEmail } from "@/tool/util";
+import { getUploadUrl,isMoible } from "@/tool/util";
 import dayjs, { Dayjs } from 'dayjs';
 import { useStore } from "vuex";
 import { useI18n } from "vue-i18n";
@@ -150,10 +215,11 @@ export default defineComponent({
 			numberOfImages:'',
 			credits:0,
 			exhibitionImgList:[],//选择的图片
-			selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
+			projectData:null,//批量id
+			objectList:[],
 			//toProduct
 			generateText:'',//输入的内容
-			similarity:30,
+			similarity:[30,60],
 			brightenValue:1,//亮度
 			relightDirection:'Right Light',//打光方向
 			relightDirectionList:[
@@ -170,27 +236,47 @@ export default defineComponent({
 					value:'Bottom Light',
 					label:useI18n().t('ProductImg.BottomLight')
 				}
-			]
+			],
+			fileList:[],
 		})
-		let init = ()=>{
+		let init = (projectData,buildType)=>{
 			operations.operationsModal = true
-
+			if(projectData?.id)operationsData.projectData = {label:projectData.name,value:projectData.id}
+			
+			if(buildType.value)operationsData.buildType = buildType
 		}
 		const changeBuildType = ()=>{
-			if(operationsData.buildType == 'design'){
-				operationsData.exhibitionImgList = []
-			}else if(operationsData.buildType == 'toProductImage'){
-				operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.design.likeData
-			}else if(operationsData.buildType == 'relight'){
-				operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.toProduct
-			}else if(operationsData.buildType == 'poseTransfer'){
-				operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.toProduct
-			}
+			// operationsData.exhibitionImgList = []
+			operationsData.projectData = null
 			props.cloudList.forEach((item)=>{
 				if(item.value == operationsData.buildType){
 					operationsData.credits = item.consumption
 				}
 			})
+			getHistoryProjectList()
+		}
+		const getGenerateCloudImgList = ()=>{
+			let list = []
+			if(operationsData.buildType == 'SINGLE_DESIGN'|| operationsData.buildType == 'SERIES_DESIGN')return list
+			let selectList = operationsData.fileList.filter((item)=>item.isChecked)
+			selectList.forEach((item)=>{
+				let obj = {
+					
+				}
+				if(operationsData.buildType == 'POSE_TRANSFER'){
+					obj = {
+						poseId:1,
+						productImage:getMinioUrl(item.imgUrl)
+					}
+				}else{
+					obj = {
+						elementId:item.id,
+						elementType:item.type
+					}
+				}
+				list.push(obj)
+			})
+			return list
 		}
 		let getPorductImg = ()=>{
 			let modularData = store.state.UploadFilesModule.modularData
@@ -223,8 +309,9 @@ export default defineComponent({
 			} 
 			return list
 		}
-		const getImageStrength = () => {
-			let imageStrength = operationsData.similarity == 100? 95 :operationsData.similarity
+		const getImageStrength = (num) => {
+			let imageStrength = num == 100? 95 :num
+			console.log(num)
 			return imageStrength;
 		};
 		const getPoseTransformData = ()=>{
@@ -240,23 +327,34 @@ export default defineComponent({
 			return list
 		}
 		let setAddData = ()=>{
+			let buildTypeCorresponding = {
+				SINGLE_DESIGN:"design",
+				SERIES_DESIGN:"design",
+				TO_PRODUCT_IMAGE:"toProductImage",
+				RELIGHT:"relight",
+				POSE_TRANSFORM:"poseTransfer"
+			}
 			return {
-				"buildType": operationsData.buildType,
+				"buildType": buildTypeCorresponding[operationsData.buildType],
 				nums: operationsData.numberOfImages,
-				projectId: operationsData.selectObject.id,
+				projectId: operationsData.projectData,
 				//productimg
 				toProductImage:{
 					prompt:operationsData.generateText,//输入的内容
-					toProductImageVOList:getPorductImg(),//选择的图片
-					projectId: operationsData.selectObject.id,
+					toProductImageVOList:(operationsData.buildType == 'TO_PRODUCT_IMAGE' || operationsData.buildType == 'RELIGHT')?getGenerateCloudImgList():[],//选择的图片
+					// toProductImageVOList:getPorductImg(),//选择的图片
+					projectId: operationsData.projectData,
 					direction:operationsData.relightDirection,//打光方向
 					brightenValue:operationsData.brightenValue,
 					imageStrength:(100 - getImageStrength())/100,
+					imageStrengthMin:(100 - getImageStrength(operationsData.similarity[1]))/100,
+					imageStrengthMax:(100 - getImageStrength(operationsData.similarity[0]))/100,
 				},
 				//poseTransform
-				poseTransform:getPoseTransformData(),
-				private: operationsData.selectObject.id,
-				ToProductImageDTO: operationsData.selectObject.id,
+				// poseTransform:getPoseTransformData(),
+				poseTransform:operationsData.buildType == 'POSE_TRANSFER'?getGenerateCloudImgList():[],
+				private: operationsData.projectData,
+				ToProductImageDTO: operationsData.projectData,
 			}
 		}
 		let cancelDsign = ()=>{
@@ -267,14 +365,18 @@ export default defineComponent({
 		let setOk = ()=>{
 			let data 
 			data = setAddData()
-			if(operationsData.buildType == 'toProductImage'){
-				if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("You need to go to the Design module and generate a design result first before you can use the 'To Product Image' cloud generation feature.")
-			}else if(operationsData.buildType == 'relight'){
-				if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("You need to go to the 'To Product Image' module and generate a result first before you can use the 'Relight' cloud generation feature.")
-			}else if(operationsData.buildType == 'poseTransfer'){
-				if(data.poseTransform.length == 0)return message.warning("You must first generate results in the 'To Product Image' module before you can use the 'Transfer Pose' cloud generation feature.")
+			if(operationsData.buildType == 'TO_PRODUCT_IMAGE'){
+				if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("Please upload the picture first.")
+				// if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("You need to go to the Design module and generate a design result first before you can use the 'To Product Image' cloud generation feature.")
+			}else if(operationsData.buildType == 'RELIGHT'){
+				if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("Please upload the picture first.")
+				// if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("You need to go to the 'To Product Image' module and generate a result first before you can use the 'Relight' cloud generation feature.")
+			}else if(operationsData.buildType == 'POSE_TRANSFER'){
+				if(data.poseTransform.length == 0)return message.warning("Please upload the picture first.")
+				// if(data.poseTransform.length == 0)return message.warning("You must first generate results in the 'To Product Image' module before you can use the 'Transfer Pose' cloud generation feature.")
 			}
-			if(!data.buildType || !data.nums)return message.warning('Please check the input box marked with *')
+			if(operationsData.buildType == 'DESIGN' && !operationsData.projectData)return message.warning('Please select a project')
+			if(!data.buildType || !data.nums || (operationsData.buildType == 'DESIGN' && !operationsData.projectData))return message.warning('Please check the input box marked with *')
 			operations.loadingShow = true
 			Https.axiosPost(Https.httpUrls.designCloud, data).then(
 			(rv) => {
@@ -294,6 +396,64 @@ export default defineComponent({
 				}
 			}
 		}
+		let getHistoryTime = null
+		const getHistoryProjectList = (event)=>{
+			clearTimeout(getHistoryTime)
+			if(!event && !operationsData.buildType){
+				operationsData.objectList = []
+				return
+			}
+			getHistoryTime = setTimeout(()=>{
+				let value = {
+					projectName:event,
+					page:1,
+					size:9999,
+					asc:0,
+					process:operationsData.buildType,
+				}
+				Https.axiosPost(Https.httpUrls.historyProject,value).then((rv)=>{
+					rv.content.forEach((item)=>{
+						item.value = item.id
+						item.label = item.name
+					})
+					operationsData.objectList = rv.content
+				})
+			},1000)
+		}
+		let beforeUpload = async (file)=>{
+            const isJpgOrPng =
+                file.type === "image/jpeg" ||
+                file.type === "image/png" ||
+                file.type === "image/jpg" ||
+                file.type === "image/bmp";
+            if (!isJpgOrPng) {
+                message.info(useI18n().t('MoodboardUpload.jsContent3'));
+            }
+            const isLt2M = file.size / 1024 / 1024 < 5;
+            if (!isLt2M) {
+                message.info(useI18n().t('MoodboardUpload.jsContent4'));
+            }
+            return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
+        }
+		let fileUploadChange = (data)=> {
+            let file = data.file;
+			let bor = true
+            if (file.status === "done") {
+                let res = JSON.parse(file.xhr.response);
+				if(res.errCode == 0){
+					file.imgUrl = res.data.url;
+					file.id = res.data.id
+					file.isChecked = true
+					file.type = 'ProductElement'
+					operationsData.fileList.filter((v) => v.status === "done");
+				}else{
+					bor = false
+				}
+				// this.showFileList = productImgData.fileList
+            } else if (file.status === "error") {
+				bor = false
+            }
+        }
        return {
            ...toRefs(operations),
            ...toRefs(operationsData),
@@ -304,10 +464,21 @@ export default defineComponent({
 			setOk,
 			changeBuildType,
 			changeNumberOfImages,
+			getHistoryProjectList,
+			beforeUpload,
+			fileUploadChange,
+			getUploadUrl,
+			getCookie,
        };
    },
    data() {
        return {
+			indicator: h(LoadingOutlined, {
+				style: {
+					fontSize: "2.4rem",
+				},
+				spin: true,
+			}),
        };
    },
    mounted() {},
@@ -360,6 +531,66 @@ export default defineComponent({
    .closeIcon {
        z-index: 2;
    }
+	.productImg_content_item_imgBox{
+		display: flex;
+		overflow-x: auto;
+		width: auto;
+		margin-bottom: 2rem;
+		align-items: center;
+		flex-wrap: nowrap;
+		width: 100%;
+		.content_item_imgBox_itemImg{
+			display: flex;
+			margin-right: 1rem;
+			position: relative;
+			height: 20rem;
+			max-height: 100%;
+			position: relative;
+			flex-shrink: 0;
+			img{
+				height: 100%;
+				width: 100%;
+				cursor: pointer;
+				object-fit: contain;
+				opacity: .5;
+				&.active{
+					opacity: 1;
+				}
+			}
+			.ant-checkbox-wrapper{
+				position: absolute;
+				right: 0;
+				top: 0;
+			}
+			&.content_item_imgBox_itemImg:hover{
+				.content_item_imgBox_itemImg_delete{
+					display: block;
+					cursor: pointer;
+				}
+			}
+			.content_item_imgBox_itemImg_delete{
+				display: none;	
+				width: 100%;
+				height: 100%;
+				background: rgba(0,0,0,.2);
+				position: absolute;
+				i{
+					position: absolute;
+					left: 50%;
+					top: 50%;
+					transform: translate(-50%,-50%);
+					color: #fff;
+				}
+			}
+
+		}
+		:deep(.upload_file_item){
+			flex-shrink: 0;
+		}
+		.content_item_imgBox_itemImg:last-child{
+			margin-right: 0;
+		}
+	}
 	.allUserPoeration_btn{
 		display: flex;
 		flex-direction: row;
--- a/src/component/home/batchGeneration/index.vue
+++ b/src/component/home/batchGeneration/index.vue
@@ -12,17 +12,28 @@
 				<div class="generalModel_state_item smail">
 					<span>Project :</span>
 					<a-select
-						v-model:value="changeEvent"
+						v-model:value="projectData"
 						show-search
 						allowClear
-						style="width: 150px"
+                        size="large"
+						:show-arrow="false"
+						 :default-active-first-option="false"
+						:not-found-content="null"
+						:filter-option="false"
+						style="width: 16rem"
+						:fieldNames="{ label: 'name', value: 'value'}"
 						placeholder="Please select"
 						:options="objectList"
+						@search="getHistoryProjectList"
 						@change="handleChange"
-					></a-select>
+					>
+					<template #option="{ value: val, label, icon,updateTime }">
+						<span :title="updateTime.replace('T', ' ')">{{ label }}</span>
+					</template>
+					</a-select>
 				</div>
 			</div>
-			<div class="createCloud" v-show="selectObject.id">
+			<div class="createCloud">
 				<div class="gallery_btn" @click="createClound">Create</div>
 			</div>
 		</div>
@@ -46,7 +57,7 @@
 			</div>
 			<a-pagination style="text-align: center;" v-model:current="currentPage" :total="total" show-less-items />
 		</div>
-		<createCloud ref="createCloud" :cloudList="generateList[workflowType]" @getContentList="submitGetContentList"></createCloud>
+		<createCloud ref="createCloud" :cloudList="generateList.seriesDesign" @getContentList="submitGetContentList"></createCloud>
 	</div>
 </template>
 <script lang="ts">
@@ -57,44 +68,50 @@ import { useStore } from "vuex";
 import { useI18n } from 'vue-i18n'
 import createCloud from "./createCloud.vue";
 import { da } from 'element-plus/es/locale';
+import { useRouter,useRoute } from 'vue-router'
 export default defineComponent({
 	components:{
 		createCloud,
 	},
-	props:{
-		workflowType:{
-		    type:String,
-			default:'' as any,
-			required:true	
-		}
-	},
 	emits:['retrieve'],
 	setup(props,{emit}) {
 		const store = useStore();
+		const route = useRoute()
 		const data = reactive({
 			pageType:'list',
 			pageSize:10,
 			currentPage:1,
 			total:0,
 			selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
+			projectData:null as any,//批量id
+			createData:null as any,
 			generateList:{
 				seriesDesign:[
-					{
-						label:'Design',
-						value:'design',
+				{
+						label:'Series design',
+						// value:'SERIES_DESIGN',
 						consumption:0,
+						value:'SERIES_DESIGN',
+					},{
+						label:'Single design',
+						// value:'SINGLE_DESIGN',
+						consumption:0,
+						value:'SINGLE_DESIGN',
 					},{
 						label:'To Product Image',
-						value:'toProductImage',
+						// value:'toProductImage',
 						consumption:5,
+						value:'TO_PRODUCT_IMAGE',
 					},{
 						label:'Relight',
-						value:'relight',
+						// value:'relight',
 						consumption:5,
+						value:'RELIGHT',
 					},{
 						label:'Transfer Pose',
-						value:'poseTransfer',
+						// value:'poseTransfer',
 						consumption:10,
+						value:'POSE_TRANSFER',
 					},
 				],
 				singleProductDesign:[
@@ -191,6 +208,7 @@ export default defineComponent({
 			]  as any,
 			contentList:[
 			]  as any,
+			objectList:[],
 			isGetContentList:false as any,
 		})
 		const dataDom = reactive({
@@ -198,7 +216,16 @@ export default defineComponent({
 		})
 		const createClound = ()=>{
 			data.isGetContentList = false
-			dataDom.createCloud.init()
+			let obj = {}
+			if(data.createData){
+				data.generateList.seriesDesign.forEach((item:any)=>{
+					if((item.value == data.createData.process)){
+						obj = item
+					}
+				})
+			}
+			
+			dataDom.createCloud.init(data.createData,obj)
 		}
 		const detailIamge = (item:any)=>{
 			//去除里面的T2025-04-17T13:45:43
@@ -233,7 +260,7 @@ export default defineComponent({
 				let value = {
 					page:data.currentPage,
 					size:data.pageSize,
-					projectId: data.selectObject.id,
+					projectId: data.projectData.id,
 				}
 				Https.axiosPost(Https.httpUrls.cloudPage,value).then((rv)=>{
 					data.contentList = rv.content
@@ -247,16 +274,47 @@ export default defineComponent({
 				})
 			}
 		}
+		let getHistoryTime = null as any
+		const getHistoryProjectList = (event:any)=>{
+			clearTimeout(getHistoryTime)
+			if(!event){
+				data.objectList = []
+				return
+			}
+			getHistoryTime = setTimeout(()=>{
+				let value = {
+					projectName:event,
+					page:1,
+					size:9999,
+					asc:0,
+					process:'',
+				}
+				Https.axiosPost(Https.httpUrls.historyProject,value).then((rv)=>{
+					rv.content.forEach((item:any)=>{
+						item.value = item.id
+						item.label = item.name
+					})
+					data.objectList = rv.content
+				})
+			},1000)
+		}
 		const submitGetContentList = ()=>{
 			data.isGetContentList = true
 			getContentList()
 		}
+		const handleChange = (event:any,value:any)=>{
+			data.createData = value
+		}
 		onBeforeUnmount(()=>{
 			data.isGetContentList = false
 		})
 		onMounted(()=>{
 			data.isGetContentList = true
-			getContentList()
+			if(route.query?.id){
+				data.projectData.value = route.query?.id
+				data.projectData.label = route.query?.name
+			}
+			// if(route.query?.type == 'creation')dataDom.createCloud.init(data.projectData)
 		})
 		return{
 			...toRefs(dataDom),
@@ -265,6 +323,8 @@ export default defineComponent({
 			detailIamge,
 			getContentList,
 			submitGetContentList,
+			handleChange,
+			getHistoryProjectList,
 		}
 	},
 	provide() {
@@ -316,7 +376,6 @@ export default defineComponent({
 				}
 			}	
 			> .createCloud{
-				margin-left: auto;
 			}
 			> .searchObject{
 				margin-left: auto;
--- a/src/component/home/chat/index.vue
+++ b/src/component/home/chat/index.vue
@@ -134,10 +134,9 @@ export default defineComponent({
 			data.chatContent = ''
 			dataDom.textarea.value = ''
 			data.filList = []
-			let isText = !data.enableThinking
 			eventSource.onmessage = function(event) {
 				data.isFinish = false
-				// console.log('收到数据:', JSON.parse(event.data));
+				console.log('收到数据:', JSON.parse(event.data));
 				// if(event.data.status == 'DESIGN_SIGNAL'){
 				// 	emit('chatChange',{type:'design'})
 				// }else if(event.data.status == 'RUNNING'){
@@ -145,30 +144,32 @@ export default defineComponent({
 				// }
 				const container = dataDom.chatBox;
      			container.scrollTop = container.scrollHeight;
-				if(JSON.parse(event.data).status == "[RUNNING]"){
-					if(/\[TEXT\]/.test(JSON.parse(event.data).content)){
-						isText = true
-					}
-					if(isText){
-						data.chatList[data.chatList.length-1].content.message+=JSON.parse(event.data).content
-					}else{
-						data.chatList[data.chatList.length-1].content.think+=JSON.parse(event.data).content
-					}
-				}else{
-					let list = ['[MOOD_SIGNAL]','[PRINT_SIGNAL]','[SKETCH_SIGNAL]']
-					if(JSON.parse(event.data).status == "[DESIGN_SIGNAL]"){

-					}else if(JSON.parse(event.data).status == "[COLOR_SIGNAL]"){
-						data.chatList.push({content:{message:''},role:'system'})
-						data.chatList[data.chatList.length-1].content.color = JSON.parse(JSON.parse(event.data).tools_data).receiveCollectionElementList
-						data.chatList.push({content:{message:''},role:'system'})
-					}else if(list.indexOf(JSON.parse(event.data).status)>-1){
-						data.chatList.push({content:{message:''},role:'system'})
-						data.chatList[data.chatList.length-1].content.img = JSON.parse(JSON.parse(event.data).tools_data).receiveCollectionElementList
+				const eventData = JSON.parse(event.data)
+				if(eventData.type == 'text'){
+					data.chatList[data.chatList.length-1].content.message+=eventData.content
+				}else if(eventData.type == 'think'){
+					data.chatList[data.chatList.length-1].content.think+=eventData.content
+				}else if(eventData.type == "tools_response"){
+					let nameList = ['moodboard','printboard','sketchboard','generate_color_code']
+					let getData = ''
+					if(nameList.indexOf(eventData.tools_name) > -1){
+						if(data.chatList[data.chatList.length - 1].content.message)data.chatList.push({content:{message:''},role:'system'})
+						if(eventData.tools_name == 'generate_color_code'){
+							data.chatList[data.chatList.length-1].content.color = JSON.parse(JSON.parse(event.data).content).receiveCollectionElementList
+							getData = 'colorboard'
+						}else{
+							data.chatList[data.chatList.length-1].content.img = JSON.parse(JSON.parse(event.data).content).receiveCollectionElementList
+							getData = eventData.tools_name
+						}
 						data.chatList.push({content:{message:''},role:'system'})
+					}else{
+
 					}
-					emit('chatChange',{type:JSON.parse(event.data).status})
+					emit('chatChange',{type:eventData.type,module:getData})
+
 				}
+					//emit('chatChange',{type:JSON.parse(event.data).status})
 			};
 			eventSource.onerror = function(error) {
 				if (eventSource.readyState === EventSource.CLOSED) {
@@ -386,7 +387,7 @@ export default defineComponent({
 							display: flex;
 							padding: 1.2rem 2rem;
 							border-radius: 2.4rem;
-							-webkit-user-select: none;
+							// -webkit-user-select: none;
 							> .icon{
 								> img{
 									width: 2.5rem;
--- a/src/component/home/design/editDesignType/index.vue
+++ b/src/component/home/design/editDesignType/index.vue
@@ -24,8 +24,8 @@
 			<i class="fi fi-rr-down-to-line"></i>
 		</div>
 	</div>
-	<div class="scaleImage_content">
-		<div v-if="isProductimg" class="productImg_modal">
+	<div class="scaleImage_content" v-if="scaleImage">
+		<div class="productImg_modal">
 			<div class="productImg_left">
 				<div class="productImg_content_item_title productImg_content_item_title_menu">
 					<span v-if="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage'">{{$t('ProductImg.MagicTools')}}</span>
@@ -94,13 +94,13 @@
 				</div>
 				<div class="productImg_content_item_generate_btn input_border">
 					<div class="input_box">
-						<div v-show="!productimgIsProductimg" class="generage_btn started_btn" @click.stop="getPrductimg">
+						<div v-show="!generateSuccess.productimgIsProductimg" class="generage_btn started_btn" @click.stop="getPrductimg">
 							{{ $t('Generate.Generate') }}
 						</div>
-						<div v-show="productimgIsProductimg && !productimgRemProductimg" class="generage_btn started_btn" @click="getPrductimg">
+						<div v-show="generateSuccess.productimgIsProductimg && !generateSuccess.productimgRemProductimg" class="generage_btn started_btn" @click="getPrductimg">
 							<i class="fi fi-br-loading"></i>
 						</div>
-						<div v-show="productimgRemProductimg" @click="removeProductimg" class="generage_btn started_btn">
+						<div v-show="generateSuccess.productimgRemProductimg" @click="removeProductimg" class="generage_btn started_btn">
 							{{$t('Generate.Close')}}
 						</div>
 					</div>
@@ -110,10 +110,10 @@
 		<div class="scaleImage_content_imgBox" :class="{active:isComparison}">
 			<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
 			<div class="loadBox" v-show="generateSuccess">
-				<div class="load" v-show="productimgIsProductimg">
+				<div class="load" v-show="generateSuccess.productimgIsProductimg">
 					<a-spin size="large" class="content_img_flex"></a-spin>
 				</div>
-				<img v-show="!productimgIsProductimg" :src="generateSuccess?.url">
+				<img v-show="!generateSuccess.productimgIsProductimg" :src="generateSuccess?.newData?.designOutfitUrl || generateSuccess?.designOutfitUrl || generateSuccess?.url">
 			</div>
 			
 			<div class="img_operate_block" v-if="isLike">
@@ -173,7 +173,7 @@ props:{
 		default:''
 	},
 },
-emits:['addGenerateImg'],
+emits:['addGenerateImg','setGenerateAwait'],
 setup(props:any,{emit}) {
 	const store = useStore();
 	let userDetail:any= computed(()=>{
@@ -181,8 +181,8 @@ setup(props:any,{emit}) {
 	})
 	let {t} = useI18n()
 	let productimg = reactive({
+		isGenerate:false,//判断是否进行generate
 		UpgradePlan:null,
-		isProductimg:false,
 		productimgSearchName:'',
 		productimgIsTextarea:false,
 		productimgRemProductimg:false,
@@ -242,34 +242,35 @@ setup(props:any,{emit}) {
 			projectId:productimg.selectObject.id,
 			imageStrength:(100 - imageStrength)/100,
 		}
-		// console.log(data)
 		// return
-		productimg.productimgIsProductimg = true
-		remPrductimgTime = setTimeout(()=>{
-			productimg.productimgRemProductimg = true
+		productimg.generateSuccess.productimgIsProductimg = true
+		productimg.generateSuccess.remPrductimgTime = setTimeout(()=>{
+			productimg.generateSuccess.productimgRemProductimg = true
 		},10000)
 		let url = Https.httpUrls.relight
 		if(scaleImageList.value[scaleImageIndex.value]?.resultType == 'ToProductImage'){
 			url = Https.httpUrls.toProduct
+		}else if(scaleImageList.value[scaleImageIndex.value]?.resultType == 'TransferPose'){
+			url = Https.httpUrls.poseTransform
 		}
-		isShowMark.value = true
+		productimg.generateSuccess.isShowMark = true
 		Https.axiosPost(url, data).then(
 			(rv) => {
-				isShowMark.value = false
+				productimg.generateSuccess.isShowMark = false
 				scaleImageList.value[scaleImageIndex.value].imgUrl = '/image/loading.gif'
 				let arr:any = []
 				rv.forEach((item:any)=>{
 				  arr.push(item.taskId)  
 				})
-				
-				// productimg.generateList.unshift(...rv)
+				if(productimg.generateSuccess?.isIndex || productimg.generateSuccess?.isIndex == 0)emit('setGenerateAwait',{index:productimg.generateSuccess.isIndex,listType:productimg.generateSuccess.listType})
 				setPrductimg(arr)
+				productimg.isGenerate = true
 			}
 		).catch(res=>{
-			isShowMark.value = false
-			productimg.productimgIsProductimg = false
-			clearInterval(remPrductimgTime)
-			productimg.productimgRemProductimg = false
+			productimg.generateSuccess.isShowMark = false
+			productimg.generateSuccess.productimgIsProductimg = false
+			clearInterval(productimg.generateSuccess.remPrductimgTime)
+			productimg.generateSuccess.productimgRemProductimg = false
 			if(res.errCode === 2){
 				Modal.confirm({
 					title: res.errMsg,
@@ -299,49 +300,66 @@ setup(props:any,{emit}) {
 		let url = Https.httpUrls.relightResult
 		if(scaleImageList.value[scaleImageIndex.value]?.resultType == 'ToProductImage'){
 			url = Https.httpUrls.toProductImageResult
+		}else if(scaleImageList.value[scaleImageIndex.value]?.resultType == 'TransferPose'){
+			url = Https.httpUrls.poseTransformResult
 		}
-		prductimgTime = setInterval(()=>{
+		productimg.generateSuccess.prductimgTime = setInterval(()=>{
 			if(!state)return
 			state = false
 			Https.axiosPost(url, data).then(
 				(rv) => {
 					state = true
-					if(productimg.productimgIsProductimg){//防止取消后有正在执行的获取状态
+					if(productimg.generateSuccess.productimgIsProductimg){//防止取消后有正在执行的获取状态
 						// generateProceedList = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid')
 						let isEnd = false
 						if(rv[0].status == 'Success'){
 							// let id = productimg.generateSuccess?.designItemId || rv[0].id
 							// rv[0].id = id
 							// let listType = productimg.generateSuccess.listType
-							productimg.generateSuccess = Object.assign(productimg.generateSuccess,rv[0])
+							rv[0].designOutfitUrl = rv[0].url
+							productimg.generateSuccess.newData = rv[0]
+							if(productimg.generateSuccess?.scaleImage){
+								setCove()
+							}
 							// productimg.generateSuccess.listType = listType
 							isEnd = true
-							clearInterval(remPrductimgTime)
+							clearInterval(productimg.generateSuccess.remPrductimgTime)
 						}else if(rv[0].status == 'Fail'){
 							isEnd = true
 						}
 						generateProceedList = data
 						if(isEnd){
 							store.state.store.dispatch('getCredits')
-							clearInterval(prductimgTime)
-							clearInterval(remPrductimgTime)
-							productimg.productimgRemProductimg = false
-							productimg.productimgIsProductimg = false
+							clearInterval(productimg.generateSuccess.prductimgTime)
+							clearInterval(productimg.generateSuccess.remPrductimgTime)
+							productimg.generateSuccess.productimgRemProductimg = false
+							productimg.generateSuccess.productimgIsProductimg = false
+							delete productimg.generateSuccess.productimgIsProductimg
+							delete productimg.generateSuccess.productimgRemProductimg
+							delete productimg.generateSuccess.remPrductimgTime
+							delete productimg.generateSuccess.prductimgTime 
 						}
 					}
 				}
 			).catch(res=>{
-				clearInterval(prductimgTime)
-				clearInterval(remPrductimgTime)
-				productimg.productimgIsProductimg = false
-				productimg.productimgRemProductimg= false
+				clearInterval(productimg.generateSuccess.prductimgTime)
+				clearInterval(productimg.generateSuccess.remPrductimgTime)
+				productimg.generateSuccess.productimgIsProductimg = false
+				productimg.generateSuccess.productimgRemProductimg= false
+				delete productimg.generateSuccess.productimgIsProductimg
+				delete productimg.generateSuccess.productimgRemProductimg
+				delete productimg.generateSuccess.remPrductimgTime
+				delete productimg.generateSuccess.prductimgTime 
 			});
 		},1000)
 	}
 	let removeProductimg = ()=>{
-		productimg.productimgIsProductimg = false
-		productimg.productimgRemProductimg= false
-		clearInterval(prductimgTime)
+		productimg.generateSuccess.productimgIsProductimg = false
+		productimg.generateSuccess.productimgRemProductimg= false
+		clearInterval(productimg.generateSuccess.prductimgTime)
+		delete productimg.generateSuccess.productimgIsProductimg
+		delete productimg.generateSuccess.productimgRemProductimg
+		delete productimg.generateSuccess.prductimgTime 
 		if(generateProceedList){
 			// let str = generateProceedList.map((obj:any) => obj.taskId).join(',');
 			let str = generateProceedList.join(',')
@@ -358,48 +376,22 @@ setup(props:any,{emit}) {
 			});
 		}
 	}
-	let submitBase64Data = async (rv:any)=>{
-		loadingShow.value = true
-		let isOverlay = false
-		await new Promise<void>((resolve, reject) => {
-			Modal.confirm({
-				title: t('scaleImage.overlayOrNot'),
-				icon: createVNode(ExclamationCircleOutlined),
-				okText: 'Yes',
-				cancelText: 'No',
-				mask:false,
-				centered:true,
-				onOk() {
-					resolve()
-					isOverlay = true
-
-				},
-				onCancel(){
-					isOverlay = false
-					resolve()
-				}
-			});
-		})
+	let setCove = ()=>{
 		let data = {
-			"base64": rv,
-			"category": scaleImageList.value[scaleImageIndex.value]?.categoryValue || scaleImageList.value[scaleImageIndex.value]?.level2Type,
-			"gender": props.sex,
-			"originalId":scaleImageList.value[scaleImageIndex.value]?.id,
-			"isOverride":isOverlay,
+			...JSON.parse(JSON.stringify(productimg.generateSuccess.newData)),
+			oldId:productimg.generateSuccess.id,
+			status:productimg.generateSuccess.status,
+			listType:productimg.generateSuccess.listType,
+			isIndex:productimg.generateSuccess.isIndex
 		}
-		Https.axiosPost(Https.httpUrls.modifySketch, data).then(
-			(rv) => {
-				rv.imgUrl = rv.url
-				rv.status = 'Success'
-				rv.category = scaleImageList.value[scaleImageIndex.value]?.category
-				rv.categoryValue = scaleImageList.value[scaleImageIndex.value]?.categoryValue
-				isOverlay?(scaleImageList.value[scaleImageIndex.value] = rv):(scaleImageList.value.unshift(rv))
-				loadingShow.value = false
-				scaleImage.value = false
-			}
-		).catch(res=>{
-			loadingShow.value = false
-		});
+		emit('addGenerateImg',data)
+		
+		delete productimg.generateSuccess.isShowMark
+		
+		delete productimg.generateSuccess.listType 
+	}
+	let setAdd = ()=>{
+
 	}
 	return {
 		t,
@@ -417,7 +409,8 @@ setup(props:any,{emit}) {
 		robotAssits,
 		getPrductimg,
 		removeProductimg,
-		submitBase64Data,
+		setCove,
+		setAdd,
 	};
 },
 data() {
@@ -445,24 +438,42 @@ mounted() {
 },
 methods: {
 	init(list:any,index:any,dialogueIndex:any,status:any,listType:string){
-		if(status == 'edit'){
+		if(status == 'add'){
 			this.generateSuccess = {
-				...list[index],
-				id:list[index].designItemId || list[index].id,
-				oldId:list[index].designItemId || list[index].id,
-				url:list[index].designOutfitUrl || list[index].url,
-				designItemId:list[index].designOutfitId,
 				listType,
 			}
-			if(list[index].imageStrength)this.productimgSimilarity = 100 - list[index].imageStrength * 100
-			if(list[index].imageStrength)list[index].brightenValue
-			if(list[index].imageStrength)list[index].direction
 		}else{
-			this.generateSuccess = {
-				listType,
-			}
+			this.generateSuccess = list[index]
+			this.generateSuccess.listType = listType
+			this.generateSuccess.isIndex = index
+
 		}
+
+		this.generateSuccess.productimgIsProductimg = !!this.generateSuccess.productimgIsProductimg
+		this.generateSuccess.productimgRemProductimg = !!this.generateSuccess.productimgRemProductimg
+		this.generateSuccess.isShowMark = !!this.generateSuccess.isShowMark
+		this.generateSuccess.remPrductimgTime = this.generateSuccess.remPrductimgTime?this.generateSuccess.remPrductimgTime:null
+		this.generateSuccess.prductimgTime = this.generateSuccess.prductimgTime?this.generateSuccess.prductimgTime:null
 		this.scaleImage = true
+		// if(status == 'edit'){
+		// 	this.generateSuccess = {
+		// 		...list[index],
+		// 		id:list[index].designItemId || list[index].id,
+		// 		oldId:list[index].designItemId || list[index].id,
+		// 		url:list[index].designOutfitUrl || list[index].url,
+		// 		designItemId:list[index].designOutfitId,
+		// 		listType,
+		// 	}
+		// 	if(list[index].imageStrength)this.productimgSimilarity = 100 - list[index].imageStrength * 100
+		// 	if(list[index].imageStrength)list[index].brightenValue
+		// 	if(list[index].imageStrength)list[index].direction
+		// }else{
+		// 	this.generateSuccess = {
+		// 		listType,
+		// 	}
+		// }
+		this.scaleImage = true
+		this.isGenerate = false
 		this.scaleImageList = list
 		// if(this.scaleImageList[index]?.resultType == 'ToProductImage')this.scaleImageList[index].sourceUrl = this.scaleImageList[index].imgUrl
 		this.scaleImageIndex = index
@@ -473,20 +484,20 @@ methods: {
 	async cancelDsign(){
 		
 		document.removeEventListener('keydown',this.setKeydown)
-		let data = {
-			...JSON.parse(JSON.stringify(this.generateSuccess)),
-		}
-		let isIndex = -1
-		if(data?.oldId){
-			this.scaleImageList.forEach((rv:any,index:number)=>{
-				if(rv.designItemId == data?.oldId || rv.id == data?.oldId){
-					isIndex = index
-				}
-			})
-		}
+		// let data = {
+		// 	...JSON.parse(JSON.stringify(this.generateSuccess)),
+		// }
+		// let isIndex = -1
+		// if(data?.oldId){
+		// 	this.scaleImageList.forEach((rv:any,index:number)=>{
+		// 		if(rv.designItemId == data?.oldId || rv.id == data?.oldId){
+		// 			isIndex = index
+		// 		}
+		// 	})
+		// }
 		
-		data.isIndex = isIndex
-		if(isIndex != -1 && data.oldId){
+		// data.isIndex = isIndex
+		if(this.isGenerate && this.generateSuccess.id){
 			await new Promise((resolve,reject)=>{
 				let this_ = this
 				Modal.confirm({
@@ -497,25 +508,43 @@ methods: {
 					mask:false,
 					centered:true,
 					onOk() {
-						this_.$emit('addGenerateImg',data)
+						// this_.$emit('addGenerateImg',data)
+						//另存为操作
+						this_.generateSuccess.status = 'add'
+						if(this_.generateSuccess?.newData){
+							this_.setCove()
+						}
 						resolve('') 
 					},
 					onCancel(){
+						//覆盖操作
+						this_.generateSuccess.status = 'cove'
+						if(this_.generateSuccess?.newData){
+							this_.setCove()
+						}
+						// if(!this_.generateSuccess?.newData?.id){
+						// 	this_.setCove()
+						// }else{
+						// }
 						resolve('') 
 					}
 				});
 			})
 		}else{
-			this.$emit('addGenerateImg',data)
+			this.generateSuccess.status = 'add'
+			if(this.generateSuccess?.newData){
+				this.setCove()
+			}
 		}
+		this.generateSuccess.scaleImage = true
 		this.scaleImage = false
-		this.scaleImageIndex = 0
+		// this.scaleImageIndex = 0
 		this.isNext = false
-		this.generateSuccess = null
-		this.scaleImageList = []
+		// this.generateSuccess = null
+		// this.scaleImageList = []
 	},
 	lastStep(){
-		if(this.productimgIsProductimg) return
+		if(this.generateSuccess.productimgIsProductimg) return
 		if(this.isNext)return
 		let num = this.scaleImageIndex
 		if(this.scaleImageIndex <= 0){
@@ -525,7 +554,7 @@ methods: {
 		}
 	},
 	nextStep(){
-		if(this.productimgIsProductimg) return
+		if(this.generateSuccess.productimgIsProductimg) return
 		if(this.isNext)return
 		let num = this.scaleImageIndex
 		if(this.scaleImageIndex >= this.scaleImageList.length-1){
@@ -535,7 +564,7 @@ methods: {
 		}
 	},
 	download(){
-		let url = this.scaleImageList[this.scaleImageIndex].imgUrl || this.scaleImageList[this.scaleImageIndex]?.url
+		let url = this.scaleImageList[this.scaleImageIndex].url || this.scaleImageList[this.scaleImageIndex]?.designOutfitUrl
 		downloadIamge(url)
 	},
 	setScaleImageIndex(index:any){
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -49,30 +49,11 @@
 								</div>
 							</div>
 							<div class="right_top_right">
-								<div class="generalModel_state">
-									<div class="generalModel_state_item smail">
-										<span>Size :</span>
-										<a-select
-											v-model:value="widthValue"
-											show-search
-											size="large"
-											allowClear
-											style="width: 150px"
-											placeholder="Please select"
-											:options="widthList"
-											@change="setSystemDesigner(500)"
-										>
-										<!-- <template #option="{ value: val, label, icon }">
-											<span role="img" :aria-label="val">{{ icon }}</span>
-											{{ label }}
-										</template> -->
-										</a-select>
-									</div>
-								</div>
+								
 							</div>
 						</div>
 						<div class="right_content_block_box">
-							<div class="right_content_block" @mouseenter="mouseenter($event,'like')">
+							<div class="right_content_block" ref="rightContentBlockBox" @mouseenter="mouseenter($event,'like')">
 								

 								<div class="right_content_body">
@@ -82,24 +63,51 @@
 												{{ $t('HomeView.SelectedDesign') }}
 												</span>
 										</div>
+										<div class="generalModel_state">
+											<!-- <div class="generalModel_state_item smail" style="margin-right: 0;">
+												<span>Type :</span>
+												<a-select
+													v-model:value="widthValue.value"
+													size="large"
+													style="width: 15rem"
+													placeholder="Please select"
+													:options="widthList"
+													@change="upDataLikeListType(500)"
+												>
+												</a-select>
+											</div> -->
+											<div class="generalModel_state_item smail" style="margin-right: 0;">
+												<span>Size :</span>
+												<a-select
+													v-model:value="widthValue.value"
+													size="large"
+													style="width: 15rem"
+													placeholder="Please select"
+													:options="widthList"
+													@change="setSystemDesigner(500)"
+												>
+												</a-select>
+											</div>
+										</div>
 									</div>
 									<div class="right_content_img_block scroll_style active">
 										<div class="right_content_img_item" ref="likeItemDom" designType="like" :index="0">
 											<div class="content_img_block content_img_GetWidth active" :style="likeStyle"
-												v-for="(design, index) in likeDesignCollectionList" :key="design.id"
-												@mousedown.stop="designMousedown(getMousePosition($event,false),design.userLikeSortId,'like')" 
-												@touchstart.passive="designMousedown(getMousePosition($event,true),design.userLikeSortId,'like')"
+												v-for="(design, index) in likeDesignCollectionList" :key="design.id || design.designItemId">
+												<div class="content_img_flex"
+												@mousedown.stop="designMousedown(getMousePosition($event,false),design.userLikeSortId || design.id,'like')" 
+												@touchstart.passive="designMousedown(getMousePosition($event,true),design.userLikeSortId || design.id,'like')"
 												@click="designDetail(
 														design,
 														index,
 														likeDesignCollectionList,
 														'like'
 													)">
-												<div class="content_img_flex">
-													<img class="content_img" :src="design.designOutfitUrl||design.url"
+													<img class="content_img" v-show="!design?.generateAwait" :src="design.designOutfitUrl||design.url"
 														:key="design.designOutfitUrl" designType="like" :index="index"/>
+													<a-spin v-show="design?.generateAwait" size="large"></a-spin>
 												</div>
-												<div class="btn">
+												<div class="btn" v-show="!design?.generateAwait">
 													<i @click.stop="openEditBtn(design.designItemId||design.id)" class="fi fi-br-menu-dots-vertical"></i>
 													<div class="btnOpen" @click.stop="()=>openEditBtnId=-1" :class="{active:openEditBtnId == design.designItemId||openEditBtnId == design.id}">
 														<div class="item" @click="dislikeDesignCollection(design,design.resultType,index)">
@@ -107,10 +115,10 @@
 															<div class="icon iconfont icon-jushoucanggift icon_like">
 															</div>
 														</div>
-														<!-- <div class="item" v-show="design.resultType == 'ToProductImage'" @click="setEditDesignType(likeDesignCollectionList,index,'TransferPose','add','like')">
+														<div class="item" v-show="design.resultType == 'ToProductImage'" @click="setEditDesignType(likeDesignCollectionList,index,'TransferPose','add','like')">
 															<div class="text">Transfer Pose</div>
 															<div class="icon iconfont icon-jushoucanggift icon_like"></div>
-														</div> -->
+														</div>
 														<div class="item" v-show="design.resultType == 'ToProductImage'" @click="setEditDesignType(likeDesignCollectionList,index,'Relight','add','like')">
 															<div class="text">Relight</div>
 															<i class="fi fi fi-br-keyboard-brightness"></i>
@@ -142,7 +150,7 @@
 										</div>
 									</div>
 									<div class="right_content_img_block scroll_style Guide_1_17"  :class="[driver__.driver?'showEvents':'']">
-										<div class="right_content_img_item" ref="collItemDom" designType="dislike" :index="0">
+										<div class="right_content_img_item" ref="collItemDom" designType="disLike" :index="0">
 											<div class="content_img_block" v-show="showDesignMark" :style="collStyle">
 												<a-spin size="large" class="content_img_flex"></a-spin>
 											</div>
@@ -151,16 +159,17 @@
 												) in designCollectionList" :key="design?.designItemId" :style="collStyle">
 													<div class="content_img_flex" 
 													:class="[(driver__.driver && driver__.index == 32)?'hideEvents':'']"
-													@mousedown.stop="designMousedown(getMousePosition($event,false),design.designItemId,'disLike')" 
-													@touchstart.passive="designMousedown(getMousePosition($event,true),design.designItemId,'disLike')"
+													@mousedown.stop="designMousedown(getMousePosition($event,false),design.designItemId || design.id,'disLike')" 
+													@touchstart.passive="designMousedown(getMousePosition($event,true),design.designItemId || design.id,'disLike')"
 														@click="
 														designDetail(
 															design,
 															index,
 															designCollectionList,
-															'dislike'
+															'disLike'
 														)">
-														<img class="content_img" :src="design.designOutfitUrl" designType="dislike" :index="index"/>
+														<img class="content_img" v-show="!design?.generateAwait" :src="design.designOutfitUrl || design.url" designType="disLike" :index="index"/>
+														<a-spin v-show="design?.generateAwait" size="large"></a-spin>
 													</div> 
 													<div class="btn">
 														<i @click.stop="openEditBtn(design.designItemId||design.id)" class="fi fi-br-menu-dots-vertical"></i>
@@ -170,10 +179,10 @@
 																<div class="icon iconfont icon-jushoucang icon_like">
 																</div>
 															</div>
-															<!-- <div class="item" v-show="design.resultType == 'ToProductImage'" @click="setEditDesignType(designCollectionList,index,'TransferPose','add','disLike')">
+															<div class="item" v-show="design.resultType == 'ToProductImage'" @click="setEditDesignType(designCollectionList,index,'TransferPose','add','disLike')">
 																<div class="text">Transfer Pose</div>
 																<div class="icon iconfont icon-jushoucanggift icon_like"></div>
-															</div> -->
+															</div>
 															<div class="item" v-show="design.resultType == 'ToProductImage'" @click="setEditDesignType(designCollectionList,index,'Relight','add','disLike')">
 																<div class="text">Relight</div>
 																<i class="fi fi fi-br-keyboard-brightness"></i>
@@ -223,6 +232,7 @@
 				RelightDirection:RelightDirection,
 				RelightDirectionList:RelightDirectionList,
 			}" 
+			@setGenerateAwait="setGenerateAwait"
 			:isProductimg="true"></editDesignType>
 	</div>

@@ -394,7 +404,10 @@ export default defineComponent({
 		let sessionStorageCollValue = JSON.parse(sessionStorage.getItem('collValue') as any)
 		
 		const collItemSize = reactive({
-			widthValue:150,
+			widthValue:{
+					label:'Medium',
+					value:170,
+				},
 			collValue:6,
 			padding:60,
 			likeStyle:{
@@ -434,10 +447,10 @@ export default defineComponent({
 			collItemSize.collTime = setTimeout(()=>{
 			nextTick(()=>{
 				let parentWidth = likeItemDom.value.parentElement.offsetWidth
-				collItemSize.widthValue = collItemSize.widthValue == -1?100:collItemSize.widthValue
-				collItemSize.widthValue = collItemSize.widthValue > parentWidth?parentWidth:collItemSize.widthValue
-				collItemSize.collValue = Math.floor(parentWidth / collItemSize.widthValue)
-				collItemSize.padding = Math.floor(parentWidth - (collItemSize.collValue * collItemSize.widthValue))
+				collItemSize.widthValue.value = collItemSize.widthValue.value == -1?100:collItemSize.widthValue.value
+				collItemSize.widthValue.value = collItemSize.widthValue.value > parentWidth?parentWidth:collItemSize.widthValue.value
+				collItemSize.collValue = Math.floor(parentWidth / collItemSize.widthValue.value)
+				collItemSize.padding = Math.floor(parentWidth - (collItemSize.collValue * collItemSize.widthValue.value))
 				let value = collItemSize.collValue

 				collItemSize.itemStyle.width = (parentWidth - collItemSize.padding - (value * 10)) / value
@@ -455,7 +468,7 @@ export default defineComponent({
 						el: elArr[i], 
 						sort: likeDesignCollectionList.value[i].sort - 1, 
 						index: i,
-						userLikeSortId:likeDesignCollectionList.value[i].userLikeSortId
+						userLikeSortId:likeDesignCollectionList.value[i].userLikeSortId || likeDesignCollectionList.value[i].id
 					});
 				}
 				moveItem('like')
@@ -470,7 +483,7 @@ export default defineComponent({
 					el: elArr[index], 
 					sort: designCollectionList.value.length - index - 1, 
 					index: designCollectionList.value.length - index - 1,
-					userLikeSortId:item.designItemId
+					userLikeSortId:item.designItemId || item.id
 				});
 			})
 		}
@@ -540,10 +553,10 @@ export default defineComponent({
 			let arrData:any = []
 			if(!likeDesignCollectionList.value)return
 			likeDesignCollectionList.value.forEach((likeItem:any)=>{
-			    let item = posiitonData.value.likeElList.filter((item:any)=>item.userLikeSortId == likeItem.userLikeSortId)[0]
+			    let item = posiitonData.value.likeElList.filter((item:any)=>item.userLikeSortId == likeItem.userLikeSortId || item.userLikeSortId == likeItem.id)[0]
 				likeItem.sort = item.sort + 1
 				let obj = {
-					id:likeItem.userLikeSortId,
+					id:likeItem.userLikeSortId || likeItem.id,
 					"sort": item.sort + 1,
 					"userLikeGroupId": likeItem.userLikeGroupId,
 					"userLikeId": likeItem.id
@@ -565,7 +578,7 @@ export default defineComponent({
 			let value = collItemSize.collValue
 			let width,height,num
 			if(str == 'like'){
-				num = value
+				num = value 
 				width = collItemSize.itemStyle.width
 				height = collItemSize.itemStyle.height
 			}else{
@@ -573,7 +586,8 @@ export default defineComponent({
 				width = (collItemDom.value.offsetWidth - 30) / 3 * collItemSize.scale[0]
 				height = (collItemDom.value.offsetWidth - 30) / 3 * collItemSize.scale[1]
 			}
-			let moveIndex = Math.round(x / (width + 10)) + Math.round(y / (height + 10)) * num;
+			let padding = str == 'like'?collItemSize.padding/2:0
+			let moveIndex = Math.round((x-padding) / (width + 10)) + Math.round(y / (height + 10)) * num;
 			moveIndex = elList.length - 1 - moveIndex
 			moveIndex = moveIndex < 0 ? 0 : moveIndex;
 			moveIndex = moveIndex > elList.length - 1 ? elList.length - 1 : moveIndex;
@@ -602,7 +616,6 @@ export default defineComponent({
 		const setLikeDislLike = (str:string,value:any)=>{
 			posiitonData.value.likeSelectIndex = 0
 			nextTick(()=>{
-				console.log(posiitonData.value.likeElList)
 				if(str == 'like'){
 					let elArr = likeItemDom.value.children
 					posiitonData.value.likeElList.push({
@@ -611,14 +624,15 @@ export default defineComponent({
 						index: value.sort - 1,
 						userLikeSortId:value.userLikeSortId
 					});
-					let collItem = posiitonData.value.generateElList.filter((item:any)=>item.userLikeSortId == value.designItemId)[0]
-					console.log(collItem)
-					posiitonData.value.generateElList = posiitonData.value.generateElList.filter((item:any)=>item.userLikeSortId != value.designItemId)
-					posiitonData.value.generateElList.forEach((item:any)=>{
-						if(item.sort > collItem.sort){
-							item.sort-=1
-						}
-					})
+					let collItem = posiitonData.value.generateElList.filter((item:any)=>(item.userLikeSortId == value.designItemId || item.userLikeSortId == value.id))[0]
+					if(collItem){
+						posiitonData.value.generateElList = posiitonData.value.generateElList.filter((item:any)=>item.userLikeSortId != value.designItemId)
+						posiitonData.value.generateElList.forEach((item:any)=>{
+							if(item.sort > collItem.sort){
+								item.sort-=1
+							}
+						})
+					}
 				}else if(str == 'disLike'){
 					let elArr = collItemDom.value.querySelectorAll('.content_img_GetWidth')
 					posiitonData.value.likeElList = posiitonData.value.likeElList.filter((item:any)=>(item.sort + 1) != value.sort)
@@ -631,10 +645,11 @@ export default defineComponent({
 						el: elArr[elArr.length-1], 
 						sort: posiitonData.value.generateElList.length, 
 						index: posiitonData.value.generateElList.length,
-						userLikeSortId:value.designItemId
+						userLikeSortId:value.designItemId||value.id
 					});
+					setDesignItemStyle()
 				}
-				moveItem('like');
+				setSystemDesigner(100)
 				// moveItem('disLike');
 			})
 		}
@@ -643,19 +658,22 @@ export default defineComponent({
 			let elLikeList = posiitonData.value.likeElList
 			let generateElList = posiitonData.value.generateElList
 			let value = collItemSize.collValue
-			let width,height
+			let width:any,height:any
 			width = (collItemDom.value.offsetWidth - 30) / 3 * collItemSize.scale[0]
 			height = (collItemDom.value.offsetWidth - 30) / 3 * collItemSize.scale[1]
-			 
+			  
 			// let num = str == 'like'?value:3
-			for(let i = 0;i < elLikeList.length;i++){
-				elLikeList[i].el.style.left = (elLikeList.length - 1 - elLikeList[i].sort) % value * (collItemSize.itemStyle.width +10) + collItemSize.padding/2 + 'px';
-				elLikeList[i].el.style.top = parseInt(String((elLikeList.length - 1 - elLikeList[i].sort) / value)) * (collItemSize.itemStyle.height +10) + 'px';
-			}
-			for(let i = 0;i < generateElList.length;i++){
-				generateElList[i].el.style.left = (generateElList.length - 1 - generateElList[i].sort) % 3 * (width +10) + 'px';
-				generateElList[i].el.style.top = parseInt(String((generateElList.length - 1 - generateElList[i].sort) / 3)) * (height +10) + 'px';
-			}
+			nextTick(()=>{
+				for(let i = 0;i < elLikeList.length;i++){
+					elLikeList[i].el.style.left = (elLikeList.length - 1 - elLikeList[i].sort) % value * (collItemSize.itemStyle.width +10) + collItemSize.padding/2 + 'px';
+					elLikeList[i].el.style.top = parseInt(String((elLikeList.length - 1 - elLikeList[i].sort) / value)) * (collItemSize.itemStyle.height +10) + 'px';
+				}
+				for(let i = 0;i < generateElList.length;i++){
+					generateElList[i].el.style.left = (generateElList.length - 1 - generateElList[i].sort) % 3 * (width +10) + 'px';
+					generateElList[i].el.style.top = parseInt(String((generateElList.length - 1 - generateElList[i].sort) / 3)) * (height +10) + 'px';
+				}
+			})
+			
 		}
 		const openCollection = (str:string)=>{
 			dataDom.collectionModal.init(str)
@@ -692,12 +710,12 @@ export default defineComponent({
 				designItemId:data.id,
 				// designItemId:data.elementId,
 				designOutfitId:'',
-				designOutfitUrl:data.url,
+				designOutfitUrl:data.designOutfitUrl,
 				sourceUrl:data.sourceUrl,
 				resultType:data.resultType,
 				elementId:data.elementId,
 				elementType:data.elementType,
-				sort:data.sort,
+				userGroupId:data.userGroupId || data.id,
 			}
 			let list = []
 			if(data.listType == 'disLike'){
@@ -705,17 +723,14 @@ export default defineComponent({
 			}else{
 				list = likeDesignCollectionList.value
 			}
-			if(data.isIndex == -1){
+			if(list[data.isIndex]?.generateAwait)list[data.isIndex].generateAwait = false;
+			if(data.status == 'add'){
 				if(data.listType == 'like'){
 					likeDesignCollection(obj,-1,data.resultType)
 				}else{
 					list.unshift(obj)
-					nextTick().then(()=>{
-						setDesignItemStyle()
-						moveItem('disLike')
-					})
 				}
-			}else{
+			}else if(data.status == 'cove'){
 				// collectionLikeUpdate
 				// Https
 				if(data.listType == 'like'){
@@ -735,6 +750,10 @@ export default defineComponent({
 				list[data.isIndex].designItemId = obj.designItemId
 				list[data.isIndex].sourceUrl = obj.sourceUrl
 			}
+			nextTick().then(()=>{
+				setDesignItemStyle()
+				setSystemDesigner(100)
+			})
 		}
 		const setNoDesignLike = (design:any,index:any,type:any,str:string) => {
 			let url
@@ -762,6 +781,7 @@ export default defineComponent({
 						let value:any = {
 							...design,
 							sort:likeDesignCollectionList.value.length + 1,
+							userLikeGroupId:design.id,
 						}
 						design.groupDetailId = rv.groupDetailId;
 						store.commit(
@@ -778,6 +798,7 @@ export default defineComponent({
 								item.sort-=1
 							}
 						})
+						setLikeDislLike('disLike',design)
 					}
 					designData.likeLoading = false;
 				}
@@ -829,6 +850,19 @@ export default defineComponent({
 					designData.likeLoading = false;
 				});
 		}
+		const upDataLikeListType = ()=>{
+
+		}
+		const setGenerateAwait = (data:any)=>{
+			let list = []
+			if(data.listType == 'disLike'){
+				list = designCollectionList.value
+			}else{
+				list = likeDesignCollectionList.value
+			}
+			list[data.index].generateAwait = true;
+
+		}
 		return {
 			store,
 			...toRefs(editDesignType),
@@ -879,6 +913,8 @@ export default defineComponent({
 			openEditBtn,
 			addGenerateImg,
 			setNoDesignLike,
+			upDataLikeListType,
+			setGenerateAwait,
 		};
 	},
 	data() {
@@ -903,7 +939,10 @@ export default defineComponent({
 				num:0,
 				currentNum:0,
 			},//获取20次都为空的话就停止获取
-			
+			observerData:{
+				time:false as any,
+				observer:null as any,
+			},
 		};
 	},
 	watch: {
@@ -925,15 +964,27 @@ export default defineComponent({
 		sessionStorage.setItem('recycleDomHidden',JSON.stringify(this.recycleDomHidden))
 		sessionStorage.setItem('collValue',JSON.stringify(this.collValue))
 		if(this.$props.isState)this.sortDesignCollection()
-		window.removeEventListener('resize', this.setItemPosition)
+		// window.removeEventListener('resize', this.setItemPosition)
+		this.observerData.observer.unobserve(this.$refs.rightContentBlockBox);
 	},
 	async mounted() {
 		window.addEventListener('beforeunload', (event)=>{
 			this.store.commit("clearAllCollection");
 		});
-		window.addEventListener('resize', this.setItemPosition)
-		this.setSystemDesigner(0)
-		this.setDesignItemStyle()
+		// window.addEventListener('resize', this.setItemPosition)
+		
+		this.$refs.rightContentBlockBox
+		this.observerData.observer = new ResizeObserver(entries => {
+			for (let entry of entries) {
+				clearTimeout(this.observerData.time)
+				this.observerData.time = setTimeout(()=>{
+					this.setSystemDesigner(0)
+					this.setDesignItemStyle()
+				},100)
+				// const { width } = entry.contentRect;
+			}
+		});
+		this.observerData.observer.observe(this.$refs.rightContentBlockBox);
 	},
 	directives:{
 		mousewheel:{
@@ -1322,7 +1373,6 @@ export default defineComponent({
 				groupDetailId: design.groupDetailId || design.id,
 				timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
 			};
-			console.log(type)
 			if(type != 'Design'){
 				this.setNoDesignLike(design,index,type,'disLike')
 				return
@@ -1551,7 +1601,7 @@ export default defineComponent({
 		//完成单个图片设计
 		finishRedesign(event: any) {
 			let { design, index, type } = event;
-			if (type === "dislike") {
+			if (type === "disLike") {
 				this.store.commit("setSingleDesignCollectionList", {
 					index: index,
 					design: design,
@@ -1571,7 +1621,7 @@ export default defineComponent({
 		setShowHide(str:string){
 			if(str == 'recycleDomHidden')this.recycleDomHidden = !this.recycleDomHidden
 			if(str == 'domHidden')this.domHidden = !this.domHidden
-			this.setSystemDesigner(0)
+			// this.setSystemDesigner(0)
 		}
 	},
 });
@@ -1622,7 +1672,7 @@ export default defineComponent({
 			.right_content_header {
 				display: flex;
 				justify-content: space-between;
-				height: 4.5rem;
+				height: 6.5rem;
 				align-items: center;
 				padding: 0 3.2rem 0 1.9rem;
 				background: rgba(255, 255, 255, 0.2);
@@ -1754,7 +1804,7 @@ export default defineComponent({
 						color: #fff;
 						flex-direction: column;
 						&.active{
-							right: 53rem;
+							right: 43rem;
 							transform: translate(0, -50%);
 						}
 					}
@@ -1812,7 +1862,8 @@ export default defineComponent({
 								margin-left: 2rem;
 							}
 							.right_content_body {
-								width: 55rem;
+								width: 45rem;
+								// width: 55rem;
 								.right_content_img_block{
 									
 									.content_img_block{
@@ -1960,12 +2011,12 @@ export default defineComponent({
 										> .btnOpen{
 											position: absolute;
 											width: max-content;
-											left: 3rem;
-											top: 3rem;
+											left: 30px;
+											top: 30px;
 											transform: translateX(-100%);
 											background: #e4e4e7;
-											padding: 1.2rem;
-											border-radius: 1.2rem;
+											padding: 12px;
+											border-radius: 12px;
 											display: none;
 											z-index: 99;
 											&.active{
@@ -1974,16 +2025,16 @@ export default defineComponent({
 											> .item{
 												display: flex;
 												align-items: center;
-												margin-bottom: .8rem;
-												padding: .8rem;
-												border-radius: .8rem;
+												margin-bottom: 8px;
+												padding: 8px;
+												border-radius: 8px;
 												cursor: pointer;
 												&:last-child{
 													margin: 0;
 												}
 												> .text{
-													font-size: 1.2rem;
-													margin-right: 1rem;
+													font-size: 12px;
+													margin-right: 10px;
 												}
 												&:hover{
 													background: #efeff1;
--- a/src/component/home/design/mannequin/index.vue
+++ b/src/component/home/design/mannequin/index.vue
@@ -116,7 +116,7 @@ export default defineComponent({
 			let value = {
 				sex:data.selectObject.sex,
 				style:data.selectObject?.style?data.selectObject?.style:'',
-				ageGroup:store.state.Workspace.probjects.ageGroup,
+				ageGroup:data.selectObject.ageGroup,
 			}
 			Https.axiosGet(Https.httpUrls.getMannequins,{params:value}).then((rv: any) => {
 				if (rv) {
--- a/src/component/home/index.vue
+++ b/src/component/home/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="homeBox">
-		<div class="mark_loading" v-show="isShowMark">
+		<div class="mark_loading" v-show="isShowMark || dataLoad">
 			<a-spin size="large" />
 		</div>
 		<div class="show">
@@ -26,6 +26,7 @@ import { useRouter,useRoute } from 'vue-router'
 import design from "./design/index.vue"
 import newPorject from "./newProject/index.vue"
 import router from '@/router';
+import {getMinioUrl} from '@/tool/util'
 import chat from "./chat/index.vue"
 export default defineComponent({
 	components:{
@@ -41,6 +42,7 @@ export default defineComponent({
 			routeQuery:{} as any,
 			selectObject:computed(()=>store.state.Workspace.probjects) as any,//选择的项目
 			chatData:null as any,
+			dataLoad:true as any,
 		})
 		let settingGetHistory:any = inject('settingGetHistory')
 		const setIsShowMark = (boolean:boolean)=>{
@@ -60,12 +62,14 @@ export default defineComponent({
 					data.openType = Object.keys(query)[0]
 				}else{
 					data.openType = ''
+					data.dataLoad = false
 				}
 				// if((query.history || query.id) != (oldQuery.history || oldQuery.id)){
 				// }
 				nextTick(()=>{
 					if(query.history || query.id){
-						data.isShowMark = true
+						if(data.openType == 'tools')data.isShowMark = true
+						data.dataLoad = true
 						createData()
 						if(query.type == 'Works'){
 							getWorks(query.id || query.history)
@@ -74,6 +78,7 @@ export default defineComponent({
 							getHistory(query.id || query.history)
 						}
 					}else{
+						data.dataLoad = false
 						createData()
 					}
 				})
@@ -174,9 +179,9 @@ export default defineComponent({
 			// })
 			setChatData()
 			if(route.name == 'tools'){
-				getCollection('tools')	
+				getCollection('tools',null)	
 			}else{
-				getCollection('design')	
+				getCollection('design',null)	
 			}
 		}
 		const setChatData = ()=>{
@@ -203,18 +208,20 @@ export default defineComponent({
 		// 		})
 		// 	})
 		// }
-		const getCollection = (type:string)=>{
+		const getCollection = (type:string,module:any)=>{
 			let moduleList = [] as any
 			if(type == 'design'){
 				moduleList = ["moodBoard", "printBoard", "colorBoard", "sketchBoard",'design','mannequin']
 			}else{
 				moduleList = ["printBoard", "colorBoard", "sketchBoard",'design','toProduct','relight','poseTransfer','mannequin',"patternMaking3D",'deReconstruction']
 			}
+			if(module)moduleList = [module]
 			let value:any = {
 				 "id":data.selectObject.id,
 				"moduleList":moduleList,
 			}
 			Https.axiosPost(Https.httpUrls.getModuleContent,value).then(async (rv)=>{
+				
 				historyChooseData(rv)//设置历史数据
 				if(rv.mannequin.length>0){
 					let arr = [] as any
@@ -230,14 +237,18 @@ export default defineComponent({
 				}
 				let allBoardData = ['sketchBoard','moodBoard','printBoard','colorBoard']
 				// let allBoardData = ['sketchBoard','moodBoard','printBoard','colorBoard','toProduct','relight','poseTransfer','mannequin']
-				let canvasData = ['canvas','deReconstruction']
-				for (let index = 0; index < canvasData.length; index++) {
-					const item = canvasData[index];
-					await getCanvasData(item)
+				if(module){
+					let canvasData = ['canvas','deReconstruction']
+					for (let index = 0; index < canvasData.length; index++) {
+						const item = canvasData[index];
+						await getCanvasData(item)
+					}
 				}
+				
 				// await setitemData(allBoardData)
 				//还有一个canvas
 				if(rv.boundingBox)store.commit('setShowSketchboard',rv.boundingBox)
+				
 				allBoardData.forEach((item)=>{
 					let value = {
 						type:item,
@@ -251,8 +262,11 @@ export default defineComponent({
 					}
 				})
 				data.isShowMark = false
+				data.dataLoad = false
 				if(type == 'design'){
+					nextTick(()=>{
 					dataDom.design.openSetData()
+					})
 				}
 			})
 		}
@@ -339,6 +353,17 @@ export default defineComponent({
 				}
 				store.commit("setPoseTransfer", value);
 			}
+			if(dataValue.patternMaking3D){
+				let patternMaking3DData = {
+					threeDSimpleId:dataValue.patternMaking3D.threeDSimpleId,
+					url:dataValue.patternMaking3D.printMinioUrl,
+					printMinioUrl:getMinioUrl(dataValue.patternMaking3D.printMinioUrl),
+					x:dataValue.patternMaking3D.x,
+					y:dataValue.patternMaking3D.y,
+				};
+				store.commit('setPatternMaking3D',patternMaking3DData)
+			}
+			
 		}
 		//统一处理选择组的渲染数据
 		const dealViewChooseData = (dataValue: any,str:string)=> {
@@ -372,6 +397,7 @@ export default defineComponent({
 		}
 		//统一处理选择组的渲染数据
 		const dealViewChooseColor = (dataValue: any)=>{
+			if(!dataValue)return [];
 			let colorList = dataValue.map((v: any) => {
 				let rgbValue = v.rgbValue.split(" ");
 				let newData: any = {
@@ -395,10 +421,10 @@ export default defineComponent({
 			return colorList;
 		}
 		const chatChange = (value:any)=>{
-			if(value.type == '[DESIGN_SIGNAL]' && dataDom.design){
+			if(value.type == 'design_control_signal' && dataDom.design){
 				dataDom.design.designNewCollection()
 			}else{
-				getCollection('design')
+				getCollection('design',value.module)
 			}
 		}
 		const newProject = (value:any)=>{
--- a/src/component/home/newProject/workspace.vue
+++ b/src/component/home/newProject/workspace.vue
@@ -210,13 +210,45 @@ export default defineComponent({
 			Https.axiosPost(Https.httpUrls.projectSaveOrUpdate,value).then((rv)=>{
 				if(rv){
 					data.selectObject.id = rv.id
-					// let position = []
-					// if(data.selectObject.sex == "Female"){
-					// 	position = store.state.UserHabit.FemalePosition
-					// }else{
-					// 	position = store.state.UserHabit.MalePosition
-					// }
-					// data.selectObject.positionList = position
+					
+					let storeData = {
+						name:rv.name,
+						id:rv.id,
+						type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign',
+						httpType:rv.process,//项目类型
+						ageGroup:rv.workspaceVO?.ageGroup,
+						style:rv.workspaceVO?.style,
+						styleId:rv.workspaceVO?.styleId,
+						styleName:rv.workspaceVO?.styleName,
+						sex:rv.workspaceVO?.sex,
+						userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg,
+						userBrandDnaName:rv.workspaceVO?.userBrandDnaName,
+						brandPercentage:rv.workspaceVO?.brandPercentage,
+						userBrandDna:rv.workspaceVO?.userBrandDna,
+						systemDesignerPercentage:rv.workspaceVO?.systemDesignerPercentage,
+						position:{
+							label:rv.workspaceVO?.positionEnum?.value,
+							value:rv.workspaceVO?.positionEnum?.name
+						},
+						positionList:[],
+						publishData:{
+							id:rv.portfolioDTO?.id?rv.portfolioDTO?.id:'',
+							portfolioDes:rv.portfolioDTO?.portfolioDes?rv.portfolioDTO?.portfolioDes:'',
+							portfolioName:rv.portfolioDTO?.portfolioName?rv.portfolioDTO?.portfolioName:'',
+							tagsDTO:rv.portfolioDTO?.tagsDTO?rv.portfolioDTO?.tagsDTO:[],
+						},
+						model:[]
+					}
+					let position = []
+					if(storeData.sex == "Female"){
+						position = store.state.UserHabit.FemalePosition
+					}else{
+						position = store.state.UserHabit.MalePosition
+					}
+					// storeData.model = model
+					data.selectObject.positionList = position
+					storeData.positionList = position
+					store.commit('setProbject',storeData)
 					emit('setProject',data.selectObject)
 				}
 			})
--- a/src/component/home/tools/cloudUploading/createCloud.vue
+++ b/src/component/home/tools/cloudUploading/createCloud.vue
@@ -1,437 +0,0 @@
-<template>
-	<div class="createCloud" ref="createCloud"></div>
-    <a-modal
-        class="createCloud_modal generalModel"
-        v-model:visible="operationsModal"
-        :footer="null"
-		:get-container="() => $refs.createCloud"
-        width="50%"
-		:height="'77rem'"
-        :maskClosable="false"
-        :centered="true"
-        :closable="false"
-		:mask="true"
-        wrapClassName="#app"
-        :keyboard="false"
-    >
-		<div class="generalModel_btn">
-			<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
-				<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
-						<circle cx="23" cy="23" r="23" fill="white" fill-opacity="0.3"/>
-						<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="#000"/>
-						<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="#000"/>
-					</svg>
-			</div>
-		</div>
-		<div class="modal_title_text">
-			<div>Create Cloud Generation Tasks</div>
-		</div>
-		<div class="allUserPoeration_center admin_page">
-			<div class="admin_state_item">
-				<span>Task type <span>*</span></span>
-				<a-select
-					v-model:value="buildType"
-					allowClear
-					style="width: 200px"
-					placeholder="Please select"
-					:options="cloudList"
-					@change="changeBuildType"
-				></a-select>
-			</div>
-			<div class="admin_state_item" v-show="buildType">
-				<span>Quantity <span>*</span></span>
-				<input
-					v-model="numberOfImages"
-					placeholder="Please enter number"
-					type="text"
-					style="width: 200px"
-					@input="changeNumberOfImages"
-				/>
-			</div>
-			<!-- toProductimg -->
-			 <div v-show="buildType == 'toProductImage'" class="admin_state_item ">
-				<span>{{$t('ProductImg.Similarity')}}</span>
-				<div class="sliderAndImput" style="width: 200px">
-					<a-slider class="system_silder"
-						v-model:value="similarity"
-						:tooltipVisible="false"
-						:step="5"
-						
-					>
-					</a-slider>
-					<input type="number" readonly v-model="similarity">
-				</div>
-			</div>
-			 <div v-show="buildType == 'relight'" class="admin_state_item ">
-				<span>{{$t('ProductImg.RelightDirection')}}</span>
-				<a-select  style="width: 200px" v-model:value="relightDirection" :options="relightDirectionList"></a-select>
-			</div>
-			<div v-show="buildType == 'relight'" class="admin_state_item ">
-				<span>{{$t('ProductImg.Highlight')}}</span>
-				<div class="sliderAndImput" style="width: 200px">
-					<a-slider class="system_silder"
-						v-model:value="brightenValue"
-						:tooltipVisible="false"
-						
-						:max="3"
-						:min="1"
-						:step="0.1"
-					>
-					</a-slider>
-					<input type="number" readonly v-model="brightenValue">
-				</div>
-			</div>
-			<div v-show="buildType == 'toProductImage' || buildType == 'relight'" class="admin_state_item">
-				<span>Keyword</span>
-				<input
-					v-model="generateText"
-					:placeholder="$t('Generate.inputContent1')"
-					type="text"
-					style="width: 200px"
-				/>
-			</div>
-			
-			<div class="selectImgList generalScroll" v-mousewheel v-show="exhibitionImgList.length>0">
-				<div v-for="item in exhibitionImgList" class="item">
-					<img :src="item.designOutfitUrl||item.url" alt="">
-				</div>
-			</div>
-
-			<!-- <div class="admin_state_item" style="width: 100%;">
-				<span style="margin: 0;">Generation time：19min</span>
-			</div> -->
-			<div v-show="buildType" class="admin_state_item" style="width: 100%;">
-				<span style="margin: 0;">Cost credit：{{credits * numberOfImages}}</span>
-			</div>
-		</div>
-		<div class="allUserPoeration_btn admin_page">
-			<!-- <div class="admin_search_item" @click="cancelDsign">
-				Close
-			</div> -->
-			<div class="admin_search_item" @click="setOk">
-				OK
-			</div>
-		
-		</div>
-    </a-modal>
-	<div class="mark_loading" v-show="loadingShow">
-		<a-spin size="large" />
-	</div>
-</template>
-<script>
-import { defineComponent, computed, reactive, watch, onMounted, nextTick, toRefs } from "vue";
-import { Https } from "@/tool/https";
-import { Modal, message } from "ant-design-vue";
-import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import { formatTime,isEmail } from "@/tool/util";
-import dayjs, { Dayjs } from 'dayjs';
-import { useStore } from "vuex";
-import { useI18n } from "vue-i18n";
-import {getMinioUrl} from '@/tool/util'
-const md5 = require("md5");
-export default defineComponent({
-    components: {
-    },
-	props:{
-		cloudList:{
-			type:Array,
-			default:[]
-		}	
-	},
-	emits: ['getContentList'],
-    setup(props,{emit}) {
-        const store = useStore();
-		let operations = reactive({
-			operationsModal:false,
-			loadingShow:false,
-		})
-		let operationsData = reactive({
-			buildType:'',
-			numberOfImages:'',
-			credits:0,
-			exhibitionImgList:[],//选择的图片
-			selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
-			//toProduct
-			generateText:'',//输入的内容
-			similarity:30,
-			brightenValue:1,//亮度
-			relightDirection:'Right Light',//打光方向
-			relightDirectionList:[
-				{
-					value:'Right Light',
-					label:useI18n().t('ProductImg.RightLight')
-				},{
-					value:'Left Light',
-					label:useI18n().t('ProductImg.LeftLight')
-				},{
-					value:'Top Light',
-					label:useI18n().t('ProductImg.TopLight')
-				},{
-					value:'Bottom Light',
-					label:useI18n().t('ProductImg.BottomLight')
-				}
-			]
-		})
-		let init = ()=>{
-			operations.operationsModal = true
-
-		}
-		const changeBuildType = ()=>{
-			if(operationsData.buildType == 'design'){
-				operationsData.exhibitionImgList = []
-			}else if(operationsData.buildType == 'toProductImage'){
-				operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.design.likeData
-			}else if(operationsData.buildType == 'relight'){
-				operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.toProduct
-			}else if(operationsData.buildType == 'poseTransfer'){
-				operationsData.exhibitionImgList = store.state.UploadFilesModule.modularData.toProduct
-			}
-			props.cloudList.forEach((item)=>{
-				if(item.value == operationsData.buildType){
-					operationsData.credits = item.consumption
-				}
-			})
-		}
-		let getPorductImg = ()=>{
-			let modularData = store.state.UploadFilesModule.modularData
-			let list = []
-			if(operationsData.buildType == 'toProductImage' || operationsData.buildType == 'relight'){
-				let productOrRelight = []
-				if(operationsData.buildType == 'toProductImage')productOrRelight = modularData.design.likeData
-				if(operationsData.buildType == 'relight')productOrRelight = modularData.toProduct
-
-				productOrRelight.forEach((item)=>{
-					if(!item.id)return
-					let obj = {
-						"createTime": "",
-						"elementId": 0,
-						"elementType": "",
-						"id": 0,
-						"isLike": 0,
-						"taskId": "",
-						"toProductImageRecordId": 0,
-						"url": "",
-					}
-					obj.elementId = item.designOutfitId
-					obj.elementType = 'DesignOutfit'
-					if(operationsData.buildType == 'relight'){
-						obj.elementId = item.id
-						obj.elementType = 'ToProductImage'
-					}
-					list.push(obj)
-				}) 
-			} 
-			return list
-		}
-		const getImageStrength = () => {
-			let imageStrength = operationsData.similarity == 100? 95 :operationsData.similarity
-			return imageStrength;
-		};
-		const getPoseTransformData = ()=>{
-			let list = []
-			let toProduct = store.state.UploadFilesModule.modularData.toProduct
-			toProduct.forEach((item)=>{
-				let obj = {
-					poseId:1,
-					productImage:getMinioUrl(item.url)
-				}	
-				list.push(obj)
-			})
-			return list
-		}
-		let setAddData = ()=>{
-			return {
-				"buildType": operationsData.buildType,
-				nums: operationsData.numberOfImages,
-				projectId: operationsData.selectObject.id,
-				//productimg
-				toProductImage:{
-					prompt:operationsData.generateText,//输入的内容
-					toProductImageVOList:getPorductImg(),//选择的图片
-					projectId: operationsData.selectObject.id,
-					direction:operationsData.relightDirection,//打光方向
-					brightenValue:operationsData.brightenValue,
-					imageStrength:(100 - getImageStrength())/100,
-				},
-				//poseTransform
-				poseTransform:getPoseTransformData(),
-				private: operationsData.selectObject.id,
-				ToProductImageDTO: operationsData.selectObject.id,
-			}
-		}
-		let cancelDsign = ()=>{
-			operationsData.buildType=''
-			operationsData.numberOfImages=''
-			operations.operationsModal = false
-		}
-		let setOk = ()=>{
-			let data 
-			data = setAddData()
-			if(operationsData.buildType == 'toProductImage'){
-				if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("You need to go to the Design module and generate a design result first before you can use the 'To Product Image' cloud generation feature.")
-			}else if(operationsData.buildType == 'relight'){
-				if(data.toProductImage.toProductImageVOList.length == 0)return message.warning("You need to go to the 'To Product Image' module and generate a result first before you can use the 'Relight' cloud generation feature.")
-			}else if(operationsData.buildType == 'poseTransfer'){
-				if(data.poseTransform.length == 0)return message.warning("You must first generate results in the 'To Product Image' module before you can use the 'Transfer Pose' cloud generation feature.")
-			}
-			if(!data.buildType || !data.nums)return message.warning('Please check the input box marked with *')
-			operations.loadingShow = true
-			Https.axiosPost(Https.httpUrls.designCloud, data).then(
-			(rv) => {
-				if (rv) {
-					operations.loadingShow = false
-					cancelDsign()
-					emit('getContentList')
-				}
-			}).catch((error) => {
-				operations.loadingShow = false
-			})
-		}
-		const changeNumberOfImages = ()=>{
-			if(operationsData.buildType =='relight' || operationsData.buildType == 'poseTransfer'){
-				if(operationsData.exhibitionImgList.length < Number(operationsData.numberOfImages)){
-					operationsData.numberOfImages = operationsData.exhibitionImgList.length
-				}
-			}
-		}
-        return {
-            ...toRefs(operations),
-            ...toRefs(operationsData),
-			cancelDsign,
-			init,
-			focus,
-			blur,
-			setOk,
-			changeBuildType,
-			changeNumberOfImages,
-        };
-    },
-    data() {
-        return {
-        };
-    },
-    mounted() {},
-    methods: {
-       
-    },
-	directives:{
-		mousewheel:{
-			mounted (el) {
-				el.addEventListener('mouseenter', (e)=> {
-					if(el.scrollWidth > el.clientWidth){
-						el.parentElement.style.overflowY = 'hidden';
-					}
-				});
-
-				// 鼠标移出事件
-				el.addEventListener('mouseleave', ()=> {
-					el.parentElement.style.overflowY = 'auto';
-				});
-				el.addEventListener('wheel',(e)=>{
-					let num = 0
-					if(e.deltaY > 0){
-						num = 25
-					}else{
-						num = -25
-					}
-					el.scrollBy(num, 0);
-				},{ passive: true })
-			}
-		},
-	},
-});
-</script>
-<style lang="less" scoped>
-:deep(.ant-modal-mask){
-	background: rgba(0, 0, 0, 0.2);
-}
-:deep(.createCloud_modal){
-	
-	.ant-modal-body{
-		display: flex;
-		flex-direction: column;
-	}
-}
-
-</style>
-<style lang="less" scoped>
-
-.createCloud_modal {
-    .closeIcon {
-        z-index: 2;
-    }
-	.allUserPoeration_btn{
-		display: flex;
-		flex-direction: row;
-		height: auto;
-		justify-content: flex-end;
-		padding: 1rem 0;
-		.admin_search_item{
-			margin-bottom: 0;
-		}
-	}
-	.allUserPoeration_center{
-		flex: 1;
-		overflow-y: auto;
-		flex-direction: row;
-		flex-wrap: wrap;
-		align-content: flex-start;
-		padding: 0 2rem;
-		> .selectImgList{
-			width: 100%;
-			display: flex;
-			overflow-x: auto;
-			align-items: center;
-			flex-wrap: nowrap;
-			height: 20rem;
-			margin: 2rem 0;
-			> .item{
-				height: 100%;
-				margin-right: 1rem;
-				&:last-child{
-					margin-right: 0;
-				}
-				> img{
-					height: 100%;
-				}
-			}
-			// 
-		}
-		> .admin_state_item{
-			width: auto;
-			// width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: flex-start;
-			> span{
-				text-align: left;
-				margin: 0;
-				margin-bottom: 1.5rem;
-				font-weight: 600;
-			}
-			:deep(> .ant-select > .ant-select-selector){
-				border-radius: 1.6rem;
-			}
-			> input{
-				border-radius: 1.6rem;
-			}
-			>.sliderAndImput{
-				display: flex;
-				align-items: center;
-				flex: 1;
-				:deep(> .ant-slider){
-					// border-radius: 1.6rem;
-					flex: 1;
-				}
-				> input{
-					border-radius: 1.6rem;
-					width: 4rem;
-					margin-left: 1rem;
-					height: 100%;
-					border-radius: 1rem;
-				}
-			}
-		}
-	}
-}
-</style>
--- a/src/component/home/tools/cloudUploading/index.vue
+++ b/src/component/home/tools/cloudUploading/index.vue
@@ -1,343 +0,0 @@
-<template>
-	<div class="uploading">
-		<div class="title">
-			<div class="list">
-				<div
-					class="titleItem active"
-				>
-					<span class="detailText">All</span>
-				</div>
-			</div>
-			<div class="createCloud">
-				<div class="gallery_btn" @click="createClound">Create</div>
-			</div>
-		</div>
-		<div class="contentList">
-			<div class="title">
-				<div class="titleItem" v-for="item in cloudTiltleList" :key="item.value">
-					{{ item.name }}
-				</div>
-			</div>
-			<div class="content">
-				<tr v-for="(row, index) in contentList" :key="index">
-					<td v-for="header in cloudTiltleList" :key="header.value">
-						<span v-show="header.value != 'operation'">
-							{{header?.fun?header.fun(row[header.value]) : row[header.value]}}
-						</span>
-						<span style="color: #007EE5; cursor: pointer;" v-show="header.value == 'operation'" @click="detailIamge(row)">
-							Review
-						</span>
-					</td>
-				</tr>
-			</div>
-			<a-pagination style="text-align: center;" v-model:current="currentPage" :total="total" show-less-items />
-		</div>
-		<createCloud ref="createCloud" :cloudList="generateList[workflowType]" @getContentList="submitGetContentList"></createCloud>
-	</div>
-</template>
-<script lang="ts">
-import { defineComponent,computed,ref,onMounted,nextTick,createVNode,toRefs, reactive, onBeforeUnmount} from 'vue'
-import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-import { Https } from "@/tool/https";
-import { useStore } from "vuex";
-import { useI18n } from 'vue-i18n'
-import createCloud from "./createCloud.vue";
-import { da } from 'element-plus/es/locale';
-export default defineComponent({
-	components:{
-		createCloud,
-	},
-	props:{
-		workflowType:{
-		    type:String,
-			default:'' as any,
-			required:true	
-		}
-	},
-	emits:['retrieve'],
-	setup(props,{emit}) {
-		const store = useStore();
-		const data = reactive({
-			pageType:'list',
-			pageSize:10,
-			currentPage:1,
-			total:0,
-			selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
-			generateList:{
-				seriesDesign:[
-					{
-						label:'Design',
-						value:'design',
-						consumption:0,
-					},{
-						label:'To Product Image',
-						value:'toProductImage',
-						consumption:5,
-					},{
-						label:'Relight',
-						value:'relight',
-						consumption:5,
-					},{
-						label:'Transfer Pose',
-						value:'poseTransfer',
-						consumption:10,
-					},
-				],
-				singleProductDesign:[
-					{
-						label:'Design',
-						value:'design',
-						consumption:0,
-					},{
-						label:'To Product Image',
-						value:'toProductImage',
-						consumption:5,
-					},
-				],
-				// printDesign:[
-				// 	{
-				// 		label:'1',
-				// 		value:100,
-				// 	}
-				// ],
-				productDrawingDesign:[
-					{
-						label:'To Product Image',
-						value:'toProductImage',
-						consumption:5,
-					},{
-						label:'Relight',
-						value:'relight',
-						consumption:5,
-					},{
-						label:'Transfer Pose',
-						value:'poseTransfer',
-						consumption:10,
-					},
-				],
-				// printingDesign3D:[
-				// 	{
-				// 		label:'1',
-				// 		value:100,
-				// 	}
-				// ],
-				// sketchDesign:[]
-			},
-			cloudTiltleList:[
-				{
-					name:'Task type',
-					value:'buildType',
-					fun:(value:any)=>{
-						let str = ''
-						if(value == 'design')str = 'Design'
-						if(value == 'toProductImage')str = 'To Product Image'
-						if(value == 'relight')str = 'Relight'
-						if(value == 'poseTransfer')str = 'Transfer Pose'
-						return str
-					}
-				},{
-					name:'Quantity generated',
-					value:'nums',
-				},{
-					name:'Creation time',
-					value:'updateTime',
-					fun:(value:any)=>{
-						if(!value)return
-						return value.split('T')[0] + ' ' + value.split('T')[1].split('.')[0] 
-					}
-				},{
-					name:'Start time',
-					value:'updateTime',
-					fun:(value:any)=>{
-						//没开始内容为 - 
-						if(!value)return
-						return value.split('T')[0] + ' ' + value.split('T')[1].split('.')[0] 
-					}
-				},{
-					name:'End time',
-					value:'updateTime',
-					fun:(value:any)=>{
-						if(!value)return
-						return value.split('T')[0] + ' ' + value.split('T')[1].split('.')[0] 
-					}
-				},{
-					name:'Status',
-					value:'process',
-					fun:(value:any)=>{
-						if(value == '100.00%'){
-							return 'Completed'
-						}else{
-							return value
-						}
-					}
-				},{
-					name:'Operation',
-					value:'operation',
-				},
-			]  as any,
-			contentList:[
-			]  as any,
-			isGetContentList:false as any,
-		})
-		const dataDom = reactive({
-			createCloud,
-		})
-		const createClound = ()=>{
-			data.isGetContentList = false
-			dataDom.createCloud.init()
-		}
-		const detailIamge = (item:any)=>{
-			//去除里面的T2025-04-17T13:45:43
-			if(item.process == '100.00%' || item.status == 1){
-				let value = {
-					taskId:item.taskId,
-					page:1,
-					size:10,
-					buildType:item.buildType,
-				}
-				Https.axiosPost(Https.httpUrls.getDesignCloudResult,value).then((rv)=>{
-					console.log(rv)
-					if(rv.design && rv.design.length > 0){
-						store.commit('addDesignCollectionList',rv.design)
-						emit('retrieve','design')
-					}else if(rv.toProductImage && rv.toProductImage.length > 0){
-						store.commit('setCloudList',{str:'toProduct',list:rv.toProductImage})
-						emit('retrieve','toProduct')	
-					}else if(rv.relight && rv.relight.length > 0){
-						store.commit('setCloudList',{str:'relight',list:rv.relight})
-						emit('retrieve','relight')	
-					}else if(rv.poseTransfer && rv.poseTransfer.length > 0){
-						store.commit('setCloudList',{str:'poseTransfer',list:rv.poseTransfer})
-						emit('retrieve','poseTransfer')	
-					}
-					data.isGetContentList = false
-				})
-			}
-		}
-		const getContentList = ()=>{
-			if(data.isGetContentList){
-				let value = {
-					page:data.currentPage,
-					size:data.pageSize,
-					projectId: data.selectObject.id,
-				}
-				Https.axiosPost(Https.httpUrls.cloudPage,value).then((rv)=>{
-					data.contentList = rv.content
-					data.total = rv.total
-					let arr = rv.content
-					let result = arr.some((item:any) => (item.process !== '100.00%' && item.status !== 1));
-					if(!result)data.isGetContentList = false
-					setTimeout(()=>{
-						getContentList()
-					},1500)
-				})
-			}
-		}
-		const submitGetContentList = ()=>{
-			data.isGetContentList = true
-			getContentList()
-		}
-		onBeforeUnmount(()=>{
-			data.isGetContentList = false
-		})
-		onMounted(()=>{
-			data.isGetContentList = true
-			getContentList()
-		})
-		return{
-			...toRefs(dataDom),
-			...toRefs(data),
-			createClound,
-			detailIamge,
-			getContentList,
-			submitGetContentList,
-		}
-	},
-	provide() {
-		return {
-		}
-	},
-})
-</script>
-<style lang="less" scoped>
-	.uploading{
-		width: 100%;
-		height: 100%;
-		position: relative;
-		padding-top: 3rem;
-		display: flex;
-		flex-direction: column;
-		> .title{
-			width: 100%;
-			display: flex;
-			> .list{
-				display: flex;
-				margin-bottom: 2.5rem;
-				> .titleItem:last-child{
-					margin-right: 0;
-				}
-				> .titleItem{
-					position: relative;
-					cursor: pointer;
-					margin-right: 6.5rem;
-				}
-				> .titleItem::before {
-						position: absolute;
-						content: "";
-						display: block;
-						background: #000;
-						height: calc(.4rem*1.2);
-						left: 50%;
-						transform: translateX(-50%);
-						bottom: -.5rem;
-						width: 0px;
-						transition: 0.3s all;
-					}
-				> .active {
-					color: #000;
-					font-weight: 600;
-				}
-				> .active::before {
-					width: 100%;
-				}
-			}	
-			> .createCloud{
-				margin-left: auto;
-			}
-		}
-		> .contentList{
-			flex: 1;
-			overflow: hidden;
-			padding-top: 2.5rem;
-			display: flex;
-			flex-direction: column;
-			> .content tr , > .title{
-				display: flex;
-				justify-content: space-between;
-				padding: 0 1.2rem;
-			}
-			> .title{
-				background: #F7F7F7;
-				> .titleItem{
-					line-height: 4.6rem;
-					font-size: 2rem;
-					color: #666666;
-					width: calc(100% / 4);
-					text-align: center;
-				}
-			}
-			.content{
-				flex: 1;
-				overflow: hidden;
-				> tr{
-					> td{
-						text-align: center;
-						width: calc(100% / 4);
-						line-height: 4.6rem;
-						font-size: 2.2rem;
-					}
-				}
-			}
-		}
-	}
-</style>
--- a/src/component/home/tools/deReconstruction/index.vue
+++ b/src/component/home/tools/deReconstruction/index.vue
@@ -22,7 +22,8 @@
 			<selectList @selectImgItem="selectImgItem" :segmentationType="segmentationType" :isSegmentation="true" upLoadHttpsUrl="/api/element/imageSegmentation" level1Type="Sketchboard" :randomId="false" type="sketch" :catecoryList="sketchCatecoryList"></selectList>
 		</div>
 		<div class="canvas itemBox">
-			<canvasBox @setGenerateImg="setGenerateImg" ref="canvasBox"></canvasBox>
+			<!-- <canvasBox @setGenerateImg="setGenerateImg" ref="canvasBox"></canvasBox> -->
+			<canvasUpload :config="ceditorConfig" clothingImageUrl="https://www.minio-api.aida.com.hk/aida-sys-image/models/female/2e4815b9-1191-419d-94ed-5771239ca4a5.png?response-content-type=image%2Fpng&response-content-disposition=inline&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20250608%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250608T161025Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=a4374c0954d11c2490ef3b86a1924cf6d423ed8ac56023b3c3ccabcdf0672620"></canvasUpload>
 		</div>
 		<div class="finished itemBox">
 			<div class="btnTop">
@@ -49,9 +50,11 @@ import { useI18n } from 'vue-i18n'
 import selectList from '@/component/DetailCopy/detailLeft/module/selectList.vue'
 import sketchCategory from "@/component/HomePage/sketchCategory.vue";
 import canvasBox from "./canvas/index.vue";
+import canvasUpload from "@/component/Canvas/CanvasEditor/index.vue";
+// import defaultModel from '@/assets/images/homePage/defaultModel.png'
 export default defineComponent({
 	components:{
-		selectList,sketchCategory,canvasBox
+		selectList,sketchCategory,canvasBox,canvasUpload
 	},
 	props:{
 	},
@@ -64,6 +67,12 @@ export default defineComponent({
 			}),
 			segmentationType:'product',
 			generateImg:computed(()=>store.state.HomeStoreModule.deReconstruction) as any,
+			ceditorConfig:{
+				width: 800,
+				height: 600,
+				backgroundColor: "#f8f8f8",
+			},
+			defaultModel:'',
 		})
 		const setIsShowMark:any = inject('setIsShowMark')
 		const dataDom = reactive({
@@ -219,6 +228,7 @@ export default defineComponent({
 			}
 			&.canvas{
 				flex: 1;
+				position: relative;
 			}
 			&.finished{
 				width: 58rem;
--- a/src/component/home/tools/patternMaking3D/index.vue
+++ b/src/component/home/tools/patternMaking3D/index.vue
@@ -24,7 +24,6 @@
 						</a-select>
 					</div>
 				</div>
-				
 			</div>
 			<div class="list" v-show="libraryOrModel == 'model'" v-if="maskShow">
 				<div v-for="item in modelList" class="modelItem" :class="{active:item.id == selectModel.id}" @click="setSelectModel(item)">
@@ -38,9 +37,7 @@
 				</div>
 			</div>
 			<div class="list printList" v-show="libraryOrModel == 'print'">
-				<div v-for="item in printList" class="modelItem" :class="{active:item.id == selectModel.id}" @click="setMaterial(item)">
-					<img :src="item.url || item.imgUrl" alt="">
-				</div>
+				<selectPrint ref="selectPrint" @setPrint="setPrint"></selectPrint>
 			</div>
 		</div>
 		<div class="model" v-show="selectModel.id != -1">
@@ -57,7 +54,7 @@
 					<img v-show="!isFront" :src="selectModel.threeDLayoutList?.[0]?.url" alt="">
 					<img v-show="isFront" :src="selectModel.threeDLayoutList?.[1]?.url" alt="">
 				</div>
-				<threeBox v-if="imgOrThree" ref="threeBox"></threeBox>
+				<threeBox v-if="imgOrThree" @saveProject="saveProject" ref="threeBox"></threeBox>
 			</div>
 			<div class="gallery_btn" v-show="!imgOrThree" @click="setImgOrThree(true)">3D view</div>			
 			<div class="gallery_btn" v-show="imgOrThree" @click="setImgOrThree(false)">Img view</div>			
@@ -81,17 +78,19 @@
 	</div>
 </template>
 <script lang="ts">
-import { defineComponent,computed,ref,provide,nextTick,createVNode,toRefs, reactive, watch} from 'vue'
+import { defineComponent,computed,ref,inject,nextTick,onMounted,toRefs, reactive, watch, onBeforeMount} from 'vue'
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { Https } from "@/tool/https";
 import { useStore } from "vuex";
 import { useI18n } from 'vue-i18n'
 import threeBox from "./three.vue"
 import download from "./download.vue"
+import {getMinioUrl} from '@/tool/util'
 import scaleImage from "@/component/HomePage/scaleImage.vue";
+import selectPrint from './selectPrint.vue'
 export default defineComponent({
 	components:{
-		threeBox,download,scaleImage
+		threeBox,download,scaleImage,selectPrint
 	},
 	props:{
 	},
@@ -109,7 +108,6 @@ export default defineComponent({
 			modelList:[] as any,
 			sex:'Female',
 			sexList:computed(()=>store.state.UserHabit.sex.value),
-			printList:computed(()=>store.state.UploadFilesModule.allBoardData.printboardFiles),
 			isShowMark:false,
 			isNoData:false,
 			isShowLoading:false,
@@ -126,8 +124,11 @@ export default defineComponent({
 			data.isNoData = false
 			data.isShowMark = false
 		}
-		const setSelectModel = (item:any)=>{
+		const createProbject:any = inject('createProbject')
+		const setSelectModel = async (item:any)=>{
+			if(!data.selectObject.id)await createProbject()
 			data.isShowMark = true
+			if(!item.threeDSimpleId)return
 			const value = {
 				threeDSimpleId:item.threeDSimpleId,
 			}
@@ -140,9 +141,10 @@ export default defineComponent({
 				// 	dataDom.threeBox.openSetData()
 				// }
 				let stateData = {
-					threeDsimpleId:item.id
+					threeDSimpleId:item.id
 				}
 				store.commit('setPatternMaking3D',stateData)
+				saveProject()
 			}).catch((err:any)=>{
 				data.isShowMark = false	
 			})
@@ -154,7 +156,7 @@ export default defineComponent({
 		})
 		const openSetData = ()=>{
 			nextTick(()=>{
-				let id = store.state.HomeStoreModule.patternMaking3D.threeDsimpleId
+				let id = store.state.HomeStoreModule.patternMaking3D.threeDSimpleId
 				if(id && data.selectModel.id == -1)setSelectModel({threeDSimpleId:id})
 			})	
 			setTimeout(()=>{
@@ -203,14 +205,46 @@ export default defineComponent({
 			// if(str == 'print' && data.selectModel.id == -1)return
 			data.libraryOrModel = str
 		}
-		const setMaterial = (item:any)=>{
-			dataDom.threeBox.addMaterial(item)
-		}
+		
 		const openScaleImage = ()=>{
 			let scaleImage:any = dataDom.scaleImage
 			scaleImage.isLike = false
 			scaleImage.init([{imgUrl:data.selectModel.threeDPatternLayoutUrl}],0)
 		}
+		const setPrint = async (item:any)=>{
+			if(dataDom.threeBox){
+				if(!data.selectObject.id)await createProbject()
+				dataDom.threeBox.addMaterial(item)
+				const stateData = {
+					printMinioUrl:getMinioUrl(item.imgUrl || item.url)
+				}
+				store.commit('setPatternMaking3D',stateData)
+				saveProject()
+			}
+			
+		}
+		let saveTime = null as any
+		const saveProject = ()=>{
+			clearTimeout(saveTime)
+			saveTime = setTimeout(()=>{
+				let value:any = {
+					projectId:data.selectObject.id,
+				}
+				store.dispatch('setModularData',{type:'patternMaking3D'})
+				const str = 'patternMaking3D'
+				store.dispatch('getProjectData',str).then((data)=>{
+					if(!data[str])return
+					value[str] = data[str]
+					Https.axiosPost(Https.httpUrls.saveModuleContent, value).then((rv)=>{
+						if(rv.boundingBox)store.commit('setShowSketchboard',rv.boundingBox)
+					})
+				})
+			},2000)
+			
+		}
+		onMounted(()=>{
+			openSetData()
+		})
 		return{
 			...toRefs(dataDom),
 			...toRefs(data),
@@ -221,8 +255,8 @@ export default defineComponent({
 			setImgOrThree,
 			openDown,
 			setLibraryOrModel,
-			setMaterial,
-			openScaleImage
+			openScaleImage,
+			setPrint,
 		}
 	},
 	directives:{
@@ -320,14 +354,7 @@ export default defineComponent({
 			    flex-wrap: wrap;
 				overflow-y: auto;
 				align-content: flex-start;
-				&.printList{
-					> .modelItem{
-						aspect-ratio: 1 / 1;	
-						>img{
-							padding: 0;
-						}
-					}
-				}
+				
 				> .modelItem{
 					width: calc(100% / 4 - 1rem);
 					margin: .5rem;
--- a/src/component/home/tools/patternMaking3D/selectPrint.vue
+++ b/src/component/home/tools/patternMaking3D/selectPrint.vue
@@ -0,0 +1,700 @@
+<template>
+    <div class="printboard_upload_modal">
+		
+        <div class="printboard_left_upload">
+            <div class="left_upload_header">
+                <div class="upload_header_item">
+                    <div class="switch_type_list">
+                        <div
+							
+							class="switch_type_item"
+							:class="[openClick == 1 ? 'select_swtich' : '']"
+						>
+							<span @click.stop="open(1)">{{ $t('PrintboardUpload.Upload') }}</span>
+						</div>
+						<div
+							
+							class="switch_type_item"
+							:class="[openClick == 2 ? 'select_swtich' : '']"
+						>
+							<span @click.stop="open(2)">{{ $t('PrintboardUpload.Library') }}</span>
+						</div>
+						<div
+							
+							class="switch_type_item Guide_1_2_1"
+							:class="[openClick == 3 ? 'select_swtich' : '']"
+						>
+							<span @click.stop="open(3)">{{ $t('PrintboardUpload.Generate') }}</span>
+							
+						</div>
+						<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
+							<div @click.stop="openPrintModel"><span>{{ scene.name }}<i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></span>	</div>
+							<ul v-show="openMenu">
+								<li 
+									v-for="item,index in printCatecoryList" 
+									class="printModel_item" 
+									@click.stop="setSceneList(item)"
+									:title="item.value == 'Pattern'?$t('PrintboardUpload.PatternTitle'):
+									item.value == 'Logo'?$t('PrintboardUpload.LogoTitle'):
+									item.value == 'Slogan'?$t('PrintboardUpload.SloganTitle'):''"
+								>{{ item.name }}</li>
+							</ul>
+						</div>
+                    </div>
+                </div>
+            </div>
+             <div v-show="openClick == 1" class="printboard_body">
+                <div class="upload_img_body">
+                    <div class="upload_item">
+                        <div :class="['upload_file_item']" v-for="(file, index) in fileList" :key="file">
+                            <div class="upload_file_img_block">
+                                <div class="upload_file_item_content" v-show="file?.status === 'uploading'">
+                                    <a-spin  :indicator="indicator" tip="Uploading..."/>
+                                </div>
+                                <div class="upload_file_item_content"  v-show="file?.status === 'done'" @click="setSetchboardGenerate(file.resData)">
+                                    <img  v-lazy="file.imgUrl" class="upload_img" :key="file.imgUrl">
+									<sketchCategory :disignTypeList="printCatecoryList" :generateList="fileList" :isSetSketchCategory="true" :item="file" ></sketchCategory>
+
+                                    <div class="delete_like_file_block" @click.stop="deleteFile(file)">
+										<span
+											class="icon iconfont icon-shanchu"
+										></span>
+									</div>
+                                </div>
+                            </div>
+                            <!-- <div class="pin_block" v-show="file?.status === 'done'">
+                                <a-checkbox v-model:checked="file.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
+                            </div> -->
+                            
+                        </div>
+                        <div class="upload_file_item upload_component" v-show="printboardList.length < 16">
+                            <a-upload
+                                :action="uploadUrl + '/api/element/upload'"
+								:capture="null"
+                                list-type="picture-card"
+                                :before-upload="beforeUpload"
+                                :data="{
+                                    ...upload
+                                }"
+                                :headers="{Authorization:token}"
+                                v-model:file-list="fileList"
+                                :customRequest="function(){}"
+                                :maxCount="16 - printboardList.length+fileList.length"
+                                accept=".jpg,.png,.jpeg,.bmp"
+                                @change="fileUploadChange"
+                                >
+								<div
+                                    class="upload_tip_block"
+									v-show="printboardList.length < 16"
+                                >
+                                    <i class="fi fi-br-upload"></i>
+                                    <!-- <img class="upload_img_icon" src="@/assets/images/homePage/add_file.png"> -->
+                                </div>
+                            </a-upload>
+                        </div>
+                    </div>
+                </div>
+            </div>
+			<Material v-show="openClick == 2" 
+				ref="Material" 
+				msg="Printboard" 
+				@setLibrary = setSetchboardGenerate 
+				@confirmSelect="confirmSelect"
+				:disignTypeList="printCatecoryList"
+				></Material>
+			<Generate v-show="openClick == 3" ref="Generate" @setLibrary = setSetchboardGenerate  :scene="scene" :sketchCatecoryList="printCatecoryList" msg="Printboard"></Generate>
+        </div>
+		<!-- 取消请求 -->
+		<scaleImage ref="scaleImage"></scaleImage>
+        <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent,h,ref,computed,inject,createVNode,provide, nextTick } from 'vue'
+import { LoadingOutlined } from '@ant-design/icons-vue';
+import {getCookie} from '@/tool/cookie'
+import {getUploadUrl} from '@/tool/util'
+import {useStore} from 'vuex'
+import { Https } from "@/tool/https";
+import { Modal,message,Upload} from 'ant-design-vue';
+import Cropper from '@/component/HomePage/Cropper.vue'
+import Material from '@/component/HomePage/Material.vue'
+import Generate from "@/component/HomePage/Generate.vue";
+import GO from "@/tool/GO";
+import { useI18n } from 'vue-i18n';
+import { openGuide,driverObj__ } from "@/tool/guide";
+import scaleImage from "@/component/HomePage/scaleImage.vue";
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import sketchCategory from "@/component/HomePage/sketchCategory.vue";
+import axios from 'axios'
+import generalMenu from "@/component/HomePage/generalMenu.vue";
+import { overflow } from 'html2canvas/dist/types/css/property-descriptors/overflow';
+
+export default defineComponent({
+    components:{
+        Cropper,
+        Material,
+		Generate,
+		scaleImage,
+		generalMenu,
+		sketchCategory,
+    },
+	emits: ['setPrint'],
+    setup(){
+        let store:any =useStore()
+        let fileList:any = ref([]),//选中的文件id数据
+            printImgList:any = ref([]), //print的印花图片
+            moodBoards:any = computed(()=>{return store.state.UploadFilesModule.moodboard})
+        let openClick: any = ref(1);
+		let {t} = useI18n()
+		let isTest = ref()
+		let userInfo:any = {}
+		let workspace:any = ref({})
+		let scene = ref({
+			name:'Pattern',
+			value:'Pattern'
+		})
+		let openMenu = ref(false)
+		let printCatecoryList:any = computed(()=>{
+			return store.state.UserHabit.printType
+		})
+        return {
+            fileList,
+            printImgList,
+            moodBoards,
+			openClick,
+			t,
+			isTest,
+			userInfo,
+			workspace,
+			scene,
+			openMenu,
+			printCatecoryList,
+        }
+    },
+    computed:{
+       
+    },
+	watch:{
+	},
+    data(){
+        return {
+            swtich_type:'upload',
+            indicator : h(LoadingOutlined, {
+                style: {
+                    fontSize: '2.4rem*1.2)',
+                },
+                spin: true,
+            }),
+            upload:{
+                isPin:0,
+				gender:'',
+                level1Type:'Printboard',
+                timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
+            },
+            token:'',
+            uploadUrl:'',
+            store:useStore(),
+            cropperFileData:{name:'',uid:''}, //裁剪的原始文件数据
+            currentFileNum:0, //当前上传的文件数
+            isUpload:false,
+			printboardList:computed(()=>{
+				return  useStore().state.UploadFilesModule.printboard
+			}),
+			isTextarea:false,
+			isInputFocus:false,
+			isUseGenerate:true
+        }
+    },
+    mounted(){
+		let userInfo:any = getCookie("userInfo")
+        this.userInfo = JSON.parse(userInfo);
+        this.token = getCookie('token') || ''
+		let isTest:any = getCookie('isTest')
+        this.isTest =JSON.parse(isTest)
+        this.uploadUrl = getUploadUrl()
+		this.workspace = computed(()=>{
+			return  this.store?.state?.Workspace?.workspace
+		})
+    },
+     methods:{
+		setSetchboardGenerate(item:any){
+			this.$emit('setPrint',item)
+		},
+		open(num: Number) {
+            this.openClick = num;
+			let material:any = this.$refs.Material
+			if(num == 2){
+				material.init('Printboard')
+			}
+			if(num == 3){
+				this.scene = this.printCatecoryList[0]
+			}
+        },
+        fileUploadChange(data:any){
+            let file = data.file
+			
+			// let res = JSON.parse(data?.xhr?.response);
+			file.id_ = GO.id++
+			file.type_ = {
+				type1:'upload',
+				type2:'Printboard'
+			};
+			file.pin = false;
+			// file.id = res.data.id?res.data.id:""
+            let Cropper:any = this.$refs.Cropper
+            if(this.currentFileNum === 1){
+                var reader = new FileReader();
+				
+                reader.onload = (e:any) => {
+                    let data_new;
+                    if (typeof e.target.result === 'object') {
+                    // 把Array Buffer转化为blob 如果是base64不需要
+                    data_new = window.URL.createObjectURL(new Blob([e.target.result]));
+                    } else {
+                    data_new = e.target.result;
+                    }
+                    Cropper.getOptionImg(data_new)
+					
+					
+                };
+                // 转化为base64
+                // reader.readAsDataURL(file)
+                // 转化为blob
+                reader.readAsArrayBuffer(file.originFileObj);
+                this.cropperFileData = file
+                Cropper.changeShowModal(true)
+            }else{
+                this.customRequest(file)
+            }
+        },
+
+        beforeUpload(file:any,fileList:any){
+            const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
+            if (!isJpgOrPng) {
+                message.info(this.t('PrintboardUpload.jsContent1'));
+            }
+            const isLt2M = file.size / 1024 / 1024 < 5;
+            if (!isLt2M) {
+                message.info(this.t('PrintboardUpload.jsContent2'));
+            }
+            if(isJpgOrPng && isLt2M){
+                this.currentFileNum = fileList.length
+            }else{
+                return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
+            }
+            
+        },
+
+        deleteFile(item:any){
+            // this.fileList.splice(item, 1)
+            // this.store.commit('setPrintboardFile',this.fileList)
+			if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+				item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:16})
+				this.store.commit("addGenerateMaterialFils", item);
+			}else{
+				this.fileList = this.store.state.UploadFilesModule.printboardFiles
+				let moodboard 
+				this.store.state.UploadFilesModule.printboardFiles.forEach((items:any,index:Number)=>{
+					if(items.id_ == item.id_){
+						moodboard = index
+						
+					}
+				})
+				this.fileList.splice(moodboard,1)
+				this.store.commit("setPrintboardFile", this.fileList);
+			}
+        },
+		likeFile(item:any,str:string){
+			if(str == 'like'){
+				let data = {
+					generateDetailId:item.id,
+					level1Type:"Printboard",
+					level2Type: item.categoryValue,
+					gender:this.workspace.sexEnum.value,
+					timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
+				}
+				Https.axiosPost(Https.httpUrls.generateLike, data).then(
+					(rv) => {
+						item.like = true
+					}
+				).catch(res=>{
+				});
+			}else{
+				let data = {
+					generateDetailId:item.id,
+					timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
+				}
+				Https.axiosGet(Https.httpUrls.generateDislike, {params:data}).then(
+					(rv) => {
+						item.like = false
+					}
+				).catch(res=>{
+				});
+			}
+
+		},
+        
+        customRequest(data:any){
+            let new_data = {
+                ...this.upload,
+                file:data.originFileObj
+            }
+            let fileUid = data.uid
+            Https.axiosPost('/api/element/upload', new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
+                (rv: any) => {
+                    if (rv) {
+                        for(let file of this.fileList){
+                            if(fileUid === file.uid){
+                                file.status = 'done'
+                                file.imgUrl = rv.url
+                                file.pin = false
+                                file.id = rv.id
+								file.category = this.printCatecoryList[0].name
+								file.categoryValue = this.printCatecoryList[0].value
+                                file.resData = rv
+								
+                            }
+                        }
+                        let fileList = this.fileList.filter((v:any)=> v.status === 'done')
+                        this.store.commit('setPrintboardFile',fileList)
+                    }
+                }
+            ).catch((res)=>{
+                let index = -1
+                this.fileList.forEach((ele:any,index1:any) => {
+                    if(fileUid === ele.uid){
+                        index = index1
+                    }
+                });
+                if(index > -1){
+                    this.fileList.splice(index, 1)
+                }
+            });
+        },
+
+        closeCropper(type:any){
+            if(this.isUpload){
+                return
+            }
+            if(type == 'error'){
+                let index = -1
+                this.fileList.forEach((ele:any,index1:any) => {
+                    if(this.cropperFileData.uid === ele.uid){
+                        index = index1
+                    }
+                });
+                if(index > -1){
+                    this.fileList.splice(index, 1)
+                }
+            }
+            let Cropper:any = this.$refs.Cropper
+            Cropper.closeCropper()
+
+        },
+
+        deletUploadFile(){
+            let index = -1
+            this.fileList.forEach((ele:any,index1:any) => {
+                if(this.cropperFileData.uid === ele.uid){
+                    index = index1
+                }
+            });
+            if(index > -1){
+                this.fileList.splice(index, 1)
+            }
+        },
+
+
+        handleCropperSuccess(event:any){
+            let {file, fileData} =event
+            let new_data = {
+                ...this.upload,
+                file:file
+            }
+            if(this.isUpload){
+                return
+            }
+            this.isUpload = true
+            const hide = message.loading('loading', 0);
+            Https.axiosPost('/api/element/upload', new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
+                (rv: any) => {
+                    for(let file of this.fileList){
+                        if(fileData.uid === file.uid){
+                            file.status = 'done'
+                            file.imgUrl = rv.url
+                            file.id = rv.id
+                            file.resData = rv
+							file.category = this.printCatecoryList[0].name
+							file.categoryValue = this.printCatecoryList[0].value
+                        }
+                    }
+                    let fileList = this.fileList.filter((v:any)=> v.status === 'done')
+					
+                    this.isUpload = false
+                    this.closeCropper('success')
+                    this.cropperFileData = {name:'',uid:''}
+                    // this.store.commit('setPrintboardFile',fileList)
+                    hide()
+                }
+            ).catch(res=>{
+                let index = -1
+                this.fileList.forEach((ele:any,index1:any) => {
+                    if(fileData.uid === ele.uid){
+                        index = index1
+                    }
+                });
+                if(index > -1){
+                    this.fileList.splice(index, 1)
+                }
+                this.cropperFileData = {name:'',uid:''}
+                this.isUpload = false
+                this.closeCropper('error')
+                hide()
+            });
+        },
+
+        recollection(){
+			
+            let arr = JSON.parse(JSON.stringify(this.store.state.UploadFilesModule.allBoardData.printboardFiles))
+			let setboard = {
+				generate:[] as any,
+				material:[] as any,
+				moodboard:[] as any,
+			}
+			arr.forEach((v:any)=>{
+				v.pin = v.pin == 1?true:false
+				this.printCatecoryList.forEach((item:any) => {
+					if(v.level2Type == item.value){
+						v.category=item.name
+						v.categoryValue=item.value
+					}
+				});
+				if(v.type_.type1 == 'generate'){
+					setboard.generate.push(v)
+				}else if(v.type_.type1 == 'material'){
+					setboard.material.push(v)
+				}else{
+					setboard.moodboard.push(v)
+				}
+			})
+			this.store.commit("setPrintboardGenerateFiles", setboard.generate);
+			this.store.commit("setPrintboardMaterialFiles", setboard.material);
+			this.store.commit("setPrintboardFile", setboard.moodboard);
+			this.fileList = setboard.moodboard
+            // this.printImgList = JSON.parse(JSON.stringify(this.store.state.UploadFilesModule.allBoardData.generatePrintFiles))
+            this.store.commit('setPrintboardFile',this.fileList)
+            // this.store.commit('setGeneratePrintFile',this.printImgList)
+
+        },
+
+        confirmSelect(event:any){
+            for(let item of event){
+                let data = {
+                    imgUrl:item.url,
+                    resData:item,
+                    pin:false,
+                    id:item.id,
+                    status:'done',
+                }
+                if(this.fileList.length == 15){
+                    message.warning(this.t('PrintboardUpload.jsContent3'))
+                    break
+                }
+                this.fileList.push(data)
+            }
+            this.store.commit('setPrintboardFile',this.fileList)
+            
+        },
+		scaleImage(index:any){
+			let scaleImage:any = this.$refs.scaleImage
+			scaleImage.isLike = false
+			scaleImage.init(this.printboardList,index)
+		},
+		setSceneList(data:any){
+			if(this.scene.value === data.value) return
+			this.scene = data
+			let generate:any = this.$refs.Generate
+			generate.sketchboardList = []
+			generate.searchPictureName = ''
+			this.openMenu = false
+		},
+		openPrintModel(){
+			if(this.openMenu)return
+			document.addEventListener('click',this.removePrintModel)
+			this.openMenu = true
+		},
+		removePrintModel(){
+			this.openMenu = false
+			document.removeEventListener('click',this.removePrintModel)
+		}
+     }
+
+})
+</script>
+<style lang="less" scoped>
+.printboard_upload_modal{
+    // padding: calc(1rem*1.2) calc(1rem*1.2) calc(1.8rem*1.2) calc(1rem*1.2);
+	height: 100%;
+    display: flex;
+    .printboard_left_upload{
+		display: flex;
+		flex-direction: column;
+        width: 100%;
+        .switch_type_list {
+            display: flex;
+            align-items: center;
+            position: relative;
+			z-index: 11;
+            .switch_type_item {
+                display: flex;
+                align-items: center;
+                // padding: 0 2rem*1.2);
+                height: calc(4rem*1.2);
+                border-radius: calc(0.8rem*1.2);
+                line-height: calc(4rem*1.2);
+                font-size: var(--aida-fsize1-8);
+                // margin-right: 2.2rem*1.2);
+                margin-right: calc(8rem*1.2);
+                color: #000;
+                cursor: pointer;
+                position: relative;
+                text-align: center;
+                transform-origin: left;
+                transform: scale(1);
+                transition: 0.3s all;
+                &.switch_type_item::before {
+                    position: absolute;
+                    content: "";
+                    display: block;
+                    background: #000;
+                    height: calc(.3rem*1.2);
+                    left: 50%;
+                    transform: translateX(-50%);
+                    bottom: calc(.6rem*1.2);
+                    width: 0px;
+                    transition: 0.3s all;
+                }
+                &.select_swtich {
+                    color: #000;
+                    // font-weight: 900;
+                    transform: scale(1.15);
+                }
+                &.select_swtich::before {
+                    width: 100%;
+                }
+				
+                .switch_icon {
+                    font-size: calc(1.8rem*1.2);
+                    margin-right: calc(0.8rem*1.2);
+                }
+            }
+			.printMenu{
+				margin-right: 0;
+				margin-top: auto;
+				position: relative;
+				margin-left: 2rem;
+				>div{
+					width: 14rem;
+					font-size: var(--aida-fsize1-6);
+					border: 0;
+					i{
+						transition: all .3s;
+						display: inline-block;
+						margin-left: 1rem;
+					}
+					.forbidden{
+						transform: rotate(180deg);
+					}
+				}
+				ul{
+					width: 14rem;
+				}
+			}
+			.switch_type_item:nth-child(3){
+				margin: 0;
+			}
+        }
+
+        .printboard_body{
+			display: flex;
+			flex-direction: column;
+            // height: calc(100% - 5rem*1.2));
+			flex: 1;
+			padding-top: calc(2.5rem*1.2);
+			height: calc(30rem*1.2);
+			overflow-x: hidden;
+			&.printboard_body::-webkit-scrollbar {
+            display: none;
+        }
+            .upload_img_body{
+                height: calc(100% - 3rem*1.2);
+                overflow-y: auto;
+                margin-bottom: calc(1rem*1.2);
+				&.upload_img_body::-webkit-scrollbar {
+					display: none;
+				}
+            }
+		
+            .upload_file_item{
+                margin: 0 calc(2rem*1.2) calc(2rem*1.2) 0;
+				// margin: 0 2rem*1.2) 2rem*1.2) 0;
+				display: inline-block;
+				width: 10rem;
+				height: 10rem;
+				border: 1px solid #f5f5f5;
+				vertical-align: top;
+				position: relative;
+				text-align: center;
+				img{
+					width: auto;
+					object-fit: cover;
+					height: 100%;
+					max-width: 100%;
+				}
+
+              .upload_file_img_block{
+				height: 100%;
+			  }
+
+                &.upload_component{
+                }
+				.checked{
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+					cursor: pointer;
+					display: none;
+					justify-content: center;
+					align-items: center;
+				}
+				&.modal_img_item:hover .checked{
+				display: flex;
+				}
+				.upload_file_item_content{
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					height: 100%;
+					position: relative;
+					cursor: pointer;
+					.upload_img{
+						display: block;
+						max-height: 100%;
+						width: auto;
+						max-width: 100%;
+						object-fit: cover;
+					}
+					&:hover .delete_like_file_block{
+						display: block;
+					}
+				}
+			}
+        }
+    }
+}
+
+
+</style>
--- a/src/component/home/tools/patternMaking3D/three.vue
+++ b/src/component/home/tools/patternMaking3D/three.vue
@@ -63,7 +63,7 @@ export default defineComponent({
 	},
 	props:{
 	},
-	emits:[],
+	emits:['saveProject'],
 	setup(props,{emit}) {
 		const store = useStore();
 		const data = reactive({
@@ -265,7 +265,7 @@ export default defineComponent({
 				texture.anisotropy = 32;  // 提高纹理清晰度
 				data.group?.traverse((child:any) => {
 					if (child.isMesh) {
-						console.log(child.name)
+						// console.log(child.name)
 						// 5. 创建新材质（根据需求选择材质类型）
 						const textureWidth = texture.image.width;
 						const textureHeight = texture.image.height;
@@ -420,7 +420,7 @@ export default defineComponent({
 			const modeUrl = await getModelUrl(value)
 			await setModel(modeUrl)
 			let patternMaking3D = store.state.HomeStoreModule.patternMaking3D
-			if(patternMaking3D.printMinioUrl)await addMaterial({url:patternMaking3D.printMinioUrl})
+			if(patternMaking3D.url)await addMaterial({url:patternMaking3D.url})
 			data.load.state = false
 		}
 		const changeRepeat = (e:any)=>{
@@ -437,6 +437,7 @@ export default defineComponent({
 					y:data.repeat.y,
 				}
 				store.commit('setPatternMaking3D',value)
+				emit('saveProject')
 			},1000)
 		}
 		const setLock = ()=>{
--- a/src/component/home/tools/poseTransfer/index.vue
+++ b/src/component/home/tools/poseTransfer/index.vue
@@ -64,8 +64,15 @@
 				</div>	
 			</div>
 			<div class="generate input_border">
-				<div class="generage_btn started_btn" v-show="!isGenerate" @click="getgenerate">
+				<!-- <div class="generage_btn started_btn" v-show="!isGenerate" @click="getgenerate">
 					{{ $t('Generate.Generate') }}
+				</div> -->
+				<div class="generage_btn started_btn"  v-show="!isGenerate">
+					<i class="fi fi-bs-magic-wand" style="background-color: #000; font-size: 2.3rem; flex: 1;margin: 0;" @click="getgenerate()"></i>
+					<div class="icon iconfont icon-xiala" :class="{active:speedState}" @click.stop="openSpeed"></div>
+					<div class="content" v-show="speedState">
+						<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
+					</div>
 				</div>
 				<div v-show="isGenerate && !remGenerate" class="generage_btn started_btn">
 					<i class="fi fi-br-loading"></i>
@@ -134,11 +141,11 @@ export default defineComponent({
 			selectImg:{},
 			token:getCookie('token'),
 			upload:{
-				projectId:store.state.Workspace.probjects.id
+				projectId:computed(()=>store.state.Workspace.probjects.id)
 			},
 			waitList:[],
 			likeList:computed(()=>store.state.HomeStoreModule.poseTransfer),
-			noLikeList:[ { "id": 128, "taskId": "df9cd154-6cf9-488a-8e64-426ef4a27e13-83", "productImage": null, "gifUrl": "https://www.minio-api.aida.com.hk/aida-users/83/pose_transform_gif/df9cd154-6cf9-488a-8e64-426ef4a27e13-83.gif?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20250530%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250530T015548Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=2a43ad4a389e8366207b6500506c17140e0387924a2adcb35188f2e59777e422", "videoUrl": "None", "firstFrameUrl": "https://www.minio-api.aida.com.hk/aida-users/83/pose_transform_first_img/df9cd154-6cf9-488a-8e64-426ef4a27e13-83.png?response-content-type=image%2Fpng&response-content-disposition=inline&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20250530%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250530T015548Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=e202d13874f0a28105602a268c802d4c99d2fbecd06a9460cc07e7c7ecbd0559", "isLiked": 0, "status": "Success", "collectionType": null, "url": "https://www.minio-api.aida.com.hk/aida-users/83/pose_transform_first_img/df9cd154-6cf9-488a-8e64-426ef4a27e13-83.png?response-content-type=image%2Fpng&response-content-disposition=inline&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20250530%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20250530T015548Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=e202d13874f0a28105602a268c802d4c99d2fbecd06a9460cc07e7c7ecbd0559" } ],
+			noLikeList:[ ],
 			isGenerate:false,//判断是否正在进行generate
 			remGenerate:false,
 			removeGenerate:false,
@@ -146,6 +153,25 @@ export default defineComponent({
 			poseList:[],
 			selectPose:null as any,
 		})
+		let speed = reactive({
+			speedList:[
+				{
+					title:'Generate high-quality content',
+					label:'High',
+					value:'',
+				},{
+					title:'Generate using Wanxiang',
+					label:'WX',
+					value:'wx',
+				},
+			],
+			speedState:false,
+			speedData:{
+				title:'Generate high-quality content',
+				label:'High',
+				value:'',
+			},
+		})
 		const setIsShowMark:any = inject('setIsShowMark')
 		const createProbject:any = inject('createProbject')
 		const dataDom = reactive({
@@ -215,8 +241,9 @@ export default defineComponent({
 				poseId:data.selectPose,
 				projectId:store.state.Workspace.probjects.id,
 				productImage:data.selectImg.minioUrl,
+				modelName:speed.speedData.value,
 			}
-			Https.axiosGet(Https.httpUrls.poseTransform,{params:value}).then((rv)=>{
+			Https.axiosPost(Https.httpUrls.poseTransform,value).then((rv)=>{
 				data.noLikeList.unshift({taskId:rv})
 				setGenerate(rv)
 			}).catch((res:any)=>{
@@ -233,7 +260,7 @@ export default defineComponent({
 				if(!data.isGenerate || !data.remGenerate)return
 				if(!state)return
 				state = false
-				Https.axiosGet(Https.httpUrls.poseTransformResult,{params:{taskId:list}}).then(
+				Https.axiosPost(Https.httpUrls.poseTransformResult,{taskId:list}).then(
 					(rv) => {
 						rv=[rv]
 						state = true
@@ -273,7 +300,7 @@ export default defineComponent({
 					data.isGenerate = false
 					data.remGenerate = false
 				});
-			},1000)
+			},20000)
 		}
 		const removeGenerate = ()=>{
 			//取消操作
@@ -377,11 +404,13 @@ export default defineComponent({
 				value = {
 					likeOrDislike:'like',
 					transformedId:item.id,
+					projectId:store.state.Workspace.probjects.id,
 				}
 			}else{
 				value = {
 					likeOrDislike:'dislike',
 					transformedId:item.id,
+					projectId:store.state.Workspace.probjects.id,
 				}
 			}
 			Https.axiosPost(Https.httpUrls.poselikeOrDisike, {},{params:value}).then(
@@ -416,7 +445,19 @@ export default defineComponent({
 		onMounted(()=>{
 			// showViewVideo({url:'https://www.minio.aida.com.hk:12025/api/v1/download-shared-object/aHR0cHM6Ly93d3cubWluaW8uYWlkYS5jb20uaGs6MTIwMjQvYWlkYS11c2Vycy84OS9wb3NlX3RyYW5zZm9ybV92aWRlby8xMjMtODkubXA0P1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9N0tOVDdNWlNLWkRXM1RVOEJZVlklMkYyMDI1MDQwOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTA0MDhUMDUxOTM1WiZYLUFtei1FeHBpcmVzPTQzMTk5JlgtQW16LVNlY3VyaXR5LVRva2VuPWV5SmhiR2NpT2lKSVV6VXhNaUlzSW5SNWNDSTZJa3BYVkNKOS5leUpoWTJObGMzTkxaWGtpT2lJM1MwNVVOMDFhVTB0YVJGY3pWRlU0UWxsV1dTSXNJbVY0Y0NJNk1UYzBOREV4T0RneE9Td2ljR0Z5Wlc1MElqb2lZV1J0YVc0aWZRLmY0Z3RoTU1BeC1GUnM3eGhWNFdjTUFCUW5lU19BVkIxUDlYbnJQbEFNWUFsVnJwY3RpYXgtU2cyY2FkZHZ0a0VCOU1NbWxGeUlIbU90aGhUWDlqN2lnJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZ2ZXJzaW9uSWQ9bnVsbCZYLUFtei1TaWduYXR1cmU9Yjg5YmQ4ZDg5M2I4ZjBjYmYxZDI3NDFjZmY0NGRiZGNmYWM2NmU0ZGM2OGIwYzQzZDA2OGI4YjYzZjE5YjhhOA'})
 		})
+		const openSpeed = ()=>{
+			speed.speedState = !speed.speedState
+			if(speed.speedState){
+				document.addEventListener('click',openSpeed)
+			}else{
+				document.removeEventListener('click',openSpeed)
+			}
+		}
+		const setSpeed = (item:any)=>{
+			speed.speedData = item
+		}
 		return{
+			...toRefs(speed),
 			...toRefs(dataDom),
 			...toRefs(data),
 			openSetData,
@@ -433,6 +474,8 @@ export default defineComponent({
 			likeSetBtn,
 			noLikeSetBtn,
 			selectPose,
+			openSpeed,
+			setSpeed,
 		}
 	},
 	directives:{
@@ -478,6 +521,44 @@ export default defineComponent({
 				> .started_btn{
 					font-weight: 300;
 				}
+				.generage_btn{
+					width: 10rem;
+					position: relative;
+				}
+				.icon-xiala{
+					margin-left: 1rem;
+					transition: all .3s;
+					cursor: pointer;
+					&.active{
+						transform: rotate(180deg);
+					}
+				}
+				.content{
+					position: absolute;
+					top: 100%;
+					width: 100%;
+					left: 0rem;
+					text-align: center;
+					border-radius: calc(1rem* 1.2);
+					overflow: hidden;
+					z-index: 3;
+					margin-top: .2rem;
+					>div{
+						background: #cccccc;
+						line-height: 2;
+						font-size: 1.8rem;
+						cursor: pointer;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						&.active{
+							background-color: #616161;
+						}
+					}
+					>div:hover{
+						background: #999999;
+					}
+				}
 			}
 		}
 		> .configuratioBox > .configuratio{