-
Add Details
+
{{ $t('addDetails.AddDetails') }}
@@ -37,7 +37,7 @@
- submit
+ {{ $t('addDetails.submit') }}
@@ -260,7 +260,7 @@ export default defineComponent({
let setSubmit = ()=>{
var allObjects = canvas.getObjects();
if(allObjects.length == 0){
- return
+ return message.info(t('addDetails.jsContent1'))
}
var canvasDom = document.createElement("canvas");
let exportCanvas = new fabric.Canvas(canvasDom, {
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index ec6f6fc2..d4d3adf9 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -987,23 +987,7 @@ export default defineComponent({
}
.habit_System_Designer {
// margin-top: calc(8rem*1.2);
- :deep(.ant-slider-track),
- :deep(.ant-slider-rail) {
-
- height: calc(.6rem*1.2);
- background-color: #e1e1e1;
- // background-image: url(@../../../../assets/images/homePage/slider.png);
- background-size: 100% 100%;
- border-radius: calc(0.5rem*1.2);
- }
- :deep(.ant-slider .ant-slider-handle:not(.ant-tooltip-open)),
- :deep(.ant-slider-handle) {
- background-color: #2d2e76 !important;
- border: none !important;
- }
- :deep(.ant-slider-handle:hover) {
- box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
- }
+
.habit_System_Designer_text_max {
display: flex;
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index 03dc9a5b..ed9648ee 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -130,7 +130,10 @@
- {{isSelectSuccessively?$t('ColorboardUpload.SelectSuccessively'):$t('ColorboardUpload.SelectSeparately')}}
+
@@ -1025,6 +1028,14 @@ export default defineComponent({
transform: translateX(-50%);
bottom: 0;
white-space: nowrap;
+ display: flex;
+ align-items: center;
+ height: 4rem;
+ font-weight: 600;
+ font-size: 1.8rem;
+ >span{
+ margin-right: 1rem;
+ }
}
.color_setting_block{
margin: auto;
diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue
index 6d5e9089..a966f40c 100644
--- a/src/component/HomePage/Material.vue
+++ b/src/component/HomePage/Material.vue
@@ -38,12 +38,12 @@
-
+
![]()
@@ -205,7 +205,7 @@ export default defineComponent({
if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
this.imgList.forEach((i:any)=>{
if(i.id == item.id){
- i.checked = false
+ i.libraryChecked = false
}
})
}
@@ -219,7 +219,7 @@ export default defineComponent({
if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
this.imgList.forEach((i:any)=>{
if(i.id == item.id){
- i.checked = false
+ i.libraryChecked = false
}
})
}
@@ -234,7 +234,7 @@ export default defineComponent({
if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
this.imgList.forEach((i:any)=>{
if(i.id == item.id){
- i.checked = false
+ i.libraryChecked = false
}
})
}
@@ -261,14 +261,14 @@ export default defineComponent({
setUseGenerate(arr:any){
let parent:any = this.$parent
this.imgList.forEach((item:any) => {
- item.checked = false
+ item.libraryChecked = false
});
if(parent.isUseGenerate){
}else{
arr.forEach((item:any) => {
this.imgList.forEach((imgListItem:any) => {
if(item.id == imgListItem.id){
- imgListItem.checked = true
+ imgListItem.libraryChecked = true
}
});
});
@@ -281,9 +281,10 @@ export default defineComponent({
imgData.categoryValue = imgData.level2TypeEnum.name
imgData.category = imgData.level2TypeEnum.value
}
+ imgData.libraryChecked = true
+ imgData.like = true
if(parent.isUseGenerate){
this.setUseGenerate([])
- imgData.checked = true
let obj = {
imgId : imgData.id,
imgUr: imgData.imgUrl,
@@ -370,7 +371,7 @@ export default defineComponent({
arr.forEach((v:any)=>{
if(item.id == v.id){
item.id_ = v.id_?v.id_:GO.id++
- item.checked = true
+ item.libraryChecked = true
item.pin = v.pin
}
})
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index b1b503b1..1d52999c 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -123,13 +123,13 @@
![]()
-
+
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 8c5adc10..55f1ba4e 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -140,13 +140,13 @@
![]()
-
+
@@ -462,6 +462,35 @@ export default defineComponent({
this.store.commit("setSketchboardFile", this.fileList);
}
},
+ likeFile(item:any,str:string){
+ if(str == 'like'){
+ let data = {
+ generateDetailId:item.id,
+ level1Type:"Sketchboard",
+ level2Type: item.categoryValue?item.categoryValue:item.level2Type,
+ gender:this.workspace.sexEnum.value,
+ timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
+ }
+ Https.axiosPost(Https.httpUrls.generateLike, data).then(
+ (rv) => {
+ item.like = true
+ }
+ ).catch(res=>{
+ });
+ }else{
+ let data = {
+ generateDetailId:item.id,
+ timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
+ }
+ Https.axiosGet(Https.httpUrls.generateDislike, {params:data}).then(
+ (rv) => {
+ item.like = false
+ }
+ ).catch(res=>{
+ });
+ }
+
+ },
recollection() {
this.useGenerate = {
imgId : '',
diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue
index 18758172..70c3e3b4 100644
--- a/src/component/HomePage/productImg.vue
+++ b/src/component/HomePage/productImg.vue
@@ -48,6 +48,19 @@
+
+ {{$t('ProductImg.Similarity')}}
+
+
{{$t('ProductImg.SelectCollection')}}
@@ -112,27 +125,34 @@
{{$t('Generate.Close')}}
-
{{$t('ProductImg.GenerateProduct')}}
-
+
@@ -206,6 +224,7 @@ export default defineComponent({
selectProductimgList:[],
generateList:{},
likeList:[],
+ similarity:0,
})
let productimgMenuList = ref([
{
@@ -265,7 +284,6 @@ export default defineComponent({
}
let cleardata = ()=>{
productImg.value = false
- productImgData.isShowMark = false
productImgData.likeList = []
productImgData.generateList = {}
productimgMenu.value = productimgMenuList.value[0]
@@ -369,7 +387,8 @@ export default defineComponent({
"isLike": 0,
"taskId": "",
"toProductImageRecordId": 0,
- "url": ""
+ "url": "",
+ imageStrength:.3
}
if(productImgData.fileList[productimgMenu.value.value]){
productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
@@ -411,15 +430,23 @@ export default defineComponent({
if(productimgMenu.value.value == 'Relight'){
url = Https.httpUrls.relight
}
+ productImgData.isShowMark = true
Https.axiosPost(url, data).then(
(rv) => {
+ productImgData.isShowMark = false
let arr:any = []
+ if(!productImgData.generateList[productimgMenu.value.value]){
+ productImgData.generateList[productimgMenu.value.value] = []
+ }
rv.forEach((item:any)=>{
arr.push(item.taskId)
})
+
+ productImgData.generateList[productimgMenu.value.value].push(...rv)
setPrductimg(arr)
}
).catch(res=>{
+ productImgData.isShowMark = false
productImgData.isProductimg = false
clearInterval(remPrductimgTime)
productImgData.remProductimg= false
@@ -427,7 +454,6 @@ export default defineComponent({
}
let generateProceedList:any = []
let setPrductimg = (dataList:any)=>{
-
let data = dataList
let dataNum = dataList.length
let state = true
@@ -447,10 +473,15 @@ export default defineComponent({
rv.forEach((element:any) => {
if(element.status == 'Success'){
element.imgUrl = element.url
- if(!productImgData.generateList[productimgMenu.value.value]){
- productImgData.generateList[productimgMenu.value.value] = []
- }
- productImgData.generateList[productimgMenu.value.value].unshift(element)
+ // if(!productImgData.generateList[productimgMenu.value.value]){
+ // productImgData.generateList[productimgMenu.value.value] = []
+ // }
+ let index = productImgData.generateList[productimgMenu.value.value].findIndex((obj:any) => obj.taskId === element.taskId);
+ productImgData.generateList[productimgMenu.value.value][index] = element
+ // productImgData.generateList[productimgMenu.value.value].unshift(element)
+ }else if(element.status == 'Fail'){
+ let index = productImgData.generateList[productimgMenu.value.value].findIndex((obj:any) => obj.taskId === element.taskId);
+ productImgData.generateList[productimgMenu.value.value].splice(index,1)
}
data = data.filter((item:any) => item !== element.taskId);
});
@@ -522,9 +553,10 @@ export default defineComponent({
generalIsMenuShow = {}
document.removeEventListener('click',removeMenuShow)
}
- let clearPrductimg = ()=>{
+ let setSimilarity = ()=>{
}
+
//超分
let setTask = (data:any)=>{
emit('setTask',data)
@@ -555,7 +587,7 @@ export default defineComponent({
setScaleImage,
setMenu,
setMenuShow,
- clearPrductimg,
+ setSimilarity,
setTask,
};
},
@@ -655,6 +687,9 @@ export default defineComponent({
font-weight: 500;
}
}
+ &.productImg_content_item_title_similarity{
+ // margin-bottom: 8rem;
+ }
}
.productImg_content_item_intro{
font-size: 1.4rem;
@@ -765,12 +800,23 @@ export default defineComponent({
border-radius: 2rem;
margin-bottom: 2%;
padding: 1rem 1.5rem;
+ position: relative;
+ .mark_loading{
+ position: absolute
+ }
.productImg_right_item{
height: 100%;
padding: 1rem 0;
margin-right: 1rem;
position: relative;
background: #fff;
+ .productImg_right_item_imgBox{
+ height: 100%;
+ .loadingImg{
+ width: 14rem;
+ object-fit: contain;
+ }
+ }
img{
height: 100%;
}
diff --git a/src/component/WorksPage/Falls.vue b/src/component/WorksPage/Falls.vue
index d551c9b4..ff9b0b8c 100644
--- a/src/component/WorksPage/Falls.vue
+++ b/src/component/WorksPage/Falls.vue
@@ -28,8 +28,9 @@
+
@{{ item.userName }}
{{item.portfolioName}}
-
{{item.portfolioDes}}
+
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index ea633650..51744d2d 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -147,6 +147,7 @@ export default {
SelectCollection:'选择的系列',
Upload:'上传',
MagicTools:'魔法工具',
+ Similarity:'相似度',
GenerateProduct:'生成的产品',
SelectedProduct:'选择的产品',
Export:'导出',
@@ -433,6 +434,11 @@ export default {
jsContent5:'Image must smaller than 5MB!',
jsContent6:"找不到这个TCX的颜色",
},
+ addDetails:{
+ AddDetails:'添加细节',
+ submit:'保存',
+ jsContent1:'请至少绘制一条线段',
+ },
DesignDetailEnd:{
NewApparel:'选择的服装',
NewPrint:'选择的印花',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 3fd3a3ad..472c8911 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -146,6 +146,7 @@ export default {
Finalize:'Finalize',
SelectCollection:'Select Collection',
Upload:'Upload',
+ Similarity:'Similarity',
MagicTools:'Magic Tools',
GenerateProduct:'Generate Product',
SelectedProduct:'Selected Product',
@@ -311,7 +312,7 @@ export default {
RGBA:'RGBA',
UploadImage:'Upload Image',////////////
ColorCode:'Color Code',
- SelectSuccessively:'Select Successively',
+ SelectSuccessively:'Mutil',
SelectSeparately:'Select Separately',
ExtractColor:'Extract Color',
Single:'Single',
@@ -434,6 +435,11 @@ export default {
jsContent5:'Image must smaller than 5MB!',
jsContent6:"Can't find the TCX color",
},
+ addDetails:{
+ AddDetails:'Add Details',
+ submit:'Submit',
+ jsContent1:'Please draw at least one line segment',
+ },
DesignDetailEnd:{
NewApparel:'New Apparel',
NewPrint:'New Print',
