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

修复sketchboard问题

Browse Source
This commit is contained in:
X1627315083
2024-01-02 13:04:57 +08:00
parent 4f51479111
commit 972a806d5f
10 changed files with 178 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/component/Detail/DesignPrintOperation.vue
View File

@@ -63,7 +63,6 @@
<div class="subitOkPreviewBtn" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
<div class="subitOkPreviewBtn Guide_1_25_1" :class="[driver__.driver?'hideEvents':'']" @click.stop="setOK">OK</div>
</div>
</div>
</div>
<div class="designOpenrtion_centent" id="designOpenrtionCentent">
@@ -167,6 +166,7 @@ export default defineComponent({
})
let loadingShow = ref(false)
let currentFullBodyView = ref('')
let designItemDetailTS = ref({})
let body = ref(false)
let {t} = useI18n()
return {
@@ -188,6 +188,7 @@ export default defineComponent({
setRevocation,
t,
currentFullBodyView,
designItemDetailTS,
body,
};
},
@@ -272,8 +273,6 @@ export default defineComponent({
let print = new Image
print.src = this.current.printObject.prints[0].path
print.onload=()=>{
let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
this.print.width = print.width+'px'
this.print.height = print.height+'px'
this.printStyleList[0].style.width = print.width+'px'
@@ -656,27 +655,10 @@ export default defineComponent({
(rv) => {
// designItemDetail.clothes[index].printObject.path = rv.clothes[0].printObject.path
this.currentFullBodyView = rv.currentFullBodyView
designItemDetail.currentFullBodyView = rv.currentFullBodyView
designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
designItemDetail.clothes[index].printObject.prints = this.computeZindex()
designItemDetail.ifSubmit = true
designItemDetail.clothes.forEach((item,i)=>{
let a
if(item.layersObject[0].imageCategory.indexOf("back") == -1){
a = item.layersObject[0]
item.layersObject[0] = item.layersObject[1]
item.layersObject[1] = a
}
item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id
item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id
})
this.store.commit("setDesignItemDetail", designItemDetail);
this.store.commit("setDesignPreviewData", data);
this.setRevocation(designItemDetail,data)
this.designItemDetailTS.rv = rv
this.designItemDetailTS.data = data
this.loadingShow = false
// this.designOpenrtion = false
// this.closeModal()
if(this.driver__.driver){
nextTick().then(()=>{
driverObj__.moveNext();
@@ -688,6 +670,31 @@ export default defineComponent({
});
},
setOK(){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
let index
designItemDetail.clothes.forEach((v,ind)=>{
if(v.id == this.current.id){
index = ind
}
})
designItemDetail.currentFullBodyView = this.designItemDetailTS.rv.currentFullBodyView
designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle
designItemDetail.clothes[index].layersObject = this.designItemDetailTS.rv.clothes[index].layersObject
designItemDetail.clothes[index].printObject.prints = this.computeZindex()
designItemDetail.ifSubmit = true
designItemDetail.clothes.forEach((item,i)=>{
let a
if(item.layersObject[0].imageCategory.indexOf("back") == -1){
a = item.layersObject[0]
item.layersObject[0] = item.layersObject[1]
item.layersObject[1] = a
}
item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id
item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id
})
this.store.commit("setDesignItemDetail", designItemDetail);
this.store.commit("setDesignPreviewData", this.designItemDetailTS.data);
this.setRevocation(designItemDetail,this.designItemDetailTS.data)
this.designOpenrtion = false
if(this.driver__.driver){
driverObj__.moveNext();

62
src/component/Detail/DesignPrintOperationMobile.vue
View File

@@ -61,7 +61,7 @@
</div>
</div>
<div class="subitOkPreviewBtn" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
<div class="subitOkPreviewBtn Guide_1_25_1" @click.stop="setOK">OK</div>
<div class="subitOkPreviewBtn Guide_1_25_1" :class="[driver__.driver?'hideEvents':'']" @click.stop="setOK">OK</div>
</div>
</div>
</div>
@@ -115,6 +115,7 @@
import { defineComponent, h,createVNode, ref ,computed, inject,nextTick} from "vue";
// import { LoadingOutlined } from "@ant-design/icons-vue";
import { useStore } from "vuex";
import { openGuide,driverObj__ } from "@/tool/guide";
import { Https } from "@/tool/https";
import { Modal,message } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
@@ -164,7 +165,9 @@ export default defineComponent({
height:''
})
let loadingShow = ref(false)
let currentFullBodyView = ref('')
let designItemDetailTS = ref({})
let body = ref(false)
let {t} = useI18n()
return {
designOpenrtion,
@@ -184,6 +187,9 @@ export default defineComponent({
setRevocation,
t,
driver__,
currentFullBodyView,
designItemDetailTS,
body,
};
},
data() {
@@ -311,7 +317,6 @@ export default defineComponent({
}else{
this.random()
}
},
setpitch(item,index){
this.printStyleList.forEach((v)=>{
@@ -651,27 +656,10 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.designSingle, data).then(
(rv) => {
// designItemDetail.clothes[index].printObject.path = rv.clothes[0].printObject.path
designItemDetail.currentFullBodyView = rv.currentFullBodyView
designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle
designItemDetail.clothes[index].layersObject = rv.clothes[index].layersObject
designItemDetail.clothes[index].printObject.prints = this.computeZindex()
designItemDetail.ifSubmit = true
designItemDetail.clothes.forEach((item,i)=>{
let a
if(item.layersObject[0].imageCategory.indexOf("back") == -1){
a = item.layersObject[0]
item.layersObject[0] = item.layersObject[1]
item.layersObject[1] = a
}
item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id
item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id
})
this.store.commit("setDesignItemDetail", designItemDetail);
this.store.commit("setDesignPreviewData", data);
this.setRevocation(designItemDetail,data)
this.currentFullBodyView = rv.currentFullBodyView
this.designItemDetailTS.rv = rv
this.designItemDetailTS.data = data
this.loadingShow = false
this.designOpenrtion = false
// this.closeModal()
if(this.driver__?.driver){
nextTick().then(()=>{
@@ -684,7 +672,35 @@ export default defineComponent({
});
},
setOK(){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
let index
designItemDetail.clothes.forEach((v,ind)=>{
if(v.id == this.current.id){
index = ind
}
})
designItemDetail.currentFullBodyView = this.designItemDetailTS.rv.currentFullBodyView
designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle
designItemDetail.clothes[index].layersObject = this.designItemDetailTS.rv.clothes[index].layersObject
designItemDetail.clothes[index].printObject.prints = this.computeZindex()
designItemDetail.ifSubmit = true
designItemDetail.clothes.forEach((item,i)=>{
let a
if(item.layersObject[0].imageCategory.indexOf("back") == -1){
a = item.layersObject[0]
item.layersObject[0] = item.layersObject[1]
item.layersObject[1] = a
}
item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id
item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id
})
this.store.commit("setDesignItemDetail", designItemDetail);
this.store.commit("setDesignPreviewData", this.designItemDetailTS.data);
this.setRevocation(designItemDetail,this.designItemDetailTS.data)
this.designOpenrtion = false
if(this.driver__.driver){
driverObj__.moveNext();
}
},
clearModal(){
this.printAmount = 1//显示数量

25
src/component/HomePage/Generate.vue
View File

@@ -117,6 +117,7 @@
</div>
<div
class="delete_file_block"
:class="[driver__.driver?'hideEvents':'']"
@click.stop="deleteFile(index)"
>
<span class="icon iconfont icon-shanchu"></span>
@@ -168,7 +169,7 @@
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
</div>
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage()"></i>
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
</div>
</div>
@@ -235,6 +236,7 @@ export default defineComponent({
let printModel = ref({
num:'',
optype:false,
value:'Painting Style',
name:useI18n().t('Generate.Model'+1)
})
let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
@@ -425,15 +427,18 @@ export default defineComponent({
document.removeEventListener('click',this.removePrintModel)
},
setprintModel(num:any){
let arr = ["Painting Style","Illustration Style","Real Style"]
if(num == 4){
this.printModel = {
num : 'Generate',
optype:false,
value:'',
name:this.t('Generate.Generate')
}
}else{
this.printModel = {
num : num,
value:arr[num-1],
optype:false,
name:this.t('Generate.Model'+num)
}
@@ -535,13 +540,23 @@ export default defineComponent({
if (file.status === "done") {
let res = JSON.parse(file.xhr.response);
if(res.errCode == 0){
let category:any={
value:'',
name:'',
}
this.sketchCatecoryList.forEach((item:any) => {
if(item.name == res.data.level2Type){
category.value = item?.value
category.name = item?.name
}
});
file.id = res.data.id;
file.imgUrl = res.data.url;
file.resData = res.data;
file.type_ = "upload";
file.id_ = GO.id++;
file.category = this.sketchCatecoryList?.[0]?.name;
file.categoryValue = this.sketchCatecoryList?.[0]?.value;
file.categoryValue = category?.value;
file.category = category?.name;
let fileList = this.sketchboardList.filter(
(v: any) => v.status === "done"
);
@@ -671,9 +686,9 @@ export default defineComponent({
}
},
scaleImage(){
scaleImage(index:any){
let scaleImage:any = this.$refs.scaleImage
scaleImage.init(this.fileList)
scaleImage.init(this.fileList,index)
},
closeModal() {
// this.myMaterialModalShow = false

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

@@ -118,7 +118,7 @@
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
</div>
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage()"></i>
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
</div>
<div class="pin_block">
<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
@@ -576,9 +576,9 @@ export default defineComponent({
collectionElementId:generage?.collectionElementid,
level1Type:generage.upload.level1Type,
level2Type:'',
text:this.captionGeneration,
text:`${generage.printModel.value},${this.captionGeneration}`,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
version:generage.printModel.num?generage.printModel.num:1,//为1就是Print
version:1,//为1就是Print
gender:'',
}
if(generateType == 'image'){
@@ -743,9 +743,9 @@ export default defineComponent({
})
},
scaleImage(){
scaleImage(index:any){
let scaleImage:any = this.$refs.scaleImage
scaleImage.init(this.generateList)
scaleImage.init(this.generateList,index)
},
generageAdd(item:any){
item.type_ = {

6
src/component/HomePage/RobotAssist.vue
View File

@@ -28,7 +28,7 @@
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(imgItem,imgIndex,index)"></i>
</div>
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img)"></i>
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(item.img,index)"></i>
</div>
</div>
</div>
@@ -231,12 +231,12 @@ export default defineComponent({
}
})
},
scaleImage(img:any){
scaleImage(img:any,index:any){
let scaleImage:any = this.$refs.scaleImage
img.forEach((item:any) => {
item.imgUrl = item.presignedUrl
});
scaleImage.init(img)
scaleImage.init(img,index)
scaleImage.scaleImageMask = true
},
robotmax(){//点击内容就设置为true显示 重置定时器

20
src/component/HomePage/SketchboardUpload.vue
View File

@@ -240,7 +240,7 @@
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
</div>
<div class="delete_like_file_block left" :class="[driver__.driver?'hideEvents':'']">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage()"></i>
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
</div>
<div class="pin_block">
<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
@@ -434,9 +434,9 @@ export default defineComponent({
})
}
},
scaleImage(){
scaleImage(index:any){
let scaleImage:any = this.$refs.scaleImage
scaleImage.init(this.generateList)
scaleImage.init(this.generateList,index)
},
getgenerateCheckbox(value:any){
this.generateCheckbox = value
@@ -447,12 +447,22 @@ export default defineComponent({
if (file.status === "done") {
let res = JSON.parse(file.xhr.response);
if(res.errCode == 0){
let category:any={
value:'',
name:'',
}
this.sketchCatecoryList.forEach((item:any) => {
if(item.name == res.data.level2Type){
category.value = item?.value
category.name = item?.name
}
});
file.imgUrl = res.data.url;
file.resData = res.data;
// file.pin = false;
//category用来数据处理
file.categoryValue = this.sketchCatecoryList?.[0]?.value;
file.category = this.sketchCatecoryList?.[0]?.name;
file.categoryValue = category?.value;
file.category = category?.name;
file.categoryShow = false;
file.id_ = GO.id++
file.id = res.data.id

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

@@ -26,8 +26,10 @@
<div class="nav_left">
<i class="fi fi-rr-arrow-small-left" @click="lastStep()"></i>
</div>
<div class="nav_list">
<img v-for="item,index in scaleImageList" @click="setScaleImageIndex(index)" :class="{active:index == scaleImageIndex}" :src="item?.imgUrl" :key="item.id">
<div class="nav_list" v-mousewheel>
<div class="nav_centent">
<img v-for="item,index in scaleImageList" @click="setScaleImageIndex(index)" :class="{active:index == scaleImageIndex}" :src="item?.imgUrl" :key="item.id">
</div>
</div>
<div class="nav_right">
<i class="fi fi-rr-arrow-small-right" @click.stop="nextStep()"></i>
@@ -84,13 +86,28 @@ export default defineComponent({
};
},
directives:{
mousewheel:{
mounted (el) {
el.addEventListener('wheel',(e:WheelEvent)=>{
let num = 0
if(e.deltaY > 0){
num = 25
}else{
num = -25
}
el.scrollBy(num, 0);
})
}
},
},
mounted() {
},
methods: {
init(list:any){
init(list:any,index:any){
this.scaleImage = true
this.scaleImageList = list
this.scaleImageIndex = index
// let scaleImageList = this.store.state.UploadFilesModule.moodboard
},
cancelDsign(){
@@ -208,6 +225,15 @@ export default defineComponent({
}
.nav_list{
margin: 0 2rem;
max-width: 60rem;
overflow-y: hidden;
&.nav_list::-webkit-scrollbar {
display: none;
}
.nav_centent{
width: auto;
display: flex;
}
img{
max-width: 5rem;
max-height: 5rem;
@@ -218,8 +244,9 @@ export default defineComponent({
overflow: hidden;
cursor: pointer;
padding: .1rem;
flex-shrink: 0;
&.active{
border: 1px solid #aaaaaa;
border: 2px solid #aaaaaa;
}
}
img:nth-child(1){

4
src/tool/guide.js
View File

@@ -91,7 +91,7 @@ const driverObj__ = driver({
// prevBtnText: '‹—',
doneBtnText: '✕',
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
// console.log(popover,options,element);
console.log(popover,options,element);
popover.previousButton.style.display = 'none'
// let driver = document.querySelector('body')
driverIndex__ = driverObj__.getState().activeIndex
@@ -112,6 +112,8 @@ const driverObj__ = driver({
// options.config.stagePadding = 10
}else if(options.state.activeIndex == 6 || options.state.activeIndex == 7){
popover.wrapper.style.transform = 'translateY(4rem)'
}else if(options.state.activeIndex == 46){
popover.wrapper.style.transform = 'translateY(-6rem)'
}else{
popover.wrapper.style.transform = 'initial'
}

2
src/views/HomeView.vue
View File

@@ -440,6 +440,8 @@ export default defineComponent({
//判断模特和当前start的sketch是否匹配
isMannequin(){
console.log(this.allBoardData?.sketchboardFiles,this.workspacePosition);
this.isMannequinShow = false
let num = 0
this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {

38
src/views/LibraryPage.vue
View File

@@ -300,8 +300,12 @@
<i v-if="!img.like" class="fi fi-rr-heart operate_icon" @click.stop="likeFile(img,'like')"></i>
<i v-else class="fi fi-sr-heart operate_icon" @click.stop="likeFile(img,'noLike')"></i>
</div>
</div>
<div class="img_operate_content left" :class="[driver__.driver?'hideEvents':'']">
<div class="img_operate_block">
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
</div>
</div>
</div>
</div>
<div class="content_img_name"></div>
@@ -363,7 +367,7 @@
</div>
</div>
</a-modal>
<scaleImage ref="scaleImage"></scaleImage>
<ModelPlacement ref="ModelPlacement" @submitModelPlacement="getLibraryList"></ModelPlacement>
<ModelPlacementMobile ref="ModelPlacementMobile" @submitModelPlacement="getLibraryList"></ModelPlacementMobile>
<setLabel ref="setLabel"></setLabel>
@@ -390,6 +394,7 @@ import {getUploadUrl,isMoible} from '@/tool/util'
import { useStore } from "vuex";
import { Https } from "@/tool/https";
import { getCookie } from "@/tool/cookie";
import scaleImage from "@/component/HomePage/scaleImage.vue";
import { useI18n } from "vue-i18n";
import { ElCascader } from 'element-plus'
export default defineComponent({
@@ -400,6 +405,7 @@ export default defineComponent({
ModelPlacementMobile,
RobotAssist,
ElCascader,
scaleImage,
},
setup() {
@@ -488,7 +494,9 @@ export default defineComponent({
}
let intersection = ref(1)
let isTest = ref()
let driver__:any = computed(()=>{
return store.state.Guide.guide
})
return {
menuList,
@@ -526,6 +534,7 @@ export default defineComponent({
props,
intersection,
isTest,
driver__
}
},
data(this_) {
@@ -1145,7 +1154,6 @@ export default defineComponent({
}
},
getgenerate(){
if(this.isTest){//试用用户禁止使用
message.info(
this.t('isTest.available')
@@ -1155,6 +1163,7 @@ export default defineComponent({
if(this.isShowMark){
return
}
let arr = ["Painting Style","Illustration Style","Real Style"]
let generateType = this.checkbox.filter((v:any)=>v.type)[0].name
if(this.selectCode == 'Moodboard'){
generateType = this.checkbox[1].name
@@ -1166,9 +1175,9 @@ export default defineComponent({
collectionElementId:generageImg?.id,
level1Type:this.selectCode,
level2Type:this.selectCode == 'Sketchboard'?this.designType.value:'',
text:this.captionGeneration,
text:this.selectCode == 'Printboard'?`${arr[this.printModel.num-1]},${this.captionGeneration}`:this.captionGeneration,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
version:this.selectCode == 'Printboard'?this.printModel.num:1,//为1就是Print
version:1,//为1就是Print
gender:this.selectCode == 'Sketchboard'?this.sex.value:'',
}
if(generateType == 'image'){
@@ -1334,6 +1343,11 @@ export default defineComponent({
).catch((res)=>{
});
},
scaleImage(index:any){
let scaleImage:any = this.$refs.scaleImage
scaleImage.scaleImageMask = true
scaleImage.init(this.generateList,index)
},
}
})
</script>
@@ -1782,8 +1796,12 @@ export default defineComponent({
position: absolute;
right: 0.6rem;
top: 0.6rem;
&.left{
left: 0.6rem;
right: auto;
}
}
.img_operate_block{
width: 3.6rem;
height: 3.6rem;
@@ -1793,7 +1811,6 @@ export default defineComponent({
line-height: 3.6rem;
cursor: pointer;
margin-bottom: 0.4rem;
.operate_icon{
font-size: 1.8rem;
color: #fff;
@@ -1801,7 +1818,12 @@ export default defineComponent({
color: red;
}
}
i{
font-size: 1.8rem;
color: #fff;
}
}
}
}
.content_img_name{