Commit be79be81 authored by 张伯涛's avatar 张伯涛

分辨率适配问题

parent 143f2325
......@@ -2,13 +2,13 @@
<div class="sidebar-logo-container" :class="{'collapse':collapse}">
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img :src="logo" class="sidebar-logo">
<img :src="logo" style="width: 32px;height: 32px" class="sidebar-logo">
<!-- <div class="sidebar-title">{{ title }} </div>-->
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<div class="sidebar-logoTitle">
<div class="sidebar-logoRow"><img :src="logo" class="sidebar-logo"></div>
<div class="sidebar-title">{{ title }} </div>
<div style="line-height: 50px;font-size: 13px;font-weight: 600" class="sidebar-title">{{ title }} </div>
</div>
</router-link>
</transition>
......
......@@ -2,6 +2,7 @@
<div class="navbar">
<div class="title-box">
<hamburger
style="width: 30px;height: 45px"
:is-active="sidebar.opened"
class="hamburger-container"
@toggleClick="toggleSideBar"
......@@ -39,23 +40,23 @@
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<div class="username-text">
<div class="username-text" style="font-size: 16px">
[您好,{{ userName }}]
</div>
<!-- <img :src="avatar" class="user-avatar">-->
<i class="el-icon-caret-bottom" />
<i class="el-icon-caret-bottom" style="font-size: 12px" />
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<el-dropdown-item>
<router-link to="/reSetPsw">
修改密码
<span style="font-size: 10px">修改密码</span>
</router-link>
</el-dropdown-item>
<el-dropdown-item @click.native="setting = true">
<span>布局设置</span>
<span style="font-size: 10px">布局设置</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出</span>
<span style="display:block;font-size: 10px">退出</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......
import store from '@/store'
const { body } = document
const WIDTH = 992 // refer to Bootstrap's responsive design
const WIDTH = 92 // refer to Bootstrap's responsive design
export default {
watch: {
......
......@@ -8,7 +8,7 @@ function setRem() {
// 设置页面根节点字体大小(“Math.min(scale, 2)” 指最高放大比例为2,可根据实际业务需求调整)
// document.documentElement.style.fontSize = baseSize * Math.min(scale, 2) + 'px'
// 设置页面根节点字体大小, 字体大小最小为12
const fontSize = (baseSize * Math.min(scale, 2)) > 12 ? (baseSize * Math.min(scale, 2)) : 12
const fontSize = (baseSize * Math.min(scale, 2)) > 14 ? (baseSize * Math.min(scale, 2)) : 14
document.documentElement.style.fontSize = fontSize + 'px'
}
// 初始化
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment