Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/home/design/collection/PrintboardUpload.vue

@@ -1,6 +1,5 @@
 <template>
     <div class="printboard_upload_modal" :class="[driver__.driver?'showEvents':'']">
-		
         <div class="printboard_left_upload modal_left">
             <div class="left_upload_header">
                 <div class="upload_header_item">

src/component/home/index.vue

@@ -97,7 +97,8 @@ export default defineComponent({
 				}
 				
 				// 如果是同一个项目且openType为history，跳过重新初始化
-				if(isSameProject){
+				console.log(isSameProject,data.openType)
+				if(isSameProject || (!query.history && !query.id)){
 					data.dataLoad = false
 					console.log(dataDom.design)
 					// dataDom.design?.init()

src/component/home/tools/toProduct/index.vue

@@ -587,8 +587,9 @@ export default defineComponent({
 				toProductImageVOList:selectArr,
 				// userLikeGroupId:upload.value.userlikeGroupId,
 				projectId:productImgData.selectObject.id,
-				modelName:obj.elementType == 'Relight'?'flux':speed.speedData.value,
+				modelName:props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value,
 				direction:RelightDirection.value,
+				ageGroup:store.state.Workspace.probjects.ageGroup,
 				brightenValue:productImgData.brightenValue,
 				imageStrength:(100 - imageStrength)/100,