From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/pages/page-web/index.vue | 72 +++++++++++++-----------------------
1 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/src/pages/page-web/index.vue b/src/pages/page-web/index.vue
index 8616925..c009c62 100644
--- a/src/pages/page-web/index.vue
+++ b/src/pages/page-web/index.vue
@@ -1,66 +1,48 @@
<template>
- <div
- class="login flex-column flex-justify-center flex-align-center m0 b0">
- <a-image
- style="width: 17vw; height: 10vw; margin-bottom: 50px"
- :src="djiLogo"
- />
- <p class="fz35 pb50" style="color: #2d8cf0">Cloud API Demo</p>
- <a-form
- layout="inline"
- :model="formState"
- class="flex-row flex-justify-center flex-align-center"
- >
+ <div class="login flex-column flex-justify-center flex-align-center m0 b0">
+ <a-image :preview="false" style="width: 17vw; height: 10vw; margin-bottom: 50px" :src="djiLogo" />
+ <p class="fz35 pb50" style="color: #2d8cf0">无人机操作系统</p>
+ <a-form layout="inline" :model="formState" class="flex-row flex-justify-center flex-align-center">
<a-form-item>
<a-input v-model:value="formState.username" placeholder="Username">
- <template #prefix
- ><UserOutlined style="color: rgba(0, 0, 0, 0.25)"
- /></template>
+ <template #prefix>
+ <UserOutlined style="color: rgba(0, 0, 0, 0.25)" />
+ </template>
</a-input>
</a-form-item>
<a-form-item>
- <a-input
- v-model:value="formState.password"
- type="password"
- placeholder="Password"
- >
- <template #prefix
- ><LockOutlined style="color: rgba(0, 0, 0, 0.25)"
- /></template>
+ <a-input v-model:value="formState.password" type="password" placeholder="Password">
+ <template #prefix>
+ <LockOutlined style="color: rgba(0, 0, 0, 0.25)" />
+ </template>
</a-input>
</a-form-item>
<a-form-item>
- <a-button
- class="m0"
- type="primary"
- html-type="submit"
- :disabled="loginBtnDisabled"
- @click="onSubmit"
- >
- Login
+ <a-button class="m0" type="primary" html-type="submit" :disabled="loginBtnDisabled" @click="onSubmit">
+ 登录
</a-button>
</a-form-item>
</a-form>
</div>
-
</template>
<script lang="ts" setup>
-import djiLogo from '/@/assets/icons/dji_logo.png'
+import djiLogo from '/@/assets/loginBg.jpg'
import { LockOutlined, UserOutlined } from '@ant-design/icons-vue'
import { message } from 'ant-design-vue'
import { reactive, computed, UnwrapRef } from 'vue'
import { login, LoginBody } from '/@/api/manage'
import { getRoot } from '/@/root'
import { ELocalStorageKey, ERouterName, EUserType } from '/@/types'
+import { encrypt, decrypt } from '/@/utils/crypto'
import router from '/@/router'
const root = getRoot()
const formState: UnwrapRef<LoginBody> = reactive({
- username: 'adminPC',
- password: 'adminPC',
- flag: EUserType.Web,
+ username: 'admin',
+ password: 'Yes@!#$20230523',
+ // flag: EUserType.Web,
})
const loginBtnDisabled = computed(() => {
@@ -68,16 +50,13 @@
})
const onSubmit = async (e: any) => {
- const result = await login(formState)
- if (result.code === 0) {
- localStorage.setItem(ELocalStorageKey.Token, result.data.access_token)
- localStorage.setItem(ELocalStorageKey.WorkspaceId, result.data.workspace_id)
- localStorage.setItem(ELocalStorageKey.Username, result.data.username)
- localStorage.setItem(ELocalStorageKey.UserId, result.data.user_id)
- localStorage.setItem(ELocalStorageKey.Flag, EUserType.Web.toString())
- root.$router.push(ERouterName.MEMBERS)
- } else {
- message.error(result.message)
+ const password = encrypt(formState.password)
+ const result = await login({ ...formState, password })
+ if (result.success) {
+ localStorage.setItem(ELocalStorageKey.Token, result.data.token)
+ localStorage.setItem(ELocalStorageKey.Username, result.data.user.username)
+ localStorage.setItem(ELocalStorageKey.UserInfo, JSON.stringify(result.data.user))
+ root.$router.push(ERouterName.PROJECT_LIST)
}
}
@@ -85,6 +64,7 @@
<style lang="scss" scoped>
@import '/@/styles/index.scss';
+
.login {
background-color: $dark-highlight;
height: 100vh;
--
Gitblit v1.9.3