接入画布

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)=>{