diff --git a/src/assets/icons/event_simulation.svg b/src/assets/icons/event_simulation.svg new file mode 100644 index 0000000..1e163f3 --- /dev/null +++ b/src/assets/icons/event_simulation.svg @@ -0,0 +1,51 @@ + + + + diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index 982bb7c..0f2681f 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -106,8 +106,8 @@ function goHome() { .jeecg-layout-header-logo { height: 74px !important; - min-width: 192px; - padding: 0 10px; + width: 342px !important; + padding: 0 0 0 8px; font-size: 14px; } diff --git a/src/components/Icon/src/IconPicker.vue b/src/components/Icon/src/IconPicker.vue index d724642..ae47ff4 100644 --- a/src/components/Icon/src/IconPicker.vue +++ b/src/components/Icon/src/IconPicker.vue @@ -1,231 +1,234 @@ diff --git a/src/components/Menu/src/components/MenuItemContent.vue b/src/components/Menu/src/components/MenuItemContent.vue index 008868e..3416e85 100644 --- a/src/components/Menu/src/components/MenuItemContent.vue +++ b/src/components/Menu/src/components/MenuItemContent.vue @@ -1,13 +1,14 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/src/components/Menu/src/index.less b/src/components/Menu/src/index.less index a35b984..bb59d77 100644 --- a/src/components/Menu/src/index.less +++ b/src/components/Menu/src/index.less @@ -32,7 +32,7 @@ .ant-menu:not(.ant-menu-inline) .ant-menu-submenu-open, .ant-menu-submenu-active, .ant-menu-submenu-title:hover { - color: #fff; + color: #00e9fe; background-color: @top-menu-active-bg-color !important; border: solid 1px rgba(5, 255, 184, 0.46); } @@ -51,7 +51,7 @@ &.ant-menu-item-selected, &.ant-menu-submenu-selected { - color: #fff; + color: #00e9fe; background-color: @top-menu-active-bg-color !important; border: solid 1px rgba(5, 255, 184, 0.46); } @@ -59,11 +59,20 @@ .ant-menu-item, .ant-menu-submenu { + font-family: MicrosoftYaHei; + font-size: 18px; + font-weight: normal; + font-stretch: normal; + letter-spacing: 2px; + color: #0cecca; + height: 74px; + padding-inline: 30px ; + &.@{basic-menu-prefix-cls}-item__level1, .ant-menu-submenu-title { - height: 74px; //@header-height; - line-height: 74px; //@header-height; + height: @header-height; + line-height: @header-height; } } } diff --git a/src/layouts/default/content/index.vue b/src/layouts/default/content/index.vue index 9fd2ad9..0864167 100644 --- a/src/layouts/default/content/index.vue +++ b/src/layouts/default/content/index.vue @@ -51,13 +51,13 @@ export default defineComponent({ position: relative; flex: 1 1 auto; min-height: 0; - margin-top: -56px; - padding-top: 103px; + // margin-top: -56px; + // padding-top: 103px; margin-left: -1px; - background-image: url(../../../assets/images/main-bg.jpg); - background-size: 100% 100%; - background-repeat: no-repeat; + // background-image: url(../../../assets/images/main-bg.jpg); + // background-size: 100% 100%; + // background-repeat: no-repeat; &.fixed { width: 1200px; diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue index 8483421..f76efe1 100644 --- a/src/layouts/default/header/index.vue +++ b/src/layouts/default/header/index.vue @@ -262,7 +262,8 @@ export default defineComponent({ .anticon, .truncate { - color: rgba(255, 255, 255, 1); + // color: rgba(255, 255, 255, 1); + color: #0cecca; } } diff --git a/src/layouts/default/index.vue b/src/layouts/default/index.vue index c8fe28c..0d2e8a6 100644 --- a/src/layouts/default/index.vue +++ b/src/layouts/default/index.vue @@ -14,79 +14,85 @@ diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts index 2ce175f..06345d5 100644 --- a/src/settings/projectSetting.ts +++ b/src/settings/projectSetting.ts @@ -20,7 +20,7 @@ const setting: ProjectConfig = { showDarkModeToggle: true, settingButtonPosition: SettingButtonPositionEnum.AUTO, permissionMode: PermissionModeEnum.BACK, - permissionCacheType: CacheTypeEnum.LOCAL, + permissionCacheType: 1, sessionTimeoutProcessing: SessionTimeoutProcessingEnum.ROUTE_JUMP, themeColor: primaryColor, themeMode: darkMode, @@ -34,7 +34,7 @@ const setting: ProjectConfig = { bgColor: HEADER_PRESET_BG_COLOR_LIST[4], fixed: true, show: true, - theme: ThemeEnum.LIGHT, + theme: ThemeEnum.DARK, useLockPage: false, showFullScreen: false, showDoc: false, @@ -49,18 +49,18 @@ const setting: ProjectConfig = { canDrag: false, show: true, hidden: false, - menuWidth: 210, - mode: MenuModeEnum.HORIZONTAL, - type: MenuTypeEnum.TOP_MENU, - theme: ThemeEnum.LIGHT, - isThemeBright: false, + menuWidth: 290, + mode: MenuModeEnum.INLINE, + type: MenuTypeEnum.MIX, + theme: ThemeEnum.DARK, + isThemeBright: true, topMenuAlign: "center", trigger: TriggerEnum.NONE, accordion: true, closeMixSidebarOnChange: false, mixSideTrigger: MixSidebarTriggerEnum.CLICK, mixSideFixed: false, - split: false + split: true }, multiTabsSetting: { cache: false, @@ -69,7 +69,7 @@ const setting: ProjectConfig = { showQuick: true, showRedo: true, showFold: true, - theme: TabsThemeEnum.CARD, + theme: TabsThemeEnum.SMOOTH }, transitionSetting: { enable: true, diff --git a/src/views/dashboard/Analysis/index.vue b/src/views/dashboard/Analysis/index.vue index 85bd3dd..31423f7 100644 --- a/src/views/dashboard/Analysis/index.vue +++ b/src/views/dashboard/Analysis/index.vue @@ -1,5 +1,5 @@