From 4f62c4c2d375743a154f7363232849ed65dbcc32 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 8 Dec 2023 16:27:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E6=8C=87?= =?UTF-8?q?=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/style/style.css | 42 ++++++- src/assets/style/style.less | 47 ++++++- src/component/Detail/DesignDetail.vue | 2 +- src/component/Detail/habit.vue | 58 ++++++--- src/component/HomePage/Cropper.vue | 3 +- src/component/HomePage/Generate.vue | 77 ++++++++---- src/component/HomePage/MoodboardUpload.vue | 41 +++--- src/component/HomePage/PrintboardUpload.vue | 26 +++- src/component/HomePage/RobotAssist.vue | 79 +++++++++++- src/component/HomePage/SketchboardUpload.vue | 53 +++++--- src/tool/guide.js | 126 +++++++++++-------- src/views/HomeView.vue | 28 +++-- 12 files changed, 421 insertions(+), 161 deletions(-) diff --git a/src/assets/style/style.css b/src/assets/style/style.css index bdc31417..cc405135 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -159,15 +159,44 @@ li { .el-cascader__collapse-tag .el-cascader__collapse-tag .el-tag--light { display: flex !important; } -.hideEvents* { +.hideEvents { + pointer-events: none !important; +} +.hideEvents * { pointer-events: none !important; } .Guide_ { pointer-events: auto !important; + overflow-y: initial !important; } .Guide_.showEvents * { pointer-events: auto !important; } +.Guide_.showEvents .hideEvents { + pointer-events: none !important; +} +.Guide_.showEvents .hideEvents * { + pointer-events: none !important; +} +.Guide_ .Guide_active { + box-shadow: 0px 0px 13px #ff5f5f; + animation: identifier 1s infinite linear; + display: block !important; +} +@keyframes identifier { + 0% { + box-shadow: none; + } + 50% { + box-shadow: 0px 0px 13px #ff5f5f; + } + 100% { + box-shadow: none; + } +} +:not(body):has(>.driver-active-element) { + overflow: initial !important; +} .delete_like_file_block { display: none; width: 2.5rem; @@ -311,6 +340,17 @@ li { top: auto; margin: 0 9rem; } +.ant-modal-confirm-confirm .ant-modal-content { + border-radius: 1rem; +} +.ant-modal-confirm-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-btns { + width: 100%; + display: flex; + justify-content: center; +} +.ant-modal-confirm-confirm .ant-modal-content .ant-modal-body .ant-modal-confirm-btns .ant-btn-primary { + margin-left: 10rem; +} .modal_component.ant-modal { top: 0; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 80ec635a..da77ac89 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -174,14 +174,15 @@ ul,li{ } } .hideEvents{ - &*{ + pointer-events:none !important; + *{ pointer-events:none !important; } - } .Guide_{ pointer-events:auto !important; + overflow-y: initial !important; &.showEvents{ *{ pointer-events:auto !important; @@ -189,9 +190,34 @@ ul,li{ // .select_img_type{ // overflow: initial !important; // } + .hideEvents{ + pointer-events:none !important; + *{ + pointer-events:none !important; + } + } + } + + .Guide_active{ + box-shadow: 0px 0px 13px rgb(255, 95, 95); + animation: identifier 1s infinite linear; + display: block !important; + @keyframes identifier { + 0% { + box-shadow: none; + } + 50% { + box-shadow: 0px 0px 13px rgb(255, 95, 95); + } + 100% { + box-shadow: none; + } + } } } - +:not(body):has(>.driver-active-element){ + overflow: initial !important; +} //爱心 .delete_like_file_block{ display: none; @@ -366,6 +392,21 @@ ul,li{ } } } +.ant-modal-confirm-confirm{ + .ant-modal-content{ + border-radius: 1rem; + .ant-modal-body{ + .ant-modal-confirm-btns{ + width: 100%; + display: flex; + justify-content: center; + .ant-btn-primary{ + margin-left: 10rem; + } + } + } + } +} .modal_component{ &.ant-modal{ diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index d4c6cf6b..dc34b783 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -362,7 +362,7 @@ export default defineComponent({ if(this.driver__.driver){ nextTick().then(()=>{ // driverObj__.moveNext(); - driverObj__.moveTo(21); + driverObj__.moveTo(41); }) } } diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 26feb595..8df10b87 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -5,7 +5,7 @@ {{ $t('Habit.Workspace') }} -
+

{{ $t('Habit.WorkspaceSetting') }}

{{ $t('Habit.settingWorkspace') }}
@@ -35,7 +35,7 @@
-
+
@@ -95,7 +95,7 @@
{{ $t('Habit.Designer') }}
-
+
=4){ + this.openType.habit = false + } + } + }, 'workspaceItem.id_':{ handler(newVal:any,oldVal:any){ this.workspace.workspaceList.forEach((v:any)=>{ @@ -270,12 +278,22 @@ export default defineComponent({ // }) } }, - 'workspaceItem.sex':{ + 'workspaceItem.overallSingle':{ handler(newVal:any,oldVal:any){ - // console.log(this.workspaceItem); - + if(this.driver__.driver){ + driverObj__.refresh(); + } } }, + // 'openType.model':{ + // handler(newVal:any,oldVal:any){ + // if(this.driver__.driver){ + // console.log(213); + + // driverObj__.refresh(); + // } + // } + // }, workspaceItem:{ handler(newVal:any,oldVal:any){ this.store.commit("setWorkspace", this.workspaceItem); @@ -565,14 +583,17 @@ export default defineComponent({ this.workspaceItem.mannequinMaleType = str this.workspaceItem.mannequinMaleId = item.id } - if(id != item.id){ - if(this.driver__.driver){ - this.openType.habit = false - nextTick().then(()=>{ - driverObj__.moveNext(); - }) - } + // if(id != item.id){ + if(this.driver__.driver){ + // this.openType.habit = false + nextTick().then(()=>{ + driverObj__.moveTo(2); + this.openType.model = false + + // driverObj__.moveNext(); + }) } + // } this.workspaceItem.mannequinUrl = item.presignedUrl this.workspaceItem.mannequinType = str this.workspaceItem.mannequinId = item.id @@ -594,8 +615,8 @@ export default defineComponent({ this.openType.habit = !this.openType.habit if(this.driver__.driver){ nextTick().then(()=>{ - // driverObj__.moveNext(); - driverObj__.moveTo(29); + driverObj__.moveNext(); + // driverObj__.moveTo(29); }) } @@ -612,9 +633,10 @@ export default defineComponent({ this.openType.sex = false this.openType.model = !this.openType.model this.getMannequins() - if(this.driver__.driver){ + if(this.driver__.driver && this.openType.model){ nextTick().then(()=>{ - driverObj__.moveNext(); + driverObj__.moveTo(3); + // driverObj__.moveNext(); }) } }else if(v == 'singleton'){ diff --git a/src/component/HomePage/Cropper.vue b/src/component/HomePage/Cropper.vue index 1f39d423..788aae74 100644 --- a/src/component/HomePage/Cropper.vue +++ b/src/component/HomePage/Cropper.vue @@ -1,6 +1,5 @@