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-07-09 19:10:01 +08:00
parent 398a617a63
commit e876abf3df
7 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -744,6 +744,7 @@ export default defineComponent({
// path:item.printObject.path?item.printObject.path :'',
prints:item?.printObject?.prints[0]?.minIOPath?item?.printObject?.prints:[]
},
undividedLayer:item?.undividedLayer,
priority:item.priority,
type:item.type,
}
@@ -1021,6 +1022,7 @@ export default defineComponent({
"prints": [
]
},
undividedLayer:'',
sketchString:'',
"layersObject": [
]
@@ -1098,6 +1100,7 @@ export default defineComponent({
// }],
prints:this.current?.printObject?.prints[0]?.minIOPath?this.current?.printObject?.prints:[]
},
undividedLayer:this.current.undividedLayer,
type:this.current.type,
}
// if(clothes && !clothes.id){

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

@@ -96,7 +96,7 @@
<img crossOrigin="anonymous" :src="item?.path" :style="{transform:`rotateZ(${printStyleList[stateOverallSingle][index]?.transform?.rotateZ}deg)`}" class="designOpenrtion_imgItme" draggable="false">
</div>
</div>
<img v-lazy="operationCurrent.undividedLayer || operationCurrent.path" alt="" class="designOpenrtion_sketch">
<img v-lazy="operationCurrent?.undividedLayer?operationCurrent.undividedLayer:operationCurrent.path" alt="" class="designOpenrtion_sketch">
<div class="designOpenrtion_btn">
<ul v-if="overallSingle" v-for="item,index in printStyleList[stateOverallSingle]" :key="item" :class="{active:item?.designOpenrtionBtn?item?.designOpenrtionBtn:false}" class="designOpenrtion_Mousingle" :style="item.style" @mousedown.stop="itemMoveMousedown(index,$event)">
<li class="designOpenrtion_btn_top" @mousedown.stop="itemSizeMousedown('top',$event)"></li>
@@ -383,6 +383,7 @@ export default defineComponent({
this.printStyleList[this.stateOverallSingle].forEach((v)=>{
v.designOpenrtionBtn = false
})
this.currentPrintStyleList.id = item.id
if(!this.overallSingle){
if(item.checked){
this.imgDomIndex = 0
@@ -402,6 +403,7 @@ export default defineComponent({
this.refetchTemplate(0,true)
this.exhibitionOpenrtionList[this.stateOverallSingle][0] = {
angle:0,
id:item.id,
designType:item.designType,
level2Type:item.level2Type,
minIOPath:item.minIOPath,
@@ -417,6 +419,7 @@ export default defineComponent({
let currentIndex = this.printStyleList[this.stateOverallSingle].length-1
this.exhibitionOpenrtionList[this.stateOverallSingle].push({
angle:0,
id:item.id,
designType:item.designType,
level2Type:item.level2Type,
minIOPath:item.minIOPath,
@@ -604,6 +607,7 @@ export default defineComponent({
top = sketch.offsetHeight/2-5
}
this.printStyleList[this.stateOverallSingle][index]={
id:this.printStyleList[this.stateOverallSingle][index].id,
centers:{
left:0,
top:0,
@@ -644,6 +648,7 @@ export default defineComponent({
}
this.systemDesignerPercentage = item.scale?item.scale*100:30
this.printStyleList[str][index]={
id:item.id,
centers:{
left:0,
top:0,
@@ -694,29 +699,36 @@ export default defineComponent({
}
let scale
let location
console.log(this.exhibitionOpenrtionList[this.stateOverallSingle],arr);
for (let index = 0; index < arr.length; index++) {
if(!this.overallSingle){
scale = this.systemDesignerPercentage/100
// location = [arr[index].style.left.replace(/px/g,'')*sketchNum+this.print.width.replace(/px/g,'')/2-7,arr[index].style.top.replace(/px/g,'')*sketchNum+this.print.height.replace(/px/g,'')/2-7]
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
}else{
await this.setPrintWH(this.exhibitionOpenrtionList[this.stateOverallSingle][index].path)
scale = (arr[index].style.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
for (let i = 0; i < this.exhibitionOpenrtionList[this.stateOverallSingle].length; i++) {
if(this.exhibitionOpenrtionList[this.stateOverallSingle][i].id == arr[index].id){
if(!this.overallSingle){
scale = this.systemDesignerPercentage/100
// location = [arr[index].style.left.replace(/px/g,'')*sketchNum+this.print.width.replace(/px/g,'')/2-7,arr[index].style.top.replace(/px/g,'')*sketchNum+this.print.height.replace(/px/g,'')/2-7]
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
}else{
await this.setPrintWH(this.exhibitionOpenrtionList[this.stateOverallSingle][index].path)
scale = (arr[index].style.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
}
let obj = {
angle : arr[index].transform.rotateZ,
// angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
location : location,
priority:arr[index].style.zIndex,
scale: scale,
designType:this.exhibitionOpenrtionList[this.stateOverallSingle][index].designType,
level2Type:this.exhibitionOpenrtionList[this.stateOverallSingle][index].level2Type,
path:this.exhibitionOpenrtionList[this.stateOverallSingle][index].path,
minIOPath:this.exhibitionOpenrtionList[this.stateOverallSingle][index].minIOPath,
ifSingle:!!this.exhibitionOpenrtionList[this.stateOverallSingle][index].ifSingle,
}
prints.push(obj)
}
}
let obj = {
angle : arr[index].transform.rotateZ,
// angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
location : location,
priority:arr[index].style.zIndex,
scale: scale,
designType:this.exhibitionOpenrtionList[this.stateOverallSingle][index].designType,
level2Type:this.exhibitionOpenrtionList[this.stateOverallSingle][index].level2Type,
path:this.exhibitionOpenrtionList[this.stateOverallSingle][index].path,
minIOPath:this.exhibitionOpenrtionList[this.stateOverallSingle][index].minIOPath,
ifSingle:!!this.exhibitionOpenrtionList[this.stateOverallSingle][index].ifSingle,
}
prints.push(obj)
}
this.computeZindex(resolve,prints)
})
@@ -779,6 +791,7 @@ export default defineComponent({
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].undividedLayer = this.designItemDetailTS.rv.clothes[index].undividedLayer
designItemDetail.clothes[index].trims = this.designItemDetailTS.rv.clothes[index].trims
designItemDetail.clothes[index].printObject.prints = this.setOkData
designItemDetail.ifSubmit = true

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

@@ -98,7 +98,7 @@
<img crossOrigin="anonymous" :src="item?.path" :style="{transform:`rotateZ(${printStyleList[index]?.transform?.rotateZ}deg)`}" class="designOpenrtionMobile_imgItme" draggable="false">
</div>
</div>
<img v-lazy="operationCurrent.undividedLayer || operationCurrent.path" alt="" class="designOpenrtion_sketch">
<img v-lazy="operationCurrent?.undividedLayer?operationCurrent.undividedLayer:operationCurrent.path" alt="" class="designOpenrtion_sketch">
<div class="designOpenrtionMobile_btn">
<ul v-if="overallSingle" v-for="item,index in printStyleList[stateOverallSingle]" :key="item" :class="{active:item?.designOpenrtionBtn?item?.designOpenrtionBtn:false}" class="designOpenrtionMobile_Mousingle" :style="item.style" @touchstart.stop="itemMoveMousedown(index,$event)">
<li class="designOpenrtionMobile_btn_top" @touchstart.stop="itemSizeMousedown('top',$event)"></li>
@@ -384,6 +384,7 @@ export default defineComponent({
this.printStyleList[this.stateOverallSingle].forEach((v)=>{
v.designOpenrtionBtn = false
})
this.currentPrintStyleList.id = item.id
if(!this.overallSingle){
if(item.checked){
this.imgDomIndex = 0
@@ -399,10 +400,12 @@ export default defineComponent({
})
item.checked = true
}
this.currentPrintStyleList.id = item.id
this.printStyleList[this.stateOverallSingle][0] = JSON.parse(JSON.stringify(this.currentPrintStyleList))
this.refetchTemplate(0,true)
this.exhibitionOpenrtionList[this.stateOverallSingle][0] = {
angle:0,
id:item.id,
designType:item.designType,
level2Type:item.level2Type,
minIOPath:item.minIOPath,
@@ -418,6 +421,7 @@ export default defineComponent({
let currentIndex = this.printStyleList[this.stateOverallSingle].length-1
this.exhibitionOpenrtionList[this.stateOverallSingle].push({
angle:0,
id:item.id,
designType:item.designType,
level2Type:item.level2Type,
minIOPath:item.minIOPath,
@@ -609,6 +613,7 @@ export default defineComponent({
top = sketch.offsetHeight/2-5
}
this.printStyleList[this.stateOverallSingle][index]={
id:this.printStyleList[this.stateOverallSingle][index].id,
centers:{
left:0,
top:0,
@@ -649,6 +654,7 @@ export default defineComponent({
}
this.systemDesignerPercentage = item.scale?item.scale*100:30
this.printStyleList[str][index]={
id:item.id,
centers:{
left:0,
top:0,
@@ -699,28 +705,32 @@ export default defineComponent({
let scale
let location
for (let index = 0; index < arr.length; index++) {
if(!this.overallSingle){
scale = this.systemDesignerPercentage/100
// location = [arr[index].style.left.replace(/px/g,'')*sketchNum+this.print.width.replace(/px/g,'')/2-7,arr[index].style.top.replace(/px/g,'')*sketchNum+this.print.height.replace(/px/g,'')/2-7]
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
}else{
await this.setPrintWH(this.exhibitionOpenrtionList[this.stateOverallSingle][index].path)
scale = (arr[index].style.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
for (let i = 0; i < this.exhibitionOpenrtionList[this.stateOverallSingle].length; i++) {
if(this.exhibitionOpenrtionList[this.stateOverallSingle][i].id == arr[index].id){
if(!this.overallSingle){
scale = this.systemDesignerPercentage/100
// location = [arr[index].style.left.replace(/px/g,'')*sketchNum+this.print.width.replace(/px/g,'')/2-7,arr[index].style.top.replace(/px/g,'')*sketchNum+this.print.height.replace(/px/g,'')/2-7]
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
}else{
await this.setPrintWH(this.exhibitionOpenrtionList[this.stateOverallSingle][index].path)
scale = (arr[index].style.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
location = [arr[index].style.left.replace(/px/g,'')*sketchNum,arr[index].style.top.replace(/px/g,'')*sketchNum]
}
let obj = {
angle : arr[index].transform.rotateZ,
// angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
location : location,
priority:arr[index].style.zIndex,
scale: scale,
designType:this.exhibitionOpenrtionList[this.stateOverallSingle][index].designType,
level2Type:this.exhibitionOpenrtionList[this.stateOverallSingle][index].level2Type,
path:this.exhibitionOpenrtionList[this.stateOverallSingle][index].path,
minIOPath:this.exhibitionOpenrtionList[this.stateOverallSingle][index].minIOPath,
ifSingle:!!this.exhibitionOpenrtionList[this.stateOverallSingle][index].ifSingle,
}
prints.push(obj)
}
}
let obj = {
angle : arr[index].transform.rotateZ,
// angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
location : location,
priority:arr[index].style.zIndex,
scale: scale,
designType:this.exhibitionOpenrtionList[this.stateOverallSingle][index].designType,
level2Type:this.exhibitionOpenrtionList[this.stateOverallSingle][index].level2Type,
path:this.exhibitionOpenrtionList[this.stateOverallSingle][index].path,
minIOPath:this.exhibitionOpenrtionList[this.stateOverallSingle][index].minIOPath,
ifSingle:!!this.exhibitionOpenrtionList[this.stateOverallSingle][index].ifSingle,
}
prints.push(obj)
}
this.computeZindex(resolve,prints)
})
@@ -783,6 +793,7 @@ export default defineComponent({
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].undividedLayer = this.designItemDetailTS.rv.clothes[index].undividedLayer
designItemDetail.clothes[index].trims = this.designItemDetailTS.rv.clothes[index].trims
designItemDetail.clothes[index].printObject.prints = this.setOkData
// designItemDetail.clothes[index].printObject.prints = this.computeZindex()

5
src/component/LibraryPage/searchLabel.vue
View File

@@ -173,10 +173,9 @@ export default defineComponent({
this.selectImgList = parent.selectImgList || ''
this.options = parent.options || []
this.selectSingleImg = data
this.newPicName = ''
this.editSex = this.sex
this.editDesignType = this.designType
this.editDesignType = data?.level2Type
if(type =='batch' && !this.selectImgList.length){ //批量但未选中
this.newPicName = ''
return
@@ -311,7 +310,7 @@ export default defineComponent({
}
let data3 = {
libraryId:this.renameType === 'batch' ? this.selectImgList : [this.selectSingleImg.id],
level2Type:this.editDesignType.value,
level2Type:this.editDesignType,
}
if(this.selectCode == 'Sketchboard' || this.selectCode == 'Printboard'){
await Https.axiosPost(Https.httpUrls.setSketchLibrary,data3).then(

1
src/tool/mount.js
View File

@@ -13,6 +13,5 @@ export default function showViewVideo(options) {
document.body.removeChild(mountNode);
},
});
console.log(glearVideo.mount(mountNode));
return glearVideo.mount(mountNode);
}

8
src/views/HomeMain.vue
View File

@@ -292,12 +292,14 @@ export default defineComponent({
},
//教程
getTutorial(){
let url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-使用手册-0705.pptx'
let url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-使用手册-0705.pdf'
if(this.locale == 'ENGLISH'){
url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-Manual-0705.pptx'
url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-Manual-0705.pdf'
showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2022/11/aida_video.mp4'})
}else{
showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2022/11/aida_video.mp4'})
}
//打开视频
// showViewVideo('https://code-create.com.hk/wp-content/uploads/2022/11/aida_video.mp4')
const a = document.createElement('a');
a.href = url;
a.download = 'aida_3.0-Manual.pptx'; // 下载的文件名

2
src/views/HomeView/library.vue
View File

@@ -646,7 +646,7 @@ export default defineComponent({
// params = 'MalePosition'
// }
this.store.commit('setPosition',this.sex)
this.designType = this.designTypeList.Sketchboard[0].value
this.designType = this.designTypeList.Sketchboard?.[0].value
// await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
// if (rv) {