响应式小改动

master
toesbieya 6 years ago
parent 76cc6772d9
commit 1565392ad3
  1. 5
      vue/src/assets/styles/display.scss
  2. 12
      vue/src/assets/styles/index.scss
  3. 2
      vue/src/assets/styles/sidebar.scss
  4. 7
      vue/src/bizComponents/SearchForm/index.vue
  5. 18
      vue/src/layout/components/Navbar/index.vue
  6. 14
      vue/src/layout/mixin/ResizeHandler.js
  7. 2
      vue/src/views/purchase/inbound/index.vue
  8. 2
      vue/src/views/purchase/order/index.vue
  9. 2
      vue/src/views/sell/order/index.vue
  10. 2
      vue/src/views/sell/outbound/index.vue
  11. 2
      vue/src/views/stock/current/index.vue
  12. 2
      vue/src/views/system/customer/index.vue
  13. 2
      vue/src/views/system/role/index.vue
  14. 2
      vue/src/views/system/supplier/index.vue
  15. 2
      vue/src/views/system/user/index.vue

@ -0,0 +1,5 @@
@media only screen and (max-width: 768px) {
.hidden-xs {
display: none !important
}
}

@ -1,5 +1,6 @@
@import "variables"; @import "variables";
@import "~element-ui/packages/theme-chalk/src/index"; @import "~element-ui/packages/theme-chalk/src/index";
@import 'display';
@import "transition"; @import "transition";
@import "element-ui"; @import "element-ui";
@import "nprogress"; @import "nprogress";
@ -181,4 +182,15 @@ a:hover {
} }
} }
.button-group {
.el-button {
margin-top: 10px;
margin-right: 10px;
& + .el-button {
margin-left: 0;
}
}
}

@ -30,6 +30,8 @@ $iconSize: 17px;
//自动隐藏 //自动隐藏
&.hide-sidebar { &.hide-sidebar {
width: 0; width: 0;
pointer-events: none;
transform: translateX(-$sideBarWidth);
} }
.sidebar-logo-container { .sidebar-logo-container {

@ -1,4 +1,6 @@
<script type="text/jsx"> <script type="text/jsx">
import {debounce} from "@/utils"
export default { export default {
name: "SearchForm", name: "SearchForm",
provide() { provide() {
@ -36,6 +38,7 @@
} }
}, },
mounted() { mounted() {
this.resize = debounce(this.resize)
this.resize() this.resize()
window.addEventListener('resize', this.resize) window.addEventListener('resize', this.resize)
}, },
@ -44,7 +47,7 @@
}, },
render() { render() {
const slots = this.$slots.default const slots = this.$slots.default
let collapseChildren = [] const collapseChildren = []
if (this.showCollapse) { if (this.showCollapse) {
collapseChildren.push( collapseChildren.push(
<el-collapse-transition> <el-collapse-transition>
@ -86,6 +89,8 @@
<style lang="scss"> <style lang="scss">
.searchForm { .searchForm {
margin-bottom: -15px;
.searchForm__collapse { .searchForm__collapse {
position: relative; position: relative;
bottom: 20px; bottom: 20px;

@ -5,11 +5,11 @@
<breadcrumb v-if="showBreadcrumb"/> <breadcrumb v-if="showBreadcrumb"/>
<div class="right-menu"> <div class="right-menu">
<search id="header-search" class="right-menu-item"/> <search id="header-search" class="right-menu-item hidden-xs"/>
<fullscreen v-model="fullscreen" class="fullscreen-btn right-menu-item" title="全屏开关"/> <fullscreen v-model="fullscreen" class="fullscreen-btn right-menu-item hidden-xs" title="全屏开关"/>
<div class="setting-btn right-menu-item" @click="settingDrawer=true"> <div class="setting-btn right-menu-item hidden-xs" @click="settingDrawer=true">
<i class="el-icon-s-operation navbar-icon" title="个性设置"/> <i class="el-icon-s-operation navbar-icon" title="个性设置"/>
</div> </div>
@ -20,24 +20,22 @@
> >
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<el-avatar :size="30" :src="avatar" icon="el-icon-user-solid"/> <el-avatar :size="30" :src="avatar" icon="el-icon-user-solid"/>
<span>{{name}}</span> <span class="hidden-xs">{{name}}</span>
</div> </div>
<el-dropdown-menu class="user-dropdown" slot="dropdown"> <el-dropdown-menu class="user-dropdown" slot="dropdown">
<router-link to="/user/index"> <router-link to="/user/index">
<el-dropdown-item icon="el-icon-user">个人中心</el-dropdown-item> <el-dropdown-item icon="el-icon-user">个人中心</el-dropdown-item>
</router-link> </router-link>
<el-dropdown-item icon="el-icon-guide" @click.native="$guide(0,steps)">新手指引</el-dropdown-item> <el-dropdown-item class="hidden-xs" icon="el-icon-guide" @click.native="$guide(0,steps)">
新手指引
</el-dropdown-item>
<router-link v-if="showSystemMonitor" to="/system/monitor"> <router-link v-if="showSystemMonitor" to="/system/monitor">
<el-dropdown-item icon="el-icon-monitor">系统监控</el-dropdown-item> <el-dropdown-item icon="el-icon-monitor">系统监控</el-dropdown-item>
</router-link> </router-link>
<router-link v-if="showSystemResource" to="/system/resource"> <router-link v-if="showSystemResource" to="/system/resource">
<el-dropdown-item icon="el-icon-setting">接口设置</el-dropdown-item> <el-dropdown-item icon="el-icon-setting">接口设置</el-dropdown-item>
</router-link> </router-link>
<el-dropdown-item <el-dropdown-item divided icon="el-icon-switch-button" @click.native="logout">
divided
icon="el-icon-switch-button"
@click.native="logout"
>
退出登录 退出登录
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>

@ -1,21 +1,25 @@
import {debounce} from '@/utils'
const {body} = document const {body} = document
const WIDTH = 768 const WIDTH = 768
function $_isMobile() {
const rect = body.getBoundingClientRect()
return rect.width - 1 < WIDTH
}
export default { export default {
methods: { methods: {
$_isMobile() {
const rect = body.getBoundingClientRect()
return rect.width - 1 < WIDTH
},
$_resizeHandler() { $_resizeHandler() {
if (!document.hidden) { if (!document.hidden) {
const isMobile = this.$_isMobile() const isMobile = $_isMobile()
this.$store.commit('app/device', isMobile ? 'mobile' : 'pc') this.$store.commit('app/device', isMobile ? 'mobile' : 'pc')
isMobile && this.$store.commit('setting/sidebarCollapse', true) isMobile && this.$store.commit('setting/sidebarCollapse', true)
} }
} }
}, },
mounted() { mounted() {
this.$_resizeHandler = debounce(this.$_resizeHandler)
window.addEventListener('resize', this.$_resizeHandler) window.addEventListener('resize', this.$_resizeHandler)
this.$_resizeHandler() this.$_resizeHandler()
}, },

@ -39,7 +39,7 @@
</el-select> </el-select>
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button> <el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see"> </el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see"> </el-button>

@ -55,7 +55,7 @@
/> />
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button> <el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see"> </el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see"> </el-button>

@ -55,7 +55,7 @@
/> />
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button> <el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see"> </el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see"> </el-button>

@ -39,7 +39,7 @@
</el-select> </el-select>
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button> <el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see"> </el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see"> </el-button>

@ -33,7 +33,7 @@
/> />
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button> <el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button>
<el-button icon="el-icon-download" size="small" type="info" @click="downloadExcel"> </el-button> <el-button icon="el-icon-download" size="small" type="info" @click="downloadExcel"> </el-button>
</el-row> </el-row>

@ -32,7 +32,7 @@
/> />
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button size="small" type="success" @click="search"> </el-button> <el-button size="small" type="success" @click="search"> </el-button>
<el-button v-if="canAdd" size="small" type="primary" @click="add"> </el-button> <el-button v-if="canAdd" size="small" type="primary" @click="add"> </el-button>
<el-button v-if="canUpdate" size="small" type="primary" @click="edit"> </el-button> <el-button v-if="canUpdate" size="small" type="primary" @click="edit"> </el-button>

@ -23,7 +23,7 @@
/> />
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button> <el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit"> </el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit"> </el-button>

@ -32,7 +32,7 @@
/> />
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button size="small" type="success" @click="search"> </el-button> <el-button size="small" type="success" @click="search"> </el-button>
<el-button v-if="canAdd" size="small" type="primary" @click="add"> </el-button> <el-button v-if="canAdd" size="small" type="primary" @click="add"> </el-button>
<el-button v-if="canUpdate" size="small" type="primary" @click="edit"> </el-button> <el-button v-if="canUpdate" size="small" type="primary" @click="edit"> </el-button>

@ -23,7 +23,7 @@
/> />
</search-form-item> </search-form-item>
</search-form> </search-form>
<el-row> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button> <el-button icon="el-icon-search" size="small" type="success" @click="search"> </el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add"> </el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit"> </el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit"> </el-button>

Loading…
Cancel
Save