diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 1ce865f0..cc723b4a 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1943,7 +1943,7 @@ textarea:focus { .accountEdit_page .input_border .input_box_btnBox.sketch .upload_item, .generalMenu_printModel_upload .input_border .input_box_btnBox.sketch .upload_item, .generate .input_border .input_box_btnBox.sketch .upload_item { - width: 6rem; + width: 8rem; } .collection_modal_body .input_border .input_box_btnBox.sketch .upload_item .upload_file_item, .design_detail_modal_component .input_border .input_box_btnBox.sketch .upload_item .upload_file_item, @@ -1954,8 +1954,8 @@ textarea:focus { .accountEdit_page .input_border .input_box_btnBox.sketch .upload_item .upload_file_item, .generalMenu_printModel_upload .input_border .input_box_btnBox.sketch .upload_item .upload_file_item, .generate .input_border .input_box_btnBox.sketch .upload_item .upload_file_item { - height: 6rem; - width: 6rem; + height: 8rem; + width: 8rem; } .collection_modal_body .input_border .input_box_btnBox > .textarea, .design_detail_modal_component .input_border .input_box_btnBox > .textarea, @@ -2248,9 +2248,11 @@ textarea:focus { margin-left: 2rem; display: flex; font-size: 1.6rem; - padding: 1rem 2rem; box-sizing: content-box; justify-content: center; + padding: 0 2rem; + line-height: 5.4rem; + height: 5.4rem; } .generage_btn_box .generage_btn { width: 10rem; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 9f921e86..4a4a865c 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -2004,10 +2004,10 @@ textarea:focus{ border: none; background-color: rgba(0, 0, 0, 0); .upload_item{ - width: 6rem; + width: 8rem; .upload_file_item{ - height: 6rem; - width: 6rem; + height: 8rem; + width: 8rem; } } } @@ -2171,9 +2171,11 @@ textarea:focus{ margin-left: 2rem; display: flex; font-size: 1.6rem; - padding: 1rem 2rem; box-sizing: content-box; justify-content: center; + padding: 0 2rem; + line-height: 5.4rem; + height: 5.4rem; } .generage_btn{ width: 10rem; diff --git a/src/component/DetailCopy/detailLeft/colorBox/index.vue b/src/component/DetailCopy/detailLeft/colorBox/index.vue index c85f0371..a2fed3fc 100644 --- a/src/component/DetailCopy/detailLeft/colorBox/index.vue +++ b/src/component/DetailCopy/detailLeft/colorBox/index.vue @@ -273,6 +273,8 @@ export default defineComponent({ border: 2px solid #000; } >.box{ + width: 100%; + height: 100%; > .background{ flex: 1; height: 7rem; diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 5c355e72..4bbd978a 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -131,13 +131,18 @@
-
+
-
{{ item.label }}
- +
{{ item.label }}
-
{{ item.label }}
+
{{ item.label }}
@@ -296,10 +301,6 @@ export default defineComponent({ ], extractList:[ { - title:'This method may produce slight discrepancies between the extracted line art and the original image.', - label:'High', - value:'', - },{ title:'Note: The extracted line art might have minor variations from the original.', label:'FLUX', value:'flux', @@ -323,13 +324,17 @@ export default defineComponent({ watch(()=>props.scene,(newVal,oldVal)=>{ if(newVal.value == 'extract'){ speed.speedData = speed.extractList[0] + }else if(newVal.value == 'Logo' || newVal.value == 'Slogan'){ + speed.speedData.value = '' + speed.speedData.label = '' }else{ speed.speedData = speed.speedList[0] } + speed.speedState = false }) const setSpeed = (item:any)=>{ - speed.speedData = item speed.speedState = false + speed.speedData = item } return { userDetail, diff --git a/src/component/HomePage/selectImgList.vue b/src/component/HomePage/selectImgList.vue index 836ca16e..4db0cffc 100644 --- a/src/component/HomePage/selectImgList.vue +++ b/src/component/HomePage/selectImgList.vue @@ -31,7 +31,7 @@
- +
diff --git a/src/component/home/batchGeneration/index.vue b/src/component/home/batchGeneration/index.vue index af9e1b02..38b05ff3 100644 --- a/src/component/home/batchGeneration/index.vue +++ b/src/component/home/batchGeneration/index.vue @@ -55,7 +55,7 @@
-
+
{{header?.fun?header.fun(row[header.value]) : row[header.value]}}
@@ -193,23 +193,25 @@ export default defineComponent({ },{ name:'Quantity generated', value:'nums', - },{ + }, + { name:'Creation time', - value:'updateTime', + value:'createTime', fun:(value:any)=>{ if(!value)return return value.split('T')[0] + ' ' + value.split('T')[1].split('.')[0] } - },{ + }, + { name:'Start time', - value:'updateTime', + value:'startTime', fun:(value:any)=>{ //没开始内容为 - if(!value)return return value.split('T')[0] + ' ' + value.split('T')[1].split('.')[0] } },{ - name:'End time', + name:'Update time', value:'updateTime', fun:(value:any)=>{ if(!value)return @@ -360,14 +362,14 @@ export default defineComponent({ },1000) } const submitGetContentList = (project:any)=>{ - data.isGetContentList = true - if(project){ - data.projectData = project - }else{ - data.projectData = null - } - data.currentPage = 1 - getContentList() + // data.isGetContentList = true + // if(project){ + // data.projectData = project + // }else{ + // data.projectData = null + // } + // data.currentPage = 1 + // getContentList() if(data.settingGetHistory)data.settingGetHistory() } const handleChange = (event:any,value:any)=>{ diff --git a/src/component/home/chat/index.vue b/src/component/home/chat/index.vue index c350593b..5b338245 100644 --- a/src/component/home/chat/index.vue +++ b/src/component/home/chat/index.vue @@ -9,7 +9,7 @@
-
+
@@ -29,7 +29,11 @@
- + + +
@@ -76,6 +80,7 @@ import { defineComponent,computed,ref,inject,nextTick,createVNode,toRefs, reactive, watch} from 'vue' import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { Https } from "@/tool/https"; +import {getMinioUrl} from '@/tool/util' import { useStore } from "vuex"; import { Modal,message,Upload,CascaderProps } from 'ant-design-vue'; import { useI18n } from 'vue-i18n' @@ -157,7 +162,7 @@ export default defineComponent({ }else if(eventData.type == 'think'){ data.chatList[data.chatList.length-1].content.think+=eventData.content }else if(eventData.type == "tools_response"){ - let nameList = ['moodboard','printboard','sketchboard','generate_color_code'] + let nameList = ['moodboard','printboard','sketchboard','generate_color_code','search_sketch_img'] let nameData = { moodboard:'moodBoard', printboard:'printBoard', @@ -171,14 +176,17 @@ export default defineComponent({ getData = 'colorBoard' }else{ data.chatList[data.chatList.length-1].content.img = JSON.parse(JSON.parse(event.data).content).receiveCollectionElementList - getData = nameData[eventData.tools_name] + if(eventData.tools_name == 'search_sketch_img'){ + getData = 'sketchBoard' + }else{ + getData = nameData[eventData.tools_name] + } } data.chatList.push({content:{message:''},role:'system'}) }else if(eventData.tools_name == 'design_control_signal'){ emit('chatChange',{type:eventData.tools_name,design:true}) } emit('chatChange',{type:eventData.type,module:getData}) - } //emit('chatChange',{type:JSON.parse(event.data).status}) }; @@ -306,6 +314,19 @@ export default defineComponent({ const deleteFile = (item:any,index:number)=>{ data.filList.splice(index,1) } + const imgError = (item:any,index:number,imgIndex:number,event:any)=>{ + if(!item?.loadNum) item.loadNum = 0 + if(item?.loadNum >= 1)return + let value = { + path:getMinioUrl(item.minioUrl) + } + Https.axiosGet(Https.httpUrls.refreshMinioUrl,{params:value}).then((rv:any)=>{ + event.target.src = rv + item.loadNum += 1 + data.chatList[index].content.img[imgIndex].monioUrl = rv + }) + + } return{ ...toRefs(dataDom), ...toRefs(data), @@ -314,6 +335,7 @@ export default defineComponent({ openChattingRecords, handleFileUpload, deleteFile, + imgError, } }, provide() { diff --git a/src/component/home/design/collection.vue b/src/component/home/design/collection.vue index cab84381..503e3d93 100644 --- a/src/component/home/design/collection.vue +++ b/src/component/home/design/collection.vue @@ -94,7 +94,7 @@ export default defineComponent({ openType:'', collectionStep:1, selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目 - createProbject:inject('createProbject') as any + createProbject:inject('createProbject',()=>{}) as any }) let driver__:any = computed(()=>{ diff --git a/src/component/home/design/collection/ColorboardUpload.vue b/src/component/home/design/collection/ColorboardUpload.vue index 8bd4f40c..c56cc87e 100644 --- a/src/component/home/design/collection/ColorboardUpload.vue +++ b/src/component/home/design/collection/ColorboardUpload.vue @@ -806,8 +806,18 @@ export default defineComponent({ this.setColorboardList(colorList) }, setPrintImg(){ - let printImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.printboard)) - let moodImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.moodboard)) + let printImgListData = [] + if(this.store?.state?.UploadFilesModule.printboard == 0){ + printImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.allBoardData.printboardFiles)) + }else{ + printImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.printboard)) + } + let moodImgListData = [] + if(this.store?.state?.UploadFilesModule.printboard == 0){ + moodImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.allBoardData.moodboardFiles)) + }else{ + moodImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.moodboard)) + } let imgListData = [...moodImgListData,...printImgListData] if(imgListData?.length==0){ message.info(this.t('ColorboardUpload.jsContent6')) @@ -821,7 +831,7 @@ export default defineComponent({ setImgGetColor(data){ data.status = 'await' this.fileList[0] = data - fetch(data.imgUrl) + fetch(data.imgUrl || data.url) .then(response => response.blob()) .then(blob => { const reader = new FileReader(); diff --git a/src/component/home/design/editDesignType/index.vue b/src/component/home/design/editDesignType/index.vue index 423fdc72..7f683818 100644 --- a/src/component/home/design/editDesignType/index.vue +++ b/src/component/home/design/editDesignType/index.vue @@ -506,7 +506,8 @@ setup(props:any,{emit}) { status:productimg.generateSuccess.status, listType:productimg.generateSuccess.listType, isIndex:productimg.generateSuccess.isIndex, - userLikeSortId:productimg.generateSuccess.userLikeSortId + userLikeSortId:productimg.generateSuccess.userLikeSortId, + parentId:productimg.generateSuccess.parentId } emit('addGenerateImg',data) @@ -588,14 +589,16 @@ methods: { } // this. + console.log(list[index]) this.generateSuccess.userLikeSortId = list[index].userLikeSortId + this.generateSuccess.parentId = list[index].parentId this.generateSuccess.productimgIsProductimg = !!this.generateSuccess.productimgIsProductimg this.generateSuccess.productimgRemProductimg = !!this.generateSuccess.productimgRemProductimg this.generateSuccess.isShowMark = !!this.generateSuccess.isShowMark this.generateSuccess.remPrductimgTime = this.generateSuccess.remPrductimgTime?this.generateSuccess.remPrductimgTime:null this.generateSuccess.prductimgTime = this.generateSuccess.prductimgTime?this.generateSuccess.prductimgTime:null this.scaleImage = true - if(this.poseList.length == 0){ + if(this.poseList.length == 0 && list[index].type == 'PoseTransfer'){ this.getPoseList() } // if(status == 'edit'){ @@ -623,7 +626,11 @@ methods: { }else{ this.speedList = this.speedTypeList.toPorductImg } - this.speedData = JSON.parse(JSON.stringify(this.speedList[0])) + if(this.scaleImageList[index].resultType == "Relight"){ + this.speedData = JSON.parse(JSON.stringify(this.speedList[1])) + }else{ + this.speedData = JSON.parse(JSON.stringify(this.speedList[0])) + } // if(this.scaleImageList[index]?.resultType == 'ToProductImage')this.scaleImageList[index].sourceUrl = this.scaleImageList[index].imgUrl this.scaleImageIndex = index if(dialogueIndex)this.robotAssits = dialogueIndex diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue index de18aa8a..c8b486c5 100644 --- a/src/component/home/design/index.vue +++ b/src/component/home/design/index.vue @@ -1,201 +1,135 @@ + \ No newline at end of file diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue new file mode 100644 index 00000000..e3c29262 --- /dev/null +++ b/src/component/home/design/tools.vue @@ -0,0 +1,181 @@ + + + \ No newline at end of file diff --git a/src/component/home/index.vue b/src/component/home/index.vue index 6cbb6e98..994eee55 100644 --- a/src/component/home/index.vue +++ b/src/component/home/index.vue @@ -450,6 +450,7 @@ export default defineComponent({ let queue = [] as any let start = false const chatChange = (value:any)=>{ + if(value.type == 'design_control_signal' && dataDom.design){ queue.push( { diff --git a/src/component/home/newProject/index.vue b/src/component/home/newProject/index.vue index 87ab8226..7796accb 100644 --- a/src/component/home/newProject/index.vue +++ b/src/component/home/newProject/index.vue @@ -126,8 +126,10 @@ export default defineComponent({ } const addChatContent = (item:any)=>{ if((data.textarea.value?.length + item.length) > 10000)return - data.chatContent += item - data.textarea.value += item + // data.chatContent += item + // data.textarea.value += item + data.chatContent = item + data.textarea.value = item } const sendChat = ()=>{ if(!data.chatContent)return @@ -215,7 +217,8 @@ export default defineComponent({ data.chatOrSetting = str } const setProject = (item:any)=>{ - router.push(`home?history=${item.id}`) + emit('newProject',item) + // router.push(`home?history=${item.id}`) } onMounted(()=>{ store.commit('createProbject') diff --git a/src/component/home/tools/patternMaking3D/index.vue b/src/component/home/tools/patternMaking3D/index.vue index 9f78c9be..dfc9041b 100644 --- a/src/component/home/tools/patternMaking3D/index.vue +++ b/src/component/home/tools/patternMaking3D/index.vue @@ -67,7 +67,7 @@
3D view
Img view
-
+
Flat pattern
@@ -112,6 +112,7 @@ export default defineComponent({ // printCatecoryList:computed(()=>{ // return store.state.UserHabit.printType // }), + userDetail:computed(()=>store.state.UserHabit.userDetail),//选择的项目 selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目 patternMaking3D:computed(()=>store.state.HomeStoreModule.patternMaking3D),//选择的项目 modelList:[] as any, @@ -137,7 +138,7 @@ export default defineComponent({ data.isNoData = false data.isShowMark = false } - const createProbject:any = inject('createProbject') as any + const createProbject:any = inject('createProbject',()=>{}) as any const setSelectModel = async (item:any)=>{ if(!data.selectObject.id)await createProbject() data.isShowMark = true diff --git a/src/component/home/tools/poseTransfer/index.vue b/src/component/home/tools/poseTransfer/index.vue index e071d94b..5b995789 100644 --- a/src/component/home/tools/poseTransfer/index.vue +++ b/src/component/home/tools/poseTransfer/index.vue @@ -28,7 +28,7 @@
-
+
store.state.Workspace.probjects.id) + projectId:computed(()=>store.state.Workspace.probjects.id), + CollectionType:'PoseTransfer', }, waitList:[], likeList:computed(()=>store.state.HomeStoreModule.poseTransfer.likedList), @@ -164,6 +168,8 @@ export default defineComponent({ }) watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{ data.fileList = store.state.HomeStoreModule.uploadElement + data.fileList[0].isChecked = true + data.selectImg = data.fileList[0] }) watch(()=>store.state.HomeStoreModule.poseTransfer.list.length,(newVal,oldVal)=>{ let list = store.state.HomeStoreModule.poseTransfer.list @@ -192,7 +198,7 @@ export default defineComponent({ }, }) const setIsShowMark:any = inject('setIsShowMark') - const createProbject:any = inject('createProbject') + const createProbject:any = inject('createProbject',()=>{}) const dataDom = reactive({ generalDragLeft:null as any, generalDragRight:null as any, @@ -209,7 +215,11 @@ export default defineComponent({ item.isChecked = true if(item.url || item.imgUrl)data.selectImg.minioUrl = getMinioUrl(item.url || item.imgUrl) } - const openSetData = ()=>{ + const openSetData = (designList:any)=>{ + if(props.isDesignPage){ + data.fileList = designList + return + } // dataDom.generalDrag.openSetData() data.currentList = store.state.UploadFilesModule.modularData.toProduct data.currentList = data.currentList?data.currentList:[] @@ -341,6 +351,7 @@ export default defineComponent({ }); } } + let isSelectObject = false let beforeUpload = async (file: any)=>{ const isJpgOrPng = file.type === "image/jpeg" || @@ -354,7 +365,8 @@ export default defineComponent({ if (!isLt2M) { message.info(useI18n().t('MoodboardUpload.jsContent4')); } - if(!data.upload.projectId){ + if(!data.upload.projectId && !isSelectObject){ + isSelectObject = true await createProbject() } return (isJpgOrPng && isLt2M && data.upload.projectId) || Upload.LIST_IGNORE; @@ -422,12 +434,14 @@ export default defineComponent({ likeOrDislike:'like', transformedId:item.id, projectId:store.state.Workspace.probjects.id, + collectionSortParentId:props.isDesignPage?item.parentId:'', } }else{ value = { likeOrDislike:'dislike', transformedId:item.id, projectId:store.state.Workspace.probjects.id, + collectionSortParentId:props.isDesignPage?item.parentId:'', } } Https.axiosPost(Https.httpUrls.poselikeOrDisike, {},{params:value}).then( @@ -455,9 +469,9 @@ export default defineComponent({ }); } const selectPose = (item:any)=>{ + data.poseList.forEach((listItem:any)=>listItem.isChecked = false) item.isChecked = true data.selectPose = item?.id || 1 - data.poseList.forEach((listItem:any)=>listItem.isChecked = false) } onMounted(()=>{ // showViewVideo({url:'https://www.minio.aida.com.hk:12025/api/v1/download-shared-object/aHR0cHM6Ly93d3cubWluaW8uYWlkYS5jb20uaGs6MTIwMjQvYWlkYS11c2Vycy84OS9wb3NlX3RyYW5zZm9ybV92aWRlby8xMjMtODkubXA0P1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9N0tOVDdNWlNLWkRXM1RVOEJZVlklMkYyMDI1MDQwOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTA0MDhUMDUxOTM1WiZYLUFtei1FeHBpcmVzPTQzMTk5JlgtQW16LVNlY3VyaXR5LVRva2VuPWV5SmhiR2NpT2lKSVV6VXhNaUlzSW5SNWNDSTZJa3BYVkNKOS5leUpoWTJObGMzTkxaWGtpT2lJM1MwNVVOMDFhVTB0YVJGY3pWRlU0UWxsV1dTSXNJbVY0Y0NJNk1UYzBOREV4T0RneE9Td2ljR0Z5Wlc1MElqb2lZV1J0YVc0aWZRLmY0Z3RoTU1BeC1GUnM3eGhWNFdjTUFCUW5lU19BVkIxUDlYbnJQbEFNWUFsVnJwY3RpYXgtU2cyY2FkZHZ0a0VCOU1NbWxGeUlIbU90aGhUWDlqN2lnJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZ2ZXJzaW9uSWQ9bnVsbCZYLUFtei1TaWduYXR1cmU9Yjg5YmQ4ZDg5M2I4ZjBjYmYxZDI3NDFjZmY0NGRiZGNmYWM2NmU0ZGM2OGIwYzQzZDA2OGI4YjYzZjE5YjhhOA'}) diff --git a/src/component/home/tools/toProduct/index.vue b/src/component/home/tools/toProduct/index.vue index 1976b0b1..09c3c740 100644 --- a/src/component/home/tools/toProduct/index.vue +++ b/src/component/home/tools/toProduct/index.vue @@ -23,7 +23,7 @@
- +
@@ -34,7 +34,7 @@
-
+
- +
@@ -167,7 +167,7 @@
- +
@@ -210,7 +210,24 @@ export default defineComponent({ scaleImage, generalMenu,UpgradePlan,generalDrag }, - props: ['setTask','productimgMenu'], + props:{ + setTask:{ + type:Object, + default:()=>{ + return {} + } + }, + productimgMenu:{ + type:Object, + default:()=>{ + return {} + } + }, + isDesignPage:{ + type:Boolean, + default:false, + }, + }, setup(props,{emit}) { const store = useStore(); let userDetail:any= computed(()=>{ @@ -224,7 +241,7 @@ export default defineComponent({ return store.state.Guide.guide }) const route = useRoute() - const createProbject:any = inject('createProbject') + const createProbject:any = inject('createProbject',()=>{}) let productImgData:any = reactive({ isShowMark:false, fileList:{}, @@ -283,6 +300,7 @@ export default defineComponent({ }, ); watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{ + if(props.isDesignPage)return productImgData.fileList[props.productimgMenu.value] = store.state.HomeStoreModule.uploadElement }) const productImgDom = reactive({ @@ -315,7 +333,6 @@ export default defineComponent({ } ]) let RelightDirection:any = ref(RelightDirectionList.value[0].value) - let selectList:any = ref({}) // let likeDesignCollectionList: any = computed(() => { // return store.state.HomeStoreModule.likeDesignCollectionList; // }); @@ -323,14 +340,17 @@ export default defineComponent({ return store.state.UploadFilesModule.modularData; }); let userlikeGroupId = 0 - const openSetData = ()=>{ + const openSetData = (designList:any)=>{ // cleardata() - if(props.productimgMenu.value == 'ToProductImage'){ - selectList.value['ToProductImage'] = JSON.parse(JSON.stringify(selectDesignList.value.design.likeData)) - }else if(props.productimgMenu.value == 'Relight'){ - selectList.value['Relight'] = JSON.parse(JSON.stringify(selectDesignList.value.toProduct)) + // if(props.productimgMenu.value == 'ToProductImage'){ + // selectList.value['ToProductImage'] = JSON.parse(JSON.stringify(selectDesignList.value.design.likeData)) + // }else if(props.productimgMenu.value == 'Relight'){ + // selectList.value['Relight'] = JSON.parse(JSON.stringify(selectDesignList.value.toProduct)) + // } + if(props.isDesignPage){ + productImgData.fileList[props.productimgMenu.value] = designList + return } - userlikeGroupId = selectDesignList.value.userlikeGroupId // getLikeProductImage(selectDesignList.value.userlikeGroupId) productImgDom.generalDragLeft.setItemPosition() @@ -378,7 +398,6 @@ export default defineComponent({ } let cleardata = ()=>{ productImgData.generateList = [] - selectList.value = {} // props.productimgMenu = productimgMenuList.value[0] } @@ -404,6 +423,7 @@ export default defineComponent({ bor = false } } + let isSelectObject = false let beforeUpload = async (file: any)=>{ const isJpgOrPng = file.type === "image/jpeg" || @@ -417,10 +437,12 @@ export default defineComponent({ if (!isLt2M) { message.info(useI18n().t('MoodboardUpload.jsContent4')); } - if(!productImgData.selectObject.id){ + if(!productImgData.selectObject.id && !isSelectObject){ + isSelectObject = true productImgData.selectObject.id = await createProbject() upload.value = { - projectId:productImgData.selectObject.id + projectId:productImgData.selectObject.id, + CollectionType:props.productimgMenu.value, } } return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE; @@ -446,7 +468,9 @@ export default defineComponent({ let likeFile = (item:any,str:any,index:any) =>{ let url let data = { - toProductImageResultId:[item.id] + toProductImageResultId:[item.id], + projectId: store.state.Workspace.probjects.id, + collectionSortParentId:props.isDesignPage?item.parentId:'', } if(str == 'like'){ url = Https.httpUrls.productImageLike @@ -504,26 +528,17 @@ export default defineComponent({ if(productImgData.fileList[props.productimgMenu.value]){ productImgData.fileList[props.productimgMenu.value].forEach((item:any)=>{ if(item.isChecked){ - obj.elementId = item.id - obj.elementType = item.type || 'ProductElement' - selectArr.push(JSON.parse(JSON.stringify(obj))) - } - }) - } - if(selectList.value[props.productimgMenu.value]){ - selectList.value[props.productimgMenu.value].forEach((item:any)=>{ - if(item.isChecked){ - obj.elementId = item.designOutfitId - obj.elementType = 'DesignOutfit' - if(props.productimgMenu.value == 'Relight'){ + if(item.resultType == 'Design'){ + obj.elementId = item.designOutfitId + obj.elementType = 'DesignOutfit' + }else{ obj.elementId = item.id - obj.elementType = 'ToProductImage' + obj.elementType = item.type || 'ProductElement' } selectArr.push(JSON.parse(JSON.stringify(obj))) } }) } - if(selectArr.length == 0) { message.info(t('ProductImg.jsContent2')) return @@ -612,11 +627,12 @@ export default defineComponent({ let index = productImgData.generateList.findIndex((obj:any) => obj.taskId === element.taskId); productImgData.generateList[index] = element // productImgData.generateList[props.productimgMenu.value].unshift(element) + data = data.filter((item:any) => item !== element.taskId); }else if(element.status == 'Fail'){ let index = productImgData.generateList.findIndex((obj:any) => obj.taskId === element.taskId); productImgData.generateList.splice(index,1) + data = data.filter((item:any) => item !== element.taskId); } - data = data.filter((item:any) => item !== element.taskId); }); generateProceedList = data if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length ==data.length)){ @@ -796,7 +812,6 @@ export default defineComponent({ RelightDirectionList, RelightDirection, - selectList, setproduct, fileUploadChange, beforeUpload, diff --git a/src/component/modules/generalDrag.vue b/src/component/modules/generalDrag.vue index 7772a9bf..e3091383 100644 --- a/src/component/modules/generalDrag.vue +++ b/src/component/modules/generalDrag.vue @@ -27,7 +27,7 @@
-
+
@@ -54,6 +54,7 @@ export default defineComponent({ showMark:{type:Boolean,default:false}, isLike:{type:Boolean,default:false}, isDelete:{type:Boolean,default:true}, + isCopy:{type:Boolean,default:true}, type:{type:String,default:''}, }, emits:['setBtn','setSort'], diff --git a/src/tool/https.js b/src/tool/https.js index e9c4b15b..835690aa 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -1,515 +1,493 @@ -import axios from "axios"; +import axios from 'axios' // import qs from 'qs' // import message from '@/components/public/message/src' -import router from "@/router/index"; -import { getCookie, clonAllCookie } from "@/tool/cookie"; +import router from '@/router/index' +import {getCookie,clonAllCookie} from '@/tool/cookie' // import cookie from '@/tools/cookie.js' -axios.defaults.timeout = 60000; //响应时间 +axios.defaults.timeout = 60000; //响应时间 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'; //配置请求头 axios.defaults.headers.post["Content-Type"] = "application/json"; -axios.defaults.headers.post["lang"] = "en"; //配置语言请求头 -axios.defaults.withCredentials = true; //跨域携带cookie -import { message } from "ant-design-vue"; -import store from "@/store"; -// if(import.meta.env.NODE_ENV == "development"){ + +axios.defaults.headers.post['lang'] = 'en'; //配置语言请求头 +axios.defaults.withCredentials = true; //跨域携带cookie +import { message } from 'ant-design-vue'; +import store from '@/store'; +// if(process.env.NODE_ENV == "development"){ // axios.defaults.baseURL = ""; //配置接口地址 // }else{ -// axios.defaults.baseURL = import.meta.env.VUE_APP_BASE_URL; //配置接口地址 +// axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址 // } -// let httpIp -// if(import.meta.env.NODE_ENV == 'development'){ +// let httpIp +// if(process.env.NODE_ENV == 'development'){ // httpIp = 'http://192.168.1.12:10086' // }else{ // httpIp = '' // } -let httpIp = import.meta.env.NODE_ENV == "development" ? "" : ""; -// let httpIp = import.meta.env.NODE_ENV == 'development' ? "https://192.168.1.8:10086" : ""; +let httpIp = process.env.NODE_ENV == 'development' ? "" : ""; +// let httpIp = process.env.NODE_ENV == 'development' ? "https://192.168.1.8:10086" : ""; -axios.defaults.baseURL = httpIp; //配置接口地址 +axios.defaults.baseURL = httpIp; //配置接口地址 // console.log(axios.defaults.baseURL); -axios.defaults.baseURL = import.meta.env.VITE_APP_BASE_URL; //配置接口地址 +axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址 // 创建取消令牌 const CancelToken = axios.CancelToken; const source = CancelToken.source(); -// console.log(import.meta.env.VITE_APP_BASE_URL); -const filterHttpsUrl = [ - "/api/portfolio/page", - "/api/portfolio/detail", - "/api/account/preLogin", - "/api/account/schoolLogin", - "/api/account/enterpriseLogin", - "/api/account/login", -]; +// console.log(process.env.VUE_APP_BASE_URL); +const filterHttpsUrl = ['/api/portfolio/page','/api/portfolio/detail','/api/account/preLogin','/api/account/schoolLogin','/api/account/enterpriseLogin','/api/account/login'] //POST传参序列化(添加请求拦截器) -axios.interceptors.request.use( - (config) => { +axios.interceptors.request.use((config) => { //在发送请求之前做某件事 - // config.cancelToken = source.token - if ( - config.method === "post" || - config.method === "put" || - config.method === "delete" - ) { - // config.data = qs.stringify(config.data); - // config.data = JSON.stringify(config.data); - } - // config.headers.Authorization = 'Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA'; - if (filterHttpsUrl.indexOf(config.url) == -1) { - config.headers.Authorization = getCookie("token"); - } else { - config.headers.Authorization = ""; + // config.cancelToken = source.token + if(config.method === 'post' || config.method === 'put' || config.method === 'delete'){ + // config.data = qs.stringify(config.data); + // config.data = JSON.stringify(config.data); } + // config.headers.Authorization = 'Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA'; + if(filterHttpsUrl.indexOf(config.url) == -1){ + config.headers.Authorization = getCookie('token'); + }else{ + config.headers.Authorization = ''; + } return config; - }, - (error) => { +},(error) =>{ return Promise.reject(error); - } -); -let isLoginTime = false; -const binaryToUrl = (binary, type = "application/octet-stream", res) => { - let blob = new Blob([binary], { - "content-type": res.headers["content-type"], - }); - let url = URL.createObjectURL(blob); - return url; -}; +}); +let isLoginTime = false +const binaryToUrl = (binary,type = 'application/octet-stream',res)=>{ + let blob = new Blob([binary], {'content-type':res.headers['content-type']}); + let url = URL.createObjectURL(blob); + return url +} //返回状态判断(添加响应拦截器) -axios.interceptors.response.use( - (res) => { - // if(res.data.data == null){ - // message.warning(res.data.errMsg) +axios.interceptors.response.use((res) =>{ + // if(res.data.data == null){ + // message.warning(res.data.errMsg) // return Promise.reject(res.data); - // }else - if (res.config.env.binary) { - let url = binaryToUrl(res.data, res.config.env.binaryType, res); - return Promise.resolve({ url, data: res.data }); - } - if (res.data) { - if (res.data.errCode === 0) { - // message.error(res.data.errMsg) - return Promise.resolve(res.data.data); - } else if (res.data.errCode === 1) { - message.warning(res.data.errMsg); - return Promise.reject(res.data); - } else if (res.data.errCode === 2) { - return Promise.reject(res.data); - } else if (res.data.errCode === -1) { - message.error(res.data.errMsg); - return Promise.reject(res.data); - } + // }else + if(res.config.env.binary){ + let url = binaryToUrl(res.data,res.config.env.binaryType,res) + return Promise.resolve({url,data:res.data}) + } + if (res.data) { + if (res.data.errCode === 0) { + // message.error(res.data.errMsg) + return Promise.resolve(res.data.data); + } else if(res.data.errCode === 1){ + message.warning(res.data.errMsg) + return Promise.reject(res.data); + } else if(res.data.errCode === 2){ + return Promise.reject(res.data); + }else if(res.data.errCode === -1){ + message.error(res.data.errMsg) + return Promise.reject(res.data); + } + } else { - if (res.data.errCode === 0) { - message.warning(res.data.errMsg); - return Promise.reject(res.data); - } else if (res.data.errCode === 1) { - message.warning(res.data.errMsg); - return Promise.reject(res.data); - } else if (res.data.errCode === 2) { - return Promise.reject(res.data); - } else if (res.data.errCode === -1) { - message.error(res.data.errMsg); - return Promise.reject(res.data); - } + if (res.data.errCode === 0) { + message.warning(res.data.errMsg) + return Promise.reject(res.data); + } else if(res.data.errCode === 1){ + message.warning(res.data.errMsg) + return Promise.reject(res.data); + } else if(res.data.errCode === 2){ + return Promise.reject(res.data); + }else if(res.data.errCode === -1){ + message.error(res.data.errMsg) + return Promise.reject(res.data); + } } - }, - function (error) { - if ( - error?.response?.status === 401 && - router.currentRoute._value.name != "setIdentification" - ) { - //如果是记录浏览器页面就不跳转login - // return - clonAllCookie(); - if (!isLoginTime) { - isLoginTime = true; - let isSystemUserRouteList = ["/Square"]; //如果是这两个页面就无需跳转未登录页 - let sSystemUser = false; - for (let index = 0; index < isSystemUserRouteList.length; index++) { - if ( - router.currentRoute.value.path.indexOf( - isSystemUserRouteList[index] - ) > -1 - ) { - sSystemUser = true; - break; - } - } - if (!sSystemUser) { - router.replace("/"); - } - message.warning("Please login and try again~"); - store.commit("createDetail"); - store.commit("createProbject"); - setTimeout(() => [(isLoginTime = false)], 2000); - } - // source.cancel('取消后续接口调用'); - return Promise.reject(); +}, function(error) { + if(error?.response?.status === 401 && router.currentRoute._value.name != 'setIdentification'){//如果是记录浏览器页面就不跳转login + // return + clonAllCookie() + if(!isLoginTime){ + isLoginTime = true + let isSystemUserRouteList = ['/Square']//如果是这两个页面就无需跳转未登录页 + let sSystemUser = false + for (let index = 0; index < isSystemUserRouteList.length; index++) { + if(router.currentRoute.value.path.indexOf(isSystemUserRouteList[index]) > -1){ + sSystemUser = true + break + } + } + if(!sSystemUser){ + router.replace('/') + } + message.warning('Please login and try again~') + store.commit('createDetail') + store.commit('createProbject') + setTimeout(()=>[ + isLoginTime = false + ],2000) + } + // source.cancel('取消后续接口调用'); + return Promise.reject() } - let data_new = error?.response?.data; + let data_new = error?.response?.data // message.error(data_new?.errMsg || 'Error: server exception') return Promise.reject(data_new); - } -); +}); export const Https = { - httpUrls: { - interfaceUrl: "", - parseGoogleCredential: "/api/third/party/parseGoogleCredential", //谷歌登录注册 - parseWeChatCode: "/api/third/party/parseWeChatCode", //微信登录 - accountIsLogin: "/api/account/isLogin", //判断用户是否登录 - accountLogin: `/api/account/login`, //账号密码登录接口 - organizationNameSearch: `/api/account/organizationNameSearch`, //查询学校或者企业版名字 - getUserLanguage: `/api/account/getUserLanguage`, //获取当前用户语言 - changeUserLanguage: `/api/account/changeUserLanguage`, //切换用户当前语言 - uploadAvatar: `/api/account/uploadAvatar`, //修改头像 - editUserName: `/api/account/editUserName`, //修改用户名 - updateUserInfo: `/api/account/updateUserInfo`, //修改国家职业 - accountDetail: `/api/account/getAccountDetail`, //用户详细信息 + httpUrls: { + interfaceUrl: '', + parseGoogleCredential:'/api/third/party/parseGoogleCredential',//谷歌登录注册 + parseWeChatCode:'/api/third/party/parseWeChatCode',//微信登录 + accountIsLogin:'/api/account/isLogin', //判断用户是否登录 + accountLogin:`/api/account/login`, //账号密码登录接口 + organizationNameSearch:`/api/account/organizationNameSearch`, //查询学校或者企业版名字 + getUserLanguage:`/api/account/getUserLanguage`, //获取当前用户语言 + changeUserLanguage:`/api/account/changeUserLanguage`, //切换用户当前语言 + uploadAvatar:`/api/account/uploadAvatar`, //修改头像 + editUserName:`/api/account/editUserName`, //修改用户名 + updateUserInfo:`/api/account/updateUserInfo`, //修改国家职业 + accountDetail:`/api/account/getAccountDetail`, //用户详细信息 - trialUserLogout: `/api/account/trialUserLogout`, //试用用户退出登录接口 - completeGuidancet: `/api/account/completeGuidance`, //用户指引结束 + trialUserLogout:`/api/account/trialUserLogout`, //试用用户退出登录接口 + completeGuidancet:`/api/account/completeGuidance`, //用户指引结束 - getExpiredTime: `/api/account/getExpiredTime`, //获取用户到期时间 + getExpiredTime:`/api/account/getExpiredTime`, //获取用户到期时间 - addNoLoginRequired: `/api/third/party/addNoLoginRequired`, //机房用户注册 - deleteNoLoginRequired: `/api/third/party/deleteNoLoginRequired`, //机房用户注销 - noLoginRequired: `api/account/noLoginRequired`, //机房用户登录 - existNoLoginRequired: `/api/third/party/existNoLoginRequired`, //获取唯一标识是否存在 + addNoLoginRequired:`/api/third/party/addNoLoginRequired`, //机房用户注册 + deleteNoLoginRequired:`/api/third/party/deleteNoLoginRequired`, //机房用户注销 + noLoginRequired:`api/account/noLoginRequired`, //机房用户登录 + existNoLoginRequired:`/api/third/party/existNoLoginRequired`, //获取唯一标识是否存在 - deleteNoLoginRequiredNew: `/api/third/party/deleteNoLoginRequiredNew`, //机房用户注销 - addNoLoginRequiredNew: `api/third/party/addNoLoginRequiredNew`, //机房用户注册 - updateNoLoginRequiredNew: `api/third/party/updateNoLoginRequiredNew`, //机房用户更新 + deleteNoLoginRequiredNew:`/api/third/party/deleteNoLoginRequiredNew`, //机房用户注销 + addNoLoginRequiredNew:`api/third/party/addNoLoginRequiredNew`, //机房用户注册 + updateNoLoginRequiredNew:`api/third/party/updateNoLoginRequiredNew`, //机房用户更新 + + endpoint:`api/third/party/your-secured-endpoint`, //获取唯一标识是否存在 + - endpoint: `api/third/party/your-secured-endpoint`, //获取唯一标识是否存在 + designWorksRegister:'/api/account/designWorksRegister', //注册 + designWorksRegisterCode:'/api/account/designWorksRegisterCode', //注册 + - designWorksRegister: "/api/account/designWorksRegister", //注册 - designWorksRegisterCode: "/api/account/designWorksRegisterCode", //注册 + preLogin:'/api/account/preLogin',//预先登入 + schoolLogin:'/api/account/schoolLogin',//学校管理员登录 + enterpriseLogin:'/api/account/enterpriseLogin',//企业管理员登录 + accountSendEmail:`/api/account/sendEmail`, //发送邮件 + accountResetPwd:'/api/account/resetPwd', //忘记密码修改 + accountLogout:'/api/account/logout',//登出 + accountBindEmail:'/api/account/bindEmail', //绑定邮箱 + bindGoogle:'/api/account/bindGoogle', //绑定谷歌 + bindWeChat:'/api/account/bindWeChat', //绑定微信 + unbindGoogle:`/api/account/unbindGoogle`, //取消绑定谷歌 + unbindWeChat:'/api/account/unbindWeChat', //取消绑定微信 + elementGeneratePrint:'/api/element/generatePrint', //生成印花 + elementSavePrint:'/api/element/savePrint',//保存印花 + getRgbByTcx:'/api/element/getRgbByTcx', // 通过hsv值获取潘通信息 + getRgbByHsv:'/api/element/getRgbByHsv', //通过hsv值获取潘通信息 + designCollection:`/api/design/designCollection`, //设计 Conllection + reDesignCollection:`/api/design/reDesignCollection`,//重新设计 Conllection + countDesignProcess:'/api/design/countDesignProcess', //统计design进度 + getDesignResult:'/api/design/getDesignResult', //查询design结果 + designSort:`/api/design/sort`, //design排序 + collectionLikeUpdate:`/api/history/collectionLikeUpdate`, //赋值排序 - preLogin: "/api/account/preLogin", //预先登入 - schoolLogin: "/api/account/schoolLogin", //学校管理员登录 - enterpriseLogin: "/api/account/enterpriseLogin", //企业管理员登录 - accountSendEmail: `/api/account/sendEmail`, //发送邮件 - accountResetPwd: "/api/account/resetPwd", //忘记密码修改 - accountLogout: "/api/account/logout", //登出 - accountBindEmail: "/api/account/bindEmail", //绑定邮箱 - bindGoogle: "/api/account/bindGoogle", //绑定谷歌 - bindWeChat: "/api/account/bindWeChat", //绑定微信 - unbindGoogle: `/api/account/unbindGoogle`, //取消绑定谷歌 - unbindWeChat: "/api/account/unbindWeChat", //取消绑定微信 - elementGeneratePrint: "/api/element/generatePrint", //生成印花 - elementSavePrint: "/api/element/savePrint", //保存印花 - getRgbByTcx: "/api/element/getRgbByTcx", // 通过hsv值获取潘通信息 - getRgbByHsv: "/api/element/getRgbByHsv", //通过hsv值获取潘通信息 - designCollection: `/api/design/designCollection`, //设计 Conllection - reDesignCollection: `/api/design/reDesignCollection`, //重新设计 Conllection - countDesignProcess: "/api/design/countDesignProcess", //统计design进度 - getDesignResult: "/api/design/getDesignResult", //查询design结果 - designSort: `/api/design/sort`, //design排序 - collectionLikeUpdate: `/api/history/collectionLikeUpdate`, //赋值排序 + designProcess:`/api/design/designProcess`, //统计design进度 + designGetModel:`/api/design/getModel`, //导出获取模特链接 - designProcess: `/api/design/designProcess`, //统计design进度 - designGetModel: `/api/design/getModel`, //导出获取模特链接 + //充值相关 + productList:`/api/product/list`, //获取商品列表 + payAlipay:`/api/ali-pay/trade/page/pay`, //支付宝确认支付 + payAlipayHK:`/api/alipay-hk/createOrder`, //香港支付宝确认支付 + payStripe:`/api/stripe/createOrder`, //Stripe支付 + payPaypal:`/api/paypal/trade`, //paypal确认支付 + getCredits:`/api/credits/getCredits`, //查询用户积分 - //充值相关 - productList: `/api/product/list`, //获取商品列表 - payAlipay: `/api/ali-pay/trade/page/pay`, //支付宝确认支付 - payAlipayHK: `/api/alipay-hk/createOrder`, //香港支付宝确认支付 - payStripe: `/api/stripe/createOrder`, //Stripe支付 - payPaypal: `/api/paypal/trade`, //paypal确认支付 - getCredits: `/api/credits/getCredits`, //查询用户积分 + cancelSubscription:`/api/stripe/cancelSubscription`, //取消订阅 + + orderInfoList:`/api/order-info/list`, //查询订单列表 + getCreditsDetail:`/api/credits/getCreditsDetail`, //查询积分列表 + tradeRefundAlipay:`/api/ali-pay/trade/refund`, //支付宝退款 + tradeRefundPaypal:`/api/paypal/trade/refund`, //paypal退款 - cancelSubscription: `/api/stripe/cancelSubscription`, //取消订阅 + tradeQuery:`/api/ali-pay/trade/query/{orderNo}`, //查询订单状态 + + getRgbByHsvBatch:`/api/element/getRgbByHsvBatch`, //通过hsv值数组批量获取潘通信息 + designLike:`/api/design/like`, //Design Like + designDislike: `/api/design/dislike`, //Design Dislike + queryUserGroup:`/api/history/queryUserGroup`, //History用户分页分组列表 + deleteUserGroup:`/api/history/deleteUserGroup`, //History删除用户分组 + updateUserGroupName:`/api/history/updateUserGroupName`, //History修改用户分组名 + projectSaveOrUpdate:`/api/project/saveOrUpdate`, //History修改用户分组名 + historyChoose:`/api/history/choose`, //History choose + getDesignDetail:`/api/design/detail/getDetail`,//查询design详情 + designSingleWithGradient:`/api/design/detail/designSingleWithGradient`,//查询需要更新mask列表 + getNextSysElement:'/api/design/detail/getNextSysElement',//切换系统的element + detailPrintDot:'/api/design/detail/printDot',//print打点预览 + designSingle:`/api/design/detail/designSingle`,//单个design + queryLibraryPage:`/api/library/queryLibraryPage`,//Library分页列表 + libraryUpload:`/api/library/upload`, // Library文件上传 + setSketchLibrary:`/api/library/updateLibraryLevel2Type`, // Library文件上传 + + queryClassification:`/api/classification/queryClassification`,//标签类别查询 + classificationSaveOrUpdate:`/api/classification/saveOrUpdate`,//标签类别新增修改 + classificationDelete:`/api/classification/delete`,//标签类别新增修改 + relationLibrary:`/api/classification/relationLibrary`,//标签类别新增修改 + getRelClassificationIdList:`/api/classification/getRelClassificationIdList`,//标签类别新增修改 + getRelPublicClassificationIdList:`/api/classification/getRelPublicClassificationIdList`,//多选获取公共标签 + editRelPublicClassificationIdList:`/api/classification/editRelPublicClassificationIdList`,//多选修改公共标签 + + //模块化 + llmStream:`/api/llm/streamNew`,//聊天 + // llmStream:`/api/llm/stream`,//聊天 + chatCreateProject:`/api/llm/chatCreateProject`,//聊天创建项目 + getChatHistory:`/api/llm/getChatHistory`,//获取聊天历史记录 + llmUploadFile:`/api/llm/uploadFile`,//聊天上传文件 + + saveOrUpdate:`/api/project/saveOrUpdate`,//模块化新增修改 + getModuleContent:`/api/project/getModuleContent`,//获取模块内容 + saveModuleContent:`/api/project/saveModuleContent`,//储存模块内容 + historyProject:`/api/project/page`,//项目记录 + projectDetail:`/api/project/delete`,//删除项目 + //3d + threeDPage:`/api/project/threeDPage`, + downloadZip:`/api/project/downloadZip`,//下载zip + getThreeDSize:`/api/project/getThreeDSize`,//下载列表 + getLayoutDetail:`/api/project/getLayoutDetail`,//获取3d详情 + getThreeDGlb:`/api/project/getThreeDGlb`, + selectHistoryProject:`/api/project/choose`,//选择项目 + getMannequinDetail:`/api/project/getMannequinDetail`,//模块化查看模特点位 + modifyProportion:`/api/generate/modifyProportion`,//模特拉伸 + addSysModelToLib:`/api/library/addSysModelToLib`, + poselikeOrDisike:`/api/generate/likeOrDislike`,//postTransform like + getAllPose:`/api/generate/getAllPose`,//获取动作 + - orderInfoList: `/api/order-info/list`, //查询订单列表 - getCreditsDetail: `/api/credits/getCreditsDetail`, //查询积分列表 - tradeRefundAlipay: `/api/ali-pay/trade/refund`, //支付宝退款 - tradeRefundPaypal: `/api/paypal/trade/refund`, //paypal退款 + + //拼贴 + genSketchRecon:`/api/generate/genSketchRecon`, + saveReconCanvas:`/api/generate/saveReconCanvas`, + + //动作变换 + poseTransform:`/api/generate/poseTransform`, + poseTransformResult:`/api/generate/poseTransformResult`, + + batchUpdateLibraryName:'/api/library/batchUpdateLibraryName',//Library修改用户文件名 + batchDeleteLibrary:'/api/library/batchDeleteLibrary',//删除library + queryLibraryTopAndBottomPage:'/api/library/queryLibraryTopAndBottomPage',//Library分页列表(查询top和bottom) + saveOrEditTemplatePoint:'/api/library/saveOrEditTemplatePoint',//保存或者编辑template打点 + libraryModelsDot:'/api/library/modelsDot',//Models打点预览 + chatStreamTest:`/api/python/chatStream`,//机器人助力 + pictureLikeOrUnLike:`/api/python/pictureLikeOrUnLike`,//机器人生成图喜欢 + getBloodBars:`/api/python/getBloodBars`,//机器人血条 + //工作空间 + workspaceDetail:`/api/workspace/detail`,//用户习惯详情 + workspaceenumValues:`/api/workspace/enumValues`,//getSex + + workspaceRemove:`/api/workspace/remove`,//删除用户习惯详情 + workspacesaveOrUpdate:`/api/workspace/saveOrUpdate`,//修改用户习惯详情 + getMannequins:`/api/workspace/getMannequins`,//模特 + getStyleList:`/api/workspace/styleList`,//获取所有风格列表 + + workspaceList:`/api/workspace/list`, + sketchAndPrintGenerate:'/api/generate/sketchAndPrint',//sketchGenerate生成图片 - tradeQuery: `/api/ali-pay/trade/query/{orderNo}`, //查询订单状态 + generatePrepare:'/api/generate/prepare',//开始生成generate图片 + generateStopWaiting:'/api/generate/stopWaiting',//取消生成 + generateResult:'/api/generate/result',//获取生成结果 + generateLike:'/api/generate/like',//喜欢ganerate图片 + generateDislike:'/api/generate/dislike',//喜欢ganerate图片 + imageToSketch:'/api/generate/imageToSketch',//成品图转为线稿 + modifySketch:'/api/generate/modifySketch',//修改画布内容并且储存 - getRgbByHsvBatch: `/api/element/getRgbByHsvBatch`, //通过hsv值数组批量获取潘通信息 - designLike: `/api/design/like`, //Design Like - designDislike: `/api/design/dislike`, //Design Dislike - queryUserGroup: `/api/history/queryUserGroup`, //History用户分页分组列表 - deleteUserGroup: `/api/history/deleteUserGroup`, //History删除用户分组 - updateUserGroupName: `/api/history/updateUserGroupName`, //History修改用户分组名 - projectSaveOrUpdate: `/api/project/saveOrUpdate`, //History修改用户分组名 - historyChoose: `/api/history/choose`, //History choose - getDesignDetail: `/api/design/detail/getDetail`, //查询design详情 - designSingleWithGradient: `/api/design/detail/designSingleWithGradient`, //查询需要更新mask列表 - getNextSysElement: "/api/design/detail/getNextSysElement", //切换系统的element - detailPrintDot: "/api/design/detail/printDot", //print打点预览 - designSingle: `/api/design/detail/designSingle`, //单个design - queryLibraryPage: `/api/library/queryLibraryPage`, //Library分页列表 - libraryUpload: `/api/library/upload`, // Library文件上传 - setSketchLibrary: `/api/library/updateLibraryLevel2Type`, // Library文件上传 + elementUpload:`/api/element/upload`,//上传图片 + imageSegmentation:`/api/element/imageSegmentation`,//分割衣服 + convertRelightElement:`/api/history/convertRelightElement`,//toproduct复制到上传图片位置 - queryClassification: `/api/classification/queryClassification`, //标签类别查询 - classificationSaveOrUpdate: `/api/classification/saveOrUpdate`, //标签类别新增修改 - classificationDelete: `/api/classification/delete`, //标签类别新增修改 - relationLibrary: `/api/classification/relationLibrary`, //标签类别新增修改 - getRelClassificationIdList: `/api/classification/getRelClassificationIdList`, //标签类别新增修改 - getRelPublicClassificationIdList: `/api/classification/getRelPublicClassificationIdList`, //多选获取公共标签 - editRelPublicClassificationIdList: `/api/classification/editRelPublicClassificationIdList`, //多选修改公共标签 + // oldHis:`/oldHis/history/queryUserGroup`,//上传图片 + sketchBoardsBoundingBox:`/api/design/sketchBoardsBoundingBox`,//裁剪sketch图片 - //模块化 - llmStream: `/api/llm/streamNew`, //聊天 - // llmStream:`/api/llm/stream`,//聊天 - chatCreateProject: `/api/llm/chatCreateProject`, //聊天创建项目 - getChatHistory: `/api/llm/getChatHistory`, //获取聊天历史记录 - llmUploadFile: `/api/llm/uploadFile`, //聊天上传文件 + trialOrderList:`/api/account/trialOrderList`,//获取审批列表 + switchIsAutoApproval:`/api/account/switchIsAutoApproval`,//切换是否自动审批 + getIsAutoApproval:`/api/account/getIsAutoApproval`,//获取是否自动审批 + trialOrderApproval:`/api/account/trialOrderApproval`,//通过审批 + trialOrderRefuse:`/api/account/trialOrderRefuse`,//拒绝审批 + + //管理员接口 + //查询所有试用用户 + inquiryGetTrial:`/api/inquiry/getTrial`,//查询所有试用用户 + getCities:`/api/inquiry/getCities`,//获取所有付款订单使用的国家 + getUserInfo:`/api/inquiry/getUserInfo`,//查询所有用户 + queryTransaction:`/api/inquiry/queryTransaction`,//查询交易记录 + queryTransactionDownload:`/api/inquiry/queryTransaction/download`,//导出交易记录 + createCoupon:`/api/stripe/createCoupon`,//创建优惠码 + updatePromCodeInfo:`/api/stripe/updatePromCodeInfo`,//修改优惠码 + getAllCoupons:`/api/stripe/getAllCoupons`,//查询优惠码列表 + checkCoupon:`/api/stripe/checkCoupon`,//根据优惠码获取结算后的金额 + deletePromCode:`/api/stripe/deletePromCode`,//删除优惠券 + addOrganization:`/api/inquiry/addOrganization`,//添加企业版或者教育版 + queryOrganization:`/api/inquiry/queryOrganization`,//查询企业版或者教育版 + - saveOrUpdate: `/api/project/saveOrUpdate`, //模块化新增修改 - getModuleContent: `/api/project/getModuleContent`, //获取模块内容 - saveModuleContent: `/api/project/saveModuleContent`, //储存模块内容 - historyProject: `/api/project/page`, //项目记录 - projectDetail: `/api/project/delete`, //删除项目 - //3d - threeDPage: `/api/project/threeDPage`, - downloadZip: `/api/project/downloadZip`, //下载zip - getThreeDSize: `/api/project/getThreeDSize`, //下载列表 - getLayoutDetail: `/api/project/getLayoutDetail`, //获取3d详情 - getThreeDGlb: `/api/project/getThreeDGlb`, - selectHistoryProject: `/api/project/choose`, //选择项目 - getMannequinDetail: `/api/project/getMannequinDetail`, //模块化查看模特点位 - modifyProportion: `/api/generate/modifyProportion`, //模特拉伸 - addSysModelToLib: `/api/library/addSysModelToLib`, - poselikeOrDisike: `/api/generate/likeOrDislike`, //postTransform like - getAllPose: `/api/generate/getAllPose`, //获取动作 + //云生成 + designCloud:`/api/design/designCloud`,//创建云生成 + cloudPage:`/api/design/cloudPage`,//创建云生成 + cloudTaskDelete:`/api/design/cloudTaskDelete`,//删除云生成 + cloudTaskNameUpdate:`/api/design/cloudTaskNameUpdate`,//修改云生成名字 + getDesignCloudResult:`/api/design/getDesignCloudResult`,//查询这条云生成记录的所有内容 - //拼贴 - genSketchRecon: `/api/generate/genSketchRecon`, - saveReconCanvas: `/api/generate/saveReconCanvas`, + //企业版教育版管理员页面 + subAccountList:`/api/account/subAccountList`,//查询子账号 + addOrUpdateSubAccount:`/api/account/addOrUpdateSubAccount`,//添加子账号 + deleteSubAccount:`/api/account/deleteSubAccount`,//删除子账号 + subAccountImportExcelDownload:`/api/account/subAccountImportExcelDownload`,//批量添加模板下载模板 + subAccountImport:`/api/account/subAccountImport`,//模板导入 + getGenerateFrequency:`/api/inquiry/getGenerateFrequency`,//积分使用详情 + getAllGenerateFuncName:`/api/inquiry/getAllGenerateFuncName`,//获取所有generate类型 - //动作变换 - poseTransform: `/api/generate/poseTransform`, - poseTransformResult: `/api/generate/poseTransformResult`, + //查询某个时间内design点击次数 + getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批 + getAllQuestionnaire:`/api/inquiry/getAllQuestionnaire`,//拒绝审批 + getActiveUserFunc:`/api/inquiry/getActiveUserFunc`,//获取各模块功能 + toProductImageElementDelete:`/api/history/toProductImageElementDelete`,//删除指定模块上传的内容 + recentActiveUser:`/api/inquiry/recentActiveUser`,//获取近期活跃用户 + recentActiveUserChart:`/api/inquiry/recentActiveUserChart`,//获取近期活跃用户图表数据 + recentNewUser:`/api/inquiry/recentNewUser`,//获取近期新增用户 + recentNewUserChart:`/api/inquiry/recentNewUserChart`,//获取新增用户图表 + trialUserCountry:`/api/inquiry/trialUserCountry`,//试用用户国家-城市分布 + conversionRate:`/api/inquiry/conversionRate`,//试用用户国家-城市分布 + getAllUserId:`/api/inquiry/getAllUserId`,//获取所有用户id和Name + adminAddUser:`/api/inquiry/addUser`,//添加用户 + modifyUser:`/api/inquiry/modifyUser`,//修改用户 + publishSysMessage:`/api/message/publishSysMessage`,//发布系统任务 + //affiliate接口 + viewsIncrease:`/api/affiliate/viewsIncrease`,//增加访问量 + affiliateRegistration:`/api/affiliate/registration`,//affiliate注册 + personalCenter:`/api/affiliate/personalCenter`,//affiliate个人中心 + affiliateList:`/api/affiliate/list`,//affiliate审批列表 + getEachAffiliateGeneratedRevenue:`/api/affiliate/getEachAffiliateGeneratedRevenue`,//affiliate每个用户根据日期查询收益 + affiliateApproval:`/api/affiliate/approval`,//affiliate同意 审批 + getPersonalMonthlyIncome:`/api/affiliate/getPersonalMonthlyIncome`,//affiliate图表接口 + + getTasksList:`/api/tasks/getList`,//获取w为执行完的所有任务 + getTasksHistory:`/api/tasks/getAllTask`,//获取所有任务列表 + prepareForSR:`/api/python/prepareForSR`,//超分 + - batchUpdateLibraryName: "/api/library/batchUpdateLibraryName", //Library修改用户文件名 - batchDeleteLibrary: "/api/library/batchDeleteLibrary", //删除library - queryLibraryTopAndBottomPage: "/api/library/queryLibraryTopAndBottomPage", //Library分页列表(查询top和bottom) - saveOrEditTemplatePoint: "/api/library/saveOrEditTemplatePoint", //保存或者编辑template打点 - libraryModelsDot: "/api/library/modelsDot", //Models打点预览 - chatStreamTest: `/api/python/chatStream`, //机器人助力 - pictureLikeOrUnLike: `/api/python/pictureLikeOrUnLike`, //机器人生成图喜欢 - getBloodBars: `/api/python/getBloodBars`, //机器人血条 - //工作空间 - workspaceDetail: `/api/workspace/detail`, //用户习惯详情 - workspaceenumValues: `/api/workspace/enumValues`, //getSex + //作品广场 + publish:`/api/portfolio/publish`,//发布作品到作品广场 + getPorfolio:`/api/portfolio/page`,//查询作品广场 + getPorfolioDetail:`/api/portfolio/detail`,//查询作品广场作品详情 + setPorfolioChoose:`/api/portfolio/choose`,//二次创作 + portfolioLike:`/api/portfolio/like`,//作品广场点赞 + portfolioNoLike:`/api/portfolio/unlike`,//作品广场取消点赞 + portfolioComment:`/api/portfolio/comment`,//作品广场评论 + portfolioCommentPage:`/api/portfolio/commentPage`,//作品广场评论列表 + commentDelete:`/api/portfolio/commentDelete`,//删除评论 + porfolioDelete:`/api/portfolio/delete`,//删除作品 + porfolioFollow:`/api/portfolio/follow`,//删除作品 + porfolioFollow:`/api/portfolio/follow`,//关注 + porfolioCancelFollow:`/api/portfolio/cancelFollow`,//取消关注 + porfolioGetFolloweeList:`/api/portfolio/getFolloweeList`,//获取关注列表 + porfolioGetFollowerList:`/api/portfolio/getFollowerList`,//获取粉丝列表 + + //product生成 + toProduct:`/api/history/toProduct`,//开始生成 + toProductImageResult:`/api/history/toProductImageResult`,//获取结果 + toProductImageElementUpload:`/api/history/toProductImageElementUpload`,//上传 + productImageLike:`/api/history/productImageLike`,//like生成结果 + productImageUnLike:`/api/history/productImageUnLike`,//取消like生成结果 + productImageLikeList:`/api/history/productImageLikeList`,//like生成结果 + + //打光 + relight:`/api/history/relight`,//开始生成 + relightResult:`/api/history/relightResult`,//开始生成 + + //保存画布 + canvasElementUpload:`/api/history/canvasElementUpload`,//画布上传临时图片 + exportSave:`/api/history/exportSave`,//保存画布 + exportSearch:`/api/history/exportSearch`,//保存画布 - workspaceRemove: `/api/workspace/remove`, //删除用户习惯详情 - workspacesaveOrUpdate: `/api/workspace/saveOrUpdate`, //修改用户习惯详情 - getMannequins: `/api/workspace/getMannequins`, //模特 - getStyleList: `/api/workspace/styleList`, //获取所有风格列表 + //活动 + activity:`/api/account/activity`, - workspaceList: `/api/workspace/list`, - sketchAndPrintGenerate: "/api/generate/sketchAndPrint", //sketchGenerate生成图片 + //bradDNA + brandLogoUpload:`/api/history/brandLogoUpload`,//上传bradDNA + brandDNAGenerate:`/api/history/brandDNAGenerate`,//上传bradDNA + brandDNAUpload:`/api/history/brandDNAUpload`,//上传DNA图片 + getInitializeProgress:`/api/history/getInitializeProgress`,//获取brand进度 + brandDNADelete:`/api/history/brandDNADelete`,//删除brandDna + + brandDNAPage:`/api/history/brandDNAPage`,//brand列表 + brandDNASaveOrUpdate:`/api/history/brandDNASaveOrUpdate`,//提交个人信息 + productImageInitialize:`/api/history/productImageInitialize`,//产品识别 + //调查问卷 + questionnaire:`/api/account/questionnaire`,//保存画布 - generatePrepare: "/api/generate/prepare", //开始生成generate图片 - generateStopWaiting: "/api/generate/stopWaiting", //取消生成 - generateResult: "/api/generate/result", //获取生成结果 - generateLike: "/api/generate/like", //喜欢ganerate图片 - generateDislike: "/api/generate/dislike", //喜欢ganerate图片 - imageToSketch: "/api/generate/imageToSketch", //成品图转为线稿 - modifySketch: "/api/generate/modifySketch", //修改画布内容并且储存 + //消息系统 + getUnreadCount:`/api/message/getUnreadCount`,//获取未读消息 + setReadStatus:`/api/message/setReadStatus`,//设置消息已读 + getHistoryNotification:`/api/message/getHistoryNotification`,//获取历史消息 + oneClickRead:`/api/message/oneClickRead`,//全部设为已读 + personalHomepage:`/api/account/personalHomepage`,//获取个人主页信息 + refreshMinioUrl:`/api/third/party/refreshMinioUrl`,//获取可以使用的minio地址 + + }, - elementUpload: `/api/element/upload`, //上传图片 - imageSegmentation: `/api/element/imageSegmentation`, //分割衣服 - convertRelightElement: `/api/history/convertRelightElement`, //toproduct复制到上传图片位置 + axiosGet(url,config) { + return new Promise((resolve, reject) => { + if(isLoginTime && url != '/api/portfolio/page') { + resolve('') + return + } + axios.get(url,config).then(response => { + resolve(response) + }).catch((error) => { + reject(error) + }) + }); + }, - // oldHis:`/oldHis/history/queryUserGroup`,//上传图片 - sketchBoardsBoundingBox: `/api/design/sketchBoardsBoundingBox`, //裁剪sketch图片 + axiosPut(url, data) { + return new Promise((resolve, reject) => { + if(isLoginTime && url != '/api/portfolio/page') { + resolve('') + return + } + axios.put(url, data).then(response => { + resolve(response) + }).catch((error) => { + reject(error) + }) + }); + }, - trialOrderList: `/api/account/trialOrderList`, //获取审批列表 - switchIsAutoApproval: `/api/account/switchIsAutoApproval`, //切换是否自动审批 - getIsAutoApproval: `/api/account/getIsAutoApproval`, //获取是否自动审批 - trialOrderApproval: `/api/account/trialOrderApproval`, //通过审批 - trialOrderRefuse: `/api/account/trialOrderRefuse`, //拒绝审批 + axiosPost(url, data,config) { + return new Promise((resolve, reject) => { + if(isLoginTime && url != '/api/portfolio/page') { + resolve('') + return + } + axios.post(url, data,config).then(response => { + resolve(response) + }).catch((error) => { + reject(error) + }) + }); + }, - //管理员接口 - //查询所有试用用户 - inquiryGetTrial: `/api/inquiry/getTrial`, //查询所有试用用户 - getCities: `/api/inquiry/getCities`, //获取所有付款订单使用的国家 - getUserInfo: `/api/inquiry/getUserInfo`, //查询所有用户 - queryTransaction: `/api/inquiry/queryTransaction`, //查询交易记录 - queryTransactionDownload: `/api/inquiry/queryTransaction/download`, //导出交易记录 - createCoupon: `/api/stripe/createCoupon`, //创建优惠码 - updatePromCodeInfo: `/api/stripe/updatePromCodeInfo`, //修改优惠码 - getAllCoupons: `/api/stripe/getAllCoupons`, //查询优惠码列表 - checkCoupon: `/api/stripe/checkCoupon`, //根据优惠码获取结算后的金额 - deletePromCode: `/api/stripe/deletePromCode`, //删除优惠券 - addOrganization: `/api/inquiry/addOrganization`, //添加企业版或者教育版 - queryOrganization: `/api/inquiry/queryOrganization`, //查询企业版或者教育版 + axiosDelete(url, newData) { + return new Promise((resolve, reject) => { + if(isLoginTime && url != '/api/portfolio/page') { + resolve('') + return + } + axios.delete(url,{data:newData}).then(response => { + resolve(response) + }).catch((error) => { + reject(error) + }) + }); + }, - //云生成 - designCloud: `/api/design/designCloud`, //创建云生成 - cloudPage: `/api/design/cloudPage`, //创建云生成 - cloudTaskDelete: `/api/design/cloudTaskDelete`, //删除云生成 - cloudTaskNameUpdate: `/api/design/cloudTaskNameUpdate`, //修改云生成名字 - getDesignCloudResult: `/api/design/getDesignCloudResult`, //查询这条云生成记录的所有内容 + - //企业版教育版管理员页面 - subAccountList: `/api/account/subAccountList`, //查询子账号 - addOrUpdateSubAccount: `/api/account/addOrUpdateSubAccount`, //添加子账号 - deleteSubAccount: `/api/account/deleteSubAccount`, //删除子账号 - subAccountImportExcelDownload: `/api/account/subAccountImportExcelDownload`, //批量添加模板下载模板 - subAccountImport: `/api/account/subAccountImport`, //模板导入 - getGenerateFrequency: `/api/inquiry/getGenerateFrequency`, //积分使用详情 - getAllGenerateFuncName: `/api/inquiry/getAllGenerateFuncName`, //获取所有generate类型 - //查询某个时间内design点击次数 - getDesignStatistic: `/api/inquiry/getDesignStatistic`, //拒绝审批 - getAllQuestionnaire: `/api/inquiry/getAllQuestionnaire`, //拒绝审批 - getActiveUserFunc: `/api/inquiry/getActiveUserFunc`, //获取各模块功能 - toProductImageElementDelete: `/api/history/toProductImageElementDelete`, //删除指定模块上传的内容 - recentActiveUser: `/api/inquiry/recentActiveUser`, //获取近期活跃用户 - recentActiveUserChart: `/api/inquiry/recentActiveUserChart`, //获取近期活跃用户图表数据 - recentNewUser: `/api/inquiry/recentNewUser`, //获取近期新增用户 - recentNewUserChart: `/api/inquiry/recentNewUserChart`, //获取新增用户图表 - trialUserCountry: `/api/inquiry/trialUserCountry`, //试用用户国家-城市分布 - conversionRate: `/api/inquiry/conversionRate`, //试用用户国家-城市分布 - getAllUserId: `/api/inquiry/getAllUserId`, //获取所有用户id和Name - adminAddUser: `/api/inquiry/addUser`, //添加用户 - modifyUser: `/api/inquiry/modifyUser`, //修改用户 - publishSysMessage: `/api/message/publishSysMessage`, //发布系统任务 - //affiliate接口 - viewsIncrease: `/api/affiliate/viewsIncrease`, //增加访问量 - affiliateRegistration: `/api/affiliate/registration`, //affiliate注册 - personalCenter: `/api/affiliate/personalCenter`, //affiliate个人中心 - affiliateList: `/api/affiliate/list`, //affiliate审批列表 - getEachAffiliateGeneratedRevenue: `/api/affiliate/getEachAffiliateGeneratedRevenue`, //affiliate每个用户根据日期查询收益 - affiliateApproval: `/api/affiliate/approval`, //affiliate同意 审批 - getPersonalMonthlyIncome: `/api/affiliate/getPersonalMonthlyIncome`, //affiliate图表接口 - getTasksList: `/api/tasks/getList`, //获取w为执行完的所有任务 - getTasksHistory: `/api/tasks/getAllTask`, //获取所有任务列表 - prepareForSR: `/api/python/prepareForSR`, //超分 - - //作品广场 - publish: `/api/portfolio/publish`, //发布作品到作品广场 - getPorfolio: `/api/portfolio/page`, //查询作品广场 - getPorfolioDetail: `/api/portfolio/detail`, //查询作品广场作品详情 - setPorfolioChoose: `/api/portfolio/choose`, //二次创作 - portfolioLike: `/api/portfolio/like`, //作品广场点赞 - portfolioNoLike: `/api/portfolio/unlike`, //作品广场取消点赞 - portfolioComment: `/api/portfolio/comment`, //作品广场评论 - portfolioCommentPage: `/api/portfolio/commentPage`, //作品广场评论列表 - commentDelete: `/api/portfolio/commentDelete`, //删除评论 - porfolioDelete: `/api/portfolio/delete`, //删除作品 - porfolioFollow: `/api/portfolio/follow`, //删除作品 - porfolioFollow: `/api/portfolio/follow`, //关注 - porfolioCancelFollow: `/api/portfolio/cancelFollow`, //取消关注 - porfolioGetFolloweeList: `/api/portfolio/getFolloweeList`, //获取关注列表 - porfolioGetFollowerList: `/api/portfolio/getFollowerList`, //获取粉丝列表 - - //product生成 - toProduct: `/api/history/toProduct`, //开始生成 - toProductImageResult: `/api/history/toProductImageResult`, //获取结果 - toProductImageElementUpload: `/api/history/toProductImageElementUpload`, //上传 - productImageLike: `/api/history/productImageLike`, //like生成结果 - productImageUnLike: `/api/history/productImageUnLike`, //取消like生成结果 - productImageLikeList: `/api/history/productImageLikeList`, //like生成结果 - - //打光 - relight: `/api/history/relight`, //开始生成 - relightResult: `/api/history/relightResult`, //开始生成 - - //保存画布 - canvasElementUpload: `/api/history/canvasElementUpload`, //画布上传临时图片 - exportSave: `/api/history/exportSave`, //保存画布 - exportSearch: `/api/history/exportSearch`, //保存画布 - - //活动 - activity: `/api/account/activity`, - - //bradDNA - brandLogoUpload: `/api/history/brandLogoUpload`, //上传bradDNA - brandDNAGenerate: `/api/history/brandDNAGenerate`, //上传bradDNA - brandDNAUpload: `/api/history/brandDNAUpload`, //上传DNA图片 - getInitializeProgress: `/api/history/getInitializeProgress`, //获取brand进度 - brandDNADelete: `/api/history/brandDNADelete`, //删除brandDna - - brandDNAPage: `/api/history/brandDNAPage`, //brand列表 - brandDNASaveOrUpdate: `/api/history/brandDNASaveOrUpdate`, //提交个人信息 - productImageInitialize: `/api/history/productImageInitialize`, //产品识别 - //调查问卷 - questionnaire: `/api/account/questionnaire`, //保存画布 - - //消息系统 - getUnreadCount: `/api/message/getUnreadCount`, //获取未读消息 - setReadStatus: `/api/message/setReadStatus`, //设置消息已读 - getHistoryNotification: `/api/message/getHistoryNotification`, //获取历史消息 - oneClickRead: `/api/message/oneClickRead`, //全部设为已读 - personalHomepage: `/api/account/personalHomepage`, //获取个人主页信息 - }, - - axiosGet(url, config) { - return new Promise((resolve, reject) => { - if (isLoginTime && url != "/api/portfolio/page") { - resolve(""); - return; - } - axios - .get(url, config) - .then((response) => { - resolve(response); - }) - .catch((error) => { - reject(error); - }); - }); - }, - - axiosPut(url, data) { - return new Promise((resolve, reject) => { - if (isLoginTime && url != "/api/portfolio/page") { - resolve(""); - return; - } - axios - .put(url, data) - .then((response) => { - resolve(response); - }) - .catch((error) => { - reject(error); - }); - }); - }, - - axiosPost(url, data, config) { - return new Promise((resolve, reject) => { - if (isLoginTime && url != "/api/portfolio/page") { - resolve(""); - return; - } - axios - .post(url, data, config) - .then((response) => { - resolve(response); - }) - .catch((error) => { - reject(error); - }); - }); - }, - - axiosDelete(url, newData) { - return new Promise((resolve, reject) => { - if (isLoginTime && url != "/api/portfolio/page") { - resolve(""); - return; - } - axios - .delete(url, { data: newData }) - .then((response) => { - resolve(response); - }) - .catch((error) => { - reject(error); - }); - }); - }, -}; +} diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 43333e11..7aaf9a27 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -47,7 +47,7 @@
-
+
Rename @@ -306,7 +306,7 @@ export default defineComponent({ searchCollectionName:'', historyTextarea:'', updateTimeType:['Todaylist','Yesterdaylist','WithinAWeeklist','EarlierTodaylist'], - selectHistoryIndex:-1, + selectHistoryId:-1, page:1, size:10, isToday:false, @@ -581,33 +581,33 @@ export default defineComponent({ }); } const editHistory = (item,index,el,list)=>{ - if(homeMainData.historyData.selectHistoryIndex == -1){ - let top = el.target.parentNode.parentNode.getBoundingClientRect().top - let parentTop = el.target.parentNode.parentNode.parentNode.offsetTop - let parentHeight = el.target.parentNode.parentNode.parentNode.offsetHeight + if(homeMainData.historyData.selectHistoryId == -1){ + let top = el.target.parentNode.parentNode.getBoundingClientRect().y + let parentTop = el.target.parentNode.parentNode.parentNode.parentNode.parentNode.getBoundingClientRect().y + let parentHeight = el.target.parentNode.parentNode.parentNode.parentNode.parentNode.offsetHeight let operation = el.target.parentNode.querySelector('.operation') - homeMainData.historyData.selectHistoryIndex = index + homeMainData.historyData.selectHistoryId = item.id //判断弹窗是加载按钮上面还是下面 if(list.length == 1){ operation.classList.add('activeLeft') return } - if((parentTop+parentHeight)/2 < top){//加在按钮上面 + if(top > parentHeight/2 + parentTop){//加在按钮上面 operation.classList.add('active') }else{ operation.classList.remove('active') } }else{ - homeMainData.historyData.selectHistoryIndex = -1 + homeMainData.historyData.selectHistoryId = -1 } let operationCli = ()=>{ - homeMainData.historyData.selectHistoryIndex = -1 + homeMainData.historyData.selectHistoryId = -1 document.removeEventListener("click", operationCli); } document.addEventListener("click",operationCli,); } const editName = (item)=>{ - homeMainData.historyData.selectHistoryIndex = -1 + homeMainData.historyData.selectHistoryId = -1 for (const key in homeMainData.openTypeList.history) { let list = ['EarlierTodaylist','Todaylist','WithinAWeeklist','Yesterdaylist'] if(list.indexOf(key) == -1)continue @@ -622,7 +622,7 @@ export default defineComponent({ const deleteItem = (item)=>{ Https.axiosPost(Https.httpUrls.projectDetail,{},{params:{projectId:item.id}}).then( (rv) => { - homeMainData.historyData.selectHistoryIndex = -1 + homeMainData.historyData.selectHistoryId = -1 settingGetHistory() if(homeMainData.openTypeChild == item.id){ router.push('/home') @@ -653,7 +653,7 @@ export default defineComponent({ } const bathGeneration = (item)=>{ homeMainData.openType = '' - homeMainData.historyData.selectHistoryIndex = -1 + homeMainData.historyData.selectHistoryId = -1 router.push(`/home/cloud?type=creation&id=${item.id}&name=${item.name}`) } return { diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 47681030..e54c31ee 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -423,13 +423,17 @@ (selectCode == 'Sketchboard')" class="fi fi-bs-magic-wand" style="background-color: #000; font-size: 2.3rem; flex: 1;margin: 0;"> {{ $t('LibraryPage.Generate') }}
-
+
-
{{ item.label }}
+
{{ item.label }}
{{ item.label }}
@@ -716,14 +720,14 @@ export default defineComponent({ title:'Generate using Wanxiang', label:'WX', value:'wx', + },{ + title:'', + label:'FLUX', + value:'flux', }, ], extractList:[ { - title:'This method may produce slight discrepancies between the extracted line art and the original image.', - label:'High', - value:'', - },{ title:'Note: The extracted line art might have minor variations from the original.', label:'FLUX', value:'flux', @@ -774,7 +778,7 @@ export default defineComponent({ level1Type:selectCode.value, level2Type:design, page:1, - ageGroup:selectCode.value == 'Sketchboard'?pageData.ageGroup:'', + ageGroup:selectCode.value == 'Models'?pageData.ageGroup:'', modelSex:sex.value?sex.value:'', pictureName:searchPictureName.value, size:pageSize.value, @@ -933,9 +937,13 @@ export default defineComponent({ } if(newVal.value == 'extract'){ this.speedData = this.extractList[0] + }else if(newVal.value == 'Logo' || newVal.value == 'Slogan'){ + this.speedData.value = '' + this.speedData.label = '' }else{ this.speedData = this.speedList[0] } + this.speedState = false } }, '$route.query':{