Commit e629ab40 authored by xxx's avatar xxx

修改

parent 33de5778
...@@ -2,10 +2,10 @@ ENV = 'development' ...@@ -2,10 +2,10 @@ ENV = 'development'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://localhost:8000' #VUE_APP_BASE_API = 'http://localhost:8000'
VUE_APP_BASE_API = 'http://192.168.0.108:8001' VUE_APP_BASE_API = 'http://8.143.203.103:9090'
VUE_APP_WS_API = 'ws://8.143.203.103:9090/webSocket' VUE_APP_WS_API = 'ws://8.143.203.103:9090/webSocket'
VUE_APP_LOCAL_API = 'http://192.168.0.108:8001' VUE_APP_LOCAL_API = 'http://8.143.203.103:9090'
VUE_APP_LOCAL_API2 = 'http://192.168.0.108:8001' VUE_APP_LOCAL_API2 = 'http://8.143.203.103:9090'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
This diff is collapsed.
...@@ -9,7 +9,7 @@ import { filterAsyncRouter } from '@/store/modules/permission' ...@@ -9,7 +9,7 @@ import { filterAsyncRouter } from '@/store/modules/permission'
NProgress.configure({ showSpinner: false }) // NProgress Configuration NProgress.configure({ showSpinner: false }) // NProgress Configuration
const whiteList = ['/login', '/register','/selectSystem'] // no redirect whitelist const whiteList = ['/login', '/register'] // no redirect whitelist
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
if (to.meta.title) { if (to.meta.title) {
......
...@@ -6,12 +6,6 @@ import HomeLayout from "../layout/home"; ...@@ -6,12 +6,6 @@ import HomeLayout from "../layout/home";
Vue.use(Router); Vue.use(Router);
export const constantRouterMap = [ export const constantRouterMap = [
{
path: "/selectSystem",
meta: { title: "选择系统", noCache: true },
component: resolve => require(["@/views/selectSystem"], resolve),
hidden: true
},
{ {
path: "/login", path: "/login",
meta: { title: "登录", noCache: true }, meta: { title: "登录", noCache: true },
...@@ -53,16 +47,16 @@ export const constantRouterMap = [ ...@@ -53,16 +47,16 @@ export const constantRouterMap = [
children: [ children: [
{ {
path: "dashboard", path: "dashboard",
//component: (resolve) => require(['@/views/home'], resolve), component: (resolve) => require(['@/views/home_manage'], resolve),
name: "Dashboard", name: "Dashboard",
meta: { title: "首页", icon: "index", affix: true, noCache: true }, meta: { title: "首页", icon: "index", affix: true, noCache: true },
component: () => { // component: () => {
if (Vue.$state.state.user.user.username === "admin") { // if (Vue.$state.state.user.user.username === "admin") {
return import("@/views/home_manage"); // return import("@/views/home_manage");
} else { // } else {
return import("@/views/home_user"); // return import("@/views/home_user");
} // }
}, // },
hidden: true hidden: true
} }
] ]
......
...@@ -341,8 +341,6 @@ export default { ...@@ -341,8 +341,6 @@ export default {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
overflow: hidden; overflow: hidden;
/* background:no-repeat center center url('~@/assets/images/cutGraph/wallhaven-4x3j3l.jpg');
background-size:100% 100%; */
} }
.top_title{ .top_title{
width: 100%; width: 100%;
......
...@@ -29,10 +29,9 @@ ...@@ -29,10 +29,9 @@
<div style="flex:1;"> <div style="flex:1;">
<el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">记住我</el-checkbox> <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">记住我</el-checkbox>
</div> </div>
<div style="flex:1;text-align:right;color:#01d6fe;"> <!-- <div style="flex:1;text-align:right;color:#01d6fe;">
<!-- <a href="/register">去注册</a> -->
<router-link :to="{path:'/register'}">去注册</router-link> <router-link :to="{path:'/register'}">去注册</router-link>
</div> </div> -->
</div> </div>
<el-form-item style="width:100%;"> <el-form-item style="width:100%;">
<el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin"> <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
...@@ -154,8 +153,8 @@ export default { ...@@ -154,8 +153,8 @@ export default {
Cookies.remove('rememberMe') Cookies.remove('rememberMe')
} }
this.$store.dispatch('Login', user).then((res) => { this.$store.dispatch('Login', user).then((res) => {
this.loading = false this.loading = false;
this.$router.push({ path: this.redirect || '/' }) this.$router.push({ path: this.redirect || '/MLargeScreen/index' })
}).catch((err) => { }).catch((err) => {
this.loading = false this.loading = false
console.log(err); console.log(err);
......
<template>
<div class="mainView">
<div class="selectBox">
<a href="http://www.wheccloud.com/login?redirect=%2Fdashboard" style='text-decoration:none;'>
<div class="selectChild selectChild1"></div>
</a>
<router-link to='/login?redirect=%2Fdashboard'>
<div class="selectChild selectChild2"></div>
</router-link>
<!-- <a href="http://www.wheccloud.com:8003/login?redirect=%2Fdashboard" style='text-decoration:none;'>
<div class="selectChild selectChild2"></div>
</a> -->
</div>
</div>
</template>
<script>
export default {
}
</script>
<style>
*{
margin: 0;
padding: 0;
}
.mainView{
width: 100vw;
height: 100vh;
background-image:url('../assets/images/login_bg.png');
}
.selectBox{
width:900px;
position: absolute;
right: 150px;
top: 280px;
display: flex;
justify-content: space-between;
}
.selectChild{
width: 410px;
height: 450px;
}
.selectChild1{
background-image:url('../assets/images/leifeng.png');
background-size: 100% 100%;
}
.selectChild2{
background-image:url('../assets/images/zhiwu.png');
background-size: 100% 100%;
}
</style>
\ No newline at end of file
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