diff --git a/.env.dr b/.env.dr index 6ba8cbb1..1a454b4b 100644 --- a/.env.dr +++ b/.env.dr @@ -26,11 +26,11 @@ VUE_APP_SYSTEM_NAME = 'DS-service' VUE_APP_LOGIN_PAGE = 'login-blue-white' # 系统配色 theme-green、theme-blue-black、theme-blue-white #VUE_APP_THEME_CLASS = 'theme-green' -#VUE_APP_THEME_CLASS = 'theme-blue-black' -VUE_APP_THEME_CLASS = 'theme-blue-white' +VUE_APP_THEME_CLASS = 'theme-blue-black' +#VUE_APP_THEME_CLASS = 'theme-blue-white' # 智慧用电管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = '' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true @@ -49,4 +49,4 @@ port= 9988 // 测试端 // target = http://192.168.10.241:32024 // 开发端 - target = http://192.168.1.17:8899 + target = https://digital-core.drgyen.com diff --git a/public/images/icon01.png b/public/images/icon01.png index fc9cc005..26df9d9d 100644 Binary files a/public/images/icon01.png and b/public/images/icon01.png differ diff --git a/public/images/icon02.png b/public/images/icon02.png index 5c5473ee..eb060d33 100644 Binary files a/public/images/icon02.png and b/public/images/icon02.png differ diff --git a/public/images/icon03.png b/public/images/icon03.png index 60668a0e..56751654 100644 Binary files a/public/images/icon03.png and b/public/images/icon03.png differ diff --git a/public/images/icon04.png b/public/images/icon04.png index 968b2753..c205e72f 100644 Binary files a/public/images/icon04.png and b/public/images/icon04.png differ diff --git a/src/assets/images/big/v3/boxbottom-bottom.png b/src/assets/images/big/v3/boxbottom-bottom.png index 9b62c95e..990fd717 100644 Binary files a/src/assets/images/big/v3/boxbottom-bottom.png and b/src/assets/images/big/v3/boxbottom-bottom.png differ diff --git a/src/assets/images/big/v3/boxbottom-center.png b/src/assets/images/big/v3/boxbottom-center.png index f9f50e70..89a7e8cf 100644 Binary files a/src/assets/images/big/v3/boxbottom-center.png and b/src/assets/images/big/v3/boxbottom-center.png differ diff --git a/src/assets/images/big/v3/boxbottom-top.png b/src/assets/images/big/v3/boxbottom-top.png index 29e87c55..83fb8377 100644 Binary files a/src/assets/images/big/v3/boxbottom-top.png and b/src/assets/images/big/v3/boxbottom-top.png differ diff --git a/src/assets/images/big/v3/boxcenter-bottom.png b/src/assets/images/big/v3/boxcenter-bottom.png index bb5e2967..d2c9d273 100644 Binary files a/src/assets/images/big/v3/boxcenter-bottom.png and b/src/assets/images/big/v3/boxcenter-bottom.png differ diff --git a/src/assets/images/big/v3/boxcenter-center.png b/src/assets/images/big/v3/boxcenter-center.png index 731a17af..b8e88808 100644 Binary files a/src/assets/images/big/v3/boxcenter-center.png and b/src/assets/images/big/v3/boxcenter-center.png differ diff --git a/src/assets/images/big/v3/boxcenter-top.png b/src/assets/images/big/v3/boxcenter-top.png index a20a52a0..ea420496 100644 Binary files a/src/assets/images/big/v3/boxcenter-top.png and b/src/assets/images/big/v3/boxcenter-top.png differ diff --git a/src/assets/images/big/v3/boxleft-bottom.png b/src/assets/images/big/v3/boxleft-bottom.png index a3e5867b..3a6b6d89 100644 Binary files a/src/assets/images/big/v3/boxleft-bottom.png and b/src/assets/images/big/v3/boxleft-bottom.png differ diff --git a/src/assets/images/big/v3/boxleft-center.png b/src/assets/images/big/v3/boxleft-center.png index aeeacd6f..bfd98174 100644 Binary files a/src/assets/images/big/v3/boxleft-center.png and b/src/assets/images/big/v3/boxleft-center.png differ diff --git a/src/assets/images/big/v3/boxleft-top.png b/src/assets/images/big/v3/boxleft-top.png index f243a9f1..79e399fe 100644 Binary files a/src/assets/images/big/v3/boxleft-top.png and b/src/assets/images/big/v3/boxleft-top.png differ diff --git a/src/assets/images/big/v3/head.png b/src/assets/images/big/v3/head.png index 8f352ffb..5321be3f 100644 Binary files a/src/assets/images/big/v3/head.png and b/src/assets/images/big/v3/head.png differ diff --git a/src/assets/images/big/v3/head1.png b/src/assets/images/big/v3/head1.png new file mode 100644 index 00000000..d1034ba1 Binary files /dev/null and b/src/assets/images/big/v3/head1.png differ diff --git a/src/assets/images/big/v3/head2.png b/src/assets/images/big/v3/head2.png new file mode 100644 index 00000000..a658c326 Binary files /dev/null and b/src/assets/images/big/v3/head2.png differ diff --git a/src/assets/images/big/v3/icon01.png b/src/assets/images/big/v3/icon01.png index fc9cc005..26df9d9d 100644 Binary files a/src/assets/images/big/v3/icon01.png and b/src/assets/images/big/v3/icon01.png differ diff --git a/src/assets/images/big/v3/icon02.png b/src/assets/images/big/v3/icon02.png index 5c5473ee..eb060d33 100644 Binary files a/src/assets/images/big/v3/icon02.png and b/src/assets/images/big/v3/icon02.png differ diff --git a/src/assets/images/big/v3/icon03.png b/src/assets/images/big/v3/icon03.png index 60668a0e..56751654 100644 Binary files a/src/assets/images/big/v3/icon03.png and b/src/assets/images/big/v3/icon03.png differ diff --git a/src/assets/images/big/v3/icon04.png b/src/assets/images/big/v3/icon04.png index 968b2753..c205e72f 100644 Binary files a/src/assets/images/big/v3/icon04.png and b/src/assets/images/big/v3/icon04.png differ diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 3e22a915..e3149a63 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -39,13 +39,13 @@ $sidebarGreenTitle: #ffffff; //theme-blue-black样式 $menuBlueBlackText:#ffffff; -$menuBlueBlackLogoBg:#041a2f; +$menuBlueBlackLogoBg:#001f45; $menuBlueBlackLogoColor:#1890FF; -$menuBlueBlackBg:#041a2f; -$menuBlueBlackHover:#1d3144; -$menuBlueBlackActive:#1d3144; -$menuBlueBlackActiveBg:#11263a; -$menuBlueBlackActiveHover:#1d3144; +$menuBlueBlackBg:#001f45; +$menuBlueBlackHover:#153154; +$menuBlueBlackActive:#153154; +$menuBlueBlackActiveBg:#08264b; +$menuBlueBlackActiveHover:#153154; $sidebarBlueBlackTitle: #587A99; //theme-blue-white样式 diff --git a/src/views/bigScreen/v3/index.vue b/src/views/bigScreen/v3/index.vue index cf34abbf..34126ac6 100644 --- a/src/views/bigScreen/v3/index.vue +++ b/src/views/bigScreen/v3/index.vue @@ -410,7 +410,7 @@ export default { display: flex; justify-content: center; // background-image: url("../../../assets/images/big/v3/bg.jpg"); - background-color: #051832; + background-color: #002b61; cursor: default; .main-block { width: 100%; diff --git a/src/views/bigScreen/v3/profile/EHead.vue b/src/views/bigScreen/v3/profile/EHead.vue index 960b7834..8347e5a2 100644 --- a/src/views/bigScreen/v3/profile/EHead.vue +++ b/src/views/bigScreen/v3/profile/EHead.vue @@ -136,6 +136,7 @@ export default {