From 5be355374e1f33070241edc2cc9341e415d3d02e Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 16 Nov 2023 09:44:53 +0800 Subject: [PATCH] 2023-11-16-1 --- src/assets/iconfont2/iconfont.css | 12 +- src/assets/iconfont2/iconfont.woff | Bin 1948 -> 2200 bytes src/assets/iconfont2/iconfont.woff2 | Bin 1516 -> 1720 bytes src/assets/style/style.css | 4 +- src/assets/style/style.less | 17 +- src/component/Detail/habit.vue | 29 +- src/component/HomePage/Generate.vue | 11 + src/component/HomePage/Header.vue | 10 +- src/component/HomePage/PrintboardUpload.vue | 9 + src/component/HomePage/SketchboardUpload.vue | 12 + src/component/LibraryPage/ModelPlacement.vue | 3 +- src/component/LibraryPage/labelList.vue | 344 ------------------- src/component/LibraryPage/setLabel.vue | 12 +- src/lang/en.ts | 3 + src/tool/https.js | 3 +- src/views/HistoryPage.vue | 38 +- src/views/LibraryPage.vue | 283 ++++++++++----- src/views/LoginPage.vue | 2 + 18 files changed, 318 insertions(+), 474 deletions(-) delete mode 100644 src/component/LibraryPage/labelList.vue diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css index 141d42c4..840700bd 100644 --- a/src/assets/iconfont2/iconfont.css +++ b/src/assets/iconfont2/iconfont.css @@ -1,18 +1,22 @@ @font-face { font-family: "iconfont"; /* Project id 4292253 */ - src: url('iconfont.woff2?t=1698742679640') format('woff2'), - url('iconfont.woff?t=1698742679640') format('woff'), - url('iconfont.ttf?t=1698742679640') format('truetype'); + src: url('iconfont.woff2?t=1700017557054') format('woff2'), + url('iconfont.woff?t=1700017557054') format('woff'), + url('iconfont.ttf?t=1700017557054') format('truetype'); } .iconfont { font-family: "iconfont" !important; - font-size: 1.6rem; + font-size: 1.8rem; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-biaoqian:before { + content: "\e603"; +} + .icon-yuyan:before { content: "\e85f"; } diff --git a/src/assets/iconfont2/iconfont.woff b/src/assets/iconfont2/iconfont.woff index 290ea7afe6c59939e00275fc19f82414183f2cd3..82644975a56a28b1f504d7544c2c47d49a8244bd 100644 GIT binary patch delta 1657 zcmV-<28Q{Z510`YcTYw}00961000P>01E&B000bVkrX|D8A~r?ZDDW#00D>q0049V z00GE?U5Bk_YaBp*T000O? z0000}0001O2n+0&lL!H40x`dnaRC#5ZLkc*c%1E#!3~5k3<3V>B|zhTvK)m6|8Inr9~SJzpBKCT(@lWuK1&-tLju z^j+?<{Z;HW^5L((_TS}-Z!z$_Ya94YbO`)Tx&%JI&jHN|A$T1Ac${Ta&u`p+L=>Jk zV~;(%{{1t%&2H9qV{cZ;rd@k&nxJeET@I8=6$KPROCl9SD+LLuP2f}tN1FBk6+Hk_ z4_vr_R5&9DR}MjH)jxm}<;V%7IE=F@6(Emi-pqS`@0;=W4WbAg?2(`GU&uodT1KbQ z3+QEp#4v$A6nO!8Dh@o?b|j#G61A(&2d{Dv2p1p647`bd20VvC7$G@<7s>v&Dtn;om;}&bO^cPk z8UXeC%z|})&I|%?d1+qPJ)?JY$!)iLt=3`#h}QLb0c#m``oCdR1G02mDxX67zaUIX)z9e3RxEhi;JS@l4L@syv{7v&BPbXNaZqmHm z^Sw#N+~=S)h>N(&TEr{h_c2D7*3aKcy4~c~`SragX8F4yut+zP%b%^uS|GGK?zD)3 z%9buNEVrBmOTn@@4Ik5np%Kp&vBn&gG9uY?K92;kJ=2;M#hR>t%cde?qDq#p3Yc4x zSqA`86HS+?n%tyyO`eeyonV0oPD8FS-K{gFroa7F*F0)dJMLlfDzg$Jyn2UR|1Z>u zS-vG;K^JRl_ik@!f;gS}NBqv*5se9g>~*C1&a+OP3JP2R+0Z*SNvCZ_DIo%_yETyq zVObt6QAKLgKBu;S(sE=@Y7i+EEP)arL~@Tu^5KF_#5$c88L3Pv*6V7gZnynhFq)rS zwhU&(vq$Hjex|XYT4&xJBTfj?&o5d~Jh=b!9Z|!XH17Q4K`H*arYiI$D&>8d!T1S`A zCVB^5;aHY`AxeF3hH$#toU4)PP$}Toh8czN&|ZNNc1Iu;$48(8Cp}4rshOJDhzl*5 z)iJkIHziz7WZ-c{#93ba&#)yPF3ms@`FIIl=GpF_b~4=h^fbA~ zNh6#!>v>duS2LhI$5c=le52Rk`KVCrvml5Z34EkWp;zub+J6z>6U8vb*Wo0~N01EqI(`U}Rum0OH;)dwJve zZN4%eaI-Lgz{ARCA~5>@|Nr$Y49tx{E(Ze>NE855oD6c4u>~DX0RVN~1Z{YnV_{%m zU;*R*|5@N{1_l5eO#&AH000000001z0jvS;0xSaB004NLV_;-pU|?g|&%nt50!%>6 z1%wO?|G|6)032cg<+Bq8OaT{-k%^I+k%f_!k&Tg^fg>q1F~2Y~F^`jL2Q3BH)E0*T DscO;q delta 1403 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�g4J|>>zNxVVuzhZ z4lx@Jiq*-0$g2s1+in%N3jvc!V-mnEc?G)<$BSSBOoT%%Os>Gmkk-(6p>;5T2fRmF zLpG0pyTN>mOX$8}kSDAcOsj1blKBW^R*tX-S*usG2H7LemCzRYiw9XF?B^MO37R`U zB!5lTm(gO@3FSubsF-TQYlJ!)jMraUKh(4Q z|M$3kb@}bFua_3y>|2~Yk+o758V7~f20wp)+S*77?+oKO@sH+GPBlkoTpy#M)WW#h zxa{zlodiM%6i!4kBgi$xMiSL;+R(TAE&OZQ`H!;W@-hkwtaCQ6{i^QBvNIdM*Cg!U zz*Z8fCyi$FHYQCK)vQR?{FvThn&E5!^Q)U0Fub90dt_{4Y~=O=VSc_)iG_G$LC|J@ zU6B}*xZ=i*73OyQU!Y4l-Tc+7-ZbJ34H&pq{d(1^TuQ=Dj2J5$Or)DH( zP`5W>rIo9c&s+|v#Zm58BJNby&E^}F zp7-}6J3i9hCEfN&pW;+^lR|jYag%IYcm0e%va)2Yn9bRSgIR#4*uSuV{1Eaxs5rfe z=At|UTJY6xbLvL^52H~Pzed3Md0*v5CK_&@ZIh@h`NmCWOXt#;8ih#Lf&!_3Bh``$ zjOwj+U*bz1`ltf~-s{FbsLNbvGZ;Y9Y7(+GQ`kaWf~wONv}m&f9hNm--f55lBuYEx zECvwz9Dt<98_4?H!xmx?su7<)*Dd?hRTrf*@#N2*U6P0bC&Hx z6}U!XOiKz-qe%thNG>NQo^M8fb*Qn8Q%o}yc^D=~P=<@p!mljujKN{LRP#*H+Z I&dr?#09Q}aVgLXD diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 31501905..8dc611a8 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -341,11 +341,11 @@ li { .pin_block .ant-checkbox-wrapper span.ant-checkbox-checked::after { border: 1px solid rgba(0, 0, 0, 0); } -.pin_block .ant-checkbox-wrapper .ant-checkbox-inner { +.ant-checkbox-inner { width: 1.6rem; height: 1.6rem; } -.pin_block .ant-checkbox-wrapper .ant-checkbox-inner::after { +.ant-checkbox-inner::after { width: 0.57142857rem; height: 0.91428571rem; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index ac3e19dd..cd16fe3a 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -396,16 +396,17 @@ ul,li{ border: 1px solid rgba(0,0,0,0); } } - .ant-checkbox-inner{ - width: 1.6rem; - height: 1.6rem; - } - .ant-checkbox-inner::after{ - width: .571428571rem; - height: .914285714rem; - } + } } +.ant-checkbox-inner{ + width: 1.6rem; + height: 1.6rem; +} +.ant-checkbox-inner::after{ + width: .571428571rem; + height: .914285714rem; +} .ant-checkbox-wrapper{ font-size: 1.4rem; span{ diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 4a6e2045..afa4505f 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -230,10 +230,6 @@ export default defineComponent({ 'workspaceItem.id_':{ handler(newVal:any,oldVal:any){ - // this.store.state.Workspace.workspace - // if(!newVal){ - // this.store.commit("setWorkspace", this.workspaceItem); - // } this.workspace.workspaceList.forEach((v:any)=>{ if(v.id == this.workspaceItem.id_){ this.workspaceItem = v @@ -248,7 +244,26 @@ export default defineComponent({ this.getMannequins() } }, - // 'workspaceItem.sex':{ + 'openType.workspace':{ + handler(newVal:any,oldVal:any){ + this.openType.addWorkspace = false + this.workspace.workspaceList.forEach((item:any) => { + item.putName = false + }); + // this.workspace.workspaceList.forEach((v:any)=>{ + // if(v.id == this.workspaceItem.id_){ + // this.workspaceItem = v + // this.workspaceItem.id_ = v.id + // } + // if(v.id == oldVal){ + // delete v.isLastIndex + // this.putWorkspace(v,newVal) + // // this.getDetail(newVal) + // } + // }) + } + }, + // 'workspa,ceItem.sex':{ // handler(newVal:any,oldVal:any){ // console.log(oldVal); @@ -467,6 +482,7 @@ export default defineComponent({ this.workspace.workspaceList.forEach((v:any )=> { v.putName = false }); + this.openType.addWorkspace = false if(v == 'put'){ this.workspaceItemName = this.workspace.workspaceList[index].workSpaceName this.workspace.workspaceList[index].putName = true @@ -525,6 +541,9 @@ export default defineComponent({ newWorkspace(){ this.workspaceItemName = '' this.openType.addWorkspace = true + this.workspace.workspaceList.forEach((item:any) => { + item.putName = false + }); }, setSex(v:any){ this.openType.sex = false diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index b4acb863..fa79b770 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -246,6 +246,8 @@ export default defineComponent({ let inputTime = ref() let {t} = useI18n() + + let isTest = ref() return { imgList, selectImgList, @@ -273,6 +275,7 @@ export default defineComponent({ inputShow, inputTime, t, + isTest, }; }, data(prop) { @@ -307,6 +310,8 @@ export default defineComponent({ // }) // this.store.commit("addGenerateFils", this.fileList); this.token = getCookie("token") || ""; + this.isTest = getCookie("isTest"); + this.uploadUrl = getUploadUrl(); this.workspace = this.store.state.Workspace.workspace }, @@ -390,6 +395,12 @@ export default defineComponent({ }, getgenerate(){ + if(this.isTest){//试用用户禁止使用 + message.warning( + this.t('isTest.available') + ); + return + } if(!this.searchPictureName){ message.warning( this.t('Generate.jsContent3') diff --git a/src/component/HomePage/Header.vue b/src/component/HomePage/Header.vue index 537ffebf..252e5a04 100644 --- a/src/component/HomePage/Header.vue +++ b/src/component/HomePage/Header.vue @@ -392,8 +392,14 @@ export default defineComponent({ if (rv) { let token = rv; setCookie("token", token); - location.reload() - this.getLang(v) + this.getLang('') + // if(this.$router.currentRoute._value.path == '/home'){ + // this.$router.push("/home") + // }else{ + // this.$router.push("/home") + // } + this.store.commit('clearAllData') + window.location.reload() } } }) diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 07bd1f0f..6266d4e5 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -164,6 +164,7 @@ export default defineComponent({ let inputShow = ref(false) let inputTime = ref() let {t} = useI18n() + let isTest = ref() return { fileList, printImgList, @@ -176,6 +177,7 @@ export default defineComponent({ inputShow, inputTime, t, + isTest, } }, computed:{ @@ -219,6 +221,7 @@ export default defineComponent({ }, mounted(){ this.token = getCookie('token') || '' + this.isTest = getCookie('isTest') || '' this.uploadUrl = getUploadUrl() }, methods:{ @@ -500,6 +503,12 @@ export default defineComponent({ },500) }, getgenerate(){ + if(this.isTest){//试用用户禁止使用 + message.warning( + this.t('isTest.available') + ); + return + } //如果是通过moodboard随即图片生成 let generage:any = this.$refs.Generate let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index 31c6b7cf..7e538cea 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -280,6 +280,7 @@ export default defineComponent({ let inputTime = ref() let {t} = useI18n() + let isTest = ref() return { fileList, openClick, @@ -291,6 +292,7 @@ export default defineComponent({ inputShow, inputTime, t, + isTest, }; }, data() { @@ -339,6 +341,7 @@ export default defineComponent({ }, mounted() { this.token = getCookie("token") || ""; + this.isTest = getCookie('isTest') || '' this.uploadUrl = getUploadUrl(); this.workspaceCom = computed(()=>{ return this.store?.state?.Workspace?.workspace @@ -469,6 +472,8 @@ export default defineComponent({ this.inputTime = setTimeout(()=>{ // let num1 = ((input as HTMLInputElement).value.match(/ /g) || []).length // let num2 = (input as HTMLInputElement).value.split(' ').length + console.log(this.captionGeneration); + if(this.captionGeneration.split(/\s+/).length > 75){ this.inputShow = true }else{ @@ -500,6 +505,7 @@ export default defineComponent({ generateDetailId:item.id, level1Type:"Sketchboard", level2Type: item.category, + gender:this.workspace.sex, timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone } Https.axiosPost(Https.httpUrls.generateLike, data).then( @@ -569,6 +575,12 @@ export default defineComponent({ }, //发送请求生成图片 getgenerate(){ + if(this.isTest){//试用用户禁止使用 + message.warning( + this.t('isTest.available') + ); + return + } let generage:any = this.$refs.Generate let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name let data = { diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue index b3416c5b..b6831726 100644 --- a/src/component/LibraryPage/ModelPlacement.vue +++ b/src/component/LibraryPage/ModelPlacement.vue @@ -259,7 +259,6 @@ export default defineComponent({ let image:any = new Image() image.src = this.option.img let imgbox:any = this.$refs.imgbox - console.log(imgbox); let imgBoxSize = imgbox.getElementsByClassName('cropper-crop-box')[0] let imgBoxSizeBG = imgbox.getElementsByClassName('cropper-view-box')[0] let divTop:any = document.createElement('div'); @@ -293,7 +292,7 @@ export default defineComponent({ }) - },300) + },800) }, realTime(data:any) { clearTimeout(this.cropperTime) diff --git a/src/component/LibraryPage/labelList.vue b/src/component/LibraryPage/labelList.vue deleted file mode 100644 index 8774df8e..00000000 --- a/src/component/LibraryPage/labelList.vue +++ /dev/null @@ -1,344 +0,0 @@ - - - \ No newline at end of file diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index 05c67652..53654778 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -36,7 +36,7 @@
  • - +
    +
    @@ -160,8 +160,8 @@ export default defineComponent({ this.options.forEach((optionsItem:any) => { optionsItem.openType = false optionsItem.addOpenType = false - if(optionsItem?.children){ - optionsItem?.children?.forEach((childrenItem:any) => { + if(optionsItem?.childList){ + optionsItem?.childList?.forEach((childrenItem:any) => { childrenItem.openType = false }); } @@ -172,6 +172,7 @@ export default defineComponent({ let data:any if(v == 'put'){ this.clearOpenType() + item.openType = true this.itemName = item.classificationName // this.options[index].openType = true @@ -298,6 +299,7 @@ export default defineComponent({ display: flex; flex-direction: column; // height: 300px; + min-height: 50rem; max-height: 65rem; overflow-y: auto; // border-radius: ; @@ -323,6 +325,7 @@ export default defineComponent({ border: 0; width: 80%; background: rgba(0,0,0,0); + border-bottom: 1px solid #b5b5b5; } } @@ -353,6 +356,7 @@ export default defineComponent({ .optionsItem{ flex-direction: column; padding: 1rem; + flex: 1; .optionsItem_title{ margin-bottom: 2rem; border-radius: 1rem; @@ -434,6 +438,8 @@ export default defineComponent({ position: sticky; background: #fff; border: none; + // margin-top: auto; + bottom: 0; >div{ } .started_btn{ diff --git a/src/lang/en.ts b/src/lang/en.ts index 39fdeb63..c35c4512 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -315,4 +315,7 @@ export default { uploadFile:{ jsContent1:'You can select up to 8 images', }, + isTest:{ + available:"This feature is not available to trial users", + } } diff --git a/src/tool/https.js b/src/tool/https.js index 99434110..42dd65e8 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -117,8 +117,9 @@ export const Https = { saveOrUpdate:`/api/classification/saveOrUpdate`,//标签类别新增修改 classificationDelete:`/api/classification/delete`,//标签类别新增修改 relationLibrary:`/api/classification/relationLibrary`,//标签类别新增修改 + getRelClassificationIdList:`/api/classification/getRelClassificationIdList`,//标签类别新增修改 + - batchUpdateLibraryName:'/api/library/batchUpdateLibraryName',//Library修改用户文件名 batchDeleteLibrary:'/api/library/batchDeleteLibrary',//删除library diff --git a/src/views/HistoryPage.vue b/src/views/HistoryPage.vue index d62924de..e4c1435a 100644 --- a/src/views/HistoryPage.vue +++ b/src/views/HistoryPage.vue @@ -65,7 +65,7 @@