From 6c393d5bf78379861f8712bfc7ae17dabe947ce8 Mon Sep 17 00:00:00 2001 From: wxd <1627315083@qq.com> Date: Sun, 1 Dec 2024 13:27:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 28 ++++++++++++++-------------- src/views/Upgrade.vue | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 4bccbf98..74f1b8ad 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -11,8 +11,8 @@ const routes: Array = [ { path: "/", // redirect重定向 - redirect: "/Square" - // redirect: "/upgrade" + // redirect: "/Square" + redirect: "/upgrade" }, { @@ -320,18 +320,18 @@ let setMurmur = (id:any)=> { router.beforeEach((to:any, from, next) => { let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问 - // // 系统维护 - // const toName = to.name === 'upgrade'; - // if(upgradeList.indexOf(to.path) > -1){ - // next(); - // }else{ - // if (toName) { - // next(); - // } else { - // next({ name: 'upgrade' }); - // } - // } - // return + // 系统维护 + const toName = to.name === 'upgrade'; + if(upgradeList.indexOf(to.path) > -1){ + next(); + }else{ + if (toName) { + next(); + } else { + next({ name: 'upgrade' }); + } + } + return // 检查路由是否存在 // 机房用户 let herfData = window.location.search.substring(1) diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue index bf7e87ed..3d7bcc39 100644 --- a/src/views/Upgrade.vue +++ b/src/views/Upgrade.vue @@ -5,13 +5,13 @@
-
System upgrading
- + +
System maintenance
-
Due to the system server upgrade, we will start the upgrade from 9:30 am Hong Kong time on the weekend of October 20th until October 21st. During this time,
the AiDA system will be temporarily inaccessible. We apologize for any inconvenience this may cause and thank you for your understanding.
+ - +
The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.
From 4d34f2d53f064a28a9b0b0b3e3c4a7df15ea0637 Mon Sep 17 00:00:00 2001 From: wxd <1627315083@qq.com> Date: Sun, 1 Dec 2024 17:22:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?generate=E6=96=B0=E5=A2=9E=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- src/assets/style/style.css | 66 +++++++++++++++++++++++++++++ src/assets/style/style.less | 36 ++++++++++++++++ src/component/HomePage/Generate.vue | 59 ++++++++++++++++++++++++-- src/router/index.ts | 26 ++++++------ src/views/HomeView/library.vue | 59 +++++++++++++++++++++++--- 6 files changed, 225 insertions(+), 23 deletions(-) diff --git a/.env.dev b/.env.dev index 2d87170d..926a368f 100644 --- a/.env.dev +++ b/.env.dev @@ -6,7 +6,7 @@ NODE_ENV = 'development' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # VUE_APP_BASE_URL = 'https://www.api.aida.com.hk' # 佩佩 -VUE_APP_BASE_URL = 'http://192.168.1.4:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.4:5567' # 海波 # VUE_APP_BASE_URL = 'http://192.168.1.9:5567' diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 49cff822..daf8f7f1 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1843,6 +1843,71 @@ textarea:focus { top: 0rem; border: 1px solid #dcdfe6; } +.collection_modal_body .input_border .generage_btn_box, +.design_detail_modal_component .input_border .generage_btn_box, +.library_page .input_border .generage_btn_box, +.productImg_modal .input_border .generage_btn_box, +.accountEdit_page .input_border .generage_btn_box, +.generalMenu_printModel_upload .input_border .generage_btn_box { + position: relative; + display: flex; + align-items: center; +} +.collection_modal_body .input_border .generage_btn_box .icon-xiala, +.design_detail_modal_component .input_border .generage_btn_box .icon-xiala, +.library_page .input_border .generage_btn_box .icon-xiala, +.productImg_modal .input_border .generage_btn_box .icon-xiala, +.accountEdit_page .input_border .generage_btn_box .icon-xiala, +.generalMenu_printModel_upload .input_border .generage_btn_box .icon-xiala { + margin-left: 1rem; + transition: all 0.3s; + cursor: pointer; +} +.collection_modal_body .input_border .generage_btn_box .icon-xiala.active, +.design_detail_modal_component .input_border .generage_btn_box .icon-xiala.active, +.library_page .input_border .generage_btn_box .icon-xiala.active, +.productImg_modal .input_border .generage_btn_box .icon-xiala.active, +.accountEdit_page .input_border .generage_btn_box .icon-xiala.active, +.generalMenu_printModel_upload .input_border .generage_btn_box .icon-xiala.active { + transform: rotate(180deg); +} +.collection_modal_body .input_border .generage_btn_box .content, +.design_detail_modal_component .input_border .generage_btn_box .content, +.library_page .input_border .generage_btn_box .content, +.productImg_modal .input_border .generage_btn_box .content, +.accountEdit_page .input_border .generage_btn_box .content, +.generalMenu_printModel_upload .input_border .generage_btn_box .content { + position: absolute; + top: 100%; + width: calc(100% - 2rem); + left: 2rem; + text-align: center; + border-radius: calc(1rem*1.2); + overflow: hidden; + z-index: 3; + margin-top: 0.2rem; +} +.collection_modal_body .input_border .generage_btn_box .content > div, +.design_detail_modal_component .input_border .generage_btn_box .content > div, +.library_page .input_border .generage_btn_box .content > div, +.productImg_modal .input_border .generage_btn_box .content > div, +.accountEdit_page .input_border .generage_btn_box .content > div, +.generalMenu_printModel_upload .input_border .generage_btn_box .content > div { + background: #cccccc; + line-height: 2; + cursor: pointer; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.collection_modal_body .input_border .generage_btn_box .content > div:hover, +.design_detail_modal_component .input_border .generage_btn_box .content > div:hover, +.library_page .input_border .generage_btn_box .content > div:hover, +.productImg_modal .input_border .generage_btn_box .content > div:hover, +.accountEdit_page .input_border .generage_btn_box .content > div:hover, +.generalMenu_printModel_upload .input_border .generage_btn_box .content > div:hover { + background: #999999; +} .collection_modal_body .input_border .generage_btn, .design_detail_modal_component .input_border .generage_btn, .library_page .input_border .generage_btn, @@ -1850,6 +1915,7 @@ textarea:focus { .accountEdit_page .input_border .generage_btn, .generalMenu_printModel_upload .input_border .generage_btn { margin-left: 2rem; + display: flex; } .collection_modal_body .upload_item, .design_detail_modal_component .upload_item, diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 847e88eb..3cbac947 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1794,9 +1794,45 @@ textarea:focus{ // color: red; // width: 100%; // } + .generage_btn_box{ + position: relative; + display: flex; + align-items: center; + .icon-xiala{ + margin-left: 1rem; + transition: all .3s; + cursor: pointer; + &.active{ + transform: rotate(180deg); + } + } + .content{ + position: absolute; + top: 100%; + width: calc(100% - 2rem); + left: 2rem; + text-align: center; + border-radius: calc(1rem* 1.2); + overflow: hidden; + z-index: 3; + margin-top: .2rem; + >div{ + background: #cccccc; + line-height: 2; + cursor: pointer; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + >div:hover{ + background: #999999; + } + } + } .generage_btn{ // margin: 0 auto; margin-left: 2rem; + display: flex; } } diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 18147931..8eebc64e 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -126,8 +126,23 @@ @click.stop="" v-model="searchPictureName" > -
- {{ $t('Generate.Generate') }} +
+
+ + {{ $t('Generate.Generate') }} + {{ speedData.label }} + +
+
+
+
{{ item.label }}
+
@@ -181,7 +196,7 @@