From cfaea1a4693912d209f25da0f6b6a818497f0b23 Mon Sep 17 00:00:00 2001 From: hujiale <13306077+hujiale9527@user.noreply.gitee.com> Date: Thu, 24 Oct 2024 20:42:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-test/src/app.vue | 14 +- apps/web-test/src/preferences.ts | 4 +- .../src/router/routes/modules/dashboard.ts | 11 + .../home/components/GridGroup/index.vue | 43 +- .../src/views/dashboard/home/template.ts | 407 ++++++++ .../src/views/dashboard/home/template.vue | 966 ++++++++++++++++++ .../src/views/dashboard/home/tiles.ts | 34 +- .../src/views/dashboard/home/usertemplate.vue | 263 +++-- 8 files changed, 1623 insertions(+), 119 deletions(-) create mode 100644 apps/web-test/src/views/dashboard/home/template.ts create mode 100644 apps/web-test/src/views/dashboard/home/template.vue diff --git a/apps/web-test/src/app.vue b/apps/web-test/src/app.vue index bbaccce1..83e0b14a 100644 --- a/apps/web-test/src/app.vue +++ b/apps/web-test/src/app.vue @@ -1,15 +1,27 @@ + + + + + + diff --git a/apps/web-test/src/views/dashboard/home/tiles.ts b/apps/web-test/src/views/dashboard/home/tiles.ts index 058d46ed..a382ea2e 100644 --- a/apps/web-test/src/views/dashboard/home/tiles.ts +++ b/apps/web-test/src/views/dashboard/home/tiles.ts @@ -118,10 +118,40 @@ const tilesList = [ maxW: 2, maxH: 4, i: 0, - x: 1, - y: 1, + x: 0, + y: 0, component: '../../components/Output1/index.vue', }, + { + name1: 'AUTO_1649411776285.png', + name2: 'AUTO_1649411776285_C智能化管线.png', + size: '2x2', + name: '智能化管线', + w: 1, + h: 2, + minW: 1, + minH: 2, + maxW: 2, + maxH: 4, + x: 2, + y: 3, + component: '../../components/Output1/index.vue', + i: 8_098_097, + }, + { + name1: 'AUTO_1612236164722.png', + name2: 'AUTO_1612236164722_C门户网站.png', + size: '2x2', + name: '门户网站', + minW: 1, + minH: 2, + maxW: 2, + maxH: 4, + w: 3, + h: 3, + component: './components/Output1/index.vue', + i: 3242, + }, ], i: 1, }, diff --git a/apps/web-test/src/views/dashboard/home/usertemplate.vue b/apps/web-test/src/views/dashboard/home/usertemplate.vue index 9b277984..b9dd14f5 100644 --- a/apps/web-test/src/views/dashboard/home/usertemplate.vue +++ b/apps/web-test/src/views/dashboard/home/usertemplate.vue @@ -1,86 +1,197 @@ - - \ No newline at end of file + + From 0682413c5f7e9ec52135a96e350cace5d4e6e46f Mon Sep 17 00:00:00 2001 From: hujiale <13306077+hujiale9527@user.noreply.gitee.com> Date: Fri, 25 Oct 2024 09:59:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-test/src/layouts/user/layout.vue | 30 +- apps/web-test/src/layouts/user/like.vue | 283 +++++------ .../home/components/Output2/index.vue | 441 +++++++++++++----- .../src/views/dashboard/home/index.vue | 2 +- 4 files changed, 483 insertions(+), 273 deletions(-) diff --git a/apps/web-test/src/layouts/user/layout.vue b/apps/web-test/src/layouts/user/layout.vue index a790d025..bc7a5bc3 100644 --- a/apps/web-test/src/layouts/user/layout.vue +++ b/apps/web-test/src/layouts/user/layout.vue @@ -42,26 +42,26 @@ const PRESET = computed((): PresetItem[] => [ tip: '顶部栏仅用于显示全局信息或操作,不包含菜单。', type: 'sidebar-topbar', }, - { - name: $t('preferences.vertical'), - tip: $t('preferences.verticalTip'), - type: 'sidebar-nav', - }, + // { + // name: $t('preferences.vertical'), + // tip: $t('preferences.verticalTip'), + // type: 'sidebar-nav', + // }, { name: $t('preferences.twoColumn'), tip: $t('preferences.twoColumnTip'), type: 'sidebar-mixed-nav', }, - // { - // name: $t('preferences.horizontal'), - // tip: $t('preferences.horizontalTip'), - // type: 'header-nav', - // }, - // { - // name: $t('preferences.mixedMenu'), - // tip: $t('preferences.mixedMenuTip'), - // type: 'mixed-nav', - // }, + { + name: $t('preferences.horizontal'), + tip: $t('preferences.horizontalTip'), + type: 'header-nav', + }, + { + name: $t('preferences.mixedMenu'), + tip: $t('preferences.mixedMenuTip'), + type: 'mixed-nav', + }, // { // name: $t('preferences.fullContent'), // tip: $t('preferences.fullContentTip'), diff --git a/apps/web-test/src/layouts/user/like.vue b/apps/web-test/src/layouts/user/like.vue index c13291bc..40eefad0 100644 --- a/apps/web-test/src/layouts/user/like.vue +++ b/apps/web-test/src/layouts/user/like.vue @@ -1,144 +1,165 @@ - \ No newline at end of file + visible.value = false; +}; + + diff --git a/apps/web-test/src/views/dashboard/home/components/Output2/index.vue b/apps/web-test/src/views/dashboard/home/components/Output2/index.vue index 0b82451d..86cb4868 100644 --- a/apps/web-test/src/views/dashboard/home/components/Output2/index.vue +++ b/apps/web-test/src/views/dashboard/home/components/Output2/index.vue @@ -1,96 +1,47 @@ - - + + \ No newline at end of file + diff --git a/apps/web-test/src/views/dashboard/home/index.vue b/apps/web-test/src/views/dashboard/home/index.vue index f8aa758f..b9ef3e99 100644 --- a/apps/web-test/src/views/dashboard/home/index.vue +++ b/apps/web-test/src/views/dashboard/home/index.vue @@ -592,7 +592,7 @@ const formState = reactive({