Skip to content

P
property-management
Commit b6351837 by chenjunxiong
Options

build: 

移除页面不必要的登录方式及底部信息
parent 0d8011ce
Showing with 155 additions and 185 deletions
ant-design-vue-jeecg/src/components/layouts/UserLayout.vue
...@@ -4,27 +4,12 @@ ...@@ -4,27 +4,12 @@
<div class="top"> <div class="top">
<div class="header"> <div class="header">
<a href="/"> <a href="/">
<img src="~@/assets/logo.svg" class="logo" alt="logo"> <span class="title">物业管理后台</span>
<span class="title">Jeecg Boot</span>
</a> </a>
</div> </div>
<div class="desc">
Jeecg Boot 是中国最具影响力的 企业级 低代码平台
</div>
</div> </div>
<route-view></route-view> <route-view></route-view>
<div class="footer">
<div class="links">
<a href="http://doc.jeecg.com" target="_blank">帮助</a>
<a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">隐私</a>
<a href="https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE" target="_blank">条款</a>
</div>
<div class="copyright">
Copyright &copy; 2019 <a href="http://www.jeecg.com" target="_blank">JEECG开源社区</a> 出品
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
......
ant-design-vue-jeecg/src/components/page/GlobalFooter.vue
<template> <template>
<div class="footer"> <div class="footer">
<div class="links">
<a href="http://www.jeecg.com" target="_blank">JEECG 首页</a>
<a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">
<a-icon type="github"/>
</a>
<a href="https://ant.design/">Ant Design</a>
<a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>
</div>
<div class="copyright">
Copyright
<a-icon type="copyright"/>
2019 <span>JEECG开源社区 出品</span>
</div>
</div> </div>
</template> </template>
......
ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
:type="collapsed ? 'menu-unfold' : 'menu-fold'" :type="collapsed ? 'menu-unfold' : 'menu-fold'"
@click="toggle"/> @click="toggle"/>
<span v-if="device === 'desktop'">欢迎进入 Jeecg-Boot 企业级低代码平台</span> <!--<span v-if="device === 'desktop'">欢迎进入 Jeecg-Boot 企业级低代码平台</span>-->
<span v-else>Jeecg-Boot</span> <!--<span v-else>Jeecg-Boot</span>-->
<user-menu :theme="theme"/> <user-menu :theme="theme"/>
</div> </div>
...@@ -49,179 +49,182 @@ ...@@ -49,179 +49,182 @@
</template> </template>
<script> <script>
import UserMenu from '../tools/UserMenu' import UserMenu from '../tools/UserMenu'
import SMenu from '../menu/' import SMenu from '../menu/'
import Logo from '../tools/Logo' import Logo from '../tools/Logo'
import { mixin } from '@/utils/mixin.js' import {mixin} from '@/utils/mixin.js'
export default { export default {
name: 'GlobalHeader', name: 'GlobalHeader',
components: { components: {
UserMenu, UserMenu,
SMenu, SMenu,
Logo, Logo,
},
mixins: [mixin],
props: {
mode: {
type: String,
// sidemenu, topmenu
default: 'sidemenu'
}, },
mixins: [mixin], menus: {
props: { type: Array,
mode: { required: true
type: String,
// sidemenu, topmenu
default: 'sidemenu'
},
menus: {
type: Array,
required: true
},
theme: {
type: String,
required: false,
default: 'dark'
},
collapsed: {
type: Boolean,
required: false,
default: false
},
device: {
type: String,
required: false,
default: 'desktop'
}
}, },
data() { theme: {
return { type: String,
headerBarFixed: false, required: false,
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮----- default: 'dark'
topMenuStyle: {
headerIndexLeft: {},
topNavHeader: {},
headerIndexRight: {},
topSmenuStyle: {}
},
chatStatus: '',
}
}, },
watch: { collapsed: {
/** 监听设备变化 */ type: Boolean,
device() { required: false,
if (this.mode === 'topmenu') { default: false
this.buildTopMenuStyle()
}
},
/** 监听导航栏模式变化 */
mode(newVal) {
if (newVal === 'topmenu') {
this.buildTopMenuStyle()
}
}
}, },
//update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮----- device: {
mounted() { type: String,
window.addEventListener('scroll', this.handleScroll) required: false,
default: 'desktop'
}
},
data() {
return {
headerBarFixed: false,
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮----- //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
topMenuStyle: {
headerIndexLeft: {},
topNavHeader: {},
headerIndexRight: {},
topSmenuStyle: {}
},
chatStatus: '',
}
},
watch: {
/** 监听设备变化 */
device() {
if (this.mode === 'topmenu') { if (this.mode === 'topmenu') {
this.buildTopMenuStyle() this.buildTopMenuStyle()
} }
//update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
}, },
methods: { /** 监听导航栏模式变化 */
handleScroll() { mode(newVal) {
if (this.autoHideHeader) { if (newVal === 'topmenu') {
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop this.buildTopMenuStyle()
if (scrollTop > 100) { }
this.headerBarFixed = true }
} else { },
this.headerBarFixed = false //update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
} mounted() {
window.addEventListener('scroll', this.handleScroll)
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
if (this.mode === 'topmenu') {
this.buildTopMenuStyle()
}
//update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
},
methods: {
handleScroll() {
if (this.autoHideHeader) {
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
if (scrollTop > 100) {
this.headerBarFixed = true
} else { } else {
this.headerBarFixed = false this.headerBarFixed = false
} }
}, } else {
toggle() { this.headerBarFixed = false
this.$emit('toggle') }
}, },
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮----- toggle() {
buildTopMenuStyle() { this.$emit('toggle')
if (this.mode === 'topmenu') { },
if (this.device === 'mobile') { //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
// 手机端需要清空样式，否则显示会错乱 buildTopMenuStyle() {
this.topMenuStyle.topNavHeader = {} if (this.mode === 'topmenu') {
this.topMenuStyle.topSmenuStyle = {} if (this.device === 'mobile') {
this.topMenuStyle.headerIndexRight = {} // 手机端需要清空样式，否则显示会错乱
this.topMenuStyle.headerIndexLeft = {} this.topMenuStyle.topNavHeader = {}
} else { this.topMenuStyle.topSmenuStyle = {}
let rightWidth = '400px' this.topMenuStyle.headerIndexRight = {}
this.topMenuStyle.topNavHeader = { 'min-width': '165px' } this.topMenuStyle.headerIndexLeft = {}
this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 165px)' } } else {
this.topMenuStyle.headerIndexRight = { 'min-width': rightWidth, 'white-space': 'nowrap' } let rightWidth = '400px'
this.topMenuStyle.headerIndexLeft = { 'width': `calc(100% - ${rightWidth})` } this.topMenuStyle.topNavHeader = {'min-width': '165px'}
} this.topMenuStyle.topSmenuStyle = {'width': 'calc(100% - 165px)'}
this.topMenuStyle.headerIndexRight = {'min-width': rightWidth, 'white-space': 'nowrap'}
this.topMenuStyle.headerIndexLeft = {'width': `calc(100% - ${rightWidth})`}
} }
}, }
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮----- },
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
// update-begin-author:sunjianlei date:20210508 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题 // update-begin-author:sunjianlei date:20210508 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
handleUpdateMenuTitle(value) { handleUpdateMenuTitle(value) {
this.$emit('updateMenuTitle', value) this.$emit('updateMenuTitle', value)
}, },
// update-end-author:sunjianlei date:20210508 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题 // update-end-author:sunjianlei date:20210508 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
}
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/ /* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
@height: 59px; @height: 59px;
.layout { .layout {
.top-nav-header-index { .top-nav-header-index {
.header-index-wide { .header-index-wide {
margin-left: 10px; margin-left: 10px;
.ant-menu.ant-menu-horizontal { .ant-menu.ant-menu-horizontal {
height: @height; height: @height;
line-height: @height; line-height: @height;
}
}
.trigger {
line-height: 64px;
&:hover {
background: rgba(0, 0, 0, 0.05);
}
} }
} }
.header { .trigger {
z-index: 2; line-height: 64px;
color: white;
height: @height;
background-color: @primary-color;
transition: background 300ms;
/* dark 样式 */
&.dark {
color: #000000;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
background-color: white !important;
}
}
.header, .top-nav-header-index { &:hover {
&.dark .trigger:hover {
background: rgba(0, 0, 0, 0.05); background: rgba(0, 0, 0, 0.05);
} }
} }
} }
.ant-layout-header { .header {
z-index: 2;
color: white;
height: @height; height: @height;
line-height: @height; background-color: @primary-color;
transition: background 300ms;
/* dark 样式 */
&.dark {
color: #000000;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.2);
background-color: white !important;
}
} }
/* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/ .header, .top-nav-header-index {
&.dark .trigger:hover {
background: rgba(0, 0, 0, 0.05);
}
}
}
.ant-layout-header {
height: @height;
line-height: @height;
}
/* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/
</style> </style>
\ No newline at end of file
ant-design-vue-jeecg/src/components/tools/Logo.vue
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<router-link :to="routerLinkTo"> <router-link :to="routerLinkTo">
<!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 --> <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
<img v-if="navTheme === 'dark'" src="~@/assets/logo-white.png" alt="logo"> <img v-if="navTheme === 'dark'" src="~@/assets/wecloud-logo.png" alt="logo">
<img v-else src="~@/assets/logo.svg" alt="logo"> <!--<img v-else src="~@/assets/logo.svg" alt="logo">-->
<!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 --> <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
<h1 v-if="showTitle">{{ title }}</h1> <h1 v-if="showTitle">{{ title }}</h1>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
props: { props: {
title: { title: {
type: String, type: String,
default: 'Jeecg-Boot Pro', default: '物业管理',
required: false required: false
}, },
showTitle: { showTitle: {
......
ant-design-vue-jeecg/src/components/tools/UserMenu.vue
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
<!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 --> <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
<!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 --> <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
<!-- update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航 --> <!-- update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
<span class="action"> <!--<span class="action">-->
<a class="logout_title" target="_blank" href="http://doc.jeecg.com"> <!-- <a class="logout_title" target="_blank" href="http://doc.jeecg.com">-->
<a-icon type="question-circle-o"></a-icon> <!-- <a-icon type="question-circle-o"></a-icon>-->
</a> <!-- </a>-->
</span> <!--</span>-->
<header-notice class="action"/> <!--<header-notice class="action"/>-->
<a-dropdown> <a-dropdown>
<span class="action action-full ant-dropdown-link user-dropdown-menu"> <span class="action action-full ant-dropdown-link user-dropdown-menu">
<a-avatar class="avatar" size="small" :src="getAvatar()"/> <a-avatar class="avatar" size="small" :src="getAvatar()"/>
......
ant-design-vue-jeecg/src/views/user/Login.vue
...@@ -9,12 +9,6 @@ ...@@ -9,12 +9,6 @@
<a-form-model-item> <a-form-model-item>
<a-checkbox @change="handleRememberMeChange" default-checked>自动登录</a-checkbox> <a-checkbox @change="handleRememberMeChange" default-checked>自动登录</a-checkbox>
<router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
忘记密码
</router-link>
<router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
注册账户
</router-link>
</a-form-model-item> </a-form-model-item>
<a-form-item style="margin-top:24px"> <a-form-item style="margin-top:24px">
...@@ -24,7 +18,6 @@ ...@@ -24,7 +18,6 @@
</a-form-model> </a-form-model>
<two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>
<login-select-tenant ref="loginSelect" @success="loginSelectOk"></login-select-tenant> <login-select-tenant ref="loginSelect" @success="loginSelectOk"></login-select-tenant>
</div> </div>
</template> </template>
......
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