diff --git a/admin/src/App.vue b/admin/src/App.vue index 2e28082..3df0c26 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -1,82 +1,36 @@ @@ -85,25 +39,34 @@ export default { name: 'App', data() { - const item = { - date: '2016-05-02', - name: '王小虎', - address: '上海市普陀区金沙江路 1518 弄' - }; return { - tableData: Array(20).fill(item), - style: { - height: null + appStyle: { + background: "#F2F2F2" + }, + mainLogo: { + appLogoName: 'UDF', + appName: 'ADMIN', + }, + mainElContainerStyle: { + height: 0 + }, + mainElHeaderStyle: { + height: "50", + background: "rgb(255, 255, 255)" + }, + mainMenuBtnStyle: { + background: "none rgb(255, 106, 0)", + color: "rgb(255, 255, 255)" } } }, created() { - window.addEventListener('resize', this.getHeight); - this.getHeight() + window.addEventListener('resize', this.getMainElContainerStyleHeight); + this.getMainElContainerStyleHeight(); }, methods: { - getHeight() { - this.style.height = window.innerHeight + 'px'; + getMainElContainerStyleHeight() { + this.mainElContainerStyle.height = window.innerHeight + 'px'; } } } diff --git a/admin/src/assets/css/glob.css b/admin/src/assets/css/glob.css deleted file mode 100644 index 89edbb9..0000000 --- a/admin/src/assets/css/glob.css +++ /dev/null @@ -1,19 +0,0 @@ -#app { - position: relative; - width: 100%; - height: 100%; - overflow: hidden; - font-family: 'Microsoft yahei'; - font-size: 13px; - font-weight: 400; -} - -body .el-scrollbar__wrap { - overflow-x: hidden; -} - -#nprogress .bar { - background: #62caff !important; -} - - diff --git a/admin/src/assets/scss/glob.scss b/admin/src/assets/scss/glob.scss index f2e8606..2ba9f9e 100644 --- a/admin/src/assets/scss/glob.scss +++ b/admin/src/assets/scss/glob.scss @@ -1,19 +1,101 @@ +#app { + position: relative; + width: 100%; + height: 100%; + overflow: hidden; + font-family: 'Microsoft yahei'; + font-size: 13px; + font-weight: 400; +} + +body .el-scrollbar__wrap { + overflow-x: hidden; +} + +#nprogress .bar { + background: #62caff !important; +} + + .el-container { - .el-aside { - color: #333; - } - .el-header { - background-color: #B3C0D1; - color: #333; - line-height: 60px; - text-align: right; - font-size: 12px; + box-shadow: rgba(0, 0, 0, 0.08) 0px 1px 4px 0px; + height: 50px; + margin: 0; + padding: 0; + + .mainMenuBtn { + width: 50px; + height: 50px; + border-radius: 0px !important; + box-sizing: border-box; + line-height: inherit; + cursor: pointer; + font-family: inherit; + font-size: inherit; + display: inline-block; + vertical-align: middle; + text-align: center; + white-space: nowrap; + padding: 0px; + outline: medium; + text-decoration: none; + transition: all 0.3s ease-out; + border-width: initial; + border-style: none; + border-color: initial; + border-image: initial; + overflow: hidden; + font-size: 20px; + } + + .mainLogoBtn { + height: 50px; + padding: 0px 12px; + cursor: pointer; + + span { + font-size: 15px; + font-family: inherit; + display: inline-block; + vertical-align: middle; + text-align: center; + + .appLogo { + font-size: 15px; + } + } + } + + .mainMenuRightDiv { + float: right; + height: 50px; + + .avatarDiv { + height: 50px; + padding-right: 12px; + display: table-cell; + vertical-align: middle; + text-align: center; + cursor: pointer; + } + + .bellDiv { + height: 50px; + padding-right: 25px; + display: table-cell; + vertical-align: middle; + text-align: center; + font-size: 18px; + cursor: pointer; + } + } } .el-main { - + margin: 0; + padding: 0; } } diff --git a/admin/src/main.js b/admin/src/main.js index ed757de..0d85453 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -9,7 +9,6 @@ import VueAxios from 'vue-axios'; import Glob from './assets/js/glob.js'; import 'element-ui/lib/theme-chalk/index.css'; import './assets/css/reset.css'; -import './assets/css/glob.css'; import './assets/scss/glob.scss'; import './assets/scss/element-variables.scss';