Skip to content

G
gavel-erp-vue
Commit 3b05ea21 authored by 李苏's avatar 李苏 💬
Browse files
Options

erp调整

parent cc5ed5e1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 172 deletions
.env.production
View file @ 3b05ea21
......@@ -5,7 +5,7 @@ VUE_APP_TITLE = 格物软件
ENV = 'production'
# gavelErp/生产环境
VUE_APP_BASE_API = 'wmsappServie'
VUE_APP_BASE_API = 'http://192.168.30.254:28080/erp'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
src/assets/images/login_iot.png 0 → 100644
View file @ 3b05ea21
This diff is collapsed.
src/layout/components/AppMain.vue
View file @ 3b05ea21
<template>
<section class="app-main">
<transition name="fade-transform" mode="out-in">
<template v-if="cachedViews.indexOf(key)!=-1 ">
<keep-alive >
<router-view :key="key" />
<template>
<section class="app-main">
<transition name="fade-transform" mode="out-in">
<keep-alive :include="cachedViews">
<router-view v-if="!$route.meta.link" :key="key" />
</keep-alive>
</template>
<template v-else >
<router-view :key="key" />
</template>
</transition>
</section>
</template>
<script>
</transition>
</section>
</template>
<script>
export default {
name: 'AppMain',
computed: {
cachedViews() {
return this.$store.state.tagsView.cachedViews
},
key() {
console.log(this.$route.name)
return this.$route.name
export default {
name: 'AppMain',
computed: {
cachedViews() {
return this.$store.state.tagsView.cachedViews
},
key() {
return this.$route.path
}
}
}
}
</script>
</script>
<style lang="scss" scoped>
.app-main {
/* 50= navbar 50 */
min-height: calc(100vh - 50px);
width: 100%;
position: relative;
overflow: hidden;
}
.fixed-header+.app-main {
padding-top: 50px;
}
.hasTagsView {
<style lang="scss" scoped>
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px);
/* 50= navbar 50 */
min-height: calc(100vh - 50px);
width: 100%;
position: relative;
overflow: hidden;
}
.fixed-header+.app-main {
padding-top: 84px;
padding-top: 50px;
}
.hasTagsView {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px);
}
.fixed-header+.app-main {
padding-top: 84px;
}
}
}
</style>
<style lang="scss">
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
padding-right: 17px;
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
padding-right: 17px;
}
}
}
</style>
src/store/modules/permission.js
View file @ 3b05ea21
This diff is collapsed.
src/store/modules/user.js
View file @ 3b05ea21
......@@ -49,7 +49,7 @@ const user = {
login(username, password, code, uuid,systemid).then(res => {
sessionStorage.setItem('allUserInfo',JSON.stringify(res.data))
localStorage.setItem('username',res.data.username)
localStorage.setItem('userid',res.data.userid)
localStorage.setItem('userid',res.data.userkey)
localStorage.setItem('systemid',systemid)
/* 存储本地一份 */
setToken(res.data.token)
......
src/views/login.vue
View file @ 3b05ea21
......@@ -28,8 +28,8 @@
</div>
</div>
<div class="login_submit">
<el-tabs class="full" type="border-card" >
<el-tab-pane label="账户登录">
<el-tabs v-model="tabPaneName" class="full" type="border-card" >
<el-tab-pane name='zh' label="账户登录">
<div class="full" >
<el-form ref="loginForm1" :model="loginForm" :rules="loginRules" class="full login-form">
<el-form-item prop="username">
......@@ -76,7 +76,7 @@
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="企业号登录">
<el-tab-pane name='qyh' label="企业号登录">
<div class="full" >
<el-form ref="loginForm2" :model="loginForm" :rules="loginRules" class="full login-form login-form2 ">
<el-form-item prop="systemid" >
......@@ -150,11 +150,13 @@ import {systeminfo} from "@/api/common/common.js"
export default {
mounted() {
// alert(window.location.origin+'/'+(window.pathname||'')+process.env.VUE_APP_BASE_API)
},
name: "Login",
data() {
return {
tabPaneName:'zh',
/* 登录方式*/
isqyh:false,
appName:'',
......@@ -306,20 +308,20 @@ export default {
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.my-element {
animation: animatedBackground 11s linear infinite;
}
@keyframes animatedBackground {
0% {
filter: hue-rotate(0deg) saturate(100%) brightness(100%) ;
}
50% {
filter: hue-rotate(38deg) saturate(100%) brightness(100%) ;
}
100% {
filter: hue-rotate(0deg) saturate(100%) brightness(100%) ;
}
}
// .my-element {
// animation: animatedBackground 11s linear infinite;
// }
// @keyframes animatedBackground {
// 0% {
// filter: hue-rotate(0deg) saturate(100%) brightness(100%) ;
// }
// 50% {
// filter: hue-rotate(38deg) saturate(100%) brightness(100%) ;
// }
// 100% {
// filter: hue-rotate(0deg) saturate(100%) brightness(100%) ;
// }
// }
.btn {
--hue: 190;
padding: 0px!important;
......@@ -437,8 +439,8 @@ export default {
justify-content: right;
align-items: center;
height: 100%;
background-image: url("../assets/images/login-rj.png");
background-size: cover;
background-image: url("../assets/images/login_iot.png");
background-size: 100% 100%;
}
.title {
font-family: Georgia, 'Times New Roman', Times, serif;
......@@ -519,9 +521,11 @@ export default {
font-size: 24px;
width: 100%;
font-weight: 800;
color: #fff;
}
}
.login_submit{
transform: translate(0.7);
height: 70%;
width: 100%;
}
......
vue.config.js
View file @ 3b05ea21
......@@ -37,10 +37,10 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.30.254:18080/dmg`,
// target: `http://192.168.30.106:9081/erp`,
// target: `http://192.168.30.254:28084/erp`,
target: `http://localhost:9080/erp`,
// target:'http://clouderp.gavelinfo.com/erp',
// target: `http://localhost:9080/erp`,
target:'http://clouderp.gavelinfo.com/erp',
changeOrigin: true,
logLevel: 'debug',
pathRewrite: {
......
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