diff --git a/ui/dasadmin/.env.development b/ui/dasadmin/.env.development index c005c640..d2cba51d 100644 --- a/ui/dasadmin/.env.development +++ b/ui/dasadmin/.env.development @@ -8,7 +8,7 @@ VITE_BASE_PATH = './' # 本地 # VITE_APP_PROXY=[["/api","http://192.168.130.12:8080/api"]] # 线上 -VITE_APP_PROXY=[["/api","http://192.168.109.195:8080/api"]] +VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]] diff --git a/ui/dasadmin/src/layouts/backend/components/aside.vue b/ui/dasadmin/src/layouts/backend/components/aside.vue index cb630e7c..162e22f6 100644 --- a/ui/dasadmin/src/layouts/backend/components/aside.vue +++ b/ui/dasadmin/src/layouts/backend/components/aside.vue @@ -37,7 +37,7 @@ const menuWidth = computed(() => config.menuWidth()) } .layout-aside-Classic, .layout-aside-Double { - background: var(--ba-bg-color-overlay); + background-image: linear-gradient(90deg, #eaf6ff 0%, #fbfdff 100%) !important; margin: 0; height: 100vh; overflow: hidden; diff --git a/ui/dasadmin/src/layouts/backend/components/header.vue b/ui/dasadmin/src/layouts/backend/components/header.vue index 94575d0f..99c2675b 100644 --- a/ui/dasadmin/src/layouts/backend/components/header.vue +++ b/ui/dasadmin/src/layouts/backend/components/header.vue @@ -24,5 +24,6 @@ const navTabs = useNavTabs() .layout-header { height: auto; padding: 0; + background-color: transparent; } diff --git a/ui/dasadmin/src/layouts/backend/components/logo.vue b/ui/dasadmin/src/layouts/backend/components/logo.vue index c03e6b2f..79a00a04 100644 --- a/ui/dasadmin/src/layouts/backend/components/logo.vue +++ b/ui/dasadmin/src/layouts/backend/components/logo.vue @@ -1,10 +1,10 @@ @@ -25,7 +25,7 @@ import { BEFORE_RESIZE_LAYOUT } from '/@/stores/constant/cacheKey' import { setNavTabsWidth } from '/@/utils/layout' const config = useConfig() -const siteConfig = useSiteConfig() +// const siteConfig = useSiteConfig() const onMenuCollapse = function () { if (config.layout.shrink && !config.layout.menuCollapse) { @@ -49,20 +49,21 @@ const onMenuCollapse = function () { diff --git a/ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue b/ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue index 47aa8ac5..83424b11 100644 --- a/ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue +++ b/ui/dasadmin/src/layouts/backend/components/menus/menuVertical.vue @@ -67,13 +67,14 @@ onBeforeRouteUpdate((to) => { diff --git a/ui/dasadmin/src/layouts/backend/components/navBar/classic.vue b/ui/dasadmin/src/layouts/backend/components/navBar/classic.vue index e8d8705a..3db571b1 100644 --- a/ui/dasadmin/src/layouts/backend/components/navBar/classic.vue +++ b/ui/dasadmin/src/layouts/backend/components/navBar/classic.vue @@ -3,9 +3,10 @@
- + + @@ -27,5 +35,28 @@ const navTabs = useNavTabs() flex-direction: column; width: 100%; height: 100%; + padding: 0 20px; +} +.layout-logo { + position: absolute; + width: 100%; + height: 60px; + display: flex; + align-items: center; + box-sizing: border-box; + padding: 10px; + background-image: linear-gradient(170deg, #eaf6ff 0%, #fbfdff 94%); + box-shadow: 0px 0px 20px 0px rgba(0, 100, 170, 0.09); +} +.logo-img { + width: 28px; +} +.website-name { + padding-left: 4px; + font-size: var(--el-font-size-extra-large); + font-weight: 600; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } diff --git a/ui/dasadmin/src/layouts/backend/router-view/main.vue b/ui/dasadmin/src/layouts/backend/router-view/main.vue index 7b4e1494..29c838c0 100644 --- a/ui/dasadmin/src/layouts/backend/router-view/main.vue +++ b/ui/dasadmin/src/layouts/backend/router-view/main.vue @@ -91,6 +91,8 @@ watch( overflow: hidden; width: 100%; height: 100%; + background-color: #ffffff; + border-radius: 6px; } .layout-main-scrollbar { width: 100%; diff --git a/ui/dasadmin/src/stores/config.ts b/ui/dasadmin/src/stores/config.ts index 6f83e479..024f632e 100644 --- a/ui/dasadmin/src/stores/config.ts +++ b/ui/dasadmin/src/stores/config.ts @@ -12,7 +12,7 @@ export const useConfig = defineStore( // 是否收缩布局(小屏设备) shrink: false, // 后台布局方式,可选值 - layoutMode: 'Default', + layoutMode: 'Classic', // 后台主页面切换动画,可选值 mainAnimation: 'slide-right', // 是否暗黑模式 @@ -24,7 +24,7 @@ export const useConfig = defineStore( // 侧边菜单文字颜色 menuColor: ['#303133', '#CFD3DC'], // 侧边菜单激活项背景色 - menuActiveBackground: ['#ffffff', '#1d1e1f'], + menuActiveBackground: ['#0064AA', '#0064AA'], // 侧边菜单激活项文字色 menuActiveColor: ['#0064AA', '#3375b9'], // 侧边菜单顶栏背景色 diff --git a/ui/dasadmin/src/stores/siteConfig.ts b/ui/dasadmin/src/stores/siteConfig.ts index 1ff9ce6c..720b0f37 100644 --- a/ui/dasadmin/src/stores/siteConfig.ts +++ b/ui/dasadmin/src/stores/siteConfig.ts @@ -5,7 +5,7 @@ import type { SiteConfig } from '/@/stores/interface' export const useSiteConfig = defineStore('siteConfig', { state: (): SiteConfig => { return { - siteName: '', + siteName: '润阳风电场数据采集系统', recordNumber: '', version: '', cdnUrl: '', diff --git a/ui/dasadmin/src/styles/var.scss b/ui/dasadmin/src/styles/var.scss index bf29d9b4..6da77106 100644 --- a/ui/dasadmin/src/styles/var.scss +++ b/ui/dasadmin/src/styles/var.scss @@ -1,22 +1,75 @@ +@use 'sass:math'; @use 'sass:map'; @use 'mixins' as *; -@forward 'element-plus/theme-chalk/src/common/var.scss' with ($colors: ('primary': ('base': #003261, +$types: primary, success, warning, danger, error, info; + +$colors: ( + ) !default; +$colors: map.deep-merge(( // 白色和黑色作为基本颜色选项 + 'white': #ffffff, + 'black': #000000, + // 为每种主题类型定义一个基础颜色 + 'primary': ('base': #0064AA, + ), + 'success': ('base': #67c23a, + ), + 'warning': ('base': #e6a23c, + ), + 'error': ('base': #f56c6c, + ), + 'info': ('base': #909399, + ), ), - 'success': ('base': #21ba45, - ), - 'warning': ('base': #f2711c, - ), - 'danger': ('base': #db2828, - ), - 'error': ('base': #db2828, - ), - 'info': ('base': #42b8dd, - ), - ), - $button-padding-horizontal: ('default': 80px, - )); + $colors +); + +// 主色调 +$color-white: map.get($colors, 'white') !default; // 白色 +$color-black: map.get($colors, 'black') !default; // 黑色 + +// 应用场景颜色 +$color-primary: map.get($colors, 'primary', 'base') !default; // 主要颜色,默认使用'base'色调 +$color-success: map.get($colors, 'success', 'base') !default; // 成功状态颜色,默认使用'base'色调 +$color-warning: map.get($colors, 'warning', 'base') !default; // 警告状态颜色,默认使用'base'色调 +$color-error: map.get($colors, 'error', 'base') !default; // 错误状态颜色,默认使用'base'色调 +$color-info: map.get($colors, 'info', 'base') !default; // 信息状态颜色,默认使用'base'色调 + +// @mixin set-color-mix-level($type, +// $number, +// $mode: 'light', +// $mix-color: $color-white) { +// $colors: map.deep-merge(($type: ('#{$mode}-#{$number}': mix($mix-color, +// map.get($colors, $type, 'base'), +// math.percentage(math.div($number, 10))), +// ), +// ), +// $colors ) !global; +// } + +// @mixin set-css-color-type($colors, $type) { +// @include set-css-var-value(('color', $type), map.get($colors, $type, 'base')); + +// @each $i in (3, 5, 7, 8, 9) { +// @include set-css-var-value(('color', $type, 'light', $i), +// map.get($colors, $type, 'light-#{$i}')); +// } + +// @include set-css-var-value(('color', $type, 'dark-2'), +// map.get($colors, $type, 'dark-2')); +// } + +// @each $type in $types { +// @for $i from 1 through 9 { +// @include set-color-mix-level($type, $i, 'light', $color-white); +// } +// } + +// // --el-color-primary-dark-2 +// @each $type in $types { +// @include set-color-mix-level($type, 2, 'dark', $color-black); +// } // 后台主体窗口左右间距 $main-space: 16px; @@ -39,7 +92,15 @@ $border-color: map.merge(('': #f6f6f6, $border-color ); + + :root { + --el-color-primary: $color-primary !important; + + // @each $type in $types { + // @include set-css-color-type($colors, $type); + // } + @include set-css-var-value('main-space', $main-space); @include set-css-var-value('color-primary-light', $primary-light); diff --git a/ui/dasadmin/src/utils/layout.ts b/ui/dasadmin/src/utils/layout.ts index a382947d..e45ceb34 100644 --- a/ui/dasadmin/src/utils/layout.ts +++ b/ui/dasadmin/src/utils/layout.ts @@ -12,7 +12,7 @@ export function mainHeight(extra = 0): CSSProperties { let height = extra const adminLayoutMainExtraHeight: anyObj = { Default: 70, - Classic: 50, + Classic: 148, Streamline: 60, } if (isAdminApp()) {