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

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

@@ -407,28 +407,6 @@ export default defineComponent({
     let productImgData: any = reactive({
       isShowMark: false,
       fileList:{
-		ToProductImage:computed(()=>{
-			if(!route.query?.id && route.query.tools == 'toProduct'){
-				return []
-			}else{
-				if(props.isDesignPage)return []
-				if(store.state.HomeStoreModule.uploadElement?.[0]){
-					store.state.HomeStoreModule.uploadElement[0].isChecked = true
-				}
-				return store.state.HomeStoreModule.uploadElement
-			}
-		}),
-		Relight:computed(()=>{
-			if(!route.query?.id && route.query.tools == 'relight'){
-				return []
-			}else{
-				if(props.isDesignPage)return []
-				if(store.state.HomeStoreModule.uploadElement?.[0]){
-					store.state.HomeStoreModule.uploadElement[0].isChecked = true
-				}
-				return store.state.HomeStoreModule.uploadElement
-			}
-		}),
 	},
       searchName: {
         ToProductImage: '',
@@ -542,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'){
@@ -553,6 +545,7 @@ export default defineComponent({
         productImgData.fileList[props.productimgMenu.value] = designList
         return
       }
+	  setFileList()
       userlikeGroupId = selectDesignList.value.userlikeGroupId
       // getLikeProductImage(selectDesignList.value.userlikeGroupId)
       productImgDom.generalDragLeft.setItemPosition()
@@ -1563,9 +1556,14 @@ export default defineComponent({
       }
     }
   }
+  .input_box_btnBox{
+    padding-bottom: 4rem;
+  }
   .asistant-btn {
     // width: 9rem;
     padding: 0.45rem 0.6rem;
+    height: 2.3rem;
+    line-height: 2.3rem;
     font-size: 1rem;
     font-weight: 400;
     color: #313131;

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])
 					})
 				}

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}`)