diff --git a/acupuncture-后台/src/assets/styles/variables.scss b/acupuncture-后台/src/assets/styles/variables.scss index 34484d47..e27750dd 100644 --- a/acupuncture-后台/src/assets/styles/variables.scss +++ b/acupuncture-后台/src/assets/styles/variables.scss @@ -1,25 +1,25 @@ // base color -$blue:#324157; -$light-blue:#3A71A8; -$red:#C03639; -$pink: #E65D6E; -$green: #30B08F; -$tiffany: #4AB7BD; -$yellow:#FEC171; -$panGreen: #30B08F; +$blue: #324157; +$light-blue: #3a71a8; +$red: #c03639; +$pink: #e65d6e; +$green: #30b08f; +$tiffany: #4ab7bd; +$yellow: #fec171; +$panGreen: #30b08f; // 默认菜单主题风格 -$base-menu-color:#bfcbd9; -$base-menu-color-active:#f4f4f5; -$base-menu-background:#304156; +$base-menu-color: #bfcbd9; +$base-menu-color-active: #f4f4f5; +$base-menu-background: #304156; $base-logo-title-color: #ffffff; -$base-menu-light-color:rgba(0,0,0,.70); -$base-menu-light-background:#ffffff; +$base-menu-light-color: rgba(0, 0, 0, 0.7); +$base-menu-light-background: #ffffff; $base-logo-light-title-color: #001529; -$base-sub-menu-background:#1f2d3d; -$base-sub-menu-hover:#001528; +$base-sub-menu-background: #1f2d3d; +$base-sub-menu-hover: #001528; // 自定义暗色菜单风格 /** @@ -50,5 +50,5 @@ $base-sidebar-width: 200px; subMenuHover: $base-sub-menu-hover; sideBarWidth: $base-sidebar-width; logoTitleColor: $base-logo-title-color; - logoLightTitleColor: $base-logo-light-title-color + logoLightTitleColor: $base-logo-light-title-color; } diff --git a/acupuncture-后台/src/store/modules/settings.js b/acupuncture-后台/src/store/modules/settings.js index 2455a1e2..e761d38a 100644 --- a/acupuncture-后台/src/store/modules/settings.js +++ b/acupuncture-后台/src/store/modules/settings.js @@ -1,42 +1,59 @@ -import defaultSettings from '@/settings' +import defaultSettings from "@/settings"; -const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings +const { + sideTheme, + showSettings, + topNav, + tagsView, + fixedHeader, + sidebarLogo, + dynamicTitle, +} = defaultSettings; -const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' +const storageSetting = JSON.parse(localStorage.getItem("layout-setting")) || ""; const state = { - title: '', - theme: storageSetting.theme || '#409EFF', + title: "", + theme: storageSetting.theme || "#fff", sideTheme: storageSetting.sideTheme || sideTheme, showSettings: showSettings, topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, - tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, - fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader, - sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo, - dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle -} + tagsView: + storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, + fixedHeader: + storageSetting.fixedHeader === undefined + ? fixedHeader + : storageSetting.fixedHeader, + sidebarLogo: + storageSetting.sidebarLogo === undefined + ? sidebarLogo + : storageSetting.sidebarLogo, + dynamicTitle: + storageSetting.dynamicTitle === undefined + ? dynamicTitle + : storageSetting.dynamicTitle, +}; const mutations = { CHANGE_SETTING: (state, { key, value }) => { if (state.hasOwnProperty(key)) { - state[key] = value + state[key] = value; } - } -} + }, +}; const actions = { // 修改布局设置 changeSetting({ commit }, data) { - commit('CHANGE_SETTING', data) + commit("CHANGE_SETTING", data); }, // 设置网页标题 setTitle({ commit }, title) { - state.title = title - } -} + state.title = title; + }, +}; export default { namespaced: true, state, mutations, - actions -} - + actions, +}; diff --git a/acupuncture-后台/src/views/bg.png b/acupuncture-后台/src/views/bg.png new file mode 100644 index 00000000..9675be65 Binary files /dev/null and b/acupuncture-后台/src/views/bg.png differ diff --git a/acupuncture-后台/src/views/login.vue b/acupuncture-后台/src/views/login.vue index 622a8b6c..1997582b 100644 --- a/acupuncture-后台/src/views/login.vue +++ b/acupuncture-后台/src/views/login.vue @@ -1,85 +1,88 @@ @@ -193,7 +196,7 @@ export default { path: this.redirect || "/", }) .catch(() => {}); - // this.getCommonQueue(); // 公共队列 + this.getCommonQueue(); }) .catch(() => { this.loading = false; @@ -228,19 +231,28 @@ export default { justify-content: center; align-items: center; height: 100%; - background-image: url("../assets/images/login-background.jpg"); + background-image: url("./bg.png"); background-size: cover; + display: flex; + .login-left { + flex: 1.5; + } + + .login-right { + flex: 1; + } } .title { + font-size: 26 px; margin: 0px auto 30px auto; - text-align: center; - color: #707070; + text-align: left; + color: #fff; } .login-form { border-radius: 6px; - background: #ffffff; + // background: #ffffff; width: 400px; padding: 25px 25px 5px 25px;