+
![]()
+
{{$t('newScaleImage.Original')}}
@@ -75,12 +77,25 @@ export default defineComponent({
type:Boolean,
default:true,
},
+ isGsap:{
+ type:Boolean,
+ default:true,
+ },
itemWidth:{
type:Number,
default:300,
- }
+ },
+ isDelete:{
+ type:Boolean,
+ default:false,
+ },
+ deleteList:{
+ type:Array,
+ default:()=>[],
+ },
},
- setup(){
+ emit:['deleteSinglePic','getImgScale'],
+ setup(props,{emit}){
let list = ref([])
let wait_list = ref([])
let width = ref(300)
@@ -91,6 +106,25 @@ export default defineComponent({
let loading = ref(false)
let computedHeight = 0
let imgDom = ref()
+ const selectImg = (item)=>{
+ if(!props.isDelete)return
+ let index = props.deleteList.indexOf(item.id)
+ if(index > -1){
+ props.deleteList.splice(index,1)
+ }else{
+ props.deleteList.push(item.id)
+ }
+ }
+ const deleteSinglePic = (data,index)=>{
+ emit('deleteSinglePic',{data,index})
+ }
+ const setItemDetail = (data)=>{
+ if(props.isDelete){
+ selectImg(data)
+ }else{
+ emit('getImgScale',data)
+ }
+ }
return{
list,
wait_list,
@@ -102,13 +136,17 @@ export default defineComponent({
loading,
computedHeight,
imgDom,
+ selectImg,
+ setItemDetail,
+ deleteSinglePic,
}
},
directives:{
fadeIn:{
mounted (el,binding) {
+ if(!binding.value.isGsap)return
let dom
- if(binding.value){
+ if(binding.value.isScroll){
dom = document.querySelector('.works_page .page_content')
}else{
dom = document.querySelector('.homeRecommend_content_body')
@@ -304,27 +342,45 @@ export default defineComponent({
border-radius: 2rem;
overflow: hidden;
padding-bottom: var(--paddingBottom);
+ &.active{
+ padding: 0;
+ }
&.falls_item:hover{
.falls_item_img{
img{
transform: scale(1.1);
}
+ > i{
+ display: flex;
+ }
}
}
.falls_item_img{
cursor: pointer;
width: 100%;
overflow: hidden;
+ border-radius: 2rem;
+ &.active{
+ border: 2px solid;
+ }
+ > i{
+ position: absolute;
+ top: 1rem;
+ right: 1rem;
+ display: none;
+ font-size: 2rem;
+ }
img{
width: 100%;
object-fit: cover;
height: 100%;
transition: all .3s;
+
}
.falls_item_user_Original{
font-weight: 600;
font-size: 12px;
- color: #39215b;
+ color: #000;
background: #c9a2ff;
padding: 0 5px;
border-radius: 4px;
diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue
index 5977d1b4..989150c1 100644
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -802,7 +802,7 @@ export default defineComponent({
align-items: flex-start;
.scaleImage_chunk_title_Original{
- color: #39215b;
+ color: #000;
background: #c9a2ff;
padding: 0 1rem;
border-radius: 4px;
@@ -812,7 +812,7 @@ export default defineComponent({
span{
&.active{
cursor: pointer;
- color: #39215b;
+ color: #000;
text-decoration: underline;
}
}
diff --git a/src/component/WorksPage/newScaleImageMobile.vue b/src/component/WorksPage/newScaleImageMobile.vue
index 7be7c020..945dd8a1 100644
--- a/src/component/WorksPage/newScaleImageMobile.vue
+++ b/src/component/WorksPage/newScaleImageMobile.vue
@@ -628,7 +628,7 @@ export default defineComponent({
}
.swiper-pagination{
.swiper-pagination-bullet-active{
- background: #39215b;
+ background: #000;
}
}
.generalModel_closeIcon{
@@ -737,7 +737,7 @@ export default defineComponent({
width: 100%;
align-items: flex-start;
.scaleImage_chunk_title_Original{
- color: #39215b;
+ color: #000;
background: #c9a2ff;
padding: 0 1rem;
border-radius: 4px;
@@ -747,7 +747,7 @@ export default defineComponent({
span{
&.active{
cursor: pointer;
- color: #39215b;
+ color: #000;
text-decoration: underline;
}
}
diff --git a/src/component/WorksPage/publish.vue b/src/component/WorksPage/publish.vue
index 4d5831ae..a1062f16 100644
--- a/src/component/WorksPage/publish.vue
+++ b/src/component/WorksPage/publish.vue
@@ -15,7 +15,7 @@
diff --git a/src/component/home/batchGeneration/createCloud.vue b/src/component/home/batchGeneration/createCloud.vue
index 90007ec3..791bbd8e 100644
--- a/src/component/home/batchGeneration/createCloud.vue
+++ b/src/component/home/batchGeneration/createCloud.vue
@@ -75,10 +75,7 @@
show-search
allowClear
:show-arrow="false"
- :default-active-first-option="false"
- :not-found-content="null"
- :filter-option="false"
- style="width: 16rem"
+ style="width: 200px"
:placeholder="$t('batchGeneration.PleaseSelect')"
:options="objectList"
@search="getHistoryProjectList"
@@ -227,7 +224,7 @@
:headers="{ Authorization: getCookie('token') }"
:before-upload="beforeUpload"
:data="{
- projectId:projectData
+ projectId:projectData?.value?projectData?.value:''
}"
v-model:file-list="fileList"
:multiple="true"
@@ -304,7 +301,10 @@ export default defineComponent({
numberOfImages: "",
credits: 0,
exhibitionImgList: [], //选择的图片
- projectData: null, //批量id
+ projectData: {
+ id:'',
+ name:'',
+ }, //批量id
objectList: [],
porjectName: "", //任务名字
//toProduct
@@ -312,6 +312,7 @@ export default defineComponent({
similarity: [20, 40],
brightenValue: 1, //亮度
relightDirection: "Right Light", //打光方向
+ sequence:'',
relightDirectionList: [
{
value: "Right Light",
@@ -337,10 +338,15 @@ export default defineComponent({
const getUploadElement = () => {
operations.loadingShow = true;
let value = {
- id: operationsData.projectData,
+ id: operationsData.projectData?.value,
moduleList: ["uploadElement"],
};
- operationsData.placeholder = "Batch_" + setPlaceholder();
+ let str = setPlaceholder()
+ if(!str){
+ str = props.cloudList.filter((item)=>item.value == operationsData.buildType)[0].label
+ str = str.replace(/\s+/g, '_')
+ }
+ operationsData.placeholder = "Batch_" + str + '_' + operationsData.sequence;
Https.axiosPost(Https.httpUrls.getModuleContent, value)
.then(async (rv) => {
operationsData.uploadElement = rv.uploadElement;
@@ -350,17 +356,18 @@ export default defineComponent({
operations.loadingShow = false;
});
};
- let init = (projectData, buildType) => {
+ let init = (projectData, buildType,sequence) => {
+ operationsData.sequence = sequence
operations.operationsModal = true;
clearData();
if (projectData?.id) {
operationsData.projectData = {
- label: projectData.name,
+ label: projectData.label,
value: projectData.id,
};
getUploadElement();
}
- if (buildType.value) operationsData.buildType = buildType;
+ if (buildType.value) operationsData.buildType = buildType.value;
};
const clearData = () => {
operationsData.porjectName = "";
@@ -370,17 +377,28 @@ export default defineComponent({
operationsData.fileList = [];
operationsData.uploadElement = [];
};
- const changeProject = () => {
+ const changeProject = (rv) => {
+ let porjectData = operationsData.objectList.find(
+ (item) => item.id === rv
+ );
+ operationsData.projectData = {
+ value: porjectData?.id,
+ label: porjectData?.name,
+ }
getUploadElement();
};
const changeBuildType = () => {
// operationsData.exhibitionImgList = []
- operationsData.projectData = null;
+ operationsData.projectData = {
+ label:'',
+ value:'',
+ };
props.cloudList.forEach((item) => {
if (item.value == operationsData.buildType) {
operationsData.credits = item.consumption;
}
});
+ getUploadElement();
getHistoryProjectList();
};
const getGenerateCloudImgList = (type) => {
@@ -399,7 +417,9 @@ export default defineComponent({
if (type == "POSE_TRANSFER") {
obj = {
poseId: 1,
+ elementId: item.id,
productImage: getMinioUrl(item.imgUrl),
+ elementType: item.type?item.type:"ProductElement",
};
} else {
obj = {
@@ -474,7 +494,8 @@ export default defineComponent({
return {
buildType: buildTypeCorresponding[operationsData.buildType],
nums: operationsData.numberOfImages,
- projectId: operationsData.projectData,
+ sequence:operationsData.sequence,
+ projectId: operationsData.projectData?.value?operationsData.projectData?.value:'',
name: operationsData.porjectName || operationsData.placeholder,
//productimg
toProductImage: {
@@ -483,7 +504,7 @@ export default defineComponent({
operationsData.buildType
), //选择的图片
// toProductImageVOList:getPorductImg(),//选择的图片
- projectId: operationsData.projectData,
+ projectId: operationsData.projectData?.value?operationsData.projectData?.value:'',
direction: operationsData.relightDirection, //打光方向
brightenValue: operationsData.brightenValue,
imageStrength: (100 - getImageStrength()) / 100,
@@ -498,8 +519,8 @@ export default defineComponent({
operationsData.buildType == "POSE_TRANSFER"
? getGenerateCloudImgList("POSE_TRANSFER")
: [],
- private: operationsData.projectData,
- ToProductImageDTO: operationsData.projectData,
+ private: operationsData.projectData?.value,
+ ToProductImageDTO: operationsData.projectData?.value,
};
};
let cancelDsign = () => {
@@ -523,13 +544,13 @@ export default defineComponent({
return message.warning("Please select or upload the picture first.");
// if(data.poseTransform.length == 0)return message.warning("You must first generate results in the 'To Product Image' module before you can use the 'Transfer Pose' cloud generation feature.")
}
- if (operationsData.buildType == "DESIGN" && !operationsData.projectData)
+ if (operationsData.buildType == "DESIGN" && !operationsData.projectData?.value)
return message.warning("Please select a project");
if (
!data.buildType ||
!data.nums ||
!data.name ||
- (operationsData.buildType == "DESIGN" && !operationsData.projectData)
+ (operationsData.buildType == "DESIGN" && !operationsData.projectData?.value)
)
return message.warning("Please check the input box marked with *");
operations.loadingShow = true;
@@ -539,7 +560,7 @@ export default defineComponent({
operations.loadingShow = false;
cancelDsign();
let porjectData = operationsData.objectList.find(
- (item) => item.id === operationsData.projectData
+ (item) => item.id === operationsData.projectData?.value
);
let project = {
value: porjectData?.id,
@@ -625,9 +646,10 @@ export default defineComponent({
}
};
const setPlaceholder = () => {
- if (!operationsData.projectData) return "";
+ if(operationsData.projectData?.label)return operationsData.projectData.label
+ if (!operationsData.projectData?.value) return "";
let index = operationsData.objectList.findIndex(
- (item) => item.id === operationsData.projectData
+ (item) => item.id === operationsData.projectData?.value
);
return operationsData.objectList[index].name;
};
diff --git a/src/component/home/batchGeneration/index.vue b/src/component/home/batchGeneration/index.vue
index c97bb15c..8102145d 100644
--- a/src/component/home/batchGeneration/index.vue
+++ b/src/component/home/batchGeneration/index.vue
@@ -55,14 +55,14 @@
-
+
{{header?.fun?header.fun(row[header.value]) : row[header.value]}}
-
+
{{$t('batchGeneration.Review')}}
@@ -177,6 +177,10 @@ export default defineComponent({
// sketchDesign:[]
},
cloudTiltleList:[
+ {
+ name:computed(()=>t('batchGeneration.sequence')),
+ value:'sequence',
+ },
{
name:computed(()=>t('batchGeneration.TaskName')),
value:'name',
@@ -205,6 +209,7 @@ export default defineComponent({
},
{
name:computed(()=>t('batchGeneration.StartTime')),
+ value:'startTime',
fun:(value:any)=>{
//没开始内容为 -
if(!value)return
@@ -243,8 +248,21 @@ export default defineComponent({
const dataDom = reactive({
createCloud,
})
+ const getNextSequence = ()=>{
+ return new Promise((resolve, reject) => {
+ data.loadingShow = true
+ Https.axiosGet(Https.httpUrls.getNextSequence).then((rv)=>{
+ data.loadingShow = false
+ data.isGetContentList = false
+ resolve(rv)
+
+ }).catch(()=>{
+ data.loadingShow = false
+ resolve('')
+ })
+ })
+ }
const createClound = ()=>{
- data.isGetContentList = false
let obj = {}
if(data.createData){
data.generateList.seriesDesign.forEach((item:any)=>{
@@ -253,8 +271,10 @@ export default defineComponent({
}
})
}
-
- dataDom.createCloud.init(data.createData,obj)
+ console.log(obj)
+ getNextSequence().then((rv)=>{
+ dataDom.createCloud.init(data.createData,obj,rv)
+ })
}
const createData = ()=>{
store.commit("createProbject");
@@ -274,6 +294,17 @@ export default defineComponent({
buildType:item.buildType,
}
createData()
+ if(item.buildType == 'design'){
+ router.push(`/home?history=${item.projectId}&source=batch`)
+ }else if(item.buildType == 'toProductImage'){
+ router.push(`/home/tools?tools=toProduct&id=${item.projectId}&source=batch`)
+ }else if(item.buildType == 'relight'){
+ router.push(`/home/tools?tools=${item.buildType}&id=${item.projectId}&source=batch`)
+ }else if(item.buildType == 'poseTransfer'){
+ router.push(`/home/tools?tools=${item.buildType}&id=${item.projectId}&source=batch`)
+ }
+ data.isGetContentList = false
+ return
Https.axiosPost(Https.httpUrls.getDesignCloudResult,value).then((rv)=>{
if(item.buildType == 'design'){
store.commit('addDesignCollectionList',rv.design)
@@ -294,19 +325,6 @@ export default defineComponent({
// store.commit('setCloudList',{str:'poseTransfer',list:rv.poseTransfer})
router.push(`/home/tools?tools=${item.buildType}&id=${item.projectId}&source=batch`)
}
- // if(rv.design && rv.design.length > 0){
- // store.commit('addDesignCollectionList',rv.design)
- // emit('retrieve','design')
- // }else if(rv.toProductImage && rv.toProductImage.length > 0){
- // store.commit('setCloudList',{str:'toProduct',list:rv.toProductImage})
- // emit('retrieve','toProduct')
- // }else if(rv.relight && rv.relight.length > 0){
- // store.commit('setCloudList',{str:'relight',list:rv.relight})
- // emit('retrieve','relight')
- // }else if(rv.poseTransfer && rv.poseTransfer.length > 0){
- // store.commit('setCloudList',{str:'poseTransfer',list:rv.poseTransfer})
- // emit('retrieve','poseTransfer')
- // }
data.isGetContentList = false
})
}
@@ -412,14 +430,22 @@ export default defineComponent({
onBeforeUnmount(()=>{
data.isGetContentList = false
})
- onMounted(()=>{
- data.isGetContentList = true
+ watch(()=>route.query.id,(newValue,oldValue)=>{
if(route.query?.id){
data.projectData = {
value:route.query?.id,
label:route.query?.name,
}
+ data.createData = {
+ label:route.query?.name,
+ id:route.query?.id,
+ process:route.query?.process
+ }
+ createClound()
}
+ },{immediate:true})
+ onMounted(()=>{
+ data.isGetContentList = true
getContentList()
// if(route.query?.type == 'creation')dataDom.createCloud.init(data.projectData)
})
@@ -510,7 +536,11 @@ export default defineComponent({
line-height: 4.6rem;
font-size: 2rem;
color: #666666;
- width: calc(100% / 4);
+ // width: calc(100% / 4);
+ width: 20rem;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
text-align: center;
}
}
diff --git a/src/component/home/chat/index.vue b/src/component/home/chat/index.vue
index f31a06cf..dbb50e55 100644
--- a/src/component/home/chat/index.vue
+++ b/src/component/home/chat/index.vue
@@ -3,7 +3,7 @@
-
+
@@ -17,7 +17,7 @@
-
已深度思考
+
{{ $t('chat.DeepThinking') }}
{{item.content.think}}
@@ -48,7 +48,7 @@
-
+
@@ -60,7 +60,7 @@
-
Deep Thinking
+
{{ $t('chat.DeepThinking') }}
{{ chatContent?.length }}/10000
@@ -71,7 +71,7 @@
-
@@ -97,7 +97,7 @@ export default defineComponent({
const route = useRoute()
const data = reactive({
chatContent:'',
- openChat:false,
+ openChat:computed(()=>store.state.Workspace.openChat),
chatList:[
] as any,
isChattingRecords:false,
@@ -114,7 +114,7 @@ export default defineComponent({
watch(()=>data.selectObject.id,(newValue,oldValue)=>{
if(newValue && (data.selectObject.httpType == 'SERIES_DESIGN' || data.selectObject.httpType == 'SINGLE_DESIGN')){
data.chatList = []
- if(route.query?.chatMode == 'true')data.openChat = true
+ if(route.query?.chatMode == 'true')store.commit('setOpenChatStatus',true)
if(route.query?.create)return
nextTick(()=>{
@@ -329,6 +329,15 @@ export default defineComponent({
})
}
+ const leftOpenChat = (str:string)=>{
+ if(str == 'left'){
+ data.isChattingRecords=true
+ store.commit('setOpenChatStatus',true)
+ }else{
+ data.isChattingRecords=false
+ store.commit('setOpenChatStatus',false)
+ }
+ }
return{
...toRefs(dataDom),
...toRefs(data),
@@ -338,6 +347,7 @@ export default defineComponent({
handleFileUpload,
deleteFile,
imgError,
+ leftOpenChat,
}
},
provide() {
diff --git a/src/component/home/design/collection.vue b/src/component/home/design/collection.vue
index da4f1b8a..db0eac7e 100644
--- a/src/component/home/design/collection.vue
+++ b/src/component/home/design/collection.vue
@@ -135,7 +135,7 @@ export default defineComponent({
value[str] = data[str]
if(!value[str] || value[str]?.length == 0)return
Https.axiosPost(Https.httpUrls.saveModuleContent, value).then((rv)=>{
- if(rv.boundingBox)store.commit('setShowSketchboard',rv.boundingBox)
+ if(rv?.boundingBox)store.commit('setShowSketchboard',rv.boundingBox)
})
})
}
@@ -224,10 +224,15 @@ export default defineComponent({
-
\ No newline at end of file
diff --git a/src/component/home/tools/deReconstruction/index.vue b/src/component/home/tools/deReconstruction/index.vue
index c793fcca..c84e1041 100644
--- a/src/component/home/tools/deReconstruction/index.vue
+++ b/src/component/home/tools/deReconstruction/index.vue
@@ -17,11 +17,11 @@
-
+
@@ -48,7 +48,7 @@
![]()
-
+
{{ $t('DeReconstruction.Download') }}
@@ -61,6 +61,7 @@ import { defineComponent,computed,ref,provide,nextTick,createVNode,toRefs, react
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { Https } from "@/tool/https";
import { useStore } from "vuex";
+import { downloadIamge,getMinioUrl } from "@/tool/util";
import { useI18n } from 'vue-i18n'
import selectList from '@/component/DetailCopy/detailLeft/module/selectList.vue'
import sketchCategory from "@/component/HomePage/sketchCategory.vue";
@@ -76,37 +77,49 @@ export default defineComponent({
emits:[],
setup(props,{emit}) {
const store = useStore();
+ const {t} = useI18n()
const data = reactive({
- sketchCatecoryList:computed(()=>{
- return store.state.Workspace.probjects.positionList
- }),
+ sketchCatecoryList:[],
segmentationType:'product',
segmentationTypeList:[{value:'product',name:'product'},{value:'sketch',name:'sketch'}],
generateImg:computed(()=>store.state.HomeStoreModule.deReconstruction) as any,
+ selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
+ sexList:[
+
+ ],
+ // sexList:computed(()=>store.state.UserHabit.sex.value),
+ femalePosition:computed(()=>store.state.UserHabit.FemalePosition),//男性衣服位置
+ malePosition:computed(()=>store.state.UserHabit.MalePosition),//女性衣服位置
+ sex:'Male',
+ sexId:1,
ceditorConfig:{
width: 800,
height: 600,
backgroundColor: "#f8f8f8",
},
defaultModel:'',
+ selectSexAge:{},
})
+ const createProbject:any = inject('createProbject',()=>{}) as any
const setIsShowMark:any = inject('setIsShowMark')
const dataDom = reactive({
canvasBox:null as any,
})
- const selectImgItem = (data:any)=>{
- console.log(data)
+ const selectImgItem = async (value:any)=>{
// getSegmentation(data)
- getSegmentation(data)
+ if(!data.selectObject?.id)await createProbject()
+ getSegmentation(value)
}
const canvasAddImg = (list:any)=>{
+ console.log(list)
list.segmentedImages.forEach((url:any) => {
list.imgUrl = url
dataDom.canvasBox.addImage({url})
});
}
const getSegmentation = (value:any)=>{
+ console.log(value)
let segmentationType = ''
if(value.designType == "Library"){
segmentationType = 'sketch'
@@ -191,7 +204,13 @@ export default defineComponent({
}
const setCanvasJSON = (canvasJSON)=>{
if(!canvasJSON)return
- let blob = new Blob([canvasJSON], { type: "application/json" });
+ let canvasData = JSON.parse(canvasJSON)
+ console.log(canvasData)
+ canvasData.canvas.objects.forEach((objectsItem:any) => {
+ if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
+
+ });
+ let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
let formData = new FormData();
formData.append("file", blob, "data.json");
formData.append("module", "deReconstruction");
@@ -201,7 +220,6 @@ export default defineComponent({
};
Https.axiosPost(Https.httpUrls.exportSave, formData, config).then(
(rv) => {
- console.log(rv)
}
);
}
@@ -209,9 +227,39 @@ export default defineComponent({
dataDom.canvasBox.setCanvas(str)
}
const getCanvasData = ()=>{
- let data = dataDom.canvasBox.getCanvasData()
- return data
+ downloadIamge(data.generateImg[0].url,'downloadIamge')
}
+ const sexChange = ()=>{
+ data.selectSexAge = data.sexList.filter((item)=>item.id == data.sexId)[0]
+ store.commit('setProbject',{sex:data.selectSexAge.value})
+ if(data.selectSexAge.value == 'Male'){
+ data.sketchCatecoryList = data.malePosition
+ }else{
+ data.sketchCatecoryList = data.femalePosition
+ }
+ if(dataDom.canvasBox?.canvasLoad)dataDom.canvasBox.changeFixedImage()
+ }
+ onMounted(()=>{
+ let sexList = store.state.UserHabit.sex.value
+ let id = 0
+ data.sexList = []
+ sexList.forEach((item:any,index) => {
+ let obj = {
+ age:'Adult',
+ name:item.name,
+ value:item.value,
+ id:index + 1,
+ } as any
+ id = index+1;
+ data.sexList.push(obj)
+ });
+ data.sexList.push({age:'Child',name:t('DeReconstruction.Girls'),value:'Female',id:id+=1})
+ data.sexList.push({age:'Child',name:t('DeReconstruction.Boys'),value:'Male',id:id+=1})
+ data.sex = data.sexList[0].value
+ data.selectSexAge = data.sexList[0]
+ data.sexId = 1
+ sexChange()
+ })
return{
...toRefs(dataDom),
...toRefs(data),
@@ -223,6 +271,7 @@ export default defineComponent({
getCanvasData,
setCanvas,
setCanvasJSON,
+ sexChange,
}
},
provide() {
diff --git a/src/component/home/tools/patternMaking3D/index.vue b/src/component/home/tools/patternMaking3D/index.vue
index d4ee5a44..2f6c1c6e 100644
--- a/src/component/home/tools/patternMaking3D/index.vue
+++ b/src/component/home/tools/patternMaking3D/index.vue
@@ -83,7 +83,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/component/modules/selectMenu.vue b/src/component/modules/selectMenu.vue
index 5d6e23c7..166688a2 100644
--- a/src/component/modules/selectMenu.vue
+++ b/src/component/modules/selectMenu.vue
@@ -91,7 +91,7 @@ defineExpose({})
font-size: 1.6rem;
box-sizing: content-box;
justify-content: center;
- padding: 0 2rem;
+ padding: 0 1rem;
line-height: 5.4rem;
height: 5.4rem;
border-radius: 4rem;
diff --git a/src/component/toolsPage/index.vue b/src/component/toolsPage/index.vue
index 6849f226..f155235c 100644
--- a/src/component/toolsPage/index.vue
+++ b/src/component/toolsPage/index.vue
@@ -16,7 +16,7 @@
-
+
@@ -25,13 +25,14 @@ import { defineComponent,computed,inject,provide,nextTick,watch,toRefs, reactive
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { Https } from "@/tool/https";
import { useStore } from "vuex";
+import { downloadIamge,getMinioUrl } from "@/tool/util";
import { useI18n } from 'vue-i18n'
import { useRoute,useRouter } from 'vue-router';
import toProduct from '@/component/home/tools/toProduct/index.vue';
import poseTransfer from '@/component/home/tools/poseTransfer/index.vue';
import deReconstruction from '@/component/home/tools/deReconstruction/index.vue';
import patternMaking3D from '@/component/home/tools/patternMaking3D/index.vue';
-import canvasUpload from "@/component/Canvas/index.vue";
+import canvasUpload from "@/component/modules/generalMiniCanvas.vue";
import {openTypeList} from "@/tool/listData.js";
export default defineComponent({
@@ -147,11 +148,35 @@ export default defineComponent({
}
provide('setIsShowMark',setIsShowMark)
provide('createProbject',createProbject)
-
+ let time = null as any
+
+ const canvasChangeGetJSON = async ({canvasJSON,submitDate})=>{
+ clearTimeout(time)
+ if(!store.state.Workspace.probjects.id)await createProbject()
+ time = setTimeout(()=>{
+ let canvasData = JSON.parse(canvasJSON)
+ canvasData.canvas.objects.forEach((objectsItem:any) => {
+ if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
+ });
+ let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
+ let formData = new FormData();
+ formData.append("file", blob, "data.json");
+ formData.append("module", "canvas");
+ formData.append("projectId", store.state.Workspace.probjects.id)
+ let config = {
+ headers: { "Content-Type": "multipart/form-data", Accept: "*/*" },
+ };
+ Https.axiosPost(Https.httpUrls.exportSave, formData, config).then(
+ (rv) => {
+ }
+ );
+ },submitDate)
+ }
return{
...toRefs(dataDom),
...toRefs(data),
createProbject,
+ canvasChangeGetJSON,
}
},
provide() {
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index c6a44344..a24aa50b 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -6,6 +6,7 @@ export default {
HISTORY:'历史',
WORKS:'作品广场',
EVENTS:'活动',
+ Events:'活动',
AdvancedTools:'高级工具',
personal:'个人中心',
bindEmail:'绑定邮箱',
@@ -23,35 +24,40 @@ export default {
SubscribeNow:'立即订阅',
TaskList:'任务列表',
ViewOrders:'查询订单',
- toolsToProduct:'产品图',
- toolsRelight:'打光',
- toolsToTransferPose:'转换姿势',
- toolsDeReconstruction:'拼贴',
- toolsPatternMaking:'3D模型',
+ toolsToProduct:'线稿转产品图',
+ toolsRelight:'产品图编辑',
+ toolsToTransferPose:'产品图视频',
+ toolsDeReconstruction:'拼贴重构廓形',
+ toolsPatternMaking:'制版',
toolsCanvas:'画布',
NewProject:'新建项目',
Rename:'重命名',
Setting:'设置',
BatchGeneration:'批量生成',
Delete:'删除',
+ onLiked:'取消喜欢',
Language:'语言',
Administrator:'管理员',
Affiliate:'组织',
- Tools:'工具',
+ Tools:'高级工具',
Type:'类型',
- Unfold:'展开',
+ Filter:'筛选',
+ Unfold:'布局',
+ expand:'展开',
+ collapse:'折叠',
Size:'大小',
Small:'小',
- Medium:'中等',
+ Medium:'中',
Large:'大',
All:'全部',
- Design:'设计图',
+ Design:'时装画',
Product:'产品图',
- PoseTransfer:'动图',
+ PoseTransfer:'时装视频',
Today:'今天',
Yesterday:'昨天',
WithinAWeek:'一周内',
Earlier:'更早',
+ openUpgrade:'升级至专业版',
pastDue:'只有成为正式用户后，您才能使用这些功能~',
jsContent1:'邮箱格式不正确',
jsContent2:'绑定邮箱成功',
@@ -140,9 +146,9 @@ export default {
Payment:'付款',
PurchasePoints:'购买',
paymentmethod:'请选择付款方式',
- policy:'继续注册账号即表示您同意我们的使用条款与服务协议。',
- policy1:'我承认我已阅读并同意',
- policy2:'条款和条件',
+ policy:'继续注册账号即表示您同意我们的使用',
+ policy1:'条款',
+ policy2:'服务协议',
policy3:'(包括服务范围)及',
policy4:'订购协议',
completed:'是否已完成支付？',
@@ -198,7 +204,7 @@ export default {
Reset:'重置',
Design:'设计',
Redesign:'重新设计',
- GeneratedDesign:'设计草稿',
+ GeneratedDesign:'生成线稿',
elementTitle:'设计素材',
recycleBin:'回收站',
SelectedDesign:'设计集',
@@ -220,14 +226,19 @@ export default {
jsContent6:" 就可以开始订阅。感谢您试用我们的服务！",
jsContent9:"您确定要清除当前系列并重新开始吗?",
jsContent10:"二次创作的作品不允许使用'设计'，但是您可以使用'重新设计'",
+ jsContent11:"取消喜欢后相关联的元素会被删除，确认要删除吗",
},
ProductImg:{
productInput:'输入关键词（例如风格、材质）',
relightInput:'输入关键词（例如场景、地点）',
Finalize:'完成',
- SelectCollection:'上传要转换的图片',
- SelectedDesign:'产品图集',
- productImageDrafts:'产品图草稿',
+ SelectCollection:'线稿图',
+ SelectCollectionRelight:'产品图',
+ DesignSelectCollection:'选择一副插图',
+ SelectedDesign:'已选',
+ DesignSelectedDesign:'已选',
+ productImageDrafts:'生成结果',
+ DesignproductImageDrafts:'生成结果',
Upload:'上传',
MagicTools:'转换产品图工具',
relightingTool:'打光工具',
@@ -251,10 +262,13 @@ export default {
jsContent3:'您有一张图生成失败，请重试。',
},
poseTransfer:{
- SelectDesign:'选择“设计”以应用',
+ SelectDesign:'产品图',
Selectpose:'选择动作',
- InputVideo:'输入的视频',
+ LikeVideo:'已选',
+ InputVideo:'生成结果',
GeneratedVideo:'生成的视频',
+ hint:'将草图改为逼真的照片，这条裙子的材质是牛仔布。',
+ jsContent1:'生成视频预计需要三分钟，请问是否继续',
},
LibraryPage:{
library:'收藏',
@@ -274,7 +288,7 @@ export default {
NoLabel:'空标签',
unionSet:'并集',
all:'全选',
- generated:'所有默认材质都是AiDA自己生成',
+ generated:'所有默认材质都是AiDA生成',
ImageOnly:'图片',
TextOnly:'文字',
TextImage:'图片-文字',
@@ -407,7 +421,7 @@ export default {
Generate:'生成',
Close:'取消',
currently:'您排在队列中的第{generateLineUp}位',
- PIN:'PIN',
+ PIN:'必须',
Maximum:'最多可上传16张图片，每张图片最大5MB',
Thumbnail:'选择的印花',
inputContent1:'生成图片的标题',
@@ -637,8 +651,9 @@ export default {
jsContent1:'请输入标签名称',
},
works:{
+ WORKS:'作品广场',
all:'全部',
- FavoriteWorks:'点赞的作品',
+ FavoriteWorks:'我的喜欢',
MyWorks:'我的作品',
RCAworkshop_2024:'AiDA工作坊 2024',
NewYear_2025:'新年 2025',
@@ -883,23 +898,28 @@ export default {
},
newProjectg:{
helpYou:'今天我能为您做些什么呢？',
- Chat:'对话',
- Setting:'设置',
- SeriesDesign:'系列设计',
+ Chat:'代理模式',
+ Setting:'手动模式',
+ SeriesDesign:'整身设计',
SeriesDesignInfo:'系列设计专注于多品类服装的协调设计，是打造统一时尚系列的理想之选。使用“设计资源”面板中的“情绪板”、“印刷板”、“配色板”、“草图板”和“人体模型”工具，收集和整理您的灵感，打造和谐的服装组合。在“草稿”和“系列”面板中，使用“产品图像”、“重新照明”和“转移姿势”等强大工具，完善您的作品。准备就绪后，将所有内容导出到“画布”以展示完整的系列设计。',
SingleDesign:'单品设计',
DeepThinking:'深度思考',
SingleDesignInfo:'单一设计专注于单一服装类别的独立设计，例如 T 恤、连衣裙或夹克，无需考虑与其他单品的搭配。使用“设计资源”面板中的“情绪板”、“打印板”、“配色板”和“草图板”来收集灵感，并专注于打造一件独一无二的作品。完成后，在“草稿”和“收藏”面板中使用“产品图像”、“重新照明”和“传输姿势”等工具优化您的设计，然后导出到“画布”以展示您的个人作品。',
- hintList1:'设计一套田园风衣服 ',
- hintList2:'设计一套夏日风衣服 ',
- hintList3:'设计一套未来风格的衣服 ',
+ hintListSERIES1:'设计一套以夏日海滩为灵感的连衣裙。',
+ hintListSERIES2:'设计一套暗色系，哥特风格的上衣。',
+ hintListSERIES3:'设计一套男童的无帽夹克设计，要求以森林探险为主题。',
+ hintListSIGNLE1:'设计一套以夏日海滩为灵感的连衣裙。',
+ hintListSIGNLE2:'设设计一套女童连衣裙，田园风格。',
+ hintListSIGNLE3:'设计一套男性短袖衬衫，阳光，活力的感觉。',
jsContent1:'文件大小不能超过 5MB。',
jsContent2:'您最多只能上传五张图片。',
jsContent3:'您最多只能上传一个文件。',
},
DeReconstruction:{
- GenerateLineDrawing:'生成线条图',
+ GenerateLineDrawing:'生成线稿图',
Download:'下载',
+ Girls:"女童",
+ Boys:"男童",
},
patternMaking3D:{
Clothing:'服装',
@@ -916,6 +936,7 @@ export default {
Rename:'重命名',
Review:'查看',
Delete:'删除',
+ sequence:'序号',
TaskName:'任务名字',
TaskType:'任务类型',
QuantityGenerated:'生成数量',
@@ -932,8 +953,9 @@ export default {
enterNumber:'请输入数量',
},
brandDNA:{
- Addbrand:'添加品牌',
+ Addbrand:'创建新品牌',
BrandName:'品牌名字',
+ BrandTextarea:'从描述中创建品牌',
BrandSlogan:'品牌标语',
BrandLogo:'品牌logo',
Generate:'生成',
@@ -942,4 +964,17 @@ export default {
Delete:'删除',
textarea:'请阐述您对这个品牌的看法，我们将帮助您设计出名称、标志以及宣传语。',
},
+ chat:{
+ DeepThinking:'深度思考',
+ message:'输入',
+ },
+ Model:{
+ Style:'风格',
+ CurrentModel:'当前模特',
+ all:'全部',
+ },
+ libraryList:{
+ System:'系统',
+ Library:'库',
+ },
}
diff --git a/src/lang/en.ts b/src/lang/en.ts
index ef592273..41e01a5f 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -6,6 +6,7 @@ export default {
HISTORY:'HISTORY',
WORKS:'GALLERY',
EVENTS:'EVENTS',
+ Events:'Events',
AdvancedTools:'Advanced tools',
personal:'Personal Center',
bindEmail:'bind email',
@@ -23,10 +24,10 @@ export default {
SubscribeNow:'Subscribe now',
TaskList:'Task List',
ViewOrders:'View Orders',
- toolsToProduct:'To Product Image',
- toolsRelight:'Relight',
- toolsToTransferPose:'Transfer Pose',
- toolsDeReconstruction:'De/Reconstruction',
+ toolsToProduct:'Line Drawing to Product',
+ toolsRelight:'Product Image Editing',
+ toolsToTransferPose:'Animate Product Image',
+ toolsDeReconstruction:'Create Sketches',
toolsPatternMaking:'3D Pattern Making',
toolsCanvas:'Canvas',
NewProject:'New Project',
@@ -34,24 +35,29 @@ export default {
Setting:'Setting',
BatchGeneration:'Batch Generation',
Delete:'Delete',
+ onLiked:'Dislike',
Language:'Language',
Administrator:'Administrator',
Affiliate:'Affiliate',
- Tools:'Tools',
+ Tools:'Advanced Tools',
Type:'Type',
- Unfold:'Unfold',
+ Filter:'Filter',
+ Unfold:'Layout',
+ expand:'Expand',
+ collapse:'Collapse',
Size:'Size',
Small:'Small',
Large:'Large',
Medium:'Medium',
All:'All',
- Design:'Design',
+ Design:'Line Drawing',
Product:'Product',
- PoseTransfer:'Pose Transfer',
+ PoseTransfer:'Video',
Today:'Today',
Yesterday:'Yesterday',
WithinAWeek:'Within a week',
Earlier:'Earlier',
+ openUpgrade:'Upgrade to Pro',
pastDue:'You can use these features only after becoming a regular user~',
jsContent1:'The email format is incorrect',
jsContent2:'Succeeded in binding the mailbox.',
@@ -140,9 +146,9 @@ export default {
Payment:'Payment',
PurchasePoints:'Purchase points',
paymentmethod:'select a payment method',
- policy:'By continuing an account, you agree to our Terms & Conditions',
- policy1:'I acknowledge that I have read, understand, and agree with the ',
- policy2:'Terms and Conditions',
+ policy:'By continuing an account, you agree to our',
+ policy1:'Terms',
+ policy2:'Conditions',
policy3:' (including the Scope of service) and the ',
policy4:'Subscription Agreement',
completed:'Is payment completed',
@@ -198,7 +204,7 @@ export default {
Reset:'Reset',
Design:'Design',
Redesign:'Redesign',
- GeneratedDesign:'Design Drafts',
+ GeneratedDesign:'Generated Line Drawing',
elementTitle:'Design Assets',
recycleBin:'Recycle Bin',
SelectedDesign:'Design Collection',
@@ -220,21 +226,26 @@ export default {
jsContent6:" to get started. Thank you for trying our services!",
jsContent9:"Are you sure to erase current collection and start over?",
jsContent10:"Re-created works are not allowed to use 'design', but you can use 'redesign'",
+ jsContent11:"By unliking this, all connected posts will be deleted. Are you sure you want to continue?",
},
ProductImg:{
- productInput:'Enter keywords (e.g. Style, Material)',
+ productInput:'Prompt to describe details',
relightInput:'Enter keywords (e.g. Scene, Location)',
Finalize:'Finalize',
- SelectCollection:'Upload or Select an Image',
- SelectedDesign:'Image Library',
- productImageDrafts:'Draft Images',
+ SelectCollection:'Line Drawings',
+ SelectCollectionRelight:'Product Image',
+ DesignSelectCollection:'Select an illustration',
+ SelectedDesign:'Selected',
+ DesignSelectedDesign:'Selected',
+ productImageDrafts:'Generated',
+ DesignproductImageDrafts:'Generated',
Upload:'Upload',
Similarity:'Similarity',
SelectionFunction:'Choose Editing Mode',
Highlight:'Adjust Exposure',
RelightDirection:'Set Light Direction',
MagicTools:'To Product lmage Tool',
- relightingTool:'Relighting Tool',
+ relightingTool:'Edit Product Image',
GenerateProduct:'Generate Product',
SelectedProduct:'Selected Product',
Export:'Export',
@@ -251,10 +262,13 @@ export default {
jsContent3:'One of your images failed to generate. Please try again.',
},
poseTransfer:{
- SelectDesign:'Select Design to Apply',
+ SelectDesign:'Product image',
Selectpose:'Select pose',
- InputVideo:'Input Video',
+ LikeVideo:'Selected',
+ InputVideo:'Generated',
GeneratedVideo:'Generated Video',
+ hint:'change the sketch to realistic photo, the material of the skirt is denim',
+ jsContent1:'Video generation will take approximately 3 minutes. Continue?',
},
LibraryPage:{
library:'Library',
@@ -637,16 +651,17 @@ export default {
jsContent1:'Please enter a tag name',
},
works:{
+ WORKS:'Gallery',
all:'All',
- FavoriteWorks:'Like Works',
+ FavoriteWorks:'My Likes',
MyWorks:'My Works',
RCAworkshop_2024:'AiDA Workshop 2024',
NewYear_2025:'NewYear 2025',
},
Publish:{
- Publish:'Publish to gallery',
+ Publish:'Share',
CoverPicture:'Cover Picture',
- CollectionTitle:'Collection Title',
+ CollectionTitle:'Share to gallery Title',
topic:'Topic',
Description:'Description',
Permissions:'Permissions',
@@ -883,16 +898,19 @@ export default {
},
newProjectg:{
helpYou:'How can I help you today?',
- Chat:'Chat',
- Setting:'Setting',
- SeriesDesign:'Series Design',
+ Chat:'Agent Mode',
+ Setting:'Manual Mode',
+ SeriesDesign:'Overall illustrantion design',
SeriesDesignInfo:'Series Design focuses on the coordinated design of multi-category clothing, ideal for creating a unified fashion collection. Gather and arrange your inspiration using the Moodboard, Printboard, Colorboard, Sketchboard, and Mannequin tools in the Design Assets panel to build harmonious outfit combinations. Refine your creations in the Draft and Collection panels using powerful tools like To Product Image, Relight, and Transfer Pose. When you’re ready, export everything to the Canvas to display your complete series design.',
- SingleDesign:'Single Design',
+ SingleDesign:'Single item design',
DeepThinking:'Deep Thinking',
SingleDesignInfo:'Single Design focuses on creating an individual clothing item, such as a T-shirt, dress, or jacket, without coordinating it with other pieces. Use the Moodboard, Printboard, Colorboard, and Sketchboard sections in the Design Assets panel to gather inspiration and develop a unique design. Once finished, refine your work in the Draft and Collection panels using tools like To Product Image, Relight, and Transfer Pose, then export to the Canvas to showcase your standalone creation. ',
- hintList1:'Design a set of countryside-inspired clothes',
- hintList2:'Design a summer-inspired outfit set.',
- hintList3:'Design a set of futuristic-style clothing.',
+ hintListSERIES1:'Design a collection of futuristic clothes, deep purple color scheme.',
+ hintListSERIES2:'Design a set of bright-colored, Bohemian-style dresses.',
+ hintListSERIES3:'Design a set of hip-hop street style denim jackets for boys.',
+ hintListSIGNLE1:'A silver-gray, steampunk-style windbreaker.',
+ hintListSIGNLE2:'Design a set of skirts in bright colors and ethnic styles.',
+ hintListSIGNLE3:'Design a set of bright-colored, Bohemian-style dresses.',
jsContent1:'The file size cannot exceed 5MB.',
jsContent2:'You can only upload five pictures.',
jsContent3:'You can only upload one file.',
@@ -900,6 +918,8 @@ export default {
DeReconstruction:{
GenerateLineDrawing:'Generate Line Drawing',
Download:'Download',
+ Girls:"Girls' Fashion",
+ Boys:"Boys' Fashion",
},
patternMaking3D:{
Clothing:'Clothing',
@@ -916,13 +936,14 @@ export default {
Rename:'Rename',
Review:'Review',
Delete:'Delete',
+ sequence:'Sequence',
TaskName:'Task Name',
TaskType:'Task Type',
- QuantityGenerated:'Generation Quality',
+ QuantityGenerated:'Quantity',
Quantity:'Quantity',
- CreationTime:'Date Created',
- StartTime:'Start time',
- UpdateTime:'Updated At',
+ CreationTime:'Created Time',
+ StartTime:'Start Time',
+ UpdateTime:'Update Time',
Status:'Status',
Keyword:'Keyword',
CostCredit:'Cost credit',
@@ -932,8 +953,9 @@ export default {
enterNumber:'Please enter number',
},
brandDNA:{
- Addbrand:'Add brand',
+ Addbrand:'Create new brand',
BrandName:'Brand Name',
+ BrandTextarea:'Generating brand from description',
BrandSlogan:'Brand Slogan',
BrandLogo:'Brand Logo',
Generate:'Generate',
@@ -942,4 +964,17 @@ export default {
Delete:'Delete',
textarea:'Please enter your thoughts about this brand, and we will help you generate the name, logo, and slogan.',
},
+ chat:{
+ DeepThinking:'Deep Thinking',
+ message:'Write your message',
+ },
+ Model:{
+ Style:'Style',
+ CurrentModel:'Current Model',
+ all:'All',
+ },
+ libraryList:{
+ System:'System',
+ Library:'Library',
+ },
}
diff --git a/src/store/Detail/designDetailCopy.ts b/src/store/Detail/designDetailCopy.ts
index 8d1b3bcd..5a1594d2 100644
--- a/src/store/Detail/designDetailCopy.ts
+++ b/src/store/Detail/designDetailCopy.ts
@@ -52,7 +52,7 @@ const DesignDetailCopy : Module
= {
v.layersObject[i].designOpenrtionBtn = false
if(v.layersObject[i].imageCategory.indexOf("back") == -1){
front[index] = v.layersObject[i]
- front[index].style.zIndex = v.priority
+ // front[index].style.zIndex = v.priority
front[index].id = v.id
front[index].undividedLayer = v.undividedLayer
}else{
@@ -206,6 +206,10 @@ const DesignDetailCopy : Module = {
}
let el:any = document.querySelector('.molepositon .perview_img')
await new Promise((resolve, reject) => {
+ if(!state.frontBack?.body?.path){
+ state.frontBack.front[0].undividedLayer = value.rv.clothes[0].undividedLayer
+ resolve('')
+ }
const img = new Image();
img.src = state.frontBack.body.path;
img.onload = () => {
diff --git a/src/store/homeStore/homeStore.ts b/src/store/homeStore/homeStore.ts
index 1ba15f08..60a85efc 100644
--- a/src/store/homeStore/homeStore.ts
+++ b/src/store/homeStore/homeStore.ts
@@ -32,8 +32,14 @@ const HomeStoreModule : Module = {
templateImgUrl:'',
designId:'',
showSketchList:[],
- toProductImageList:[],
- relightList:[],
+ toProductImageList:{
+ list:[],
+ likedList:[],
+ },
+ relightList:{
+ list:[],
+ likedList:[],
+ },
uploadElement:[],
poseTransfer:{
list:[],
@@ -46,6 +52,7 @@ const HomeStoreModule : Module = {
categoryValue:'23',
categoryShow:false
}],
+ deReconstructionUploadImages:[],
patternMaking3D:{
collectionElementId:null,
threeDSimpleId:null,
@@ -73,9 +80,18 @@ const HomeStoreModule : Module = {
},
setRelightList(state,data){
if(data.str == 'add'){
- state.relightList.unshift(...data.list)
+ if(data.list){
+ state.relightList.list.unshift(...data.list)
+ }
+ if(data.likedList){
+ state.relightList.likedList.unshift(...data.likedList)
+ }
}else{
- state.relightList.splice(data.index,1)
+ if(data.list){
+ state.relightList.list.splice(data.index,1)
+ }else if(data.likedList){
+ state.relightList.likedList.splice(data.index,1)
+ }
}
},
setUploadElement(state,data){
@@ -107,6 +123,12 @@ const HomeStoreModule : Module = {
}
}
},
+ toolsClear(state){
+ state.relightList.likedList = []
+ state.uploadElement = []
+ state.toProductImageList.likedList = []
+ state.poseTransfer.likedList = []
+ },
setDeReconstruction(state,data){
if(data.str == 'add'){
state.deReconstruction = []
@@ -117,6 +139,13 @@ const HomeStoreModule : Module = {
}else{
state.deReconstruction.splice(data.index,1)
}
+ },
+ setDeReconstructionUploadImages(state,data){
+ if(data.str == 'add'){
+ state.deReconstructionUploadImages.unshift(...data.list)
+ }else{
+ state.deReconstructionUploadImages.splice(data.index,1)
+ }
},
setPatternMaking3D(state,data){
for (const key in data) {
@@ -134,9 +163,18 @@ const HomeStoreModule : Module = {
},
setToProductImage(state,data){
if(data.str == 'add'){
- state.toProductImageList.unshift(...data.list)
+ if(data.list){
+ state.toProductImageList.list.unshift(...data.list)
+ }
+ if(data.likedList){
+ state.toProductImageList.likedList.unshift(...data.likedList)
+ }
}else{
- state.toProductImageList.splice(data.index,1)
+ if(data.list){
+ state.toProductImageList.list.splice(data.index,1)
+ }else if(data.likedList){
+ state.toProductImageList.likedList.splice(data.index,1)
+ }
}
},
setDeleteDesignCollectionList(state,data){
@@ -188,14 +226,21 @@ const HomeStoreModule : Module = {
state.likeDesignCollectionList = []
state.designCollectionId = ''
state.deleteDesignCollectionList = []
- state.relightList = []
+ state.relightList = {
+ list:[],
+ likedList:[],
+ }
state.uploadElement = []
- state.toProductImageList = []
+ state.toProductImageList = {
+ list:[],
+ likedList:[],
+ }
state.poseTransfer = {
list:[],
likedList:[],
}
state.deReconstruction = null
+ state.deReconstructionUploadImages = []
state.patternMaking3D = {
collectionElementId:null,
threeDSimpleId:null,
diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts
index aa3946d9..40b98d9d 100644
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -3,6 +3,8 @@ import {RootState} from '../index'
import { Https } from "@/tool/https";
import { setLang } from "@/tool/guide";
import { setCookie } from "@/tool/cookie";
+import { useI18n } from "vue-i18n";
+
import store from '../index'
interface UserHabit{
clothingType:any,
@@ -266,7 +268,7 @@ const userHabit : Module = {
if(data.systemUser != 0)state.userDetail.systemList.push(1)
if(data.affiliate)state.userDetail.systemList.push(2)
- let adminIdList = [88,6,46,31,73,83,87,4,11482,11630,12201,12592,23534]
+ let adminIdList = [88,6,46,31,73,83,87,4,11482,11630,12201,12592,23534,23705]
// if(data.email == '' || data.email)state.userDetail.systemList.push(3)
if(adminIdList.indexOf(data.userId) > -1 || data.systemUser == 6 || data.systemUser == 7){
state.userDetail.systemList.push(3)
@@ -389,7 +391,8 @@ const userHabit : Module = {
item.value = item.name
item.name = name
});
- rv.unshift({name:'All',value:'',id:''})
+ const {t} = useI18n()
+ rv.unshift({name:t('Model.all'),value:'',id:''})
store.commit('setMannequinStyle',rv)
resolve('')
}
diff --git a/src/store/workspace/workspace.ts b/src/store/workspace/workspace.ts
index 8e84fb99..5b39201f 100644
--- a/src/store/workspace/workspace.ts
+++ b/src/store/workspace/workspace.ts
@@ -16,6 +16,7 @@ const Workspace : Module = {
workspaceSex:{},
workspacePosition:{},
workspaceAllPosition:{},
+ openChat:false,
probjects:{
name:'',//项目名称
id:'',//项目id
@@ -53,6 +54,9 @@ const Workspace : Module = {
// a.download = 'video.mp4'
// a.click()
},
+ setOpenChatStatus(state,boolean){
+ state.openChat = boolean
+ },
setWorkspaceSex(state,files){
state.workspaceSex = files
},
diff --git a/src/tool/flexible.js b/src/tool/flexible.js
index 85cf0c1e..c53e76f8 100644
--- a/src/tool/flexible.js
+++ b/src/tool/flexible.js
@@ -4,7 +4,7 @@ let flexible = (designWidth, maxWidth,minWidth) =>{
var doc = document, win = window, docEl = doc.documentElement, remStyle = document.createElement("style"), tid;
designWidth = designWidth || 1920;
maxWidth = maxWidth || 2560;
- minWidth = minWidth || 500;
+ minWidth = minWidth || 1024;
// minWidth = minWidth || 1024;
function refreshRem() {
var width = docEl.getBoundingClientRect().width;
diff --git a/src/tool/https.js b/src/tool/https.js
index 267146a5..aac645cc 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -181,6 +181,7 @@ export const Https = {
elementSavePrint:'/api/element/savePrint',//保存印花
getRgbByTcx:'/api/element/getRgbByTcx', // 通过hsv值获取潘通信息
getRgbByHsv:'/api/element/getRgbByHsv', //通过hsv值获取潘通信息
+ elementDelete:'/api/element/delete', //删除上传的图片
designCollection:`/api/design/designCollection`, //设计 Conllection
reDesignCollection:`/api/design/reDesignCollection`,//重新设计 Conllection
countDesignProcess:'/api/design/countDesignProcess', //统计design进度
@@ -223,7 +224,8 @@ export const Https = {
designSingle:`/api/design/detail/designSingle`,//单个design
queryLibraryPage:`/api/library/queryLibraryPage`,//Library分页列表
libraryUpload:`/api/library/upload`, // Library文件上传
- setSketchLibrary:`/api/library/updateLibraryLevel2Type`, // Library文件上传
+ setSketchLibrary:`/api/library/updateLibraryLevel2Type`, // 修改图片类型
+ updateElementLevel2Type:`/api/element/updateElementLevel2Type`, // 修改拼贴上传的衣服类型
queryClassification:`/api/classification/queryClassification`,//标签类别查询
classificationSaveOrUpdate:`/api/classification/saveOrUpdate`,//标签类别新增修改
@@ -337,6 +339,7 @@ export const Https = {
addOrUpdateSubAccount:`/api/account/addOrUpdateSubAccount`,//添加子账号
deleteSubAccount:`/api/account/deleteSubAccount`,//删除子账号
subAccountImportExcelDownload:`/api/account/subAccountImportExcelDownload`,//批量添加模板下载模板
+ getNextSequence:`/api/project/getNextSequence`,//批量添加模板下载模板
subAccountImport:`/api/account/subAccountImport`,//模板导入
getGenerateFrequency:`/api/inquiry/getGenerateFrequency`,//积分使用详情
getAllGenerateFuncName:`/api/inquiry/getAllGenerateFuncName`,//获取所有generate类型
@@ -391,6 +394,9 @@ export const Https = {
toProduct:`/api/history/toProduct`,//开始生成
toProductImageResult:`/api/history/toProductImageResult`,//获取结果
toProductImageElementUpload:`/api/history/toProductImageElementUpload`,//上传
+ historyDeleteResult:`/api/history/deleteResult`,//relight toproduct删除
+ generateDeleteResult:`/api/generate/deleteResult`,//pose删除
+
productImageLike:`/api/history/productImageLike`,//like生成结果
productImageUnLike:`/api/history/productImageUnLike`,//取消like生成结果
productImageLikeList:`/api/history/productImageLikeList`,//like生成结果
diff --git a/src/tool/listData.js b/src/tool/listData.js
index 427012f6..c0788da3 100644
--- a/src/tool/listData.js
+++ b/src/tool/listData.js
@@ -271,6 +271,11 @@ const openTypeList = (t)=>{
// router:'tools=design'
// },
{
+ icon:'i class="fi fi-rr-puzzle-alt',
+ value:'deReconstruction',
+ label:t('Header.toolsDeReconstruction'),
+ router:'tools=deReconstruction'
+ },{
icon:'fi fi-ss-box-open',
value:'toProduct',
label:t('Header.toolsToProduct'),
@@ -285,17 +290,14 @@ const openTypeList = (t)=>{
value:'poseTransfer',
label:t('Header.toolsToTransferPose'),
router:'tools=poseTransfer'
- },{
- icon:'i class="fi fi-rr-puzzle-alt',
- value:'deReconstruction',
- label:t('Header.toolsDeReconstruction'),
- router:'tools=deReconstruction'
- },{
- icon:'fi fi-rr-cubes',
- value:'patternMaking3D',
- label:t('Header.toolsPatternMaking'),
- router:'tools=patternMaking3D'
- },{
+ },
+ // {
+ // icon:'fi fi-rr-cubes',
+ // value:'patternMaking3D',
+ // label:t('Header.toolsPatternMaking'),
+ // router:'tools=patternMaking3D'
+ // },
+ {
icon:'fi fi-rr-pen-swirl',
value:'canvasUpload',
label:t('Header.toolsCanvas'),
@@ -352,12 +354,12 @@ const openTypeList = (t)=>{
],
WithinAWeeklist:[
],
- EarlierTodaylist:[
+ Earlierlist:[
],
},
gallery:{
icon:'fi-rr-gallery',
- label:t('Header.WORKS'),
+ label:t('works.WORKS'),
value:'works',
router:'/home/works',
list:[
@@ -386,7 +388,7 @@ const openTypeList = (t)=>{
},
event:{
icon:'fi-rr-calendar-star',
- label:t('Header.EVENTS'),
+ label:t('Header.Events'),
value:'events',
router:'/home/events',
list:[
diff --git a/src/tool/mdEvent.js b/src/tool/mdEvent.js
index b3aaf859..014edcb7 100644
--- a/src/tool/mdEvent.js
+++ b/src/tool/mdEvent.js
@@ -1,6 +1,6 @@
const getMousePosition = (e,bor,dom) => {
e.stopPropagation()
- e.preventDefault();
+ // if(e?.preventDefault)e.preventDefault();
if(bor){
const touch = e.changedTouches[0];
event = {
diff --git a/src/tool/util.js b/src/tool/util.js
index da8a84f2..e04f6d8c 100644
--- a/src/tool/util.js
+++ b/src/tool/util.js
@@ -23,6 +23,7 @@ const getUploadUrl = () => {
return url
}
const getMinioUrl = (url) => {
+ if (!isValidMinioUrl(url)) return '';
if(isUrl(url)){
const { pathname } = new URL(url);
const result = pathname.slice(1);
@@ -30,6 +31,9 @@ const getMinioUrl = (url) => {
}
return ''
}
+function isValidMinioUrl(url) {
+ return url.includes('www.minio-api.aida.com.hk'); // 关键特征检测
+ }
function isUrl(str) {
try {
new URL(str);
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index c9d63d76..d60b9951 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -31,18 +31,19 @@
-
- 
+ 
+