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

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

@@ -171,8 +171,20 @@ export default defineComponent({
 				CollectionType:'PoseTransfer',
 			},
 			waitList:[],
-			likeList:computed(()=>store.state.HomeStoreModule.poseTransfer.likedList),
-			noLikeList:computed(()=>store.state.HomeStoreModule.poseTransfer.list),
+			likeList:computed(()=>{
+				if(!route.query?.id && route.query.tools == 'poseTransfer'){
+					return []
+				}else{
+					return store.state.HomeStoreModule.poseTransfer.likedList
+				}
+			}),
+			noLikeList:computed(()=>{
+				if(!route.query?.id && route.query.tools == 'poseTransfer'){
+					return []
+				}else{
+					return store.state.HomeStoreModule.poseTransfer.list
+				}
+			}),
 			isGenerate:false,//判断是否正在进行generate
 			remGenerate:false,
 			removeGenerate:false,

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

@@ -383,7 +383,11 @@ export default defineComponent({
     isDesignPage: {
       type: Boolean,
       default: false
-    }
+    },
+	isState:{
+		type:Boolean,
+		default:false,
+	},
   },
   emit: ['unLike'],
   setup(props, { emit }) {
@@ -402,7 +406,30 @@ export default defineComponent({
     const createProbject: any = inject('createProbject', () => {})
     let productImgData: any = reactive({
       isShowMark: false,
-      fileList: {},
+      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: '',
         Relight: ''
@@ -411,17 +438,37 @@ export default defineComponent({
       isProductimg: false, //开始生成
       selectProductimgList: [],
       generateList: {
-        ToProductImage: computed(
-          () => store.state.HomeStoreModule.toProductImageList.list
-        ),
-        Relight: computed(() => store.state.HomeStoreModule.relightList.list)
+        ToProductImage:computed(()=>{
+			if(!route.query?.id && route.query.tools == 'toProduct'){
+				return []
+			}else{
+				return store.state.HomeStoreModule.toProductImageList.list
+			}
+		}),
+		Relight:computed(()=>{
+			if(!route.query?.id && route.query.tools == 'relight'){
+				return []
+			}else{
+				return store.state.HomeStoreModule.relightList.list
+			}
+		}),
       },
       selectObject: computed(() => store.state.Workspace.probjects), //选择的项目
       likeList: {
-        ToProductImage: computed(
-          () => store.state.HomeStoreModule.toProductImageList.likedList
-        ),
-        Relight: computed(() => store.state.HomeStoreModule.relightList.likedList)
+        ToProductImage:computed(()=>{
+			if(!route.query?.id && route.query.tools == 'toProduct'){
+				return []
+			}else{
+				return store.state.HomeStoreModule.toProductImageList.likedList
+			}
+		}),
+		Relight:computed(()=>{
+			if(!route.query?.id && route.query.tools == 'relight'){
+				return []
+			}else{
+				return store.state.HomeStoreModule.relightList.likedList
+			}
+		}),
       } as any,
       similarity: 30,
       brightenValue: 1,
@@ -454,18 +501,6 @@ export default defineComponent({
         value: 'advanced'
       }
     })
-
-    watch(
-      () => store.state.HomeStoreModule.uploadElement.length,
-      (newVal, oldVal) => {
-        if (props.isDesignPage) return
-        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 productImgDom = reactive({
       generalDragLeft: null as any,
       generalDragRight: null as any
@@ -567,7 +602,6 @@ export default defineComponent({
     }
 
     let fileUploadChange = (data: any) => {
-      console.log(data)
       let file = data.file
       let bor = true
       if (file.status === 'done') {
@@ -614,9 +648,6 @@ export default defineComponent({
           CollectionType: props.productimgMenu.value
         }
       }
-      console.log(
-        !!((isJpgOrPng && isLt2M && productImgData.selectObject.id) || Upload.LIST_IGNORE)
-      )
       return !!(
         (isJpgOrPng && isLt2M && productImgData.selectObject.id) ||
         Upload.LIST_IGNORE
@@ -660,7 +691,6 @@ export default defineComponent({
         .then(rv => {
           if (str == 'like') {
             // if(rv?.sort)item.sort = rv.sort
-            console.log(rv)
             if (rv?.sort) item.oldSort = rv.sort
             if (rv?.id) item.userLikeSortId = rv.id
             item.newLike = true
@@ -669,7 +699,6 @@ export default defineComponent({
               str: 'add',
               index: -1
             }
-            console.log(value)
             if (props.productimgMenu.value == 'ToProductImage') {
               store.commit('setToProductImage', value)
             } else {
@@ -711,7 +740,6 @@ export default defineComponent({
       }
       if (productImgData.fileList[props.productimgMenu.value]) {
         productImgData.fileList[props.productimgMenu.value].forEach((item: any) => {
-          console.log(item)
           if (item.isChecked) {
             if (item.resultType == 'Design') {
               obj.elementId = item.designOutfitId
@@ -827,10 +855,6 @@ export default defineComponent({
                   let index = productImgData.generateList[
                     props.productimgMenu.value
                   ].findIndex((obj: any) => obj.taskId === element.taskId)
-                  console.log(
-                    productImgData.generateList[props.productimgMenu.value][index]
-                  )
-                  console.log(element)
                   for (const key in element) {
                     if (element[key]) {
                       productImgData.generateList[props.productimgMenu.value][index][
@@ -895,7 +919,6 @@ export default defineComponent({
           timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
           type: props.productimgMenu.value
         }
-        console.log(productImgData.generateList[props.productimgMenu.value].value)
         Https.axiosGet(Https.httpUrls.generateStopWaiting, { params: data })
           .then(rv => {
             generateProceedList = []
@@ -1062,7 +1085,6 @@ export default defineComponent({
           productImgData.isProductimg = true
           productImgData.remProductimg = true
           productImgData.isShowMark = false
-          console.log(taskIdList)
           setPrductimg(arr)
         }
       },