@@ -629,7 +629,7 @@ export default defineComponent({
(sketchGrouping - 1) * 20) /
sketchGrouping;
}
- if (key == "likeDesignCollectionList" || key == 'likePorductImg') {
+ if (key == "likeDesignCollectionList" || key == 'FinalizeImage') {
imgWidth =
(canvasWH.value.width -
(likeDesign - 1) * 20) /
@@ -647,7 +647,7 @@ export default defineComponent({
}else if(key == 'upImgFiles'){
imgId = data
minioUrl = data.url
- }else if(key == 'likePorductImg'){
+ }else if(key == 'FinalizeImage'){
imgId = data.id
let url = data.imgUrl.split('?')[0]
var match = url.match(/:(\d+)\/(.*)/);
@@ -734,7 +734,7 @@ export default defineComponent({
data.imgUrl = item.designOutfitUrl;
data.name = "result" + index + "." + data.imgUrl.split(".").pop().split("?").shift();;
}
- if (key == "likePorductImg") {
+ if (key == "FinalizeImage") {
data.imgUrl = item.designOutfitUrl;
data.name = "porduct" + index + "." + data.imgUrl.split(".").pop().split("?").shift();;
}
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index 84c96f05..b1b503b1 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -398,7 +398,7 @@ export default defineComponent({
let data = {
generateDetailId:item.id,
level1Type:"Printboard",
- level2Type: '',
+ level2Type: item.categoryValue,
gender:this.workspace.sexEnum.value,
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
}
diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue
index 62bd2cfc..6e80395c 100644
--- a/src/component/HomePage/TaskPage.vue
+++ b/src/component/HomePage/TaskPage.vue
@@ -154,7 +154,7 @@ export default defineComponent({
// this.getTaskList()
let time = 100
if(data){
- time = 10000
+ time = 1000
}
setTimeout(() => {
this.currentPage = 1
@@ -187,7 +187,7 @@ export default defineComponent({
getTaskList(){
clearTimeout(this.getTaskTime)
let arr = this.taskListUnfinished.map((item:any) => item.taskId)
- if(arr <= 0){
+ if(arr <= 0 && !arr[0].taskId){
return
}
Https.axiosPost(Https.httpUrls.getTasksList,arr).then((rv)=>{
@@ -227,6 +227,7 @@ export default defineComponent({
})
},
getTaskMoreList(value:any){
+ clearTimeout(this.getTaskTime)
let data = {
size:this.pageSize,
page: this.currentPage,
@@ -234,6 +235,7 @@ export default defineComponent({
endTime: "",
startTime: "",
}
+ this.isShowMark = true
Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
this.isShowMark = false
if(this.currentPage != 1 && rv.content.length == 0){
@@ -244,23 +246,23 @@ export default defineComponent({
this.taskListMore.push(...rv.content)
this.total = rv.total
this.taskListUnfinished = []
- rv.content.forEach((item:any) => {
- value.forEach((valueItem:any) => {
- if(valueItem == item.taskId && item.status == 'success'){
- downloadIamge(item.outputImage,item.imageName)
- this.store.dispatch('getCredits')
- }
+ if(value){
+ rv.content.forEach((item:any) => {
+ value.forEach((valueItem:any) => {
+ if(valueItem == item.taskId && item.status == 'success'){
+ downloadIamge(item.outputImage,item.imageName)
+ this.store.dispatch('getCredits')
+ }
+ });
});
- });
+ }
this.taskListMore.forEach((item:any,index:number)=>{
if(item.status == 'Waiting' || item.status == 'Executing'){
item.index = index
this.taskListUnfinished.push(item)
+ this.getTaskList()
}
})
- if(!this.getTaskTime){
- this.getTaskList()
- }
// if(this.taskListMore.indexOf('success'))
}
}).catch((rv) => {
diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue
index fc69773a..2f9bf7ae 100644
--- a/src/component/HomePage/productImg.vue
+++ b/src/component/HomePage/productImg.vue
@@ -51,7 +51,7 @@
{{$t('ProductImg.SelectCollection')}}
- ![]()
+ ![]()
{{$t('ProductImg.Upload')}}
@@ -91,7 +91,6 @@
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => fileUploadChange(file)"
>
-
@@ -119,13 +118,16 @@
{{$t('ProductImg.GenerateProduct')}}
-
+
![]()
@@ -134,13 +136,19 @@
-
+
+
+
-
+
![]()
-
![]()
+
-
-
+
-
@@ -193,12 +201,8 @@ export default defineComponent({
remProductimg:false,//是否出现取消按钮
isProductimg:false,//开始生成
selectProductimgList:[],
- generateList:[
-
- ],
- likeList:[
-
- ],
+ generateList:{},
+ likeList:{},
})
let productimgMenuList = ref([
{
@@ -238,7 +242,7 @@ export default defineComponent({
rv.forEach((item:any) => {
item.imgUrl = item.url
});
- productImgData.likeList.push(...rv)
+ productImgData.likeList[productimgMenu.value.value] = rv
}
).catch(res=>{
});
@@ -259,7 +263,9 @@ export default defineComponent({
let cleardata = ()=>{
productImg.value = false
productImgData.isShowMark = false
- productImgData.likeList = []
+ productImgData.likeList = {}
+ productImgData.generateList = {}
+ productimgMenu.value = productimgMenuList.value[0]
}
let fileUploadChange = (data: any)=> {
@@ -316,11 +322,17 @@ export default defineComponent({
Https.axiosPost(url, data).then(
(rv) => {
if(str == 'like'){
- productImgData.likeList.push(item)
- productImgData.generateList.splice(index,1)
+ if(!productImgData.likeList[productimgMenu.value.value]){
+ productImgData.likeList[productimgMenu.value.value] = []
+ }
+ productImgData.likeList[productimgMenu.value.value].push(item)
+ productImgData.generateList[productimgMenu.value.value].splice(index,1)
}else{
- productImgData.generateList.push(item)
- productImgData.likeList.splice(index,1)
+ if(!productImgData.generateList[productimgMenu.value.value]){
+ productImgData.generateList[productimgMenu.value.value] = []
+ }
+ productImgData.generateList[productimgMenu.value.value].push(item)
+ productImgData.likeList[productimgMenu.value.value].splice(index,1)
}
}
@@ -328,13 +340,20 @@ export default defineComponent({
});
}
let setExport = ()=>{
+ let imgList:any = []
+ productimgMenuList.value.forEach((item:any)=>{
+ if(productImgData.likeList[item.value]){
+ imgList.push(...productImgData.likeList[item.value])
+ }
+ })
let data = {
- key:'likePorductImg',
- imgList:productImgData.likeList,
+ key:'FinalizeImage',
+ imgList:imgList,
userlikeGroupId,
beenPublished:productImgData.beenPublished
}
let exportModel:any = ExportModel.value
+
exportModel.init(data)
}
let remPrductimgTime:any = null
@@ -353,20 +372,25 @@ export default defineComponent({
"toProductImageRecordId": 0,
"url": ""
}
- productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
- if(item.isChecked){
- obj.elementId = item.id
- obj.elementType = item.type
- selectArr.push(JSON.parse(JSON.stringify(obj)))
- }
- })
- selectList.value[productimgMenu.value.value].forEach((item:any)=>{
- if(item.isChecked){
- obj.elementId = item.designOutfitId
- obj.elementType = 'DesignOutfit'
- selectArr.push(JSON.parse(JSON.stringify(obj)))
- }
- })
+ if(productImgData.fileList[productimgMenu.value.value]){
+ productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
+ if(item.isChecked){
+ obj.elementId = item.id
+ obj.elementType = item.type
+ selectArr.push(JSON.parse(JSON.stringify(obj)))
+ }
+ })
+ }
+ if(selectList.value[productimgMenu.value.value]){
+ selectList.value[productimgMenu.value.value].forEach((item:any)=>{
+ if(item.isChecked){
+ obj.elementId = item.designOutfitId
+ obj.elementType = 'DesignOutfit'
+ selectArr.push(JSON.parse(JSON.stringify(obj)))
+ }
+ })
+ }
+
if(selectArr.length == 0) {
message.info(t('ProductImg.jsContent2'))
return
@@ -411,7 +435,10 @@ export default defineComponent({
rv.forEach((element:any) => {
if(element.status == 'Success'){
element.imgUrl = element.url
- productImgData.generateList.unshift(element)
+ if(!productImgData.generateList[productimgMenu.value.value]){
+ productImgData.generateList[productimgMenu.value.value] = []
+ }
+ productImgData.generateList[productimgMenu.value.value].unshift(element)
}
data = data.filter((item:any) => item !== element.taskId);
});
@@ -458,6 +485,28 @@ export default defineComponent({
})
scaleImage.value.init(arr,index)
scaleImage.value.isLike = false
+ scaleImage.value.isComparison = true
+ }
+ let generalIsMenuShow:any = {}
+ let setMenuShow = (item:any)=>{
+ item.menuShow = true
+ generalIsMenuShow = item
+ document.addEventListener('click',removeMenuShow)
+ }
+ let setMenu=(menuItem:any,item:any)=>{
+ productimgMenu.value = menuItem
+ if(!selectList.value[productimgMenu.value.value]){
+ selectList.value[productimgMenu.value.value] = []
+ }
+ if(selectList.value[menuItem.value].indexOf(item) == -1){
+ selectList.value[menuItem.value].push(item)
+ }
+ generalIsMenuShow.menuShow = false
+ }
+ let removeMenuShow = ()=>{
+ generalIsMenuShow.menuShow = false
+ generalIsMenuShow = {}
+ document.removeEventListener('click',removeMenuShow)
}
//超分
let setTask = (data:any)=>{
@@ -487,6 +536,8 @@ export default defineComponent({
removeProductimg,
scaleImage,
setScaleImage,
+ setMenu,
+ setMenuShow,
setTask,
};
},
@@ -674,9 +725,12 @@ export default defineComponent({
justify-content: space-around;
.input_box{
flex: 0;
- .generage_btn{
- margin: 0;
- }
+
+ }
+ .started_btn{
+ // width: 13rem;
+ // text-align: center;
+ margin: 0;
}
}
}
@@ -692,17 +746,18 @@ export default defineComponent({
background: #f6f6fa;
border-radius: 2rem;
margin-bottom: 2%;
- padding: 0 1.5rem;
+ padding: 1rem 1.5rem;
.productImg_right_item{
height: 100%;
padding: 1rem 0;
margin-right: 1rem;
position: relative;
+ background: #fff;
img{
height: 100%;
}
- .productImg_right_item_like,.productImg_right_item_scale{
+ .productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{
display: none;
position: absolute;
top: 1rem;
@@ -712,12 +767,34 @@ export default defineComponent({
color: red;
}
}
+ .productImg_right_item_menu{
+ ul{
+ top: 100%;
+ position: absolute;
+ width: 10rem;
+ text-align: center;
+ border-radius: calc(1rem*1.2);
+ overflow: hidden;
+ li{
+ background: #cccccc;
+ }
+ li:hover{
+ // background: rgba(0,0,0,.4);
+ background: #999999;
+ color: #000;
+ }
+ }
+ }
+ .iconLeft{
+ left: 2rem;
+ right: auto;
+ }
.productImg_right_item_scale{
top: 4rem;
}
}
.productImg_right_item:hover{
- .productImg_right_item_like,.productImg_right_item_scale{
+ .productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{
display: block;
}
}
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index 05ab9027..036d3580 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -21,12 +21,11 @@
-
+
+
+
+