diff --git a/.env b/.env index 621a5f9..f0fd512 100644 --- a/.env +++ b/.env @@ -5,7 +5,7 @@ VITE_PORT = 3100 VITE_GLOB_APP_TITLE = JeecgBoot 企业级低代码平台 # 简称,此变量只能是字符/下划线 -VITE_GLOB_APP_SHORT_NAME = JeecgBoot_Pro +VITE_GLOB_APP_SHORT_NAME = 放射性源项分析系统 # 单点登录服务端地址 VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index 8072ced..f7cd530 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/assets/images/main-bg.jpg b/src/assets/images/main-bg.jpg new file mode 100644 index 0000000..31c3bbf Binary files /dev/null and b/src/assets/images/main-bg.jpg differ diff --git a/src/assets/images/nav-bg.png b/src/assets/images/nav-bg.png new file mode 100644 index 0000000..fc3611a Binary files /dev/null and b/src/assets/images/nav-bg.png differ diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index bd1a570..982bb7c 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -11,83 +11,113 @@ diff --git a/src/components/Icon/data/icons.data.ts b/src/components/Icon/data/icons.data.ts index bcac58e..2c09157 100644 --- a/src/components/Icon/data/icons.data.ts +++ b/src/components/Icon/data/icons.data.ts @@ -788,4 +788,5 @@ export default [ 'ant-design:zhihu-square-filled', 'ant-design:zoom-in-outlined', 'ant-design:zoom-out-outlined', + 'ant-design:event-simulation' ]; diff --git a/src/components/Menu/src/components/MenuItemContent.vue b/src/components/Menu/src/components/MenuItemContent.vue index 3044fbc..008868e 100644 --- a/src/components/Menu/src/components/MenuItemContent.vue +++ b/src/components/Menu/src/components/MenuItemContent.vue @@ -1,34 +1,35 @@ + return { + prefixCls, + getI18nName, + getIcon, + }; + }, +}); + \ No newline at end of file diff --git a/src/components/Menu/src/index.less b/src/components/Menu/src/index.less index c969109..a35b984 100644 --- a/src/components/Menu/src/index.less +++ b/src/components/Menu/src/index.less @@ -19,7 +19,8 @@ &.ant-menu-dark { background-color: transparent; // update-begin--author:liaozhiyang---date:20240407---for:【QQYUN-8762】顶部菜单模式文字调整 - color: rgba(255 ,255 ,255, 1); + color: rgba(255, 255, 255, 1); + // update-end--author:liaozhiyang---date:20240407---for:【QQYUN-8762】顶部菜单模式文字调整 .ant-menu-submenu:hover, .ant-menu-item-open, @@ -33,6 +34,7 @@ .ant-menu-submenu-title:hover { color: #fff; background-color: @top-menu-active-bg-color !important; + border: solid 1px rgba(5, 255, 184, 0.46); } .ant-menu-item:hover, @@ -41,6 +43,7 @@ .ant-menu-submenu-active, .ant-menu-submenu-title:hover { background-color: @top-menu-active-bg-color; + border: solid 1px rgba(5, 255, 184, 0.46); } .@{basic-menu-prefix-cls}-item__level1 { @@ -48,16 +51,19 @@ &.ant-menu-item-selected, &.ant-menu-submenu-selected { + color: #fff; background-color: @top-menu-active-bg-color !important; + border: solid 1px rgba(5, 255, 184, 0.46); } } .ant-menu-item, .ant-menu-submenu { + &.@{basic-menu-prefix-cls}-item__level1, .ant-menu-submenu-title { - height: @header-height; - line-height: @header-height; + height: 74px; //@header-height; + line-height: 74px; //@header-height; } } } @@ -73,4 +79,4 @@ box-shadow: unset !important; transition: unset; } -} +} \ No newline at end of file diff --git a/src/design/color.less b/src/design/color.less index b7ad7e2..07b7b95 100644 --- a/src/design/color.less +++ b/src/design/color.less @@ -58,7 +58,7 @@ html { @header-light-desc-color: #7c8087; @header-light-bottom-border-color: #eee; // top-menu -@top-menu-active-bg-color: var(--header-active-menu-bg-color); +@top-menu-active-bg-color: #2e6663; // var(--header-active-menu-bg-color); // ================================= // ==============Menu============ diff --git a/src/design/var/index.less b/src/design/var/index.less index f9af55f..21e7962 100644 --- a/src/design/var/index.less +++ b/src/design/var/index.less @@ -14,7 +14,7 @@ // headers // update-begin--author:liaozhiyang---date:20240407---for:【QQYUN-8762】顶栏高度 -@header-height: 60px; +@header-height: 89px; // update-end--author:liaozhiyang---date:20240407---for:【QQYUN-8762】顶栏高度 // logo width diff --git a/src/layouts/default/content/index.vue b/src/layouts/default/content/index.vue index a5ca774..9fd2ad9 100644 --- a/src/layouts/default/content/index.vue +++ b/src/layouts/default/content/index.vue @@ -7,60 +7,67 @@ diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue index 51a7094..8483421 100644 --- a/src/layouts/default/header/index.vue +++ b/src/layouts/default/header/index.vue @@ -1,260 +1,318 @@