This commit is contained in:
X1627315083
2023-12-15 15:23:34 +08:00
parent 909ea7ac2f
commit fc4403c6ca
48 changed files with 211 additions and 107 deletions

View File

@@ -110,7 +110,7 @@
:headers="{ Authorization: token }"
v-model:file-list="uploadList"
:before-upload="beforeUpload"
:maxCount="8 - uploadList.length"
:maxCount="8"
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => upFileUploadChange(file)"
>
@@ -580,18 +580,18 @@ export default defineComponent({
let fileList = this.uploadList.filter(
(v) => v.status === "done"
);
if (this.uploadList.length >= 8) {
message.info(this.t('DesignDetailAlter.jsContent2'));
} else {
// this.store.commit("setSketchboardFile", fileList);
this.uploadList = fileList
// this.store.commit("clearMoodTemplateId");
if(this.selectCode == 'Sketchboard'){
this.apparelList = this.uploadList
}else{
this.printList = this.uploadList
}
this.uploadList = fileList
// this.store.commit("clearMoodTemplateId");
if(this.selectCode == 'Sketchboard'){
this.apparelList = this.uploadList
}else{
this.printList = this.uploadList
}
// if (this.uploadList.length > 8) {
// message.info(this.t('DesignDetailAlter.jsContent2'));
// } else {
// // this.store.commit("setSketchboardFile", fileList);
// }
}else{
bor = false
}

View File

@@ -60,7 +60,8 @@
<img :src="designOpenrtionList[0].path">
</div>
</div>
<div class="subitOkPreviewBtn Guide_1_25" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
<div class="subitOkPreviewBtn" @click.stop="setPreview">{{ $t('DesignPrintOperation.preview') }}</div>
<div class="subitOkPreviewBtn Guide_1_25_1" @click.stop="setOK">OK</div>
</div>
</div>
@@ -98,6 +99,11 @@
</div>
</div>
</div>
<div class="designOpenrtion_right">
<div class="designOpenrtion_entirety_img">
<img :src="currentFullBodyView" alt="">
</div>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
@@ -108,7 +114,7 @@
<script >
import { defineComponent, h,createVNode, ref ,computed, inject,nextTick} from "vue";
import { LoadingOutlined } from "@ant-design/icons-vue";
// import { LoadingOutlined } from "@ant-design/icons-vue";
import { useStore } from "vuex";
import { openGuide,driverObj__ } from "@/tool/guide";
import { Https } from "@/tool/https";
@@ -160,7 +166,8 @@ export default defineComponent({
height:''
})
let loadingShow = ref(false)
let currentFullBodyView = ref('')
let body = ref(false)
let {t} = useI18n()
return {
designOpenrtion,
@@ -180,6 +187,8 @@ export default defineComponent({
loadingShow,
setRevocation,
t,
currentFullBodyView,
body,
};
},
data() {
@@ -238,6 +247,11 @@ export default defineComponent({
},
methods: {
init(){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
this.currentFullBodyView = designItemDetail.currentFullBodyView? designItemDetail.currentFullBodyView:designItemDetail.designItemUrl
if(designItemDetail.others.length == 0){
this.body = true
}
let DesignPrintOperationParent = this.$parent
this.designOpenrtion = true
this.clearModal()
@@ -510,7 +524,10 @@ export default defineComponent({
}
// let x = sketch.width-Number(this.print.width.replace(/px/g,''))
// let y = sketch.height-Number(this.print.height.replace(/px/g,''))
let x = sketch?.width-this.print.width.replace(/px/g,'')*scale
let x = sketch?.width - this.print.width.replace(/px/g,'')*scale
if(!this.overallSingle){
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]={
centers:{
@@ -639,7 +656,7 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.designSingle, data).then(
(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
@@ -659,7 +676,7 @@ export default defineComponent({
this.store.commit("setDesignPreviewData", data);
this.setRevocation(designItemDetail,data)
this.loadingShow = false
this.designOpenrtion = false
// this.designOpenrtion = false
// this.closeModal()
if(this.driver__.driver){
nextTick().then(()=>{
@@ -671,6 +688,9 @@ export default defineComponent({
this.loadingShow = false
});
},
setOK(){
this.designOpenrtion = false
},
clearModal(){
this.printAmount = 1//显示数量
this.designOpenrtion = true//modal页面关闭
@@ -760,7 +780,20 @@ export default defineComponent({
}
}
.designOpenrtion_right{
height: 50rem;
position: absolute;
right: 2rem;
left: auto;
top: 50%;
transform: translateY(-50%);
.designOpenrtion_entirety_img{
height: 100%;
img{
height: 100%;
}
}
}
.designOpenrtion_open{
position: absolute;
top: 50%;
@@ -903,6 +936,7 @@ export default defineComponent({
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
display: flex;
&.active{
flex-direction: row;
}

View File

@@ -1,7 +1,7 @@
<template>
<div>
<a-modal
class="designOpenrtion_modal"
class="designOpenrtion_modal Guide_1_24"
v-model:visible="designOpenrtion"
:class="[driver__.driver?'hideEvents':'']"
:footer="null"
@@ -61,6 +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>
</div>
</div>
@@ -97,6 +98,11 @@
</div>
</div>
</div>
<div class="designOpenrtion_right">
<div class="designOpenrtion_entirety_img">
<img :src="currentFullBodyView" alt="">
</div>
</div>
</div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
@@ -107,7 +113,7 @@
<script >
import { defineComponent, h,createVNode, ref ,computed, inject,nextTick} from "vue";
import { LoadingOutlined } from "@ant-design/icons-vue";
// import { LoadingOutlined } from "@ant-design/icons-vue";
import { useStore } from "vuex";
import { Https } from "@/tool/https";
import { Modal,message } from 'ant-design-vue';
@@ -236,6 +242,11 @@ export default defineComponent({
},
methods: {
init(){
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
this.currentFullBodyView = designItemDetail.currentFullBodyView? designItemDetail.currentFullBodyView:designItemDetail.designItemUrl
if(designItemDetail.others.length == 0){
this.body = true
}
let DesignPrintOperationParent = this.$parent
this.designOpenrtion = true
this.clearModal()
@@ -669,6 +680,9 @@ export default defineComponent({
this.loadingShow = false
});
},
setOK(){
this.designOpenrtion = false
},
clearModal(){
this.printAmount = 1//显示数量
this.designOpenrtion = true//modal页面关闭
@@ -758,7 +772,20 @@ export default defineComponent({
}
}
.designOpenrtion_right{
height: 50rem;
position: absolute;
right: 2rem;
left: auto;
top: 50%;
transform: translateY(-50%);
.designOpenrtion_entirety_img{
height: 100%;
img{
height: 100%;
}
}
}
.designOpenrtion_open{
position: absolute;
top: 50%;

View File

@@ -156,7 +156,7 @@ import { useStore } from "vuex";
import { defineComponent, createVNode,nextTick, computed,ref,Ref} from "vue";
import { UserOutlined, DownOutlined } from "@ant-design/icons-vue";
import { Https } from "@/tool/https";
import type { MenuProps } from "ant-design-vue";
// import type { MenuProps } from "ant-design-vue";
import { Modal,message,Upload} from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { openGuide,driverObj__ } from "@/tool/guide";

View File

@@ -42,10 +42,9 @@
<script >
import { defineComponent, h,createVNode, ref ,computed, inject,nextTick} from "vue";
import { LoadingOutlined } from "@ant-design/icons-vue";
// import { LoadingOutlined } from "@ant-design/icons-vue";
import { useStore } from "vuex";
import { Modal,message } from 'ant-design-vue';
import GO from '@/tool/GO';
// import { Modal,message } from 'ant-design-vue';
import { Https } from "@/tool/https";
export default defineComponent({
// props: ["frontBack"],

View File

@@ -42,10 +42,7 @@
<script >
import { defineComponent, h,createVNode, ref ,computed, inject,nextTick} from "vue";
import { LoadingOutlined } from "@ant-design/icons-vue";
import { useStore } from "vuex";
import { Modal,message } from 'ant-design-vue';
import GO from '@/tool/GO';
import { Https } from "@/tool/https";
export default defineComponent({
// props: ["frontBack"],