diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 9bfbf82e..0e65de08 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -83,6 +83,7 @@ @input="ifMaximumLength" :maxlength='inputShow?0:9999' @keydown.enter="getgenerate()" + @click.stop="" v-model="searchPictureName" > @@ -490,14 +491,18 @@ export default defineComponent({ element.id_ = GO.id++ this.fileList.unshift(element) data = data.filter((item:any) => item !== element.taskId); - element.categoryValue = this.scene?.name - element.category = this.scene?.value - // this.sketchCatecoryList.forEach((itemCategory:any) => { - // if(itemCategory.value == element.category){ - // element.categoryValue = itemCategory?.name - // element.category = itemCategory?.value - // } - // }); + if(this.type_.type2 == 'Sketchboard'){ + this.sketchCatecoryList.forEach((itemCategory:any) => { + if(itemCategory.value == element.category){ + console.log(element,itemCategory); + element.categoryValue = itemCategory?.name + element.category = itemCategory?.value + } + }); + }else{ + element.categoryValue = this.scene?.name + element.category = this.scene?.value + } } }); if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length ==data.length)){ @@ -542,6 +547,11 @@ export default defineComponent({ }, setTextareaShow(){ this.isTextarea = !this.isTextarea + if(this.isTextarea){ + document.addEventListener('click',this.setTextareaShow) + }else{ + document.removeEventListener('click',this.setTextareaShow) + } }, cliSetKeyword(value:any){ let str = '' @@ -667,6 +677,7 @@ export default defineComponent({ generateDetailId:item.id, level1Type:this.type_.type2, level2Type: level2Type, + gender:this.workspace.sexEnum.name, timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone } Https.axiosPost(Https.httpUrls.generateLike, data).then( @@ -726,10 +737,11 @@ export default defineComponent({ flex-direction: column; border-right: 1px solid #e5e5e5; position: relative; - padding-top: calc(2.5rem*1.2); - &.generate::-webkit-scrollbar { - display: none; - } + // padding-top: calc(2.5rem*1.2); + .input_border{ + padding-top: calc(2.5rem*1.2); + } + .mark_loading{ position: absolute; width: 100%; @@ -743,7 +755,7 @@ export default defineComponent({ position: sticky; top: 0; background: #fff; - padding-bottom: calc(2rem*1.2); + padding-top: calc(2rem*1.2); z-index: 3; } .generate_checkbox { @@ -756,6 +768,10 @@ export default defineComponent({ flex-wrap: wrap; align-content: flex-start; flex: 1; + overflow-y: auto; + &.generage_img::-webkit-scrollbar { + display: none; + } .generage_img_item { cursor: pointer; margin: 0 calc(2rem*1.2) calc(2rem*1.2) 0; diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 1eb0d68b..5db7592c 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -195,7 +195,7 @@ export default defineComponent({ level2Type:'', designType:'' }) - let workspace = ref({}) + let workspace:any = ref({}) let sceneList = ref([ { name:'Pattern', @@ -399,6 +399,7 @@ export default defineComponent({ generateDetailId:item.id, level1Type:"Printboard", level2Type: '', + gender:this.workspace.sexEnum.name, timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone } Https.axiosPost(Https.httpUrls.generateLike, data).then( diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index bf1e94bf..0382cf55 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -313,7 +313,7 @@ export default defineComponent({ } let setChoose = () =>{ - if(systemUser.value != 1){ + if(systemUser.value.value !== 1){ return message.info('请先登录或者升级为正式用户') } if(imgData.scaleImageData.openSource == 0){ diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 57fa392e..fd2a863f 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -202,7 +202,7 @@