aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整bug

Browse Source
This commit is contained in:
X1627315083
2024-06-24 16:45:20 +08:00
parent bbfb1538f3
commit 15077d37ea
10 changed files with 170 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/Detail/DesignDetail.vue
View File

@@ -369,7 +369,7 @@ export default defineComponent({
if(newVal && newVal.length > 0){
this.exhibitionList.elements = this.setExhibitionList(newVal)
}else{
this.exhibitionList.print = []
this.exhibitionList.elements = []
}
}
},
@@ -492,7 +492,7 @@ export default defineComponent({
this.designItemId = data.design.designItemId
this.designOutfitId = data.design.designOutfitId
let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
// let url = Https.httpUrls.getDesignDetail + `?designItemId=40660&designPythonOutfitId=40366`
// let url = Https.httpUrls.getDesignDetail + `?designItemId=61204&designPythonOutfitId=60908`
this.parentData = data
this.loadingShow = true
Https.axiosGet(url).then(

28
src/component/Detail/DesignDetailAlter.vue
View File

@@ -521,7 +521,7 @@ export default defineComponent({
},
workspaceCom(newVal,oldVal){
this.workspace = newVal
this.upload.gender = newVal?.sexEnum?.name
this.upload.gender = newVal?.sexEnum?.value
},
},
mounted () {
@@ -636,14 +636,21 @@ export default defineComponent({
file.id = res.data.id;
file.url = res.data.url;
file.resData = res.data;
this.sketchCatecoryList.forEach((item) => {
if(item.value == res.data.level2Type){
file.categoryValue = item?.value;
file.category = item?.name;
}
});
let type
if(res.data.level2Type){
this.designTypeList.forEach((item) => {
if(item.value == res.data.level2Type){
file.categoryValue = item?.value;
type = item.value
file.category = item?.name;
}
});
}else{
file.categoryValue = this.designTypeList[0].value;
type = this.designTypeList[0].value
file.category = this.designTypeList[0].name;
}
file.designType = res.data.designType
let type = this.body?this.current.type:res.data.level2Type
file.level2Type = type;
file.minIOPath = file.resData.minIOPath
let fileList = this.uploadList.filter(
@@ -724,8 +731,9 @@ export default defineComponent({
},
selectImgItem(imgData){
let DesignDetailEnd = this.$refs.DesignDetailEnd
imgData.categoryValue = imgData.level2TypeEnum.name
imgData.category = imgData.level2TypeEnum.value
console.log(imgData);
imgData.categoryValue = imgData.categoryValue?imgData.categoryValue:imgData.level2TypeEnum.name
imgData.category = imgData.category?imgData.category:imgData.level2TypeEnum.value
if(this.selectCode == 'Sketchboard'){
// this.current.id_ = imgData.id
// this.current.path = imgData.url

8
src/component/HomePage/ExportModel.vue
View File

@@ -54,7 +54,7 @@
<div v-if="item[0] && key == 'colorBoards'" class="exportCanvasBox_intro">Color</div>
<div v-if="item[0] && key == 'sketchboardFiles'" class="exportCanvasBox_intro">Sketch</div>
<div v-if="item[0] && key == 'likeDesignCollectionList'" class="exportCanvasBox_intro">Selected Design</div>
<div v-if="item[0] && key == 'likePorductImg'" class="exportCanvasBox_intro">Selected Product</div>
<div v-if="item[0] && key == 'FinalizeImage'" class="exportCanvasBox_intro">Selected Product</div>
<div class="exportCanvasBox_item_color" v-if="key == 'colorBoards'" v-for="colorItem in item" :class="{active:colorItem.upScaleChecked}" draggable="true" @dragstart="onDragstart(key,colorItem)" @click="isMoible?setDragstart(key,colorItem):''">
<div class="color_content" v-if="colorItem.gradient" :style="{height:'10rem','background-image':colorItem?.gradient?`linear-gradient(${colorItem?.gradient.angle}deg,${setGradient(colorItem?.gradient)}`:'none'}"></div>
<div v-if="!colorItem.gradient">
@@ -629,7 +629,7 @@ export default defineComponent({
(sketchGrouping - 1) * 20) /
sketchGrouping;
}
if (key == "likeDesignCollectionList" || key == 'likePorductImg') {
if (key == "likeDesignCollectionList" || key == 'FinalizeImage') {
imgWidth =
(canvasWH.value.width -
(likeDesign - 1) * 20) /
@@ -647,7 +647,7 @@ export default defineComponent({
}else if(key == 'upImgFiles'){
imgId = data
minioUrl = data.url
}else if(key == 'likePorductImg'){
}else if(key == 'FinalizeImage'){
imgId = data.id
let url = data.imgUrl.split('?')[0]
var match = url.match(/:(\d+)\/(.*)/);
@@ -734,7 +734,7 @@ export default defineComponent({
data.imgUrl = item.designOutfitUrl;
data.name = "result" + index + "." + data.imgUrl.split(".").pop().split("?").shift();;
}
if (key == "likePorductImg") {
if (key == "FinalizeImage") {
data.imgUrl = item.designOutfitUrl;
data.name = "porduct" + index + "." + data.imgUrl.split(".").pop().split("?").shift();;
}

2
src/component/HomePage/PrintboardUpload.vue
View File

@@ -398,7 +398,7 @@ export default defineComponent({
let data = {
generateDetailId:item.id,
level1Type:"Printboard",
level2Type: '',
level2Type: item.categoryValue,
gender:this.workspace.sexEnum.value,
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
}

26
src/component/HomePage/TaskPage.vue
View File

@@ -154,7 +154,7 @@ export default defineComponent({
// this.getTaskList()
let time = 100
if(data){
time = 10000
time = 1000
}
setTimeout(() => {
this.currentPage = 1
@@ -187,7 +187,7 @@ export default defineComponent({
getTaskList(){
clearTimeout(this.getTaskTime)
let arr = this.taskListUnfinished.map((item:any) => item.taskId)
if(arr <= 0){
if(arr <= 0 && !arr[0].taskId){
return
}
Https.axiosPost(Https.httpUrls.getTasksList,arr).then((rv)=>{
@@ -227,6 +227,7 @@ export default defineComponent({
})
},
getTaskMoreList(value:any){
clearTimeout(this.getTaskTime)
let data = {
size:this.pageSize,
page: this.currentPage,
@@ -234,6 +235,7 @@ export default defineComponent({
endTime: "",
startTime: "",
}
this.isShowMark = true
Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
this.isShowMark = false
if(this.currentPage != 1 && rv.content.length == 0){
@@ -244,23 +246,23 @@ export default defineComponent({
this.taskListMore.push(...rv.content)
this.total = rv.total
this.taskListUnfinished = []
rv.content.forEach((item:any) => {
value.forEach((valueItem:any) => {
if(valueItem == item.taskId && item.status == 'success'){
downloadIamge(item.outputImage,item.imageName)
this.store.dispatch('getCredits')
}
if(value){
rv.content.forEach((item:any) => {
value.forEach((valueItem:any) => {
if(valueItem == item.taskId && item.status == 'success'){
downloadIamge(item.outputImage,item.imageName)
this.store.dispatch('getCredits')
}
});
});
});
}
this.taskListMore.forEach((item:any,index:number)=>{
if(item.status == 'Waiting' || item.status == 'Executing'){
item.index = index
this.taskListUnfinished.push(item)
this.getTaskList()
}
})
if(!this.getTaskTime){
this.getTaskList()
}
// if(this.taskListMore.indexOf('success'))
}
}).catch((rv) => {

163
src/component/HomePage/productImg.vue
View File

@@ -51,7 +51,7 @@
<div class="productImg_content_item_title">{{$t('ProductImg.SelectCollection')}}</div>
<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" >
<img @click="setGenerate(item)" v-lazy="item.designOutfitUrl" alt="" :class="{active:item.isChecked}">
<img @click="setGenerate(item)" v-lazy="item.designOutfitUrl?item.designOutfitUrl:item.url" alt="" :class="{active:item.isChecked}">
</div>
</div>
<div class="productImg_content_item_title">{{$t('ProductImg.Upload')}}</div>
@@ -91,7 +91,6 @@
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => fileUploadChange(file)"
>
<div
class="upload_tip_block"
>
@@ -119,13 +118,16 @@
<div class="productImg_right">
<div class="productImg_content_item_title">{{$t('ProductImg.GenerateProduct')}}</div>
<div class="productImg_right_item_box generalScroll" v-mousewheel>
<div class="productImg_right_item" v-for="item,index in generateList" :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_like">
<i class="fi fi-rr-heart" @click.stop="likeFile(item,'like',index)"></i>
</div>
<div class="productImg_right_item_scale">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="setScaleImage(generateList,index)"></i>
<i class="fi fi-bs-expand-arrows-alt" @click.stop="setScaleImage(generateList[productimgMenu.value],index)"></i>
</div>
<div class="productImg_right_item_menu iconLeft">
<i class="fi fi-rr-circle-ellipsis" @click.stop="setScaleImage(generateList[productimgMenu.value],index)"></i>
</div>
</div>
</div>
@@ -134,13 +136,19 @@
<div class="button_second" @click="setExport">{{$t('ProductImg.Export')}}</div>
</div>
<div class="productImg_right_item_box generalScroll" v-mousewheel>
<div class="productImg_right_item" v-for="item,index in likeList" :key="item">
<div class="productImg_right_item" v-for="item,index in likeList[productimgMenu.value]" :key="item">
<img :src="item.url" alt="">
<div class="productImg_right_item_like">
<div class="productImg_right_item_like iconLeft">
<i class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike',index)"></i>
</div>
<div class="productImg_right_item_scale">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="setScaleImage(likeList,index)"></i>
<div class="productImg_right_item_scale iconLeft">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="setScaleImage(likeList[productimgMenu.value],index)"></i>
</div>
<div class="productImg_right_item_menu">
<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>
@@ -193,12 +201,8 @@ export default defineComponent({
remProductimg:false,//是否出现取消按钮
isProductimg:false,//开始生成
selectProductimgList:[],
generateList:[
],
likeList:[
],
generateList:{},
likeList:{},
})
let productimgMenuList = ref([
{
@@ -238,7 +242,7 @@ export default defineComponent({
rv.forEach((item:any) => {
item.imgUrl = item.url
});
productImgData.likeList.push(...rv)
productImgData.likeList[productimgMenu.value.value] = rv
}
).catch(res=>{
});
@@ -259,7 +263,9 @@ export default defineComponent({
let cleardata = ()=>{
productImg.value = false
productImgData.isShowMark = false
productImgData.likeList = []
productImgData.likeList = {}
productImgData.generateList = {}
productimgMenu.value = productimgMenuList.value[0]
}
let fileUploadChange = (data: any)=> {
@@ -316,11 +322,17 @@ export default defineComponent({
Https.axiosPost(url, data).then(
(rv) => {
if(str == 'like'){
productImgData.likeList.push(item)
productImgData.generateList.splice(index,1)
if(!productImgData.likeList[productimgMenu.value.value]){
productImgData.likeList[productimgMenu.value.value] = []
}
productImgData.likeList[productimgMenu.value.value].push(item)
productImgData.generateList[productimgMenu.value.value].splice(index,1)
}else{
productImgData.generateList.push(item)
productImgData.likeList.splice(index,1)
if(!productImgData.generateList[productimgMenu.value.value]){
productImgData.generateList[productimgMenu.value.value] = []
}
productImgData.generateList[productimgMenu.value.value].push(item)
productImgData.likeList[productimgMenu.value.value].splice(index,1)
}
}
@@ -328,13 +340,20 @@ export default defineComponent({
});
}
let setExport = ()=>{
let imgList:any = []
productimgMenuList.value.forEach((item:any)=>{
if(productImgData.likeList[item.value]){
imgList.push(...productImgData.likeList[item.value])
}
})
let data = {
key:'likePorductImg',
imgList:productImgData.likeList,
key:'FinalizeImage',
imgList:imgList,
userlikeGroupId,
beenPublished:productImgData.beenPublished
}
let exportModel:any = ExportModel.value
exportModel.init(data)
}
let remPrductimgTime:any = null
@@ -353,20 +372,25 @@ export default defineComponent({
"toProductImageRecordId": 0,
"url": ""
}
productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
if(item.isChecked){
obj.elementId = item.id
obj.elementType = item.type
selectArr.push(JSON.parse(JSON.stringify(obj)))
}
})
selectList.value[productimgMenu.value.value].forEach((item:any)=>{
if(item.isChecked){
obj.elementId = item.designOutfitId
obj.elementType = 'DesignOutfit'
selectArr.push(JSON.parse(JSON.stringify(obj)))
}
})
if(productImgData.fileList[productimgMenu.value.value]){
productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
if(item.isChecked){
obj.elementId = item.id
obj.elementType = item.type
selectArr.push(JSON.parse(JSON.stringify(obj)))
}
})
}
if(selectList.value[productimgMenu.value.value]){
selectList.value[productimgMenu.value.value].forEach((item:any)=>{
if(item.isChecked){
obj.elementId = item.designOutfitId
obj.elementType = 'DesignOutfit'
selectArr.push(JSON.parse(JSON.stringify(obj)))
}
})
}
if(selectArr.length == 0) {
message.info(t('ProductImg.jsContent2'))
return
@@ -411,7 +435,10 @@ export default defineComponent({
rv.forEach((element:any) => {
if(element.status == 'Success'){
element.imgUrl = element.url
productImgData.generateList.unshift(element)
if(!productImgData.generateList[productimgMenu.value.value]){
productImgData.generateList[productimgMenu.value.value] = []
}
productImgData.generateList[productimgMenu.value.value].unshift(element)
}
data = data.filter((item:any) => item !== element.taskId);
});
@@ -458,6 +485,28 @@ export default defineComponent({
})
scaleImage.value.init(arr,index)
scaleImage.value.isLike = false
scaleImage.value.isComparison = true
}
let generalIsMenuShow:any = {}
let setMenuShow = (item:any)=>{
item.menuShow = true
generalIsMenuShow = item
document.addEventListener('click',removeMenuShow)
}
let setMenu=(menuItem:any,item:any)=>{
productimgMenu.value = menuItem
if(!selectList.value[productimgMenu.value.value]){
selectList.value[productimgMenu.value.value] = []
}
if(selectList.value[menuItem.value].indexOf(item) == -1){
selectList.value[menuItem.value].push(item)
}
generalIsMenuShow.menuShow = false
}
let removeMenuShow = ()=>{
generalIsMenuShow.menuShow = false
generalIsMenuShow = {}
document.removeEventListener('click',removeMenuShow)
}
//超分
let setTask = (data:any)=>{
@@ -487,6 +536,8 @@ export default defineComponent({
removeProductimg,
scaleImage,
setScaleImage,
setMenu,
setMenuShow,
setTask,
};
},
@@ -674,9 +725,12 @@ export default defineComponent({
justify-content: space-around;
.input_box{
flex: 0;
.generage_btn{
margin: 0;
}
}
.started_btn{
// width: 13rem;
// text-align: center;
margin: 0;
}
}
}
@@ -692,17 +746,18 @@ export default defineComponent({
background: #f6f6fa;
border-radius: 2rem;
margin-bottom: 2%;
padding: 0 1.5rem;
padding: 1rem 1.5rem;
.productImg_right_item{
height: 100%;
padding: 1rem 0;
margin-right: 1rem;
position: relative;
background: #fff;
img{
height: 100%;
}
.productImg_right_item_like,.productImg_right_item_scale{
.productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{
display: none;
position: absolute;
top: 1rem;
@@ -712,12 +767,34 @@ export default defineComponent({
color: red;
}
}
.productImg_right_item_menu{
ul{
top: 100%;
position: absolute;
width: 10rem;
text-align: center;
border-radius: calc(1rem*1.2);
overflow: hidden;
li{
background: #cccccc;
}
li:hover{
// background: rgba(0,0,0,.4);
background: #999999;
color: #000;
}
}
}
.iconLeft{
left: 2rem;
right: auto;
}
.productImg_right_item_scale{
top: 4rem;
}
}
.productImg_right_item:hover{
.productImg_right_item_like,.productImg_right_item_scale{
.productImg_right_item_like,.productImg_right_item_scale,.productImg_right_item_menu{
display: block;
}
}

5
src/component/HomePage/scaleImage.vue
View File

@@ -21,12 +21,11 @@
</div>
<div class="scaleImage_content">
<img :src="scaleImageList[scaleImageIndex]?.imgUrl">
<!-- <img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.url"> -->
<div class="img_operate_block" v-if="isLike">
<i v-if="!scaleImageList[scaleImageIndex]?.like" class="fi fi-rr-heart operate_icon" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'like')"></i>
<i v-else class="fi fi-sr-heart operate_icon" :adminLike="!!scaleImageList[scaleImageIndex]?.like" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'noLike')"></i>
</div>
</div>
<div class="scaleImage_nav" @keydown="handleKeyDown">
<div class="nav_left">
@@ -67,6 +66,7 @@ export default defineComponent({
setup() {
let scaleImage: any = ref(false);
let loadingShow = ref(false)
let isComparison = ref(false)
const visible = ref<boolean>(false);
const setVisible = (value:any): void => {
visible.value = value;
@@ -81,6 +81,7 @@ export default defineComponent({
return {
scaleImage,
loadingShow,
isComparison,
visible,
setVisible,
scaleImageList,

6
src/component/LibraryPage/ModelPlacement.vue
View File

@@ -230,7 +230,7 @@ export default defineComponent({
mounted(){
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.getSex()
// this.getSex()
},
methods:{
formatter(value:number){
@@ -607,7 +607,7 @@ export default defineComponent({
libraryId:this.printObject.id,
templateId:this.printObject.templateId || null,
modelType:'Library',
modelSex:this.sex.value,
modelSex:this.sex,
checkMd5:1,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...this.getPrintLocation()
@@ -635,7 +635,7 @@ export default defineComponent({
level1Type:'Models',
level2Type:'',
checkMd5:1,
sex:this.sex.value,
sex:this.sex,
modelType:'Library',
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}

6
src/component/LibraryPage/ModelPlacementMobile.vue
View File

@@ -231,7 +231,7 @@ export default defineComponent({
mounted(){
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.getSex()
// this.getSex()
this.option.imgLoad = ()=>{
this.setImageSize()
}
@@ -605,7 +605,7 @@ export default defineComponent({
libraryId:this.printObject.id,
templateId:this.printObject.templateId || null,
modelType:'Library',
modelSex:this.sex.value,
modelSex:this.sex,
checkMd5:1,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...this.getPrintLocation()
@@ -633,7 +633,7 @@ export default defineComponent({
level1Type:'Models',
level2Type:'',
checkMd5:1,
sex:this.sex.value,
sex:this.sex,
modelType:'Library',
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}