fix
This commit is contained in:
2
.env.dev
2
.env.dev
@@ -9,4 +9,4 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
|
|||||||
# 佩佩
|
# 佩佩
|
||||||
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
|
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
|
||||||
# 海波
|
# 海波
|
||||||
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
|
VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
|
||||||
|
|||||||
@@ -79,6 +79,27 @@ li {
|
|||||||
margin-top: -0.4rem;
|
margin-top: -0.4rem;
|
||||||
border: solid 0.2rem #343579;
|
border: solid 0.2rem #343579;
|
||||||
}
|
}
|
||||||
|
.ant-slider:hover .ant-slider-track {
|
||||||
|
background-color: #e1e1e1;
|
||||||
|
}
|
||||||
|
.ant-slider:hover .ant-slider-handle {
|
||||||
|
box-shadow: rgba(41, 62, 141, 0.16) 0px 0 0 4px;
|
||||||
|
}
|
||||||
|
.ant-slider-track,
|
||||||
|
.ant-slider-rail {
|
||||||
|
height: calc(0.6rem*1.2);
|
||||||
|
background-color: #e1e1e1;
|
||||||
|
background-size: 100% 100%;
|
||||||
|
border-radius: calc(0.5rem*1.2);
|
||||||
|
}
|
||||||
|
.ant-slider .ant-slider-handle:not(.ant-tooltip-open),
|
||||||
|
.ant-slider-handle {
|
||||||
|
background-color: #2d2e76 !important;
|
||||||
|
border: none !important;
|
||||||
|
}
|
||||||
|
.ant-slider-handle:hover {
|
||||||
|
box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
|
||||||
|
}
|
||||||
.cliAdmin_like {
|
.cliAdmin_like {
|
||||||
animation: adminLike 0.5s ease-in-out forwards;
|
animation: adminLike 0.5s ease-in-out forwards;
|
||||||
transform-origin: center;
|
transform-origin: center;
|
||||||
@@ -921,14 +942,22 @@ li {
|
|||||||
box-shadow: none !important;
|
box-shadow: none !important;
|
||||||
}
|
}
|
||||||
.ant-switch {
|
.ant-switch {
|
||||||
min-width: 4.4rem;
|
min-width: 5.4rem;
|
||||||
height: 2.2rem;
|
height: 2.2rem;
|
||||||
line-height: 2.2rem;
|
line-height: 2.2rem;
|
||||||
}
|
}
|
||||||
.ant-switch .ant-switch-handle {
|
.ant-switch .ant-switch-handle {
|
||||||
|
top: 50%;
|
||||||
|
transform: translateY(-50%);
|
||||||
width: 1.8rem;
|
width: 1.8rem;
|
||||||
height: 1.8rem;
|
height: 1.8rem;
|
||||||
}
|
}
|
||||||
|
.ant-switch .ant-switch-inner {
|
||||||
|
margin: 0 1rem 0 3rem;
|
||||||
|
}
|
||||||
|
.ant-switch-checked .ant-switch-inner {
|
||||||
|
margin: 0 3rem 0 1rem;
|
||||||
|
}
|
||||||
.ant-message {
|
.ant-message {
|
||||||
z-index: 1049 !important;
|
z-index: 1049 !important;
|
||||||
top: 6rem;
|
top: 6rem;
|
||||||
|
|||||||
@@ -87,6 +87,30 @@ input:focus{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.ant-slider:hover{
|
||||||
|
.ant-slider-track{
|
||||||
|
background-color: #e1e1e1;
|
||||||
|
}
|
||||||
|
.ant-slider-handle{
|
||||||
|
box-shadow: rgba(41,62,141,.16) 0px 0 0 4px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.ant-slider-track,
|
||||||
|
.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);
|
||||||
|
}
|
||||||
|
.ant-slider .ant-slider-handle:not(.ant-tooltip-open),
|
||||||
|
.ant-slider-handle {
|
||||||
|
background-color: #2d2e76 !important;
|
||||||
|
border: none !important;
|
||||||
|
}
|
||||||
|
.ant-slider-handle:hover {
|
||||||
|
box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
|
||||||
|
}
|
||||||
.cliAdmin_like{
|
.cliAdmin_like{
|
||||||
animation: adminLike .5s ease-in-out forwards;
|
animation: adminLike .5s ease-in-out forwards;
|
||||||
transform-origin: center;
|
transform-origin: center;
|
||||||
@@ -1043,13 +1067,21 @@ input:focus{
|
|||||||
box-shadow: none !important;
|
box-shadow: none !important;
|
||||||
}
|
}
|
||||||
.ant-switch{
|
.ant-switch{
|
||||||
min-width: 4.4rem;
|
min-width: 5.4rem;
|
||||||
height: 2.2rem;
|
height: 2.2rem;
|
||||||
line-height: 2.2rem;
|
line-height: 2.2rem;
|
||||||
.ant-switch-handle{
|
.ant-switch-handle{
|
||||||
|
top: 50%;
|
||||||
|
transform: translateY(-50%);
|
||||||
width: 1.8rem;
|
width: 1.8rem;
|
||||||
height: 1.8rem;
|
height: 1.8rem;
|
||||||
}
|
}
|
||||||
|
.ant-switch-inner{
|
||||||
|
margin: 0 1rem 0 3rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.ant-switch-checked .ant-switch-inner{
|
||||||
|
margin: 0 3rem 0 1rem;
|
||||||
}
|
}
|
||||||
.ant-message{
|
.ant-message{
|
||||||
z-index: 1049 !important;
|
z-index: 1049 !important;
|
||||||
|
|||||||
@@ -96,7 +96,6 @@ export default defineComponent({
|
|||||||
align: "center",
|
align: "center",
|
||||||
width: 50,
|
width: 50,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
width: 50,
|
|
||||||
dataIndex: "country",
|
dataIndex: "country",
|
||||||
key: "country",
|
key: "country",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -64,7 +64,7 @@
|
|||||||
v-show="file?.status === 'done'"
|
v-show="file?.status === 'done'"
|
||||||
>
|
>
|
||||||
<img :src="file?.url" class="upload_img" />
|
<img :src="file?.url" class="upload_img" />
|
||||||
<sketchCategory v-if="selectCode == 'Sketchboard' || selectCode == 'Printboard'" :disignTypeList="sketchCatecoryList" :generateList="uploadList" :item="file" ></sketchCategory>
|
<sketchCategory v-if="selectCode == 'Sketchboard' || selectCode == 'Printboard'" :disignTypeList="designTypeList" :generateList="uploadList" :item="file" ></sketchCategory>
|
||||||
<div
|
<div
|
||||||
class="delete_file_block"
|
class="delete_file_block"
|
||||||
@click.stop="deleteFile(index)"
|
@click.stop="deleteFile(index)"
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
<div class="addDetails_center">
|
<div class="addDetails_center">
|
||||||
<div class="modal_title_text">
|
<div class="modal_title_text">
|
||||||
<div>Add Details</div>
|
<div>{{ $t('addDetails.AddDetails') }}</div>
|
||||||
<div class="modal_title_text_intro"></div>
|
<div class="modal_title_text_intro"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="exportCanvasBox_center">
|
<div class="exportCanvasBox_center">
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="exportCanvasBox_submit" @click="setSubmit">
|
<div class="exportCanvasBox_submit" @click="setSubmit">
|
||||||
<div class="started_btn">
|
<div class="started_btn">
|
||||||
submit
|
{{ $t('addDetails.submit') }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -260,7 +260,7 @@ export default defineComponent({
|
|||||||
let setSubmit = ()=>{
|
let setSubmit = ()=>{
|
||||||
var allObjects = canvas.getObjects();
|
var allObjects = canvas.getObjects();
|
||||||
if(allObjects.length == 0){
|
if(allObjects.length == 0){
|
||||||
return
|
return message.info(t('addDetails.jsContent1'))
|
||||||
}
|
}
|
||||||
var canvasDom = document.createElement("canvas");
|
var canvasDom = document.createElement("canvas");
|
||||||
let exportCanvas = new fabric.Canvas(canvasDom, {
|
let exportCanvas = new fabric.Canvas(canvasDom, {
|
||||||
|
|||||||
@@ -987,23 +987,7 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
.habit_System_Designer {
|
.habit_System_Designer {
|
||||||
// margin-top: calc(8rem*1.2);
|
// 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 {
|
.habit_System_Designer_text_max {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -130,7 +130,10 @@
|
|||||||
<img src="#" :title="pantongNameList[index]">
|
<img src="#" :title="pantongNameList[index]">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="started_btn upload_color_btn" v-show="selectColorList.length>0" @click="()=>isSelectSuccessively = !isSelectSuccessively">{{isSelectSuccessively?$t('ColorboardUpload.SelectSuccessively'):$t('ColorboardUpload.SelectSeparately')}}</div>
|
<div class="upload_color_btn" v-show="selectColorList.length>0">
|
||||||
|
<span>{{$t('ColorboardUpload.SelectSuccessively')}}</span>
|
||||||
|
<a-switch :checked="isSelectSuccessively" @click="()=>isSelectSuccessively = !isSelectSuccessively" checked-children="ON" un-checked-children="OFF"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="right_content_line">
|
<div class="right_content_line">
|
||||||
@@ -1025,6 +1028,14 @@ export default defineComponent({
|
|||||||
transform: translateX(-50%);
|
transform: translateX(-50%);
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
height: 4rem;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 1.8rem;
|
||||||
|
>span{
|
||||||
|
margin-right: 1rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.color_setting_block{
|
.color_setting_block{
|
||||||
margin: auto;
|
margin: auto;
|
||||||
|
|||||||
@@ -38,12 +38,12 @@
|
|||||||
<div class="my_material_content">
|
<div class="my_material_content">
|
||||||
|
|
||||||
<div class="material_content_body scroll_style">
|
<div class="material_content_body scroll_style">
|
||||||
<div v-for="item,index in imgList" :key="item" class="content_img_item" :class="[ item?.checked ? 'active':'' , selectCode == 'Moodboard' ? 'moodb':'' ]" >
|
<div v-for="item,index in imgList" :key="item" class="content_img_item" :class="[ item?.libraryChecked ? 'active':'' , selectCode == 'Moodboard' ? 'moodb':'' ]" >
|
||||||
<img :src="item?.imgUrl" @click.stop="selectImgItem(item)">
|
<img :src="item?.imgUrl" @click.stop="selectImgItem(item)">
|
||||||
<sketchCategory v-if="selectCode == 'Sketchboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true" @upTypeSucced='upTypeSucced'></sketchCategory>
|
<sketchCategory v-if="selectCode == 'Sketchboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true" @upTypeSucced='upTypeSucced'></sketchCategory>
|
||||||
<!-- <printCategory v-if="selectCode == 'Printboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></printCategory> -->
|
<!-- <printCategory v-if="selectCode == 'Printboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></printCategory> -->
|
||||||
<!-- <div v-if="selectCode == 'Sketchboard' || selectCode == 'Printboard'" class="pin_block">
|
<!-- <div v-if="selectCode == 'Sketchboard' || selectCode == 'Printboard'" class="pin_block">
|
||||||
<a-checkbox v-model:checked="item.pin">{{ $t('Material.PIN') }}</a-checkbox>
|
<a-checkbox v-model:libraryChecked="item.pin">{{ $t('Material.PIN') }}</a-checkbox>
|
||||||
</div> -->
|
</div> -->
|
||||||
</div>
|
</div>
|
||||||
<div v-show="total > imgList?.length && total != 0" class="material_content_list_loding" v-observe>
|
<div v-show="total > imgList?.length && total != 0" class="material_content_list_loding" v-observe>
|
||||||
@@ -205,7 +205,7 @@ export default defineComponent({
|
|||||||
if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
|
if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
|
||||||
this.imgList.forEach((i:any)=>{
|
this.imgList.forEach((i:any)=>{
|
||||||
if(i.id == item.id){
|
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){
|
if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
|
||||||
this.imgList.forEach((i:any)=>{
|
this.imgList.forEach((i:any)=>{
|
||||||
if(i.id == item.id){
|
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){
|
if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
|
||||||
this.imgList.forEach((i:any)=>{
|
this.imgList.forEach((i:any)=>{
|
||||||
if(i.id == item.id){
|
if(i.id == item.id){
|
||||||
i.checked = false
|
i.libraryChecked = false
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -261,14 +261,14 @@ export default defineComponent({
|
|||||||
setUseGenerate(arr:any){
|
setUseGenerate(arr:any){
|
||||||
let parent:any = this.$parent
|
let parent:any = this.$parent
|
||||||
this.imgList.forEach((item:any) => {
|
this.imgList.forEach((item:any) => {
|
||||||
item.checked = false
|
item.libraryChecked = false
|
||||||
});
|
});
|
||||||
if(parent.isUseGenerate){
|
if(parent.isUseGenerate){
|
||||||
}else{
|
}else{
|
||||||
arr.forEach((item:any) => {
|
arr.forEach((item:any) => {
|
||||||
this.imgList.forEach((imgListItem:any) => {
|
this.imgList.forEach((imgListItem:any) => {
|
||||||
if(item.id == imgListItem.id){
|
if(item.id == imgListItem.id){
|
||||||
imgListItem.checked = true
|
imgListItem.libraryChecked = true
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -281,9 +281,10 @@ export default defineComponent({
|
|||||||
imgData.categoryValue = imgData.level2TypeEnum.name
|
imgData.categoryValue = imgData.level2TypeEnum.name
|
||||||
imgData.category = imgData.level2TypeEnum.value
|
imgData.category = imgData.level2TypeEnum.value
|
||||||
}
|
}
|
||||||
|
imgData.libraryChecked = true
|
||||||
|
imgData.like = true
|
||||||
if(parent.isUseGenerate){
|
if(parent.isUseGenerate){
|
||||||
this.setUseGenerate([])
|
this.setUseGenerate([])
|
||||||
imgData.checked = true
|
|
||||||
let obj = {
|
let obj = {
|
||||||
imgId : imgData.id,
|
imgId : imgData.id,
|
||||||
imgUr: imgData.imgUrl,
|
imgUr: imgData.imgUrl,
|
||||||
@@ -370,7 +371,7 @@ export default defineComponent({
|
|||||||
arr.forEach((v:any)=>{
|
arr.forEach((v:any)=>{
|
||||||
if(item.id == v.id){
|
if(item.id == v.id){
|
||||||
item.id_ = v.id_?v.id_:GO.id++
|
item.id_ = v.id_?v.id_:GO.id++
|
||||||
item.checked = true
|
item.libraryChecked = true
|
||||||
item.pin = v.pin
|
item.pin = v.pin
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -123,13 +123,13 @@
|
|||||||
<img v-lazy="item.imgUrl">
|
<img v-lazy="item.imgUrl">
|
||||||
<sketchCategory :disignTypeList="printCatecoryList" :generateList="printboardList" :isSpread="true" :item="item" ></sketchCategory>
|
<sketchCategory :disignTypeList="printCatecoryList" :generateList="printboardList" :isSpread="true" :item="item" ></sketchCategory>
|
||||||
|
|
||||||
<!-- <div
|
<div
|
||||||
class="delete_like_file_block left1"
|
class="delete_like_file_block left1"
|
||||||
:class="[driver__.driver?'hideEvents':'']"
|
:class="[driver__.driver?'hideEvents':'']"
|
||||||
>
|
>
|
||||||
<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
|
<i v-if="!item.like || item.libraryChecked" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
|
||||||
<i v-else class="fi fi-sr-heart" :adminLike="!!item.like" @click.stop="likeFile(item,'noLike')"></i>
|
<i v-else class="fi fi-sr-heart" :adminLike="!!item.like" @click.stop="likeFile(item,'noLike')"></i>
|
||||||
</div> -->
|
</div>
|
||||||
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
|
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
|
||||||
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
|
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -140,13 +140,13 @@
|
|||||||
<img v-lazy="item.imgUrl">
|
<img v-lazy="item.imgUrl">
|
||||||
<sketchCategory :disignTypeList="sketchCatecoryList" :generateList="sketchboardList" :isSpread="true" :item="item" :driver__="driver__.driver"></sketchCategory>
|
<sketchCategory :disignTypeList="sketchCatecoryList" :generateList="sketchboardList" :isSpread="true" :item="item" :driver__="driver__.driver"></sketchCategory>
|
||||||
|
|
||||||
<!-- <div
|
<div
|
||||||
class="delete_like_file_block left1"
|
class="delete_like_file_block left1"
|
||||||
:class="[driver__.driver?'hideEvents':'']"
|
:class="[driver__.driver?'hideEvents':'']"
|
||||||
>
|
>
|
||||||
<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
|
<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
|
||||||
<i v-else class="fi fi-sr-heart" :adminLike="!!item.like" @click.stop="likeFile(item,'noLike')"></i>
|
<i v-else class="fi fi-sr-heart" :adminLike="!!item.like" @click.stop="likeFile(item,'noLike')"></i>
|
||||||
</div> -->
|
</div>
|
||||||
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
|
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
|
||||||
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
|
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
|
||||||
</div>
|
</div>
|
||||||
@@ -462,6 +462,35 @@ export default defineComponent({
|
|||||||
this.store.commit("setSketchboardFile", this.fileList);
|
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() {
|
recollection() {
|
||||||
this.useGenerate = {
|
this.useGenerate = {
|
||||||
imgId : '',
|
imgId : '',
|
||||||
|
|||||||
@@ -48,6 +48,19 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="productImg_content_item_title productImg_content_item_title_similarity">
|
||||||
|
<span>{{$t('ProductImg.Similarity')}}</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="text" v-model="similarity">
|
||||||
|
<a-slider id="system_silder"
|
||||||
|
v-model:value="similarity"
|
||||||
|
@afterChange="setSimilarity"
|
||||||
|
:tooltipVisible="false"
|
||||||
|
:step=".05"
|
||||||
|
>
|
||||||
|
</a-slider>
|
||||||
|
</div>
|
||||||
<div class="productImg_content_item_title">{{$t('ProductImg.SelectCollection')}}</div>
|
<div class="productImg_content_item_title">{{$t('ProductImg.SelectCollection')}}</div>
|
||||||
<div class="productImg_content_item_imgBox generalScroll" v-mousewheel>
|
<div class="productImg_content_item_imgBox generalScroll" v-mousewheel>
|
||||||
<div class="content_item_imgBox_itemImg" v-for="item in selectList[productimgMenu.value]" :key="item.id" >
|
<div class="content_item_imgBox_itemImg" v-for="item in selectList[productimgMenu.value]" :key="item.id" >
|
||||||
@@ -112,27 +125,34 @@
|
|||||||
{{$t('Generate.Close')}}
|
{{$t('Generate.Close')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="input_clear started_btn" @click="clearPrductimg">{{$t('ProductImg.Clear')}}</div> -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="productImg_right">
|
<div class="productImg_right">
|
||||||
<div class="productImg_content_item_title">{{$t('ProductImg.GenerateProduct')}}</div>
|
<div class="productImg_content_item_title">{{$t('ProductImg.GenerateProduct')}}</div>
|
||||||
<div class="productImg_right_item_box generalScroll" v-mousewheel>
|
<div class="productImg_right_item_box generalScroll" v-mousewheel>
|
||||||
<div class="productImg_right_item" v-for="item,index in generateList[productimgMenu.value]" :key="item">
|
<div class="productImg_right_item" v-for="item,index in generateList[productimgMenu.value]" :key="item">
|
||||||
<img :src="item.url" alt="">
|
<div class="productImg_right_item_imgBox" v-if="item.status != 'Success'">
|
||||||
<div class="productImg_right_item_like">
|
<img class="loadingImg" src="@/assets/images/homePage/loading.gif" alt="">
|
||||||
<i class="fi fi-rr-heart" @click.stop="likeFile(item,'like',index)"></i>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="productImg_right_item_scale iconLeft">
|
<div class="productImg_right_item_imgBox" v-else>
|
||||||
<i class="fi fi-bs-expand-arrows-alt" @click.stop="setScaleImage(generateList[productimgMenu.value],index)"></i>
|
<img :src="item.url" alt="">
|
||||||
</div>
|
<div class="productImg_right_item_like">
|
||||||
<div class="productImg_right_item_menu iconLeft">
|
<i class="fi fi-rr-heart" @click.stop="likeFile(item,'like',index)"></i>
|
||||||
<i class="fi fi-rr-circle-ellipsis" @click.stop="setMenuShow(item)"></i>
|
</div>
|
||||||
<ul v-show="item.menuShow">
|
<div class="productImg_right_item_scale iconLeft">
|
||||||
<li v-for="menuItem,index in productimgMenuList" v-show="index != 0" @click.stop="setMenu(menuItem,item)" :key="menuItem.value">{{ menuItem.label }}</li>
|
<i class="fi fi-bs-expand-arrows-alt" @click.stop="setScaleImage(generateList[productimgMenu.value],index)"></i>
|
||||||
</ul>
|
</div>
|
||||||
|
<div class="productImg_right_item_menu iconLeft">
|
||||||
|
<i class="fi fi-rr-circle-ellipsis" @click.stop="setMenuShow(item)"></i>
|
||||||
|
<ul v-show="item.menuShow">
|
||||||
|
<li v-for="menuItem,index in productimgMenuList" v-show="index != 0" @click.stop="setMenu(menuItem,item)" :key="menuItem.value">{{ menuItem.label }}</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="mark_loading" v-show="isShowMark">
|
||||||
|
<a-spin size="large" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="productImg_content_item_title productImg_right_titleBtn">
|
<div class="productImg_content_item_title productImg_right_titleBtn">
|
||||||
{{$t('ProductImg.SelectedProduct')}}
|
{{$t('ProductImg.SelectedProduct')}}
|
||||||
@@ -158,9 +178,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mark_loading" v-show="isShowMark">
|
|
||||||
<a-spin size="large" />
|
|
||||||
</div>
|
|
||||||
<ExportModel ref="ExportModel" @setTask="setTask"></ExportModel>
|
<ExportModel ref="ExportModel" @setTask="setTask"></ExportModel>
|
||||||
<scaleImage ref="scaleImage"></scaleImage>
|
<scaleImage ref="scaleImage"></scaleImage>
|
||||||
</a-modal>
|
</a-modal>
|
||||||
@@ -206,6 +224,7 @@ export default defineComponent({
|
|||||||
selectProductimgList:[],
|
selectProductimgList:[],
|
||||||
generateList:{},
|
generateList:{},
|
||||||
likeList:[],
|
likeList:[],
|
||||||
|
similarity:0,
|
||||||
})
|
})
|
||||||
let productimgMenuList = ref([
|
let productimgMenuList = ref([
|
||||||
{
|
{
|
||||||
@@ -265,7 +284,6 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
let cleardata = ()=>{
|
let cleardata = ()=>{
|
||||||
productImg.value = false
|
productImg.value = false
|
||||||
productImgData.isShowMark = false
|
|
||||||
productImgData.likeList = []
|
productImgData.likeList = []
|
||||||
productImgData.generateList = {}
|
productImgData.generateList = {}
|
||||||
productimgMenu.value = productimgMenuList.value[0]
|
productimgMenu.value = productimgMenuList.value[0]
|
||||||
@@ -369,7 +387,8 @@ export default defineComponent({
|
|||||||
"isLike": 0,
|
"isLike": 0,
|
||||||
"taskId": "",
|
"taskId": "",
|
||||||
"toProductImageRecordId": 0,
|
"toProductImageRecordId": 0,
|
||||||
"url": ""
|
"url": "",
|
||||||
|
imageStrength:.3
|
||||||
}
|
}
|
||||||
if(productImgData.fileList[productimgMenu.value.value]){
|
if(productImgData.fileList[productimgMenu.value.value]){
|
||||||
productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
|
productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
|
||||||
@@ -411,15 +430,23 @@ export default defineComponent({
|
|||||||
if(productimgMenu.value.value == 'Relight'){
|
if(productimgMenu.value.value == 'Relight'){
|
||||||
url = Https.httpUrls.relight
|
url = Https.httpUrls.relight
|
||||||
}
|
}
|
||||||
|
productImgData.isShowMark = true
|
||||||
Https.axiosPost(url, data).then(
|
Https.axiosPost(url, data).then(
|
||||||
(rv) => {
|
(rv) => {
|
||||||
|
productImgData.isShowMark = false
|
||||||
let arr:any = []
|
let arr:any = []
|
||||||
|
if(!productImgData.generateList[productimgMenu.value.value]){
|
||||||
|
productImgData.generateList[productimgMenu.value.value] = []
|
||||||
|
}
|
||||||
rv.forEach((item:any)=>{
|
rv.forEach((item:any)=>{
|
||||||
arr.push(item.taskId)
|
arr.push(item.taskId)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
productImgData.generateList[productimgMenu.value.value].push(...rv)
|
||||||
setPrductimg(arr)
|
setPrductimg(arr)
|
||||||
}
|
}
|
||||||
).catch(res=>{
|
).catch(res=>{
|
||||||
|
productImgData.isShowMark = false
|
||||||
productImgData.isProductimg = false
|
productImgData.isProductimg = false
|
||||||
clearInterval(remPrductimgTime)
|
clearInterval(remPrductimgTime)
|
||||||
productImgData.remProductimg= false
|
productImgData.remProductimg= false
|
||||||
@@ -427,7 +454,6 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
let generateProceedList:any = []
|
let generateProceedList:any = []
|
||||||
let setPrductimg = (dataList:any)=>{
|
let setPrductimg = (dataList:any)=>{
|
||||||
|
|
||||||
let data = dataList
|
let data = dataList
|
||||||
let dataNum = dataList.length
|
let dataNum = dataList.length
|
||||||
let state = true
|
let state = true
|
||||||
@@ -447,10 +473,15 @@ export default defineComponent({
|
|||||||
rv.forEach((element:any) => {
|
rv.forEach((element:any) => {
|
||||||
if(element.status == 'Success'){
|
if(element.status == 'Success'){
|
||||||
element.imgUrl = element.url
|
element.imgUrl = element.url
|
||||||
if(!productImgData.generateList[productimgMenu.value.value]){
|
// if(!productImgData.generateList[productimgMenu.value.value]){
|
||||||
productImgData.generateList[productimgMenu.value.value] = []
|
// productImgData.generateList[productimgMenu.value.value] = []
|
||||||
}
|
// }
|
||||||
productImgData.generateList[productimgMenu.value.value].unshift(element)
|
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);
|
data = data.filter((item:any) => item !== element.taskId);
|
||||||
});
|
});
|
||||||
@@ -522,9 +553,10 @@ export default defineComponent({
|
|||||||
generalIsMenuShow = {}
|
generalIsMenuShow = {}
|
||||||
document.removeEventListener('click',removeMenuShow)
|
document.removeEventListener('click',removeMenuShow)
|
||||||
}
|
}
|
||||||
let clearPrductimg = ()=>{
|
let setSimilarity = ()=>{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//超分
|
//超分
|
||||||
let setTask = (data:any)=>{
|
let setTask = (data:any)=>{
|
||||||
emit('setTask',data)
|
emit('setTask',data)
|
||||||
@@ -555,7 +587,7 @@ export default defineComponent({
|
|||||||
setScaleImage,
|
setScaleImage,
|
||||||
setMenu,
|
setMenu,
|
||||||
setMenuShow,
|
setMenuShow,
|
||||||
clearPrductimg,
|
setSimilarity,
|
||||||
setTask,
|
setTask,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -655,6 +687,9 @@ export default defineComponent({
|
|||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
&.productImg_content_item_title_similarity{
|
||||||
|
// margin-bottom: 8rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.productImg_content_item_intro{
|
.productImg_content_item_intro{
|
||||||
font-size: 1.4rem;
|
font-size: 1.4rem;
|
||||||
@@ -765,12 +800,23 @@ export default defineComponent({
|
|||||||
border-radius: 2rem;
|
border-radius: 2rem;
|
||||||
margin-bottom: 2%;
|
margin-bottom: 2%;
|
||||||
padding: 1rem 1.5rem;
|
padding: 1rem 1.5rem;
|
||||||
|
position: relative;
|
||||||
|
.mark_loading{
|
||||||
|
position: absolute
|
||||||
|
}
|
||||||
.productImg_right_item{
|
.productImg_right_item{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 1rem 0;
|
padding: 1rem 0;
|
||||||
margin-right: 1rem;
|
margin-right: 1rem;
|
||||||
position: relative;
|
position: relative;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
|
.productImg_right_item_imgBox{
|
||||||
|
height: 100%;
|
||||||
|
.loadingImg{
|
||||||
|
width: 14rem;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
}
|
||||||
img{
|
img{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,8 +28,9 @@
|
|||||||
<div class="falls_item_user">
|
<div class="falls_item_user">
|
||||||
<!-- <img src="http://121.40.53.210:3000/falls/5.png" alt=""> -->
|
<!-- <img src="http://121.40.53.210:3000/falls/5.png" alt=""> -->
|
||||||
<div class="falls_item_user_detail">
|
<div class="falls_item_user_detail">
|
||||||
|
<span>@{{ item.userName }}</span>
|
||||||
<div>{{item.portfolioName}}</div>
|
<div>{{item.portfolioName}}</div>
|
||||||
<span :title="item.portfolioDes">{{item.portfolioDes}}</span>
|
<!-- <span :title="item.portfolioDes">{{item.portfolioDes}}</span> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="falls_item_detail">
|
<div class="falls_item_detail">
|
||||||
|
|||||||
@@ -147,6 +147,7 @@ export default {
|
|||||||
SelectCollection:'选择的系列',
|
SelectCollection:'选择的系列',
|
||||||
Upload:'上传',
|
Upload:'上传',
|
||||||
MagicTools:'魔法工具',
|
MagicTools:'魔法工具',
|
||||||
|
Similarity:'相似度',
|
||||||
GenerateProduct:'生成的产品',
|
GenerateProduct:'生成的产品',
|
||||||
SelectedProduct:'选择的产品',
|
SelectedProduct:'选择的产品',
|
||||||
Export:'导出',
|
Export:'导出',
|
||||||
@@ -433,6 +434,11 @@ export default {
|
|||||||
jsContent5:'Image must smaller than 5MB!',
|
jsContent5:'Image must smaller than 5MB!',
|
||||||
jsContent6:"找不到这个TCX的颜色",
|
jsContent6:"找不到这个TCX的颜色",
|
||||||
},
|
},
|
||||||
|
addDetails:{
|
||||||
|
AddDetails:'添加细节',
|
||||||
|
submit:'保存',
|
||||||
|
jsContent1:'请至少绘制一条线段',
|
||||||
|
},
|
||||||
DesignDetailEnd:{
|
DesignDetailEnd:{
|
||||||
NewApparel:'选择的服装',
|
NewApparel:'选择的服装',
|
||||||
NewPrint:'选择的印花',
|
NewPrint:'选择的印花',
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ export default {
|
|||||||
Finalize:'Finalize',
|
Finalize:'Finalize',
|
||||||
SelectCollection:'Select Collection',
|
SelectCollection:'Select Collection',
|
||||||
Upload:'Upload',
|
Upload:'Upload',
|
||||||
|
Similarity:'Similarity',
|
||||||
MagicTools:'Magic Tools',
|
MagicTools:'Magic Tools',
|
||||||
GenerateProduct:'Generate Product',
|
GenerateProduct:'Generate Product',
|
||||||
SelectedProduct:'Selected Product',
|
SelectedProduct:'Selected Product',
|
||||||
@@ -311,7 +312,7 @@ export default {
|
|||||||
RGBA:'RGBA',
|
RGBA:'RGBA',
|
||||||
UploadImage:'Upload Image',////////////
|
UploadImage:'Upload Image',////////////
|
||||||
ColorCode:'Color Code',
|
ColorCode:'Color Code',
|
||||||
SelectSuccessively:'Select Successively',
|
SelectSuccessively:'Mutil',
|
||||||
SelectSeparately:'Select Separately',
|
SelectSeparately:'Select Separately',
|
||||||
ExtractColor:'Extract Color',
|
ExtractColor:'Extract Color',
|
||||||
Single:'Single',
|
Single:'Single',
|
||||||
@@ -434,6 +435,11 @@ export default {
|
|||||||
jsContent5:'Image must smaller than 5MB!',
|
jsContent5:'Image must smaller than 5MB!',
|
||||||
jsContent6:"Can't find the TCX color",
|
jsContent6:"Can't find the TCX color",
|
||||||
},
|
},
|
||||||
|
addDetails:{
|
||||||
|
AddDetails:'Add Details',
|
||||||
|
submit:'Submit',
|
||||||
|
jsContent1:'Please draw at least one line segment',
|
||||||
|
},
|
||||||
DesignDetailEnd:{
|
DesignDetailEnd:{
|
||||||
NewApparel:'New Apparel',
|
NewApparel:'New Apparel',
|
||||||
NewPrint:'New Print',
|
NewPrint:'New Print',
|
||||||
|
|||||||
Reference in New Issue
Block a user