From edf86ce90642b57ff0e01ee3d30f6ba6b31668d3 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 28 Dec 2023 10:36:48 +0800 Subject: [PATCH] fix --- .env.test | 1 + src/component/HomePage/Generate.vue | 18 +++++--- .../HomePage/NewCollectionReview.vue | 2 +- src/component/LibraryPage/setLabel.vue | 33 ++++++++++++--- src/lang/cn.ts | 14 +++---- src/lang/en.ts | 14 +++---- src/lang/fr.ts | 14 +++---- src/lang/it.ts | 14 +++---- src/lang/ja.ts | 14 +++---- src/lang/kr.ts | 14 +++---- src/lang/ru.ts | 14 +++---- src/lang/th.ts | 14 +++---- src/lang/vn.ts | 14 +++---- src/tool/guide.js | 2 +- src/views/HomeView.vue | 13 +++--- src/views/LibraryPage.vue | 42 +++++++++++++------ 16 files changed, 144 insertions(+), 93 deletions(-) diff --git a/.env.test b/.env.test index 9c6509d7..b79e87f1 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,4 @@ NODE_ENV = 'development' VUE_APP_BASE_URL = 'http://18.167.251.121:10088' +# VUE_APP_BASE_URL = 'http://18.167.251.121:10086' # VUE_APP_BASE_URL = 'http://192.168.1.7:5567' diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 64b78511..b76123d1 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -235,7 +235,7 @@ export default defineComponent({ let printModel = ref({ num:'', optype:false, - name:useI18n().t('Generate.Model')+'1' + name:useI18n().t('Generate.Model'+1) }) let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard}) // let sketchCatecoryList:any = ref([]) @@ -435,7 +435,7 @@ export default defineComponent({ this.printModel = { num : num, optype:false, - name:this.t('Generate.Model')+num + name:this.t('Generate.Model'+num) } } nextTick().then(()=>{ @@ -734,17 +734,21 @@ export default defineComponent({ } .printModel{ >div{ - width: 7rem; - display: flex; + width: 13rem; + // display: flex; + display: block; justify-content: center; border-radius: 1rem; margin: 0; border: 2px solid; cursor: pointer; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } ul{ position: absolute; - width: 7rem; + width: 13rem; text-align: center; margin-top: .3rem; border-radius: 1rem; @@ -753,6 +757,10 @@ export default defineComponent({ background: rgba(0,0,0,.2); line-height: 2; cursor: pointer; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + padding: 0 1rem; &.printModel_item:hover{ background: rgba(0,0,0,.4); } diff --git a/src/component/HomePage/NewCollectionReview.vue b/src/component/HomePage/NewCollectionReview.vue index 49aded8c..877051b3 100644 --- a/src/component/HomePage/NewCollectionReview.vue +++ b/src/component/HomePage/NewCollectionReview.vue @@ -105,7 +105,7 @@ export default defineComponent({ let newArr:any = [] oldVal.forEach((item:any,index:any) => { oldArr.push(item.id?item.id:item.sketchBoardId) - newArr.push(newVal[index].id?newVal[index].id:newVal[index].sketchBoardIdd) + newArr.push(newVal?.[index]?.id?newVal?.[index]?.id:newVal?.[index]?.sketchBoardIdd) }); if(JSON.stringify(newArr)!=JSON.stringify(oldArr)){ this.setSketch() diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index 5bdded5d..59dd4999 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -41,7 +41,7 @@
+
-
Delete
+
Delete
@@ -73,6 +73,7 @@ export default defineComponent({ let openType = ref(false) let itemName = ref('') let {t} = useI18n() + let labelBor = ref(false)//判断是否选中标签 return { multiple, indeterminate, @@ -82,7 +83,8 @@ export default defineComponent({ openType, type, itemName, - t + t, + labelBor } }, data(){ @@ -94,7 +96,6 @@ export default defineComponent({ this.clearOpenType() }, watch: { - }, directives:{ mousewheel:{ @@ -136,8 +137,8 @@ export default defineComponent({ }else{ this.multiple = true } - this.clearOpenType() this.options = data + this.clearOpenType() }, clearSetLabel(){ this.clearOpenType() @@ -150,14 +151,16 @@ export default defineComponent({ item.checkAll = value.checkAll }); } + this.deleteShow(this.options) }, onCheckAllchildrenItem(value:any){ let boor = value?.childList.every( (item:any) => item.checkAll ) if(boor){ - value.checkAll = true + // value.checkAll = true }else{ value.checkAll = false } + this.deleteShow(this.options) }, clearOpenType(){ this.openType = false @@ -324,6 +327,20 @@ export default defineComponent({ "userId": '' } return data + }, + deleteShow(value:any){ + // this.options + this.labelBor = false + for(let index = 0; index{ if(isBeginnerNum){ driverObj__.drive(isBeginnerNum); }else{ - driverObj__.drive(); + driverObj__.drive(0); } data = { index:driverIndex__, diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 0345b830..ad2f3e66 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -441,18 +441,19 @@ export default defineComponent({ //判断模特和当前start的sketch是否匹配 isMannequin(){ this.isMannequinShow = false - let isSketchItem:any + let num = 0 this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => { - isSketchItem = true this.workspacePosition.forEach((positionItem:any) => { if(positionItem.name == sketchItem.category){ - isSketchItem = false + num ++ + // console.log(num,this.allBoardData?.sketchboardFiles.length); } }); - if(isSketchItem){ - this.isMannequinShow = true - } + }); + if(num != this.allBoardData?.sketchboardFiles?.length){ + this.isMannequinShow = true + } }, formatter(value: number) { return `${value}%`; diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index 3329eded..6584c72e 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -221,7 +221,14 @@
- +
{{ $t('LibraryPage.Generate') }}
{{ $t('LibraryPage.maximumLength') }}
@@ -256,7 +263,7 @@
@@ -454,7 +462,7 @@ export default defineComponent({ let printModel = ref({ num:1, optype:false, - name:useI18n().t('LibraryPage.model')+'1' + name:useI18n().t('LibraryPage.Model1') }) let {t} = useI18n() const options:any = ref([ @@ -1133,7 +1141,7 @@ export default defineComponent({ this.printModel = { num : num, optype:false, - name:this.t('LibraryPage.model')+num + name:this.t('LibraryPage.Model'+num) } }, getgenerate(){ @@ -1145,6 +1153,9 @@ export default defineComponent({ return } let generateType = this.checkbox.filter((v:any)=>v.type)[0].name + if(this.selectCode == 'Moodboard'){ + generateType = this.checkbox[1].name + } let generageImg = this.selectGenerateList.filter((v:any)=>v.checked)[0] let data = { generateType:generateType, @@ -1161,7 +1172,7 @@ export default defineComponent({ if(generageImg?.id){ data.text = '' }else{ - message.warning( + message.info( this.t('LibraryPage.jsContent9') ); return @@ -1173,7 +1184,7 @@ export default defineComponent({ if(this.captionGeneration){ let arr = this.captionGeneration.split(/\s+/).length if(arr > 75){ - message.warning( + message.info( this.t('LibraryPage.jsContent6') ); return @@ -1191,7 +1202,7 @@ export default defineComponent({ if(this.captionGeneration){ let arr = this.captionGeneration.split(/\s+/).length if(arr > 75){ - message.warning( + message.info( this.t('LibraryPage.jsContent6') ); return @@ -1204,7 +1215,7 @@ export default defineComponent({ return } }else{ - message.warning( + message.info( this.t('LibraryPage.jsContent9') ); return @@ -1648,18 +1659,21 @@ export default defineComponent({ font-size: 1.4rem; font-weight: 500; >div{ - width: 7rem; - display: flex; + width: 13rem; + // display: flex; + display: block; justify-content: center; border-radius: 1rem; margin: 0; border: 2px solid; cursor: pointer; - + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } ul{ position: absolute; - width: 7rem; + width: 13rem; text-align: center; margin-top: .3rem; border-radius: 1rem; @@ -1669,6 +1683,10 @@ export default defineComponent({ background: #c5c4c8; line-height: 2; cursor: pointer; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + padding: 0 1rem; &.printModel_item:hover{ background: #949396; }