diff --git a/admin/src/App.vue b/admin/src/App.vue
index 6eb4a35..f042f03 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -2,8 +2,9 @@
-
+
+
+
+
+
@@ -92,6 +97,18 @@
+
+
+
+
+
+
+
@@ -99,15 +116,19 @@
import glob from "./assets/js/glob";
import api_user from "./api/user";
+ import leftMenu from "./components/leftMenu";
export default {
name: 'App',
+ components: {
+ leftMenu
+ },
data() {
return {
golbSetting: {
appLogoName: 'ITKK',
copyRight: '© 2019-2020 itkk.org',
- appBackground: "#F2F2F2",
+ appBackground: "#FAFAFA",
headerBackground: "#FFFFFF",
menuBtnColor: "#FFFFFF",
themeBackground: "#FF6A00",
@@ -151,7 +172,9 @@
showSearchInput: false,
searchInputText: null,
userDto: {},
- elAsideShow: true
+ elAsideShow: true,
+ leftMenuDrawerShow: false,
+ leftMenuDrawerStyle: {}
}
},
mounted() {
@@ -191,12 +214,15 @@
this.backtopStyle.color = this.golbSetting.themeColor;
this.userDtoBtnStyle.color = this.golbSetting.themeBackground;
this.logoutBtnStyle.color = this.golbSetting.themeBackground;
+ this.logoutBtnStyle.background = this.golbSetting.appBackground;
},
//resize监听器
resizeListener() {
//设定容器高度
+ this.appStyle.height = window.innerHeight + 'px';
this.mainElContainerStyle.height = window.innerHeight + 'px';
this.mainChildElContainerStyle.height = (window.innerHeight - 50) + 'px';
+ this.leftMenuDrawerStyle.height = window.innerHeight + 'px';
//设定框宽度
this.searchInputStyle.width = window.innerWidth - 200 - 10 + 'px';
//判断是否显示菜单栏
@@ -210,11 +236,19 @@
logoutBtnClick() {
const loading = this.$loading({lock: true, text: '操作中'});
api_user.logout().then(response => window.location.href = '/').finally(() => loading.close());
+ },
+ //菜单按钮点击
+ mainMenuBtnClick() {
+ this.leftMenuDrawerShow = !this.leftMenuDrawerShow;
}
}
}
-
+
diff --git a/udf-api/udf-api-server/src/main/resources/templates/common.html b/udf-api/udf-api-server/src/main/resources/templates/common.html
index beb82a8..6a0b148 100644
--- a/udf-api/udf-api-server/src/main/resources/templates/common.html
+++ b/udf-api/udf-api-server/src/main/resources/templates/common.html
@@ -17,7 +17,7 @@
font-family: 'Microsoft yahei';
font-size: 13px;
font-weight: 400;
- background-color: #F2F2F2;
+ background-color: #FAFAFA;
}
a, a:hover, a:active, a:focus {
@@ -440,22 +440,16 @@
});
//注册按钮点击事件
$('.header-right-bar-registered-div button').on('click', function () {
- //打开loading
- openLoading();
//跳转注册界面
window.location.href = '/registered.html';
});
//登陆按钮点击事件
$('.header-right-bar-login-div button').on('click', function () {
- //打开loading
- openLoading();
//跳转登陆界面
window.location.href = '/login.html';
});
//头像按钮点击事件
$('.header-right-bar-user-div').on('click', function () {
- //打开loading
- openLoading();
//跳转控制台
window.location.href = '/admin';
});