2023-10-31-2-dist

This commit is contained in:
X1627315083
2023-10-31 16:04:40 +08:00
parent 4bc10f121a
commit 5d89e3c007
19 changed files with 425 additions and 217 deletions

2
.gitignore vendored
View File

@@ -1,6 +1,6 @@
.DS_Store .DS_Store
node_modules node_modules
/dist # /dist
# local env files # local env files

View File

@@ -185,6 +185,10 @@ li {
.operate_file_block .select_img_type .category_list .category_item:hover { .operate_file_block .select_img_type .category_list .category_item:hover {
background: linear-gradient(-137deg, #eeefdb, #e7dbed); background: linear-gradient(-137deg, #eeefdb, #e7dbed);
} }
.ant-message {
z-index: 1049 !important;
top: 6rem;
}
.ant-modal-confirm-btns .ant-btn:hover { .ant-modal-confirm-btns .ant-btn:hover {
color: #39215b !important; color: #39215b !important;
border-color: #39215b !important; border-color: #39215b !important;

View File

@@ -229,6 +229,10 @@ ul,li{
} }
} }
} }
.ant-message{
z-index: 1049 !important;
top: 6rem;
}
.ant-modal-confirm-btns{ .ant-modal-confirm-btns{
.ant-btn:hover{ .ant-btn:hover{
color: #39215b !important; color: #39215b !important;

View File

@@ -653,10 +653,6 @@ export default defineComponent({
// console.log(this.current.printObject,imgData); // console.log(this.current.printObject,imgData);
} }
// imgData.type_ = this.type_
// this.store.commit("addGenerateMaterialFils", imgData);
}, },
//请求我的印花&&模型 //请求我的印花&&模型
getLibraryList(){ getLibraryList(){

View File

@@ -487,7 +487,7 @@ export default defineComponent({
justify-content: space-between; justify-content: space-between;
} }
.modal_img{ .modal_img{
width: 45rem; width: 50rem;
// width: 40rem; // width: 40rem;
height: 5rem; height: 5rem;
overflow-x: hidden; overflow-x: hidden;

View File

@@ -166,10 +166,11 @@
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i> <i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
</div> </div>
</div> </div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
</div>
</div> </div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
</div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
@@ -314,6 +315,7 @@ export default defineComponent({
generageAdd(data: any) { generageAdd(data: any) {
data.type_ = this.type_; data.type_ = this.type_;
data.resData = JSON.parse(JSON.stringify(data)) data.resData = JSON.parse(JSON.stringify(data))
data.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", data); this.store.commit("addGenerateMaterialFils", data);
}, },
@@ -500,6 +502,7 @@ export default defineComponent({
}, },
deleteFile(item: any) { deleteFile(item: any) {
if (item.type_ == "generate" || item.type_ == "material") { if (item.type_ == "generate" || item.type_ == "material") {
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item); this.store.commit("addGenerateMaterialFils", item);
} else { } else {
this.sketchboardList = this.sketchboardList =
@@ -565,6 +568,8 @@ export default defineComponent({
flex: 1; flex: 1;
// height: 30rem; // height: 30rem;
// overflow-x: hidden; // overflow-x: hidden;
display: flex;
flex-direction: column;
border-right: 1px solid #e5e5e5; border-right: 1px solid #e5e5e5;
&.generate::-webkit-scrollbar { &.generate::-webkit-scrollbar {
display: none; display: none;
@@ -629,7 +634,16 @@ export default defineComponent({
} }
.generage_img { .generage_img {
display: flex; display: flex;
position: relative;
flex-wrap: wrap; flex-wrap: wrap;
align-content: flex-start;
flex: 1;
.mark_loading{
position: absolute;
width: 100%;
height: 100%;
z-index: 99;
}
.generage_img_item { .generage_img_item {
cursor: pointer; cursor: pointer;
margin: 0 2rem 2rem 0; margin: 0 2rem 2rem 0;

View File

@@ -84,6 +84,7 @@ import { Https } from "@/tool/https";
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import { useStore } from "vuex"; import { useStore } from "vuex";
import GO from '@/tool/GO'; import GO from '@/tool/GO';
import { useI18n } from 'vue-i18n';
export default defineComponent({ export default defineComponent({
props: ["msg",'disignTypeList'], props: ["msg",'disignTypeList'],
@@ -103,6 +104,8 @@ export default defineComponent({
// ]) // ])
let workspace:any = ref({}) let workspace:any = ref({})
let {t} = useI18n()
return{ return{
myMaterialModalShow, myMaterialModalShow,
imgList, imgList,
@@ -115,7 +118,8 @@ export default defineComponent({
searcMaterialhName, searcMaterialhName,
designType, designType,
// disignTypeList, // disignTypeList,
workspace workspace,
t
} }
}, },
data (prop) { data (prop) {
@@ -259,6 +263,7 @@ export default defineComponent({
this.imgList.forEach((v:any)=>{ this.imgList.forEach((v:any)=>{
v.categoryShow = false v.categoryShow = false
}) })
imgData.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", imgData); this.store.commit("addGenerateMaterialFils", imgData);
}, },
//改变页码 //改变页码

View File

@@ -334,6 +334,7 @@ export default defineComponent({
deleteFile(item: any) { deleteFile(item: any) {
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){ if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item); this.store.commit("addGenerateMaterialFils", item);
}else{ }else{

View File

@@ -117,12 +117,13 @@
<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox> <a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
</div> </div>
</div> </div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
</div>
<Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper> <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
</div> </div>
</template> </template>
@@ -277,6 +278,7 @@ export default defineComponent({
// this.fileList.splice(item, 1) // this.fileList.splice(item, 1)
// this.store.commit('setPrintboardFile',this.fileList) // this.store.commit('setPrintboardFile',this.fileList)
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){ if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item); this.store.commit("addGenerateMaterialFils", item);
}else{ }else{
this.fileList = this.store.state.UploadFilesModule.printboardFiles this.fileList = this.store.state.UploadFilesModule.printboardFiles
@@ -498,7 +500,7 @@ export default defineComponent({
let data = { let data = {
generateType:generateType, generateType:generateType,
designType:'', designType:'',
collectionElementId:generage.collectionElementid, collectionElementId:generage?.collectionElementid,
level1Type:generage.upload.level1Type, level1Type:generage.upload.level1Type,
level2Type:'', level2Type:'',
text:this.captionGeneration, text:this.captionGeneration,
@@ -507,7 +509,7 @@ export default defineComponent({
gender:'', gender:'',
} }
if(generateType == 'image'||generateType == 'text-image'){ if(generateType == 'image'||generateType == 'text-image'){
if(generage.collectionElementid){ if(generage?.collectionElementid){
}else{ }else{
message.warning( message.warning(
@@ -543,8 +545,8 @@ export default defineComponent({
let arr let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{ rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = { arr = {
id:rv.generatedCollectionItems[index].generateItemId, id:v.generateItemId,
imgUrl:rv.generatedCollectionItems[index].generateItemUrl, imgUrl:v.generateItemUrl,
id_:GO.id++ id_:GO.id++
} }
this.generateList.push(arr) this.generateList.push(arr)
@@ -562,6 +564,7 @@ export default defineComponent({
type2: 'Printboard', type2: 'Printboard',
}, },
item.resData = JSON.parse(JSON.stringify(item)) item.resData = JSON.parse(JSON.stringify(item))
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item); this.store.commit("addGenerateMaterialFils", item);
} }
} }
@@ -834,6 +837,15 @@ export default defineComponent({
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-start; justify-content: flex-start;
position: relative;
align-content: flex-start;
.mark_loading{
position: absolute;
width: 100%;
height: 100%;
z-index: 99;
}
.modal_imgItem{ .modal_imgItem{
margin: 0 2rem 5rem 0; margin: 0 2rem 5rem 0;
display: inline-block; display: inline-block;

View File

@@ -235,12 +235,13 @@
<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox> <a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
</div> </div>
</div> </div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
</div>
<!-- <layout ref="layout" :moodb_className="moodb_className" :flex_direction="flex_direction" @setmoodbClass="setmoodbClass"></layout> --> <!-- <layout ref="layout" :moodb_className="moodb_className" :flex_direction="flex_direction" @setmoodbClass="setmoodbClass"></layout> -->
@@ -475,6 +476,7 @@ export default defineComponent({
deleteFile(item: any) { deleteFile(item: any) {
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){ if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item); this.store.commit("addGenerateMaterialFils", item);
}else{ }else{
this.fileList = this.store.state.UploadFilesModule.sketchboardFiles this.fileList = this.store.state.UploadFilesModule.sketchboardFiles
@@ -569,7 +571,7 @@ export default defineComponent({
let data = { let data = {
generateType:generateType, generateType:generateType,
designType:'', designType:'',
collectionElementId:generage.collectionElementid, collectionElementId:generage?.collectionElementid,
level1Type:generage.upload.level1Type, level1Type:generage.upload.level1Type,
level2Type:generage.level2Type, level2Type:generage.level2Type,
text:this.captionGeneration, text:this.captionGeneration,
@@ -578,7 +580,7 @@ export default defineComponent({
gender:this.workspace.sex, gender:this.workspace.sex,
} }
if(generateType == 'image'||generateType == 'text-image'){ if(generateType == 'image'||generateType == 'text-image'){
if(generage.collectionElementid){ if(generage?.collectionElementid){
}else{ }else{
message.warning( message.warning(
this.t('SketchboardUpload.jsContent5') this.t('SketchboardUpload.jsContent5')
@@ -613,8 +615,8 @@ export default defineComponent({
let arr let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{ rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = { arr = {
id:rv.generatedCollectionItems[index].generateItemId, id:v.generateItemId,
imgUrl:rv.generatedCollectionItems[index].generateItemUrl, imgUrl:v.generateItemUrl,
category:generage.level2Type, category:generage.level2Type,
id_:GO.id++ id_:GO.id++
} }
@@ -633,6 +635,7 @@ export default defineComponent({
type2: 'Sketchboard', type2: 'Sketchboard',
}, },
item.resData = JSON.parse(JSON.stringify(item)) item.resData = JSON.parse(JSON.stringify(item))
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item); this.store.commit("addGenerateMaterialFils", item);
} }
}, },
@@ -896,6 +899,14 @@ export default defineComponent({
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-start; justify-content: flex-start;
align-content: flex-start;
position: relative;
.mark_loading{
position: absolute;
width: 100%;
height: 100%;
z-index: 99;
}
.modal_imgItem{ .modal_imgItem{
margin: 0 2rem 4rem 0; margin: 0 2rem 4rem 0;
display: inline-block; display: inline-block;

View File

@@ -16,7 +16,10 @@
<div v-show="collectionStep === 3">{{ $t('collectionModal.Colorboard') }}</div> <div v-show="collectionStep === 3">{{ $t('collectionModal.Colorboard') }}</div>
<div v-show="collectionStep === 4">{{ $t('collectionModal.Sketchboard') }}</div> <div v-show="collectionStep === 4">{{ $t('collectionModal.Sketchboard') }}</div>
<!-- <div v-show="collectionStep === 5">Markets Sketch</div> --> <!-- <div v-show="collectionStep === 5">Markets Sketch</div> -->
<div class="collection_title_text_intro">{{ $t('collectionModal.collection') }}</div> <div class="collection_title_text_intro" v-show="collectionStep === 1">{{ $t('collectionModal.MoodCollection') }}</div>
<div class="collection_title_text_intro" v-show="collectionStep === 2">{{ $t('collectionModal.PrinCollection') }}</div>
<div class="collection_title_text_intro" v-show="collectionStep === 3">{{ $t('collectionModal.ColorCollection') }}</div>
<div class="collection_title_text_intro" v-show="collectionStep === 4">{{ $t('collectionModal.SketchCollection') }}</div>
</div> </div>
<div class="collection_progress"> <div class="collection_progress">
<a-progress :strokeWidth= 13 strokeColor="#341e57" type="circle" :percent="collectionStep*25" :format="percent => `${collectionStep}/4`" /> <a-progress :strokeWidth= 13 strokeColor="#341e57" type="circle" :percent="collectionStep*25" :format="percent => `${collectionStep}/4`" />

View File

@@ -294,7 +294,7 @@ export default defineComponent({
cropper.cropOffsertY = cropper.getImgAxis().y1 cropper.cropOffsertY = cropper.getImgAxis().y1
imgBoxSize.addEventListener('mousemove',this.startMove) imgBoxSize.addEventListener('mousemove',this.startMove)
this.setImageSize() this.setImageSize()
this.getDefaultPointList(this.imgBox) this.getDefaultPointList(this.imgBox,' ')
},300) },300)
}, },
realTime(data:any) { realTime(data:any) {
@@ -343,7 +343,7 @@ export default defineComponent({
}, },
//初始化可以使用的点位 //初始化可以使用的点位
getDefaultPointList(imgBox:any){ getDefaultPointList(imgBox:any,str:any){
this.isSubmit = false this.isSubmit = false
this.locationList=[] this.locationList=[]
this.pointList = [ this.pointList = [
@@ -360,36 +360,35 @@ export default defineComponent({
pointList:[{type:'handLeft',color:'#d88e8e',show:true,field:'hand'},{type:'handRight',color:'#d88e8e',show:true,field:'hand'}] pointList:[{type:'handLeft',color:'#d88e8e',show:true,field:'hand'},{type:'handRight',color:'#d88e8e',show:true,field:'hand'}]
}, },
] ]
if(this.printObject.shoulderLeft?.length >1){//编辑 for(let ponit of this.pointList){
console.log(this.printObject); for(let pointItem of ponit.pointList){
if(this.printObject[pointItem.type]?.length){
pointItem.show = false
let data = {
left:this.printObject[pointItem.type][0] * imgBox.width - 12,
top:this.printObject[pointItem.type][1] * imgBox.height - 12,
color:pointItem.color,
type:pointItem.type,
field:pointItem.field,
}
this.locationList.push(data)
}
}
}
if(str != 'setPoint'){//编辑
this.isSubmit = true this.isSubmit = true
// this.option.canScale = false // this.option.canScale = false
// this.option.canMove = false // this.option.canMove = false
for(let ponit of this.pointList){
for(let pointItem of ponit.pointList){
if(this.printObject[pointItem.type]?.length){
pointItem.show = false
let data = {
left:this.printObject[pointItem.type][0] * imgBox.width - 12,
top:this.printObject[pointItem.type][1] * imgBox.height - 12,
color:pointItem.color,
type:pointItem.type,
field:pointItem.field,
}
this.locationList.push(data)
}
}
}
this.oldLocationList = JSON.parse(JSON.stringify(this.locationList)) this.oldLocationList = JSON.parse(JSON.stringify(this.locationList))
this.oldPointList = JSON.parse(JSON.stringify(this.pointList))
}else{ }else{
this.option.canScale = true this.option.canScale = true
// this.option.fixedBox = false // this.option.fixedBox = false
this.option.canMove = true this.option.canMove = true
// this.option.canMoveBox = true // this.option.canMoveBox = true
} }
this.oldPointList = JSON.parse(JSON.stringify(this.pointList))
}, },
setPoint(){ setPoint(){
console.log(); console.log();
@@ -422,7 +421,7 @@ export default defineComponent({
file:printObject.file, file:printObject.file,
url:printObject.url url:printObject.url
} }
this.getDefaultPointList(this.imgBox) this.getDefaultPointList(this.imgBox,'setPoint')
}, },
AddDian(point:any){ AddDian(point:any){
if(!point.show){ if(!point.show){
@@ -530,8 +529,8 @@ export default defineComponent({
Modal.confirm({ Modal.confirm({
title: this.t('ModelPlacement.jsContent1'), title: this.t('ModelPlacement.jsContent1'),
icon: createVNode(ExclamationCircleOutlined), icon: createVNode(ExclamationCircleOutlined),
okText: 'Ok', okText: 'Yes',
cancelText: 'Cancel', cancelText: 'No',
mask:false, mask:false,
// centered:true, // centered:true,
onOk() { onOk() {
@@ -558,6 +557,9 @@ export default defineComponent({
}, },
restoreLocationList(){ restoreLocationList(){
this.locationList = []
console.log(this.locationList);
this.pointList = JSON.parse(JSON.stringify(this.oldPointList)) this.pointList = JSON.parse(JSON.stringify(this.oldPointList))
this.locationList = JSON.parse(JSON.stringify(this.oldLocationList)) this.locationList = JSON.parse(JSON.stringify(this.oldLocationList))
}, },

View File

@@ -304,8 +304,8 @@ export default defineComponent({
Modal.confirm({ Modal.confirm({
title: "You haven't marked the image yet, and the model will not be uploaded. Are you sure you want to close it?", title: "You haven't marked the image yet, and the model will not be uploaded. Are you sure you want to close it?",
icon: createVNode(ExclamationCircleOutlined), icon: createVNode(ExclamationCircleOutlined),
okText: 'Ok', okText: 'Yes',
cancelText: 'Cancel', cancelText: 'No',
mask:false, mask:false,
// centered:true, // centered:true,
onOk() { onOk() {

View File

@@ -69,6 +69,7 @@ export default {
Prints:'Prints', Prints:'Prints',
Sketches:'Sketches', Sketches:'Sketches',
Mannequins:'Mannequins', Mannequins:'Mannequins',
model:'model',
jsContent1:'Are you sure to delete the picture?', jsContent1:'Are you sure to delete the picture?',
jsContent2:'Are you sure to delete the picture?', jsContent2:'Are you sure to delete the picture?',
jsContent3:'You can only upload Image file!', jsContent3:'You can only upload Image file!',
@@ -242,7 +243,10 @@ export default {
Printboard:'Printboard', Printboard:'Printboard',
Colorboard:'Colorboard', Colorboard:'Colorboard',
Sketchboard:'Sketchboard', Sketchboard:'Sketchboard',
collection:'select moodboard for your collection', MoodCollection:'select moodboard for your collection',
PrinCollection:'select printboard for your collection',
ColorCollection:'select colors for your collection',
SketchCollection:'select sketchboard for your collection',
jsContent1:'You must select the image and then use the layout.', jsContent1:'You must select the image and then use the layout.',
jsContent2:'The uploaded files will not be saved, being sure to continue? ', jsContent2:'The uploaded files will not be saved, being sure to continue? ',
jsContent3:'You must choose one or more colors for further process.', jsContent3:'You must choose one or more colors for further process.',
@@ -292,4 +296,7 @@ export default {
preview:'preview', preview:'preview',
jsContent1:'The above changes are not saved, being sure to continue? ', jsContent1:'The above changes are not saved, being sure to continue? ',
}, },
uploadFile:{
jsContent1:'You can select up to 8 images',
},
} }

View File

@@ -44,8 +44,8 @@ export default {
GeneratedDesign:'生成的设计', GeneratedDesign:'生成的设计',
SelectedDesign:'喜欢的设计', SelectedDesign:'喜欢的设计',
Export:'导出', Export:'导出',
jsContent1:'必须选择一种或多种颜色进行下一步处理。', jsContent1:'必须选择一种或多种颜色进行下一步。',
jsContent2:'必须选择一种或多种颜色进行下一步处理。', jsContent2:'必须选择一种或多种颜色进行下一步。',
jsContent3:'导出文件失败。', jsContent3:'导出文件失败。',
}, },
LibraryPage:{ LibraryPage:{
@@ -58,24 +58,25 @@ export default {
ImageOnly:'图片', ImageOnly:'图片',
TextOnly:'文字', TextOnly:'文字',
TextImage:'图片-文字', TextImage:'图片-文字',
inputContent2:'输入生成内容', inputContent2:'输入生成图片的标题',
maximumLength:'输入的内容超过允许输入的最大长度', maximumLength:'输入的内容超过允许输入的最大长度',
Model1:'模型1', Model1:'模型1',
Model2:'模型2', Model2:'模型2',
inputContent3:'输入生成内容', inputContent3:'输入生成图片的标题',
Cancel:'取消', Cancel:'取消',
Sure:'确定', Sure:'确定',
Moodboard:'Moodboard', Moodboard:'情绪板',
Prints:'印花', Prints:'印花',
Sketches:'服装', Sketches:'服装',
Mannequins:'模特', Mannequins:'模特',
model:'模型',
jsContent1:'你确定要删除选中图片吗?', jsContent1:'你确定要删除选中图片吗?',
jsContent2:'你确定要删除选中图片吗?', jsContent2:'你确定要删除选中图片吗?',
jsContent3:'您只能上传图片文件!', jsContent3:'您只能上传图片文件!',
jsContent4:'图片必须小于2MB', jsContent4:'图片必须小于2MB',
jsContent5:'图片已经上传是否继续上传', jsContent5:'图片已经上传是否继续上传',
jsContent6:'输入的内容超过允许输入的最大长度', jsContent6:'输入的内容超过允许输入的最大长度',
jsContent7:'请输入内容~"', jsContent7:'请输入内容~',
}, },
HistoryPage:{ HistoryPage:{
History:'历史', History:'历史',
@@ -86,19 +87,19 @@ export default {
Rename:'重命名', Rename:'重命名',
Retrieve:'选择', Retrieve:'选择',
Delete:'删除', Delete:'删除',
inputContent2:'输入新名称', inputContent2:'输入新名称',
Submit:'保存', Submit:'保存',
CollectionsName:'名字', CollectionsName:'名字',
UptateTime:'修改时间', UptateTime:'修改时间',
SketchCounts:'草图数量', SketchCounts:'草图数量',
Operations:'操作', Operations:'Operations',
jsContent1:'删除成功', jsContent1:'删除成功',
jsContent2:'您确定要删除这个收藏吗?', jsContent2:'您确定要删除这个收藏吗?',
jsContent3:'修改成功', jsContent3:'修改成功',
jsContent4:'图片必须小于2MB', jsContent4:'图片必须小于2MB',
jsContent5:'图片已经上传是否继续上传', jsContent5:'图片已经上传是否继续上传',
jsContent6:'输入的内容超过允许输入的最大长度', jsContent6:'输入的内容超过允许输入的最大长度',
jsContent7:'请输入内容~"', jsContent7:'请输入内容~',
}, },
ModelPlacement:{ ModelPlacement:{
Registration:'新增模特', Registration:'新增模特',
@@ -109,187 +110,193 @@ export default {
System:'系统', System:'系统',
Library:'收藏', Library:'收藏',
Point:'点位', Point:'点位',
RemovePoint:'Remove Point', RemovePoint:'删除点位',
mannequinHint:'Please change the pure white inside the mannequin for another color to enhance your experience', mannequinHint:'模特背景图片请使用白色或者其他颜色来增强效果',
SHOULDER:'SHOULDER', SHOULDER:'肩膀',
WAISTBAND:'WAISTBAND', WAISTBAND:'腰部',
HAND:'HAND', HAND:'',
jsContent1:"You haven't marked the image yet, and the model will not be uploaded. Are you sure you want to close it?", jsContent1:"您还没有保存,模特不会上传,确定要继续吗?",
jsContent2:'图片已经上传是否继续上传', jsContent2:'图片已经上传是否继续上传',
}, },
ModelPlacementMobile:{ ModelPlacementMobile:{
Registration:'Registration', Registration:'新增模特',
Submit:'保存', Submit:'保存',
Preview:'预览', Preview:'预览',
Back:'Back', Back:'Back',
Restore:'重置', Restore:'重置',
Point:'点位', Point:'点位',
RemovePoint:'Remove Point', RemovePoint:'删除点位',
mannequinHint:'Please change the pure white inside the mannequin for another color to enhance your experience', mannequinHint:'模特背景图片请使用白色或者其他颜色来增强效果',
SHOULDER:'SHOULDER', SHOULDER:'肩膀',
WAISTBAND:'WAISTBAND', WAISTBAND:'腰部',
HAND:'HAND', HAND:'',
jsContent1:"You haven't marked the image yet, and the model will not be uploaded. Are you sure you want to close it?", jsContent1:"您还没有保存,模特不会上传,确定要继续吗?",
jsContent2:'图片已经上传是否继续上传', jsContent2:'图片已经上传是否继续上传',
}, },
Upload:{ Upload:{
Delete:'Delete', Delete:'删除',
Maximum2M:'Maximum 10 images can be uploaded, Maximum 2M per image', Maximum2M:'您最多可以上传10张照片每张照片不能超过2MB',
jsContent1:'您只能上传图片文件!', jsContent1:'您只能上传图片文件!',
jsContent2:'图片必须小于2MB', jsContent2:'图片必须小于2MB',
jsContent3:'upload failed', jsContent3:'上传失败',
}, },
SketchboardUpload:{ SketchboardUpload:{
Upload:'Upload', Upload:'上传',
Library:'Library', Library:'收藏',
Generate:'Generate', Generate:'生成',
PIN:'PIN', PIN:'PIN',
Thumbnail:'Thumbnail preview of selected sketchboard', Thumbnail:'选择的服装缩略图',
inputContent1:'Caption generation', inputContent1:'生成图片的标题',
maximumLength:'输入的内容超过允许输入的最大长度', maximumLength:'输入的内容超过允许输入的最大长度',
jsContent1:"upload failed", jsContent1:"上传失败",
jsContent2:"您只能上传图片文件!", jsContent2:"您只能上传图片文件!",
jsContent3:'图片必须小于2MB', jsContent3:'图片必须小于2MB',
jsContent4:"Maximum number of allowable file uploads has been exceeded", jsContent4:"超过允许上传的最大图片数量",
jsContent5:"Please select a picture", jsContent5:"请选择一张图片",
jsContent6:"输入的内容超过允许输入的最大长度", jsContent6:"输入的内容超过允许输入的最大长度",
jsContent7:"请输入内容~", jsContent7:"请输入内容~",
}, },
PrintboardUpload:{ PrintboardUpload:{
Upload:'Upload', Upload:'上传',
Library:'Library', Library:'收藏',
Generate:'Generate', Generate:'生成',
PIN:'PIN', PIN:'PIN',
Thumbnail:'Thumbnail preview of selected printboard', Thumbnail:'选择的印花缩略图',
inputContent1:'Caption generation', inputContent1:'生成图片的标题',
maximumLength:'输入的内容超过允许输入的最大长度', maximumLength:'输入的内容超过允许输入的最大长度',
jsContent1:"您只能上传图片文件!", jsContent1:"您只能上传图片文件!",
jsContent2:'图片必须小于2MB', jsContent2:'图片必须小于2MB',
jsContent3:"Maximum number of allowable file uploads has been exceeded", jsContent3:"超过允许上传的最大图片数量",
jsContent4:"Please select a picture", jsContent4:"请选择一张图片",
jsContent5:"输入的内容超过允许输入的最大长度", jsContent5:"输入的内容超过允许输入的最大长度",
jsContent6:"请输入内容~", jsContent6:"请输入内容~",
}, },
ColorboardUpload:{ ColorboardUpload:{
Thumbnail:'Thumbnail preview of selected colorboard', Thumbnail:'选择的颜色缩略图',
Clear:'Clear', Clear:'清除',
Palette:'Palette', Palette:'调色板',
HEX:'HEX', HEX:'HEX',
RGBA:'RGBA', RGBA:'RGBA',
AutoRecognize:'Auto Recognize', AutoRecognize:'识别图片颜色',
ColorCode:'Color Code', ColorCode:'颜色代码',
ExtractColor:'Extract Color', ExtractColor:'提取颜色',
jsContent1:"Your browser does not support it", jsContent1:"您的浏览器不支持",
jsContent2:"Can't find the TCX color", jsContent2:"找不到这个TCX的颜色",
jsContent3:"您只能上传图片文件!", jsContent3:"您只能上传图片文件!",
jsContent4:'图片必须小于2MB', jsContent4:'图片必须小于2MB',
}, },
MoodboardUpload:{ MoodboardUpload:{
Upload:'Upload', Upload:'上传',
Library:'Library', Library:'收藏',
Generate:'Generate', Generate:'生成',
Delete:'Delete', Delete:'删除',
Thumbnail:'Thumbnail preview of selected moodboard', Thumbnail:'选择的情绪板缩略图',
layout:'layout', layout:'布局',
jsContent1:'You can select up to 8 images', jsContent1:'您最多可以选择8张图片',
jsContent2:"upload failed", jsContent2:"上传失败",
jsContent3:"您只能上传图片文件!", jsContent3:"您只能上传图片文件!",
jsContent4:'图片必须小于2MB', jsContent4:'图片必须小于2MB',
jsContent5:'Please click Layout to sort randomly', jsContent5:'请点击布局进行随机排序',
}, },
Cropper:{ Cropper:{
Cutpicture:'Cut picture', Cutpicture:'切图',
Finish:'Finish', Finish:'完成',
Cancel:'Cancel', Cancel:'取消',
CropPreview:'Crop Preview', CropPreview:'缩略图',
}, },
Material:{ Material:{
inputContent1:'Please input', inputContent1:'输入名字进行搜索',
PIN:'PIN', PIN:'PIN',
}, },
MarketingSketchUpload:{ MarketingSketchUpload:{
Upload:'Upload', Upload:'上传',
MyLibrary:'My Library', MyLibrary:'我的收藏',
maximumLength:'Maximum 15 images can be uploaded, Maximum 2M per image', maximumLength:'最多可以上传15张照片每张照片不能超过2MB',
jsContent1:'upload failed', jsContent1:'上传失败',
jsContent2:"您只能上传图片文件!", jsContent2:"您只能上传图片文件!",
jsContent3:'图片必须小于2MB', jsContent3:'图片必须小于2MB',
jsContent5:'Maximum number of allowable file uploads has been exceeded', jsContent5:'超过允许上传的最大图片数量',
}, },
layout:{ layout:{
MoodBoardDesign:'MoodBoard Design', MoodBoardDesign:'设计情绪板',
Submit:'保存', Submit:'保存',
}, },
Generate:{ Generate:{
ImageOnly:'Image Only', ImageOnly:'图片',
TextOnly:'Text Only', TextOnly:'文字',
TextImage:'Text-Image', TextImage:'图片-文字',
Model1:'模型1', Model1:'模型1',
Model2:'模型2', Model2:'模型2',
inputContent1:'输入生成内容', inputContent1:'输入生成图片的标题',
Generate:'Generate', Generate:'生成',
maximumLength:'输入的内容超过允许输入的最大长度', maximumLength:'输入的内容超过允许输入的最大长度',
jsContent1:"您只能上传图片文件!", jsContent1:"您只能上传图片文件!",
jsContent2:'图片必须小于2MB', jsContent2:'图片必须小于2MB',
jsContent3:"请输入内容~", jsContent3:"请输入内容~",
jsContent4:'输入的内容超过允许输入的最大长度', jsContent4:'输入的内容超过允许输入的最大长度',
jsContent5:"请输入内容~", jsContent5:"请输入内容~",
jsContent6:"You can select up to 8 images", jsContent6:"您最多可以选择8张图片",
jsContent7:"upload failed", jsContent7:"上传失败",
}, },
collectionModal:{ collectionModal:{
Moodboard:'Moodboard', Moodboard:'情绪板',
Printboard:'Printboard', Printboard:'印花板',
Colorboard:'Colorboard', Colorboard:'颜色板',
Sketchboard:'Sketchboard', Sketchboard:'服装板块',
collection:'select moodboard for your collection', MoodCollection:'选择需要收藏的情绪板',
jsContent1:'You must select the image and then use the layout.', PrinCollection:'选择需要收藏的印花板',
jsContent2:'The uploaded files will not be saved, being sure to continue? ', ColorCollection:'选择需要收藏的颜色板',
jsContent3:'You must choose one or more colors for further process.', SketchCollection:'选择需要收藏的服装板',
jsContent1:'您必须选择图片然后点击布局.',
jsContent2:'上传的文件不会保存,是否继续? ',
jsContent3:'您必须选择一种或多种颜色进行下一步。',
}, },
DesignDetail:{ DesignDetail:{
Details:'Details', Details:'详情',
EditDetails:'Edit the details of your design', EditDetails:'编辑设计的细节',
Submit:'保存', Submit:'保存',
CurrentApparel:'Current Apparel', CurrentApparel:'当前服装',
CurrentPrint:'Current Print', CurrentPrint:'当前印花',
CurrentColor:'Current Color', CurrentColor:'当前颜色',
}, },
DesignDetailAlter:{ DesignDetailAlter:{
Upload:'Upload', Upload:'上传',
Library:'Library', Library:'收藏',
inputContent1:'Please input', inputContent1:'输入名字进行搜索',
Palette:'Palette', Palette:'调色板',
HEX:'HEX', HEX:'HEX',
RGBA:'RGBA', RGBA:'RGBA',
AutoRecognize:'Auto Recognize', AutoRecognize:'识别图片颜色',
Delete:'Delete', Delete:'删除',
ColorCode:'Color Code', ColorCode:'颜色代码',
jsContent1:"Your browser does not support it", jsContent1:"您的浏览器不支持",
jsContent2:"You can select up to 8 images", jsContent2:"您最多可以选择8张图片",
jsContent3:"upload failed", jsContent3:"上传失败",
jsContent4:'您只能上传图片文件!', jsContent4:'您只能上传图片文件!',
jsContent5:'Image must smaller than 5MB!', jsContent5:'Image must smaller than 5MB!',
jsContent6:"Can't find the TCX color", jsContent6:"找不到这个TCX的颜色",
}, },
DesignDetailEnd:{ DesignDetailEnd:{
NewApparel:'New Apparel', NewApparel:'选择的服装',
NewPrint:'New Print', NewPrint:'选择的印花',
Placement:'Placement', Placement:'模式',
Overall:'Overall', Overall:'整体',
Single:'Single', Single:'单个',
NewColor:'New Color', NewColor:'选择的颜色',
preview:'preview', preview:'预览',
Layout:'Layout', Layout:'布局',
jsContent1:'Please select print', jsContent1:'请选择印个印花',
}, },
DesignPrintOperation:{ DesignPrintOperation:{
Placement:'Placement', Placement:'调整位置',
Overall:'Overall', Overall:'整体',
Single:'Single', Single:'单个',
Random:'Random', Random:'随机',
inputContent:'Please input', inputContent:'输入名字进行搜索',
preview:'preview', preview:'预览',
jsContent1:'The above changes are not saved, being sure to continue? ', jsContent1:'以上操作没有保存,是否继续? ',
},
uploadFile:{
jsContent1:'您最多可以选择8张图片哦',
}, },
} }

View File

@@ -1,8 +1,8 @@
import {Module} from 'vuex' import {Module} from 'vuex'
import {RootState} from '../index' import {RootState} from '../index'
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { useI18n } from "vue-i18n";
import GO from '@/tool/GO'; import GO from '@/tool/GO';
interface UploadFiles{ interface UploadFiles{
moodboard:any, moodboard:any,
disposeMoodboard:any, disposeMoodboard:any,
@@ -90,9 +90,11 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
}else{ }else{
arr = state.printboard arr = state.printboard
} }
if(file.length == 0){ if(file.length == 0){
if(arr.length >= 8){ if(arr.length >= 8){
message.warning('You can select up to 8 images') // message.warning(GO.jsContent1)
message.warning(data.jsContent1)
}else{ }else{
data.checked = true data.checked = true
file.push(data) file.push(data)
@@ -107,7 +109,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
} }
if(str){ if(str){
if(arr.length >= 8){ if(arr.length >= 8){
message.warning('You can select up to 8 images') message.warning(data.jsContent1)
}else{ }else{
data.checked = true data.checked = true
file.push(data) file.push(data)

View File

@@ -8,7 +8,7 @@
<div class="page_content_body"> <div class="page_content_body">
<HeaderComponent></HeaderComponent> <HeaderComponent></HeaderComponent>
<div class="history_page_body"> <div class="history_page_body">
<div class="history_header">{{ $t('HistoryPage.History') }}History</div> <div class="history_header">{{ $t('HistoryPage.History') }}</div>
<div class="history_table_search"> <div class="history_table_search">
<a-range-picker class="range_picker" v-model:value="rangePickerValue" :placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]" valueFormat="YYYY-MM-DD"> <a-range-picker class="range_picker" v-model:value="rangePickerValue" :placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]" valueFormat="YYYY-MM-DD">
<template #suffixIcon> <template #suffixIcon>
@@ -32,7 +32,7 @@
bordered:false bordered:false
}"> }">
<template #bodyCell="{ column, text, record ,index}"> <template #bodyCell="{ column, text, record ,index}">
<div class="operate_list" v-if="column.title === 'Operations'"> <div class="operate_list" v-if="column?.Operations">
<div class="operate_item" @click="turnToDetail(record)">{{ $t('HistoryPage.Detail') }}</div> <div class="operate_item" @click="turnToDetail(record)">{{ $t('HistoryPage.Detail') }}</div>
<div class="operate_item" @click="renameCollection(record,index)">{{ $t('HistoryPage.Rename') }}</div> <div class="operate_item" @click="renameCollection(record,index)">{{ $t('HistoryPage.Rename') }}</div>
<div class="operate_item" @click="retrieveHome(record)">{{ $t('HistoryPage.Retrieve') }}</div> <div class="operate_item" @click="retrieveHome(record)">{{ $t('HistoryPage.Retrieve') }}</div>
@@ -97,6 +97,7 @@ export default defineComponent({
fixed: 'right', fixed: 'right',
width: 150, width: 150,
// slots:{customRender:'action'} // slots:{customRender:'action'}
Operations:true,
}, },
]); ]);
let collectionList:any = ref([]) let collectionList:any = ref([])

View File

@@ -1324,7 +1324,5 @@ export default defineComponent({
} }
} }
.ant-message{
z-index: 1049 !important;
}
</style> </style>

View File

@@ -234,10 +234,10 @@
</div> </div>
<div class="content_body_table scroll_style"> <div class="content_body_table scroll_style">
<div class="content_img_item" v-for="(img,index) in imgList" :key="img.id" @click="selectImgItem(img)"> <div class="content_img_item" v-for="(img,index) in generateList" :key="img.id" @click="selectImgItem(img)">
<div :class="['content_img_item_block', selectImgList.indexOf(img.id) > -1 ? 'select_item_img' :'']"> <div :class="['content_img_item_block', selectImgList.indexOf(img.id) > -1 ? 'select_item_img' :'']">
<img v-lazy="img.url" :key="img.url" :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']"/> <img v-lazy="img.imgUrl" :key="img.imgUrl" :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']"/>
<div class="img_item_hover"> <!-- <div class="img_item_hover">
<div class="img_operate_content"> <div class="img_operate_content">
<div class="img_operate_block" @click.stop="editPlacementClick(img)" v-show="selectCode === 'Models'"> <div class="img_operate_block" @click.stop="editPlacementClick(img)" v-show="selectCode === 'Models'">
<span class="icon iconfont icon-tianxie operate_icon"></span> <span class="icon iconfont icon-tianxie operate_icon"></span>
@@ -249,25 +249,17 @@
<span class="icon iconfont icon-shanchu operate_icon"></span> <span class="icon iconfont icon-shanchu operate_icon"></span>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<div class="content_img_name">{{img.name}}</div> <div class="content_img_name"></div>
</div> </div>
<div class="no_data_block" v-show="!imgList.length && !isShowMark"> <div class="no_data_block" v-show="!imgList.length && !isShowMark">
<img src="@/assets/images/homePage/null_img.png"> <img src="@/assets/images/homePage/null_img.png">
</div> </div>
</div> </div>
<div class="table_pagination" v-show="imgList.length"> <div class="table_pagination" v-show="generateList.length">
<a-pagination
v-model:current="currentPage"
v-model:pageSize="pageSize"
:total="total"
:showQuickJumper="true"
:showSizeChanger="false"
@change="changePage"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -381,16 +373,156 @@ export default defineComponent({
let generateCheckbox:any = ref() let generateCheckbox:any = ref()
let captionGeneration:any = ref() let captionGeneration:any = ref()
let inputTime = ref() let inputTime = ref()
let generateList:any = ref([]) let generateList:any = ref([
{
"id": 266,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735547_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065908Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=910634477c4188db039cfddfa69147c02d354200989a6515ee80dc9b939e6b83"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
},
{
"id": 267,
"imgUrl": "http://18.167.251.121:9000/aida-users/83/moodboard/1698735554_0.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20231031%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20231031T065915Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=1d9928c2568398267ab75e74a00ad054ddffb7953859f8bc285db57718953b64"
}
])
let selectGenerateList:any = ref([]) let selectGenerateList:any = ref([])
let printModel = ref({ let printModel = ref({
num:1, num:1,
optype:false, optype:false,
name:'model1' name:useI18n().t('LibraryPage.model')+'1'
}) })
let {t} = useI18n() let {t} = useI18n()
console.log();
return { return {
menuList, menuList,
selectImgList, selectImgList,
@@ -421,7 +553,7 @@ export default defineComponent({
generateList, generateList,
selectGenerateList, selectGenerateList,
printModel, printModel,
t t,
} }
}, },
data(this_) { data(this_) {
@@ -868,7 +1000,7 @@ export default defineComponent({
this.printModel = { this.printModel = {
num : num, num : num,
optype:false, optype:false,
name:'model'+num name:this.t('LibraryPage.model')+num
} }
}, },
getgenerate(){ getgenerate(){
@@ -877,7 +1009,7 @@ export default defineComponent({
let data = { let data = {
generateType:generateType, generateType:generateType,
designType:'', designType:'',
collectionElementId:generageImg.id, collectionElementId:generageImg?.id,
level1Type:this.selectCode, level1Type:this.selectCode,
level2Type:this.selectCode == 'Sketchboard'?this.designType:'', level2Type:this.selectCode == 'Sketchboard'?this.designType:'',
text:this.captionGeneration, text:this.captionGeneration,
@@ -886,7 +1018,7 @@ export default defineComponent({
gender:this.selectCode == 'Sketchboard'?this.sex:'', gender:this.selectCode == 'Sketchboard'?this.sex:'',
} }
if(generateType == 'image'||generateType == 'text-image'){ if(generateType == 'image'||generateType == 'text-image'){
if(generageImg.id){ if(generageImg?.id){
}else{ }else{
message.warning( message.warning(
@@ -914,22 +1046,26 @@ export default defineComponent({
return return
} }
} }
Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then( // this.isShowMark = true
(rv) => { // Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
if(rv){ // (rv) => {
this.generateList = [] // if(rv){
let arr // let arr
rv.generatedCollectionItems.forEach((v:any,index:number)=>{ // rv.generatedCollectionItems.forEach((v:any,index:number)=>{
arr = { // arr = {
id:rv.generatedCollectionItems[index].generateItemId, // id:v.generateItemId,
imgUrl:rv.generatedCollectionItems[index].generateItemUrl, // imgUrl:v.generateItemUrl,
} // }
this.generateList.push(arr) // this.generateList.push(arr)
}) // console.log(this.generateList);
}
} // })
).catch(res=>{ // this.isShowMark = false
}); // }
// }
// ).catch(res=>{
// this.isShowMark = false
// });
}, },
} }
}) })
@@ -960,6 +1096,7 @@ export default defineComponent({
flex-direction: column; flex-direction: column;
.library_page_body{ .library_page_body{
overflow: hidden;
width: 100%; width: 100%;
// height: calc(100% - 7rem); // height: calc(100% - 7rem);
flex: 1; flex: 1;
@@ -1263,7 +1400,7 @@ export default defineComponent({
line-height: 2; line-height: 2;
cursor: pointer; cursor: pointer;
&.printModel_item:hover{ &.printModel_item:hover{
background: rgba(0,0,0,.4); background: #949396;
} }
} }
} }
@@ -1294,6 +1431,9 @@ export default defineComponent({
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-start; justify-content: flex-start;
align-content: flex-start; align-content: flex-start;
&.content_body_table::-webkit-scrollbar {
display: none;
}
.content_img_item{ .content_img_item{
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
@@ -1389,8 +1529,9 @@ export default defineComponent({
.table_pagination{ .table_pagination{
text-align: center; text-align: center;
margin-top: 2rem; // height: 5.2rem;
flex: 1; flex: 1;
margin-top: 2rem;
} }
} }
} }