提交修改

src/component/home/index.vue

@@ -17,7 +17,7 @@
 	<chat ref="chatDom" @chatChange="chatChange" v-show="openType == 'history'"></chat>
 </template>
 <script lang="ts">
-import { defineComponent,computed,ref,watch,nextTick,provide,toRefs, reactive, onMounted} from 'vue'
+import { defineComponent,computed,inject,watch,nextTick,provide,toRefs, reactive, onMounted} from 'vue'
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { Https } from "@/tool/https";
 import { useStore } from "vuex";
@@ -31,9 +31,6 @@ export default defineComponent({
 	components:{
 		design,newPorject,chat
 	},
-	props:{
-		settingGetHistory:{type:Function,default:()=>{}},
-	},
 	emits:['setTask','newProject'],
 	setup(props,{emit}) {
 		const store = useStore();
@@ -45,6 +42,7 @@ export default defineComponent({
 			selectObject:computed(()=>store.state.Workspace.probjects) as any,//选择的项目
 			chatData:null as any,
 		})
+		let settingGetHistory:any = inject('settingGetHistory')
 		const setIsShowMark = (boolean:boolean)=>{
 			data.isShowMark = boolean
 		}
@@ -55,7 +53,7 @@ export default defineComponent({
 			chatDom:null as any,
 		})
 		watch(() => route.query,
-			(query, oldQuery) => {
+			(query:any, oldQuery:any) => {
 				data.routeQuery = query
 				const key = Object.keys(query)?.[0]
 				if(key){
@@ -63,14 +61,20 @@ export default defineComponent({
 				}else{
 					data.openType = ''
 				}
+				// if((query.history || query.id) != (oldQuery.history || oldQuery.id)){
+				// }
 				nextTick(()=>{
-					if(query.id || query.history){
+					if(query.history || query.id){
 						data.isShowMark = true
+						createData()
 						if(query.type == 'Works'){
 							getWorks(query.id || query.history)
 						}else{
+							// setProjectData({id:query.id,process:'toProduct'})
 							getHistory(query.id || query.history)
 						}
+					}else{
+						createData()
 					}
 				})
 				
@@ -78,6 +82,7 @@ export default defineComponent({
 			{ immediate: true } // 立即触发一次以处理初始参数
 		);
 		const createData = ()=>{
+			store.commit("createProbject");
 			store.commit("clearAllData");
 			store.commit("clearAllCollection");
 			store.commit("setAllBoardDataChoose",{});
@@ -112,7 +117,8 @@ export default defineComponent({
 				id,
 			}
 			if(!id)return
-			createData()
+				data.isShowMark = false
+
 			Https.axiosPost(Https.httpUrls.selectHistoryProject,value).then((rv: any) => {
 				setProjectData(rv)
 			}).catch((res)=>{
@@ -128,26 +134,26 @@ export default defineComponent({
 				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,
+				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
+					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:[],
+					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:[]
 			}
@@ -167,7 +173,11 @@ export default defineComponent({
 			// 	dataDom.workflow.isUpdataPorject = true
 			// })
 			setChatData()
-			getCollection()	
+			if(route.name == 'tools'){
+				getCollection('tools')	
+			}else{
+				getCollection('design')	
+			}
 		}
 		const setChatData = ()=>{
 			if(!data.chatData)return
@@ -193,10 +203,16 @@ export default defineComponent({
 		// 		})
 		// 	})
 		// }
-		const getCollection = ()=>{
+		const getCollection = (type:string)=>{
+			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']
+			}
 			let value:any = {
 				 "id":data.selectObject.id,
-				"moduleList":["moodBoard", "printBoard", "colorBoard", "sketchBoard",'design','toProduct','relight','poseTransfer','mannequin']
+				"moduleList":moduleList,
 			}
 			Https.axiosPost(Https.httpUrls.getModuleContent,value).then(async (rv)=>{
 				historyChooseData(rv)//设置历史数据
@@ -214,7 +230,7 @@ export default defineComponent({
 				}
 				let allBoardData = ['sketchBoard','moodBoard','printBoard','colorBoard']
 				// let allBoardData = ['sketchBoard','moodBoard','printBoard','colorBoard','toProduct','relight','poseTransfer','mannequin']
-				let canvasData = ['canvas']
+				let canvasData = ['canvas','deReconstruction']
 				for (let index = 0; index < canvasData.length; index++) {
 					const item = canvasData[index];
 					await getCanvasData(item)
@@ -235,7 +251,9 @@ export default defineComponent({
 					}
 				})
 				data.isShowMark = false
-				dataDom.design.openSetData()
+				if(type == 'design'){
+					dataDom.design.openSetData()
+				}
 			})
 		}
 		const getCanvasData = (str:any)=>{
@@ -380,11 +398,11 @@ export default defineComponent({
 			if(value.type == '[DESIGN_SIGNAL]' && dataDom.design){
 				dataDom.design.designNewCollection()
 			}else{
-				getCollection()
+				getCollection('design')
 			}
 		}
 		const newProject = (value:any)=>{
-			props.settingGetHistory()
+			settingGetHistory()
 			router.push(`home?history=${value.id}`)
 			data.chatData = value