diff --git a/src/api/login.js b/src/api/login.js index 7b7388f..8bfc8f2 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,60 +1,50 @@ import request from '@/utils/request' // 登录方法 -export function login(username, password, code, uuid) { - const data = { - username, - password, - code, - uuid - } - return request({ - url: '/login', - headers: { - isToken: false, - repeatSubmit: false - }, - method: 'post', - data: data - }) +export function loginAPI(data) { + return request({ + url: '/system/login', + method: 'post', + data, + }) } // 注册方法 export function register(data) { - return request({ - url: '/register', - headers: { - isToken: false - }, - method: 'post', - data: data - }) + return request({ + url: '/register', + headers: { + isToken: false, + }, + method: 'post', + data: data, + }) } // 获取用户详细信息 export function getInfo() { - return request({ - url: '/getInfo', - method: 'get' - }) + return request({ + url: '/getInfo', + method: 'get', + }) } // 退出方法 export function logout() { - return request({ - url: '/logout', - method: 'post' - }) + return request({ + url: '/logout', + method: 'post', + }) } // 获取验证码 export function getCodeImg() { - return request({ - url: '/captchaImage', - headers: { - isToken: false - }, - method: 'get', - timeout: 20000 - }) -} \ No newline at end of file + return request({ + url: '/captchaImage', + headers: { + isToken: false, + }, + method: 'get', + timeout: 20000, + }) +} diff --git a/src/api/platform/index.js b/src/api/platform/index.js new file mode 100644 index 0000000..e252147 --- /dev/null +++ b/src/api/platform/index.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +// 获取平台管理列表数据 +export function getPlatformListAPI() { + return request({ + url: '/platform/list', + method: 'POST', + data: {}, + }) +} + +// 新增平台 +export function addPlatformAPI(data) { + return request({ + url: '/platform/addPlantForm', + method: 'POST', + data, + }) +} + +// 编辑平台 +export function editPlatformAPI(data) { + return request({ + url: '/platform/updatePlantForm', + method: 'POST', + data, + }) +} + +// 删除平台 +export function delPlatformAPI(data) { + return request({ + url: '/platform/delete', + method: 'POST', + data, + }) +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 442535f..694d1a8 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -38,6 +38,7 @@ import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' import RuoYiGit from '@/components/RuoYi/Git' import RuoYiDoc from '@/components/RuoYi/Doc' +import { removeToken } from '@/utils/auth' export default { components: { @@ -80,9 +81,11 @@ export default { type: 'warning', }) .then(() => { - this.$store.dispatch('LogOut').then(() => { - location.href = '/login' - }) + // this.$store.dispatch('LogOut').then(() => { + // location.href = '/login' + // }) + removeToken() + location.href = '/login' }) .catch(() => {}) }, diff --git a/src/views/login.vue b/src/views/login.vue index 054b244..40b3a58 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -18,7 +18,7 @@ - 记住密码 + 记住密码 import Cookies from 'js-cookie' +import { loginAPI } from '@/api/login' +import { setToken } from '@/utils/auth' import { encrypt, decrypt } from '@/utils/jsencrypt' export default { @@ -44,10 +46,10 @@ export default { data() { return { title: process.env.VUE_APP_TITLE, + rememberMe: false, loginForm: { username: 'admin', password: '000000', - rememberMe: false, }, loginRules: { username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }], @@ -76,31 +78,31 @@ export default { this.loginForm = { username: username === undefined ? this.loginForm.username : username, password: password === undefined ? this.loginForm.password : decrypt(password), - rememberMe: rememberMe === undefined ? false : Boolean(rememberMe), } + + this.rememberMe = rememberMe === undefined ? false : Boolean(rememberMe) }, handleLogin() { - this.$router.push({ path: this.redirect || '/platform' }).catch(() => {}) - // this.$refs.loginForm.validate((valid) => { - // if (valid) { - // this.loading = true - // if (this.loginForm.rememberMe) { - // Cookies.set('username', this.loginForm.username, { expires: 30 }) - // Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 }) - // Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 }) - // } else { - // Cookies.remove('username') - // Cookies.remove('password') - // Cookies.remove('rememberMe') - // } - // // 设置token并跳转 - // Cookies.set('Admin-Token', 'mock-token-' + Date.now()) - // setTimeout(() => { - // this.loading = false - // this.$router.push({ path: this.redirect || '/platform' }).catch(() => {}) - // }, 1000) - // } - // }) + this.$refs.loginForm.validate(async (valid) => { + if (valid) { + this.loading = true + if (this.rememberMe) { + Cookies.set('username', this.loginForm.username, { expires: 30 }) + Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 }) + Cookies.set('rememberMe', this.rememberMe, { expires: 30 }) + } else { + Cookies.remove('username') + Cookies.remove('password') + Cookies.remove('rememberMe') + } + // 设置token并跳转 + const res = await loginAPI(this.loginForm) + setToken(res?.data) + if (res.code === 200) { + this.$router.push({ path: this.redirect || '/platform' }).catch(() => {}) + } + } + }) }, }, } diff --git a/src/views/platform/components/addAndEditForm.vue b/src/views/platform/components/addAndEditForm.vue index 41e4e65..6af7756 100644 --- a/src/views/platform/components/addAndEditForm.vue +++ b/src/views/platform/components/addAndEditForm.vue @@ -11,8 +11,8 @@ - - + + @@ -32,7 +32,7 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +