-
+
+ ref="content" >
![]()
@@ -84,17 +91,23 @@
![]()
![]()
-
+
+ -
+
+
-
+
+ -
+
+
@@ -125,15 +138,25 @@ export default defineComponent({
setup(prop) {
let designOpenrtion = ref(false);
- let designOpenrtionList = ref([])
+ let designOpenrtionList = ref([])//新增的元素
+ let designList = ref([])//已经存在的元素
+ let setOkData = ref([])
+ let exhibitionOpenrtionList = ref({
+ single:[],
+ overall:[],
+ })//展示的元素
let driver__ = inject('driver__')
let current = inject('current')//父组件传过来的数据
let setRevocation = inject('setRevocation')//父组件传过来的数据
let overallSingle = ref(false)
+ let stateOverallSingle = ref('single')
let systemDesignerPercentage = ref(0)
- let printAmount = ref(1)//印花数量
let printZIndex = ref(2)//印花优先级
- let printStyleList = ref([{
+ let printStyleList = ref({
+ single:[],
+ overall:[],
+ });
+ let currentPrintStyleList = ref({
centers:{
left:0,
top:0,
@@ -152,7 +175,7 @@ export default defineComponent({
rotateZ:0,
},
designOpenrtionBtn:false
- }]);
+ });
let direction = ref('')
let imgDom = ref()
@@ -174,11 +197,15 @@ export default defineComponent({
designOpenrtion,
designOpenrtionList,
overallSingle,
+ stateOverallSingle,
+ designList,
+ setOkData,
+ exhibitionOpenrtionList,
systemDesignerPercentage,
current,
- printAmount,
printZIndex,
printStyleList,
+ currentPrintStyleList,
direction,//判断点击的是li那个边
imgDom,
imgDomIndex,
@@ -211,8 +238,8 @@ export default defineComponent({
let num = 1
let x = 0
let y = 0
- num = value.instance.printStyleList[value.instance.imgDomIndex].transform.scale
- angle = value.instance.printStyleList[value.instance.imgDomIndex].transform.rotateZ
+ num = value.instance.printStyleList[num = value.instance.stateOverallSingle][value.instance.imgDomIndex].transform.scale
+ angle = value.instance.printStyleList[num = value.instance.stateOverallSingle][value.instance.imgDomIndex].transform.rotateZ
// 添加鼠标按下事件监听器
el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)"
// let scale = Number(elParent.firstElementChild.style.transform?.split('scale(')[1]?.split(')')[0])
@@ -236,7 +263,7 @@ export default defineComponent({
document.addEventListener('touchmove', touchmove,{passive:true});
// 添加鼠标松开事件监听器
let touchend = () => {
- value.instance.printStyleList[value.instance.imgDomIndex].transform.rotateZ = angle
+ value.instance.printStyleList[num = value.instance.stateOverallSingle][value.instance.imgDomIndex].transform.rotateZ = angle
mouse = false;
document.removeEventListener('touchend',touchend)
document.removeEventListener('touchmove',touchmove)
@@ -254,52 +281,48 @@ export default defineComponent({
if(designItemDetail.others.length == 0){
this.body = true
}
- let DesignPrintOperationParent = this.$parent
this.designOpenrtion = true
this.clearModal()
- this.designOpenrtionList = []
- this.designOpenrtionList.push(...this.current.printObject.prints)
- this.overallSingle = DesignPrintOperationParent.overallSingle
- this.systemDesignerPercentage = DesignPrintOperationParent.systemDesignerPercentage
+ this.overallSingle = this.current.printObject.ifSingle?true:false
+ this.ifListOver()
+ if(this.current.printObject.prints)this.exhibitionOpenrtionList[this.stateOverallSingle] = JSON.parse(JSON.stringify(this.current.printObject.prints))
+ if(this.$parent.exhibitionList.print)this.designOpenrtionList = JSON.parse(JSON.stringify(this.$parent.exhibitionList.print))
+ if(this.$parent.elementsList)this.designList = JSON.parse(JSON.stringify(this.$parent.printsList))
+ // this.overallSingle = this.current.ifSingle?false:this.current.ifSingle
let skecth = new Image
skecth.src = this.current.path
skecth.onload=()=>{
this.sketch.width = skecth.width/10+'rem'
this.sketch.height = skecth.height/10+'rem'
+ skecth.remove()
}
- // this.sketch = {
- // width:this.current.layersObject[1].imageSize[0]/10+'rem',
- // height:this.current.layersObject[1].imageSize[1]/10+'rem'
- // }
- let print = new Image
- print.src = this.current.printObject.prints[0].path
- print.onload=()=>{
- this.print.width = print.width+'px'
- this.print.height = print.height+'px'
- this.printStyleList[0].style.width = print.width+'px'
- this.printStyleList[0].style.height = print.height+'px'
- this.printStyleList[0].designOpenrtionBtn = false
- nextTick().then(()=>{
- if(this.designOpenrtionList[0].scale){
- this.designOpenrtionList.forEach((item,index)=>{
- this.setTemplate(item,index)
- this.printAmount = this.printStyleList.length
- if (!this.overallSingle) {
- this.printAmount = 1
- this.setprintAmount()
- }
- if(this.current.printObject.ifSingle != this.overallSingle){
- this.refetchTemplate(0)
- }
-
- })
- }else{
- this.refetchTemplate(0)
- }
+ if(this.exhibitionOpenrtionList[this.stateOverallSingle].length > 0){
+ this.exhibitionOpenrtionList[this.stateOverallSingle].forEach((item,index)=>{
+ this.setTemplate(item,index)
})
-
+ }else{
}
-
+ },
+ ifListOver(){
+ if(!this.overallSingle){
+ // this.designOpenrtionList = this.designOpenrtionList.filter((item)=>item.level2Type == "Pattern")
+ // this.designList = this.designList.filter((item)=>item.level2Type == "Pattern")
+ this.stateOverallSingle = 'overall'
+ }else{
+ this.stateOverallSingle = 'single'
+ }
+ },
+ setPrintWH(url){
+ let print = new Image
+ return new Promise((resolve, reject) => {
+ print.onload=()=>{
+ this.print.width = print.width+'px'
+ this.print.height = print.height+'px'
+ resolve()
+ print.remove()
+ }
+ print.src = url
+ })
},
systemDesigner(num) {
let DesignPrintOperationParent = this.$parent
@@ -310,27 +333,53 @@ export default defineComponent({
},
setOveralSingle(){
- let DesignPrintOperationParent = this.$parent
- DesignPrintOperationParent.overallSingle = this.overallSingle
- if (!this.overallSingle) {
- this.printAmount = 1
- this.setprintAmount()
+ if(!this.overallSingle){
+ // this.refetchTemplate(0)
+ this.stateOverallSingle = 'overall'
}else{
- this.random()
+ this.stateOverallSingle = 'single'
}
+ // this.random()
},
- setpitch(item,index){
- this.printStyleList.forEach((v)=>{
+ async setpitch(item,index){
+ await this.setPrintWH(item.path)
+ this.printStyleList[this.stateOverallSingle].forEach((v)=>{
v.designOpenrtionBtn = false
})
- this.imgDomIndex = index
- this.printStyleList[index].designOpenrtionBtn = true
- this.printStyleList[index].style.zIndex = this.printZIndex++
+ if(!this.overallSingle){
+ this.printStyleList[this.stateOverallSingle][0] = JSON.parse(JSON.stringify(this.currentPrintStyleList))
+ this.exhibitionOpenrtionList[this.stateOverallSingle][0] = {
+ angle:0,
+ designType:item.designType,
+ level2Type:item.level2Type,
+ minIOPath:item.minIOPath,
+ path:item.path,
+ priority:1,
+ scale:.3,
+ location:[0,0]
+ }
+ this.refetchTemplate(0)
+ this.systemDesignerPercentage = 30
+ }else{
+ this.printStyleList[this.stateOverallSingle].push(JSON.parse(JSON.stringify(this.currentPrintStyleList)))
+ let currentIndex = this.printStyleList[this.stateOverallSingle].length-1
+ this.exhibitionOpenrtionList[this.stateOverallSingle].push({
+ angle:0,
+ designType:item.designType,
+ level2Type:item.level2Type,
+ minIOPath:item.minIOPath,
+ path:item.path,
+ priority:1,
+ scale:1,
+ location:[0,0]
+ })
+ this.refetchTemplate(currentIndex)
+ }
},
//设置移动
itemMoveMousedown(index,event){
this.imgDomIndex = index
- this.printStyleList.forEach((v)=>{
+ this.printStyleList[this.stateOverallSingle].forEach((v)=>{
v.designOpenrtionBtn = false
})
if(!this.overallSingle){
@@ -340,17 +389,17 @@ export default defineComponent({
}
let scale = Number(this.imgDom.children[0].style.transform?.split('scale(')[1]?.split(')')[0])
let rotateZ = Number(this.imgDom.children[0].style.transform?.split('rotateZ(')[1]?.split('deg')[0])
- this.printStyleList[index].designOpenrtionBtn = true
- this.printStyleList[index].style.zIndex = this.printZIndex++
- this.printStyleList[index].transform = {
+ this.printStyleList[this.stateOverallSingle][index].designOpenrtionBtn = true
+ this.printStyleList[this.stateOverallSingle][index].style.zIndex = this.printZIndex++
+ this.printStyleList[this.stateOverallSingle][index].transform = {
scale:scale,
rotateZ:rotateZ?rotateZ:0,
}
let imgDomWH = this.imgDom.getBoundingClientRect()
- let left = Number(this.printStyleList[index].style.left.replace(/px/g,''))
- let top = Number(this.printStyleList[index].style.top.replace(/px/g,''))
- this.printStyleList[index].centers.left = imgDomWH.x+event.changedTouches[0].pageX - this.imgDom.getBoundingClientRect().left-left
- this.printStyleList[index].centers.top = imgDomWH.y+event.changedTouches[0].pageY - this.imgDom.getBoundingClientRect().top-top
+ let left = Number(this.printStyleList[this.stateOverallSingle][index].style.left.replace(/px/g,''))
+ let top = Number(this.printStyleList[this.stateOverallSingle][index].style.top.replace(/px/g,''))
+ this.printStyleList[this.stateOverallSingle][index].centers.left = imgDomWH.x+event.changedTouches[0].pageX - this.imgDom.getBoundingClientRect().left-left
+ this.printStyleList[this.stateOverallSingle][index].centers.top = imgDomWH.y+event.changedTouches[0].pageY - this.imgDom.getBoundingClientRect().top-top
document.addEventListener("touchend", this.touchend);
document.addEventListener("touchmove", this.moveMousemove);
},
@@ -358,23 +407,23 @@ export default defineComponent({
itemSizeMousedown(direction,event){
this.direction = direction
this.imgDom = document.getElementsByClassName('designOpenrtionMobile_modal')[0].getElementsByClassName("modal_imgItem")[this.imgDomIndex]
- let scale = Number(this.imgDom.firstChild.style.transform?.split('scale(')[1]?.split(')')[0])
- let rotateZ = Number(this.imgDom.firstChild.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
- this.printStyleList[this.imgDomIndex].designOpenrtionBtn = true
- this.printStyleList[this.imgDomIndex].transform = {
+ let scale = Number(this.imgDom.style.transform?.split('scale(')[1]?.split(')')[0])
+ let rotateZ = Number(this.imgDom.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].designOpenrtionBtn = true
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].transform = {
scale:scale,
rotateZ:rotateZ,
}
let imgDomWH = this.imgDom.getBoundingClientRect()
let li = document.getElementsByClassName('designOpenrtionMobile_modal')[0].getElementsByClassName("designOpenrtionMobile_btn_top")[0].offsetWidth/2
if(this.direction == 'right' || this.direction == 'bottom'){
- this.printStyleList[this.imgDomIndex].centers.left = imgDomWH.x+event.changedTouches[0].pageX - this.imgDom.getBoundingClientRect().left-li
- this.printStyleList[this.imgDomIndex].centers.top = imgDomWH.y+event.changedTouches[0].pageY - this.imgDom.getBoundingClientRect().top-li
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.left = imgDomWH.x+event.changedTouches[0].pageX - this.imgDom.getBoundingClientRect().left-li
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.top = imgDomWH.y+event.changedTouches[0].pageY - this.imgDom.getBoundingClientRect().top-li
}else{
- this.printStyleList[this.imgDomIndex].centers.left = imgDomWH.x+event.changedTouches[0].pageX - this.imgDom.getBoundingClientRect().left+imgDomWH.width-li
- this.printStyleList[this.imgDomIndex].centers.top = imgDomWH.y+event.changedTouches[0].pageY - this.imgDom.getBoundingClientRect().top+imgDomWH.height-li
- this.printStyleList[this.imgDomIndex].centers.right = this.imgDom.parentNode.offsetWidth -imgDomWH.width - this.imgDom.offsetLeft
- this.printStyleList[this.imgDomIndex].centers.bottom = this.imgDom.parentNode.offsetHeight -imgDomWH.height - this.imgDom.offsetTop
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.left = imgDomWH.x+event.changedTouches[0].pageX - this.imgDom.getBoundingClientRect().left+imgDomWH.width-li
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.top = imgDomWH.y+event.changedTouches[0].pageY - this.imgDom.getBoundingClientRect().top+imgDomWH.height-li
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.right = this.imgDom.parentNode.offsetWidth -imgDomWH.width - this.imgDom.offsetLeft
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.bottom = this.imgDom.parentNode.offsetHeight -imgDomWH.height - this.imgDom.offsetTop
}
document.addEventListener("touchend", this.sizeMouseup);
@@ -385,22 +434,22 @@ export default defineComponent({
let imgDomWH = this.imgDom.getBoundingClientRect()
let parentNode = document.getElementsByClassName('designOpenrtionMobile_modal')[0].getElementsByClassName("designOpenrtionMobile_imgMask")[0]
parentNode = parentNode.getBoundingClientRect()
- let x = ( e.changedTouches[0].pageX - this.printStyleList[this.imgDomIndex].centers.left)+'px'
- let y = ( e.changedTouches[0].pageY - this.printStyleList[this.imgDomIndex].centers.top)+'px'
- this.printStyleList[this.imgDomIndex].style.left = x
- this.printStyleList[this.imgDomIndex].style.top = y
+ let x = ( e.changedTouches[0].pageX - this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.left)+'px'
+ let y = ( e.changedTouches[0].pageY - this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.top)+'px'
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.left = x
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.top = y
if(!this.overallSingle){
if(x.replace(/px/g,'') >= parentNode.width - imgDomWH.width){
- this.printStyleList[this.imgDomIndex].style.left = parentNode.width - imgDomWH.width+'px'
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.left = parentNode.width - imgDomWH.width+'px'
}
if(x.replace(/px/g,'') <= 0){
- this.printStyleList[this.imgDomIndex].style.left = 0+'px'
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.left = 0+'px'
}
if(y.replace(/px/g,'') >= parentNode.height - imgDomWH.height){
- this.printStyleList[this.imgDomIndex].style.top = parentNode.height - imgDomWH.height+'px'
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.top = parentNode.height - imgDomWH.height+'px'
}
if(y.replace(/px/g,'') <= 0){
- this.printStyleList[this.imgDomIndex].style.top = 0+'px'
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.top = 0+'px'
}
}
@@ -421,12 +470,12 @@ export default defineComponent({
width = w+'px'
height = w*num1+'px'
}else if(this.direction == 'top'){
- this.printStyleList[this.imgDomIndex].style.top = 'auto'
- // this.printStyleList[this.imgDomIndex].style.left = 'auto'
- // this.printStyleList[this.imgDomIndex].style.bottom = parentNode.offsetHeight -imgDomWH.height - this.imgDom.offsetTop+'px'
- this.printStyleList[this.imgDomIndex].style.bottom = this.printStyleList[this.imgDomIndex].centers.bottom+'px'
- w = ( e.changedTouches[0].pageX - this.printStyleList[this.imgDomIndex].centers.left)*num
- h = (this.printStyleList[this.imgDomIndex].centers.top - e.changedTouches[0].pageY)
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.top = 'auto'
+ // this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.left = 'auto'
+ // this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.bottom = parentNode.offsetHeight -imgDomWH.height - this.imgDom.offsetTop+'px'
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.bottom = this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.bottom+'px'
+ w = ( e.changedTouches[0].pageX - this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.left)*num
+ h = (this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.top - e.changedTouches[0].pageY)
height = h+'px'
width = h*num+'px'
@@ -435,19 +484,19 @@ export default defineComponent({
height = h+'px'
width = h*num+'px'
}else if(this.direction == 'left'){
- this.printStyleList[this.imgDomIndex].style.left = 'auto'
- this.printStyleList[this.imgDomIndex].style.right = this.printStyleList[this.imgDomIndex].centers.right+'px'
- w = (this.printStyleList[this.imgDomIndex].centers.left - e.changedTouches[0].pageX)
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.left = 'auto'
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.right = this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.right+'px'
+ w = (this.printStyleList[this.stateOverallSingle][this.imgDomIndex].centers.left - e.changedTouches[0].pageX)
width = w+'px'
height = w*num1+'px'
}
//判断尺寸是否到边
- this.printStyleList[this.imgDomIndex].style.width = width
- this.printStyleList[this.imgDomIndex].style.height = height
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.width = width
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style.height = height
},
//鼠标抬起
sizeMouseup(e){
- this.printStyleList[this.imgDomIndex].style={
+ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].style={
right:'auto',
left:this.imgDom.offsetLeft+'px',
bottom:'auto',
@@ -464,47 +513,12 @@ export default defineComponent({
document.removeEventListener("touchend", this.touchend);
document.removeEventListener("touchmove", this.moveMousemove);
},
-
-
- setprintAmount(){
- if(this.printAmount < 1){
- this.printAmount = 1
- return
- }
- if(this.printAmount > 20){
- this.printAmount = 20
- return
- }
- let printTiemNum
- if(this.printAmount>this.printStyleList.length){
- let num = this.printAmount - this.printStyleList.length
- for (let index = 0; index < num; index++) {
- this.printStyleList.push(JSON.parse(JSON.stringify(this.printStyleList[this.printStyleList.length-1])))
- this.printStyleList[this.printStyleList.length-1].transform.rotateZ = 0
- this.refetchTemplate(this.printStyleList.length-1)
- this.designOpenrtionList.push(this.current.printObject.prints[this.current.printObject.prints.length-1])
- }
- }else{
- let num = this.printStyleList.length - this.printAmount
- this.designOpenrtionList.splice(this.printStyleList.length-num,num)
- this.printStyleList.splice(this.printStyleList.length-num,num)
- }
- this.printStyleList.forEach((v)=>{
- v.designOpenrtionBtn = false
- })
- this.printStyleList[this.printStyleList.length-1].designOpenrtionBtn = true
- this.imgDomIndex = this.printStyleList.length-1
- },
deletePrint(){
- if(this.designOpenrtionList.length <= 1){
- return
- }
- this.designOpenrtionList.splice(this.imgDomIndex,1)
- this.printStyleList.splice(this.imgDomIndex,1)
- this.printAmount = this.designOpenrtionList.length
+ this.exhibitionOpenrtionList[this.stateOverallSingle].splice(this.imgDomIndex,1)
+ this.printStyleList[this.stateOverallSingle].splice(this.imgDomIndex,1)
},
random(){
- this.designOpenrtionList.forEach((v,index)=>{
+ this.exhibitionOpenrtionList[this.stateOverallSingle].forEach((v,index)=>{
this.refetchTemplate(index)
})
},
@@ -530,7 +544,7 @@ export default defineComponent({
x = sketch?.width - this.print.width.replace(/px/g,'')*scale/2
}
let y = sketch?.height-this.print.height.replace(/px/g,'')*scale
- this.printStyleList[index]={
+ this.printStyleList[this.stateOverallSingle][index]={
centers:{
left:0,
top:0,
@@ -547,7 +561,7 @@ export default defineComponent({
transform:{
// scale:scale<.2?.2:scale,//0.2-3
// rotateZ:rotateZ1-rotateZ2,
- rotateZ:this.printStyleList[index].transform.rotateZ?this.printStyleList[index].transform.rotateZ:0
+ rotateZ:this.printStyleList[this.stateOverallSingle][index].transform.rotateZ?this.printStyleList[this.stateOverallSingle][index].transform.rotateZ:0
},
designOpenrtionBtn:false
}
@@ -568,7 +582,7 @@ export default defineComponent({
if(sketch.offsetHeight < item.location[1]/sketchNum){
top = sketch.offsetHeight +'px'
}
- this.printStyleList[index]={
+ this.printStyleList[this.stateOverallSingle][index]={
centers:{
left:0,
top:0,
@@ -590,7 +604,7 @@ export default defineComponent({
}
},
computeZindex(){
- let arr = JSON.parse(JSON.stringify(this.printStyleList))
+ let arr = JSON.parse(JSON.stringify(this.printStyleList[this.stateOverallSingle]))
arr.sort((a, b) => {
var a_num = a["style"].zIndex;
var b_num = b["style"].zIndex;
@@ -604,37 +618,40 @@ export default defineComponent({
},
computeSize(arr){
// let num = this.sketch/
- let sketch = document.getElementsByClassName("designOpenrtionMobile_sketch")[0]
- let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
- let prints = []
- let scale
- let location
- arr.forEach((v,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{
- 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]
+ return new Promise(async (resolve, reject) => {
+ let sketch = document.getElementsByClassName("designOpenrtionMobile_sketch")[0]
+ let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
+ let scale
+ let prints = []
+ 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]
+ }
+ let obj = {
+ 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,
+ }
+ prints.push(obj)
}
- let obj = {
- angle : !this.overallSingle ? 0:arr[index].transform.rotateZ,
- location : location,
- priority:arr[index].style.zIndex,
- scale: scale,
- designType:this.designOpenrtionList[index].designType,
- path:this.designOpenrtionList[index].path,
- minIOPath:this.designOpenrtionList[index].minIOPath,
- }
- prints.push(obj)
+ resolve(prints)
})
- return prints
},
- setPreview(){
+ async setPreview(){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
let index
- let scale = this.printStyleList[0].style.width.replace(/px/g,'')/this.print.width.replace(/px/g,'')
designItemDetail.clothes.forEach((v,ind)=>{
if(v.id == this.current.id){
index = ind
@@ -649,9 +666,12 @@ export default defineComponent({
// timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
// }
let data = this.store.state.DesignDetailModule.designPreviewData
+ await this.computeZindex().then((rv)=>{
+ this.setOkData = rv
+ })
data.designSingleItemDTOList[index].printObject={
ifSingle:this.overallSingle,
- prints:this.computeZindex(),
+ prints:this.setOkData,
}
data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
this.loadingShow = true
@@ -686,7 +706,9 @@ 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].printObject.prints = this.computeZindex()
+ designItemDetail.clothes[index].trims = this.designItemDetailTS.rv.clothes[index].trims
+ designItemDetail.clothes[index].printObject.prints = this.setOkData
+ // designItemDetail.clothes[index].printObject.prints = this.computeZindex()
designItemDetail.ifSubmit = true
designItemDetail.clothes.forEach((item,i)=>{
let a
@@ -708,31 +730,18 @@ export default defineComponent({
}
},
clearModal(){
- this.printAmount = 1//显示数量
this.designOpenrtion = true//modal页面关闭
this.printZIndex = 2//点击图片z-index
this.imgDomIndex = 0//点击图片下标
this.designOpenrtionList = []
- this.printStyleList.splice(1,this.printStyleList.length-1)
- this.printStyleList[0] = {
- centers:{
- left:0,
- top:0,
- },
- style:{
- left:0+"px",
- top:0+"px",
- right:"auto",
- bottom:"auto",
- width:'auto',
- height:'auto',
- zIndex:1,
- },
- transform:{
- scale:1,
- rotateZ:0,
- },
- designOpenrtionBtn:false
+ this.designList = []
+ this.exhibitionOpenrtionList = {
+ single:[],
+ overall:[],
+ }
+ this.printStyleList = {
+ single:[],
+ overall:[],
}
},
closeModal(){
@@ -1111,6 +1120,19 @@ export default defineComponent({
width: 0;
height: 0;
}
+ .designOpenrtionMobile__delete{
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 4rem;
+ background: none;
+ transform: translate(100%, -100%);
+ height: 4rem;
+ img{
+ width: 100%;
+ height: 100%;
+ }
+ }
.designOpenrtionMobile_rotote::after{
position: absolute;
content: "";
diff --git a/src/component/Detail/addDetails.vue b/src/component/Detail/addDetails.vue
new file mode 100644
index 00000000..7f56e877
--- /dev/null
+++ b/src/component/Detail/addDetails.vue
@@ -0,0 +1,437 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index a6f39f1a..95b45485 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -105,11 +105,11 @@
- {{ $t('Habit.System') }}({{systemDesigner.system}}%)
+ {{ $t('Habit.System') }}({{systemDesigner.designer}}%)
- {{ $t('Habit.Designer') }}({{systemDesigner.designer}}%)
+ {{ $t('Habit.Designer') }}({{systemDesigner.system}}%)
@@ -811,17 +811,18 @@ export default defineComponent({
// },
setWorkspaceStyle(data: any){
this.workspaceItem.styleId = data
- this.putWorkspace(this.workspaceItem,'')
+ this.putWorkspace(this.workspaceItem,this.workspaceItem.id)
},
setStyle(){
- this.openType.habit = false
+ // this.openType.habit = false
let habitSetStyle:any = this.$refs.habitSetStyle;
- habitSetStyle.habitSetStyleMask = true
+ // habitSetStyle.habitSetStyleMask = true
// habitSetStyle.styleList = this.styleList
- habitSetStyle.init();
+ habitSetStyle.init(this.workspaceItem);
},
setParentData(){
- this.openType.habit = true
+ // this.openType.habit = true
+ // this.getDetail(this.workspaceItem.id)
},
},
});
diff --git a/src/component/Detail/habitSetStyle.vue b/src/component/Detail/habitSetStyle.vue
index 7eaafd2a..702c1094 100644
--- a/src/component/Detail/habitSetStyle.vue
+++ b/src/component/Detail/habitSetStyle.vue
@@ -10,6 +10,7 @@
:mask="habitSetStyleMask"
:keyboard="false"
:destroyOnClose="true"
+ :zIndex="1050"
>