diff --git a/src/component/home/tools/poseTransfer/index.vue b/src/component/home/tools/poseTransfer/index.vue index 5af73543..9d5bbcb5 100644 --- a/src/component/home/tools/poseTransfer/index.vue +++ b/src/component/home/tools/poseTransfer/index.vue @@ -441,6 +441,7 @@ export default defineComponent({ } } const openSetData = (designList: any) => { + console.log('重置页面------------') if (props.isDesignPage) { //标识design页面打开的tools data.fileList = designList @@ -692,7 +693,7 @@ export default defineComponent({ if (!isLt2M) { message.info(useI18n().t('MoodboardUpload.jsContent4')) } - if (!data?.upload?.projectId && !isSelectObject) { + if (!route?.query?.id && !isSelectObject) { isSelectObject = true await createProbject() } @@ -939,7 +940,7 @@ export default defineComponent({ watch( () => store.state.HomeStoreModule.uploadElement.length, (newVal, oldVal) => { - if (props.isDesignPage) return + if (props.isDesignPage || (!route.query?.id && !route.query?.history)) return data.fileList = store.state.HomeStoreModule.uploadElement.filter( item => !item.frameType ) @@ -951,7 +952,7 @@ export default defineComponent({ lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter( item => item.frameType === 'last' ) - + console.log('fileList',data.fileList) // 更新 showFirstFrameList 中项的选中状态 showFirstFrameList.value.forEach((listItem: any) => { if (listItem.id == data.selectImg.id) { @@ -960,6 +961,9 @@ export default defineComponent({ listItem.isChecked = false } }) + }, + { + immediate:true } ) diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 4f25e4e2..0cda79c7 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -523,7 +523,7 @@ export default defineComponent({ bathGenerationList: ['poseTransfer', 'SERIES_DESIGN', 'toProduct', 'relight'], showHistory: false, isNewProject: false, - cachedRoutes:computed(()=>store.state.Workspace.cachedRoutes),// + cachedRoutes: computed(() => store.state.Workspace.cachedRoutes) // }) let userDetail = computed(() => { return store.state.UserHabit.userDetail @@ -578,7 +578,7 @@ export default defineComponent({ nextTick(async () => { const key = Object.keys(query)?.[0] if (key) { - if (query.id) { + if (query.id && !query.tools) { homeMainData.openType = 'history' homeMainData.openTypeChild = query.id } else { @@ -1030,7 +1030,7 @@ export default defineComponent({ if (currentProjectActive.value) return if (currentProjectPath.value) { router.push(currentProjectPath.value) - // router.back() + // router.back() } }