diff --git a/src/component/home/tools/toProduct/index.vue b/src/component/home/tools/toProduct/index.vue index 84b6abb2..2a08c7d0 100644 --- a/src/component/home/tools/toProduct/index.vue +++ b/src/component/home/tools/toProduct/index.vue @@ -520,6 +520,20 @@ export default defineComponent({ return store.state.UploadFilesModule.modularData }) let userlikeGroupId = 0 + watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{ + setFileList() + }) + const setFileList = () => { + if(props.isDesignPage)return + if(!route.query?.id && route.query.tools){ + productImgData.fileList[props.productimgMenu.value] = [] + }else{ + productImgData.fileList[props.productimgMenu.value] = store.state.HomeStoreModule.uploadElement + if(productImgData.fileList[props.productimgMenu.value][0]){ + productImgData.fileList[props.productimgMenu.value][0].isChecked = true + } + } + } const openSetData = (designList: any) => { // cleardata() // if(props.productimgMenu.value == 'ToProductImage'){ @@ -530,16 +544,8 @@ export default defineComponent({ if (props.isDesignPage) { productImgData.fileList[props.productimgMenu.value] = designList return - }else if(!route.query?.id && route.query.tools){ - productImgData.fileList[props.productimgMenu.value] = [] - }else{ - productImgData.fileList[props.productimgMenu.value] = computed(()=>{ - if(store.state.HomeStoreModule.uploadElement?.[0]){ - store.state.HomeStoreModule.uploadElement[0].isChecked = true - } - return store.state.HomeStoreModule.uploadElement - }) - } + } + setFileList() userlikeGroupId = selectDesignList.value.userlikeGroupId // getLikeProductImage(selectDesignList.value.userlikeGroupId) productImgDom.generalDragLeft.setItemPosition() diff --git a/src/component/toolsPage/index.vue b/src/component/toolsPage/index.vue index f3caccac..ef04f5f6 100644 --- a/src/component/toolsPage/index.vue +++ b/src/component/toolsPage/index.vue @@ -90,12 +90,11 @@ export default defineComponent({ } watch(() => route.query, (query:any, oldQuery:any) => { - if(oldQuery && query?.tools == oldQuery?.tools)return + if(oldQuery && query == oldQuery)return const key = Object.keys(query)?.[0] if(route.name == 'toolsPage' && key){ data.openType = query[key] nextTick(()=>{ - if(route.fullPath === store.state.Workspace.projectPath)return open(query[key]) }) } diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue index 1d3e2791..a5797d9b 100644 --- a/src/views/HomeView/history.vue +++ b/src/views/HomeView/history.vue @@ -462,7 +462,7 @@ export default defineComponent({ // this.$router.push({ name: 'homePage', params: { id: record.id, type: 'History' } }) // this.store.commit('setChooseIsDesign', num) // router.push(`/home/tools?tools=toProduct&id=${childItem.id}`) - + this.store.commit('setProjectPath','') if (record.process == 'SERIES_DESIGN' || record.process == 'SINGLE_DESIGN') { this.$router.push(`/home/history/${record?.id}`) // this.$router.push(`/home?history=${record?.id}`)