From a5317551f7f2e07a011ff94593c830533af110e0 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 15 Dec 2023 11:10:32 +0800 Subject: [PATCH] fix --- src/assets/style/style.css | 3 ++ src/assets/style/style.less | 3 ++ src/component/Detail/DesignDetail.vue | 49 ++++++++++++++------ src/component/Detail/DesignDetailAlter.vue | 11 +++++ src/component/Detail/DesignDetailEnd.vue | 28 ++--------- src/component/HomePage/ColorboardUpload.vue | 10 ++++ src/component/HomePage/Generate.vue | 1 - src/component/HomePage/PrintboardUpload.vue | 23 +++++++-- src/component/HomePage/RobotAssist.vue | 15 ++++++ src/component/HomePage/SketchboardUpload.vue | 21 +++++++-- src/component/HomePage/scaleImage.vue | 8 +++- src/views/LibraryPage.vue | 4 ++ src/views/LoginPage.vue | 16 +++++-- 13 files changed, 139 insertions(+), 53 deletions(-) diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 7a86a334..40806d2a 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -218,6 +218,9 @@ li { .delete_like_file_block i.fi-sr-heart { color: red; } +.delete_like_file_block.left { + left: 0rem; +} .el-popper .el-cascader-panel { --el-cascader-menu-selected-text-color: #000; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 5ef536fe..e831e6e6 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -242,6 +242,9 @@ ul,li{ color: red; } } + &.left{ + left: 0rem; + } } .el-popper{ diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 92f10a31..7a803171 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -253,7 +253,11 @@ export default defineComponent({ handler: async function(newVal,oldVal) { let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) this.ifSubmit = designItemDetail.ifSubmit?designItemDetail.ifSubmit:false - this.current = JSON?.parse(JSON?.stringify(designItemDetail?.clothes?.[this?.currentIndex])) + if(newVal.clothes.length == 0){ + this.current = '' + }else{ + this.current = JSON?.parse(JSON?.stringify(designItemDetail?.clothes?.[this?.currentIndex])) + } if(designItemDetail.others[0].layersObject.length != 0){ this.body = false }else{ @@ -781,7 +785,22 @@ export default defineComponent({ this.designItemDetail.clothes.forEach((item:any)=>{ item.clothesOpen = false }) - let color = this.designItemDetail.clothes[0].color + let color + if(this.designItemDetail.clothes[0]){ + color = this.designItemDetail.clothes[0].color + }else{ + color = { + "id": '', + "name": "Brilliant White New", + "tcx": "11-1123", + "r": 255, + "g": 255, + "b": 255, + "h": 0, + "s": 0, + "v": 100 + } + } let aa = { "id": '', "type": "", @@ -802,17 +821,21 @@ export default defineComponent({ // let DesignDetailAlter:any = this.$refs.DesignDetailAlter // DesignDetailAlter.changePlace() this.designOrder = true - if(this.designItemDetail.clothes[this.designItemDetail.clothes.length-1].id){ - this.designItemDetail.clothes.push(aa) - this.clothesDetail(aa,this.designItemDetail.clothes.length-1) - let DesignDetailAlter:any = this.$refs.DesignDetailAlter - DesignDetailAlter.init(1) - // this.current = aa - // this.designOrder = true - // let DesignDetailAlter:any = this.$refs.DesignDetailAlter - // DesignDetailAlter.changePlace() - }else{ - } + this.designItemDetail.clothes.push(aa) + this.clothesDetail(aa,this.designItemDetail.clothes.length-1) + let DesignDetailAlter:any = this.$refs.DesignDetailAlter + DesignDetailAlter.init(1) + // if(this.designItemDetail.clothes?.[this.designItemDetail.clothes.length-1]?.id){ + // // this.current = aa + // // this.designOrder = true + // // let DesignDetailAlter:any = this.$refs.DesignDetailAlter + // // DesignDetailAlter.changePlace() + // }else{ + // this.designItemDetail.clothes.push(aa) + // this.clothesDetail(aa,this.designItemDetail.clothes.length-1) + // let DesignDetailAlter:any = this.$refs.DesignDetailAlter + // DesignDetailAlter.init(1) + // } }, //元素替换 diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index 8a812dc9..07f53340 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -1431,12 +1431,23 @@ export default defineComponent({ bottom: -.5rem; right: .5rem; border-radius: .5rem; + } .vc-chrome-fields{ .vc-input__label{ margin-top: 1rem; } } + .vc-chrome-fields:nth-child(2){ + >:last-of-type { + display: none; + } + } + .vc-chrome-fields:nth-child(3){ + >:last-of-type { + display: none; + } + } } .vc-chrome-controls{ align-items: center; diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index 81692acf..b6aad618 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -251,6 +251,7 @@ export default defineComponent({ }) if(!this.current.id){ data.designSingleItemDTOList[index].priority = zIndex+=1 + } if(this.type_ == 1){ if(data.designSingleItemDTOList[index].path != this.sketchImg.minIOPath && this.sketchImg.id_){ @@ -267,30 +268,7 @@ export default defineComponent({ let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}` data.designSingleItemDTOList[index].color = color } - // if(!bor){ - // index = designItemDetail.clothes.length - // let color = `${this.$parent.selectColor.rgba.r} ${this.$parent.selectColor.rgba.g} ${this.$parent.selectColor.rgba.b}` - // let obj = { - // "color": color, - // "id": this.sketchImg.id_? this.sketchImg.id_:this.current.id_, - // "path": this.sketchImg.minIOPath? this.sketchImg.minIOPath: this.current.minIOPath, - // "offset": [ - // 0, - // 0 - // ], - // "scale": 1, - // "printObject": { - // "ifSingle": false, - // "prints": [ - // ] - // }, - // priority:zIndex, - // "type": this.sketchImg.type - // } - // // data.designSingleItemDTOList.push(obj) - // // designItemDetail.clothes.push(obj) - // } - // return + data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone this.loadingShow = true Https.axiosPost(Https.httpUrls.designSingle, data).then( @@ -310,7 +288,7 @@ export default defineComponent({ }else{ } - if(!designItemDetail.clothes[index].id){ + if(!this.current.id ){ designItemDetail.clothes[index].priority = zIndex } } diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index 13e7325b..e74d4a04 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -781,6 +781,16 @@ export default defineComponent({ margin-top: 1rem; } } + .vc-chrome-fields:nth-child(2){ + >:last-of-type { + display: none; + } + } + .vc-chrome-fields:nth-child(3){ + >:last-of-type { + display: none; + } + } } .vc-chrome-controls{ align-items: center; diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 37c35365..1a82675f 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -658,7 +658,6 @@ export default defineComponent({ }, scaleImage(){ let scaleImage:any = this.$refs.scaleImage - scaleImage.init(this.fileList) }, closeModal() { diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 8b8e99dd..699b5460 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -117,6 +117,9 @@ +
+ +
{{ $t('PrintboardUpload.PIN') }}
@@ -128,7 +131,7 @@ - + @@ -146,12 +149,14 @@ import Generate from "@/component/HomePage/Generate.vue"; import GO from "@/tool/GO"; import { useI18n } from 'vue-i18n'; import { openGuide,driverObj__ } from "@/tool/guide"; +import scaleImage from "@/component/HomePage/scaleImage.vue"; export default defineComponent({ components:{ Cropper, Material, - Generate + Generate, + scaleImage, }, setup(){ let store:any =useStore() @@ -164,7 +169,8 @@ export default defineComponent({ }) let openClick: any = ref(1); let generateCheckbox:any = ref() - let generateList:any = ref([]) + let generateList:any = ref([ + ]) let loadingShow = ref(false) let inputShow = ref(false) let inputTime = ref() @@ -601,6 +607,9 @@ export default defineComponent({ return } } + if(generateType == 'image'){ + data.text = '' + } this.loadingShow = true Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then( (rv) => { @@ -712,7 +721,10 @@ export default defineComponent({ }) }, - + scaleImage(){ + let scaleImage:any = this.$refs.scaleImage + scaleImage.init(this.generateList) + }, generageAdd(item:any){ item.type_ = { type1: "generate", @@ -912,6 +924,9 @@ export default defineComponent({ text-align: center; line-height: 3.2rem; left: auto; + &.left{ + left: .9rem; + } .icon-shanchu{ font-size: 1.6rem; color: #fff; diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue index dda84d7d..d02d8186 100644 --- a/src/component/HomePage/RobotAssist.vue +++ b/src/component/HomePage/RobotAssist.vue @@ -27,6 +27,9 @@ +
+ +
@@ -46,11 +49,13 @@
+
+