Skip to content

S
saas-manage
Commit 01073dec by chehuidong
Options

bug

parent bb1ba8b5
Showing with 36 additions and 20 deletions
src/common/api/login.js
import axios from './axios' import axios from './axios'
export function getLoginState({ userName, password }) { export function getLoginState({ account, password }) {
return axios.post('platform/user/login', { userName, password }) return axios.post('platform/user/login', { account, password })
} }
export function logout() { export function logout() {
......
src/views/LoginPage.vue
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<h2>登录</h2> <h2>登录</h2>
<el-form ref="loginForm" :model="loginForm" class="login-form"> <el-form ref="loginForm" :model="loginForm" class="login-form">
<el-form-item <el-form-item
prop="userName" prop="account"
:rules="[ :rules="[
{ required: true, message: '请输入用户名' }, { required: true, message: '请输入用户名' },
]" ]"
> >
<el-input <el-input
prefix-icon="el-icon-user" prefix-icon="el-icon-user"
v-model="loginForm.userName" v-model="loginForm.account"
placeholder="User Name" placeholder="User Name"
clearable clearable
></el-input> ></el-input>
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
data() { data() {
return { return {
loginForm: { loginForm: {
userName: '', account: '',
password: '', password: '',
}, },
showPwd: false, showPwd: false,
......
src/views/home/HomeView.vue
...@@ -43,6 +43,7 @@ export default { ...@@ -43,6 +43,7 @@ export default {
} }
.right { .right {
height: calc(100% - 60px);
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -58,7 +59,7 @@ export default { ...@@ -58,7 +59,7 @@ export default {
.content { .content {
flex: 1; flex: 1;
padding: 10px 10px 0px 10px; padding: 10px;
background-color: #f1f1f1; background-color: #f1f1f1;
} }
</style> </style>
src/views/home/navMenu.vue
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
mode="horizontal" mode="horizontal"
:default-active="this.$route.path" :default-active="this.$route.path"
text-color="#fff" text-color="#fff"
style="flex: 1"
background-color="#1565C0" background-color="#1565C0"
@click.native="onClickMenus" @click.native="onClickMenus"
active-text-color="#ffd04b" active-text-color="#ffd04b"
...@@ -48,7 +49,10 @@ ...@@ -48,7 +49,10 @@
<span class="user-name">{{ <span class="user-name">{{
userInfo && userInfo.userName userInfo && userInfo.userName
}}</span> }}</span>
<el-button type="text" style="color:#fff" @click="logout" <el-button
type="text"
style="color: #fff"
@click="logout"
>退出登录</el-button >退出登录</el-button
> >
</div> </div>
...@@ -100,6 +104,14 @@ export default { ...@@ -100,6 +104,14 @@ export default {
index: 'user', index: 'user',
children: [], children: [],
}, },
{
id: 4,
path: '',
label: '角色管理',
icon: 'el-icon-s-order',
index: 'user',
children: [],
},
], ],
}, },
], ],
...@@ -134,7 +146,11 @@ export default { ...@@ -134,7 +146,11 @@ export default {
height: 60px; height: 60px;
overflow: hidden; overflow: hidden;
background-color: #1565c0; background-color: #1565c0;
&::v-deep { &::v-deep {
.el-menu {
border-bottom: none;
}
.el-submenu__title i { .el-submenu__title i {
color: #fff; color: #fff;
} }
...@@ -149,7 +165,6 @@ export default { ...@@ -149,7 +165,6 @@ export default {
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
padding: 14px 20px; padding: 14px 20px;
border-right: 1px solid #e6e6e6;
background-color: #1565c0; background-color: #1565c0;
} }
...@@ -157,6 +172,7 @@ export default { ...@@ -157,6 +172,7 @@ export default {
font-size: 16px; font-size: 16px;
} }
.user-area { .user-area {
float: right;
display: flex; display: flex;
align-items: center; align-items: center;
flex-shrink: 0; flex-shrink: 0;
......
src/views/menu.vue
...@@ -416,8 +416,7 @@ export default { ...@@ -416,8 +416,7 @@ export default {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 20px; padding: 10px 20px 0;
padding-top: 10px;
} }
.table-wrap { .table-wrap {
......
src/views/system/users.vue
...@@ -397,7 +397,7 @@ export default { ...@@ -397,7 +397,7 @@ export default {
axios.get('sysRole/all_list').then((res) => { axios.get('sysRole/all_list').then((res) => {
this.roleList = res.data this.roleList = res.data
}) })
axios.get('saasUserLogin/employeePlatformList') axios.get('platform/user/employeePlatformList')
.then((res) => { .then((res) => {
this.platforms = res.data this.platforms = res.data
}) })
...@@ -619,7 +619,7 @@ export default { ...@@ -619,7 +619,7 @@ export default {
}, },
methods: { methods: {
spentChange(v, item) { spentChange(v, item) {
axios.post('saasUserLogin/update', { axios.post('platform/user/update', {
...item, ...item,
cost: v, cost: v,
}).then(() => { }).then(() => {
...@@ -679,7 +679,7 @@ export default { ...@@ -679,7 +679,7 @@ export default {
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
axios.post('saasUserLogin/resetPassword/' + row.id).then( axios.post('platform/user/resetPassword/' + row.id).then(
(res) => { (res) => {
this.$alert( this.$alert(
'重置成功\n\r 新密码为：' + '重置成功\n\r 新密码为：' +
...@@ -691,7 +691,7 @@ export default { ...@@ -691,7 +691,7 @@ export default {
.catch(() => {}) .catch(() => {})
}, },
enableChange(val, row) { enableChange(val, row) {
axios.post('saasUserLogin/setEnableStatus', { axios.post('platform/user/setEnableStatus', {
enable: val, enable: val,
userId: row.id, userId: row.id,
}).then((res) => { }).then((res) => {
...@@ -705,7 +705,7 @@ export default { ...@@ -705,7 +705,7 @@ export default {
return return
} }
axios.post('saasUserLogin/setBindingStatus', { axios.post('platform/user/setBindingStatus', {
bindStatus: !row.bindStatus, bindStatus: !row.bindStatus,
userId: row.id, userId: row.id,
}).then((res) => { }).then((res) => {
...@@ -743,7 +743,7 @@ export default { ...@@ -743,7 +743,7 @@ export default {
if (!this.formId) { if (!this.formId) {
return this.$message('请勾选至少一条记录') return this.$message('请勾选至少一条记录')
} }
axios.get('saasUserLogin/axios.get', { axios.get('platform/user/axios.get', {
id: v.id, id: v.id,
}).then((res) => { }).then((res) => {
const funcRoleIds = [] const funcRoleIds = []
...@@ -801,7 +801,7 @@ export default { ...@@ -801,7 +801,7 @@ export default {
getList() { getList() {
const { pageSize, currentPage } = const { pageSize, currentPage } =
this.paginationOptions this.paginationOptions
axios.post('saasUserLogin/list_page', { axios.post('platform/user/list_page', {
pageSize, pageSize,
currentPage, currentPage,
...this.searchForm, ...this.searchForm,
...@@ -832,7 +832,7 @@ export default { ...@@ -832,7 +832,7 @@ export default {
// 修改 // 修改
upSection() { upSection() {
const url = 'saasUserLogin/update' const url = 'platform/user/update'
this.$refs.addcurrencyform.validate((valid) => { this.$refs.addcurrencyform.validate((valid) => {
if (valid) { if (valid) {
const data = JSON.parse( const data = JSON.parse(
...@@ -863,7 +863,7 @@ export default { ...@@ -863,7 +863,7 @@ export default {
}, },
// 新增 // 新增
addSection() { addSection() {
const url = 'saasUserLogin/add' const url = 'platform/user/add'
this.$refs.addcurrencyform.validate((valid) => { this.$refs.addcurrencyform.validate((valid) => {
if (valid) { if (valid) {
const data = JSON.parse( const data = JSON.parse(
...@@ -916,7 +916,7 @@ export default { ...@@ -916,7 +916,7 @@ export default {
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
axios.get('saasUserLogin/delete', { axios.get('platform/user/delete', {
ids: ids, ids: ids,
}).then((res) => { }).then((res) => {
if (res.code === 200) { if (res.code === 200) {
......
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