From 9e43b3ab2ee60ea352d191a6fed1e7c8f53441d6 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 31 十月 2024 10:41:34 +0800
Subject: [PATCH] Web端
---
src/layout/component/sidebar/components/MenuList.vue | 197 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 150 insertions(+), 47 deletions(-)
diff --git a/src/layout/component/sidebar/components/MenuList.vue b/src/layout/component/sidebar/components/MenuList.vue
index 471c92b..f189dfb 100644
--- a/src/layout/component/sidebar/components/MenuList.vue
+++ b/src/layout/component/sidebar/components/MenuList.vue
@@ -21,14 +21,14 @@
><span class="user_name"> {{ userName }} </span></span
><span ref="toggleExitLoginBtnRef"
><span
- class="ywicon text-white"
- :class="{ 'icon-fold': !state.isShowExitLogin, 'icon-unfold': state.isShowExitLogin }"
+ class="ywifont text-white"
+ :class="{ 'ywicon-fold': !state.isShowExitLogin, 'ywicon-unfold': state.isShowExitLogin }"
@click="toggleShowExitLogin"
></span
></span>
</div>
<div class="pop_up actived" v-show="state.isShowExitLogin">
- <div class="exit" @click="logoutClick"><i class="ywicon icon-tuichu"></i> 閫�鍑虹櫥褰�</div>
+ <div class="exit" @click="logoutClick"><i class="ywifont ywicon-tuichu"></i> 閫�鍑虹櫥褰�</div>
</div>
</div>
<div v-else class="user_login">
@@ -37,19 +37,54 @@
</div>
</div>
</div>
- <div class="pc-login" v-show="state.isShowLogin">
+ <div class="pc-login items-center justify-center" style="display: flex" v-show="state.isShowLogin">
<div class="login_box">
<div class="sign_in">
- <i class="ywicon icon-guanbi closes" @click="handleClose"></i>
- <h1><span>鐧诲綍 WI 姘村姟</span></h1>
- <el-form ref="loginFormRef" :model="state.loginForm" :rules="loginRules" class="demo-ruleForm mt-[24px]" size="large">
- <el-form-item label="璐﹀彿" prop="account">
- <el-input v-model="state.loginForm.account" clearable />
- </el-form-item>
- <el-form-item label="瀵嗙爜" prop="pwd">
- <el-input v-model="state.loginForm.pwd" type="password" autocomplete="off" clearable />
- </el-form-item>
- </el-form>
+ <i class="ywifont ywicon-guanbi closes" @click="handleClose"></i>
+ <h1><span>鐧诲綍 WI 姘村姟鏅鸿兘</span></h1>
+ <el-tabs v-model="state.activeLoginName" class="mt-[24px]" @tab-change="handleUserClick">
+ <el-tab-pane label="璐︽埛瀵嗙爜鐧诲綍" name="accountUser">
+ <el-form
+ ref="loginFormRef"
+ :model="state.loginForm"
+ :rules="loginRules"
+ class="demo-ruleForm mt-[24px] min-h-[140px]"
+ size="large"
+ >
+ <el-form-item label="璐﹀彿" prop="account">
+ <el-input v-model="state.loginForm.account" clearable />
+ </el-form-item>
+ <el-form-item label="瀵嗙爜" prop="pwd">
+ <el-input v-model="state.loginForm.pwd" type="password" autocomplete="off" clearable />
+ </el-form-item>
+ </el-form>
+ </el-tab-pane>
+ <el-tab-pane label="鎵嬫満鍙风櫥褰�" name="phoneUser">
+ <el-form
+ ref="formPhoneRef"
+ :rules="loginPhoneRules"
+ :model="state.loginPhoneForm"
+ size="large"
+ class="mt-[24px] min-h-[140px]"
+ >
+ <el-form-item label="鎵嬫満鍙�" prop="phoneUser">
+ <el-input v-model="state.loginPhoneForm.phoneUser" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable>
+ <template #prepend>+86</template>
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="verifyCode" label="楠岃瘉鐮�">
+ <el-input v-model="state.loginPhoneForm.verifyCode" placeholder="璇疯緭鍏ュ洓浣嶉獙璇佺爜" maxlength="6" clearable>
+ <template #append>
+ <el-button type="primary" @click="handleSendVerifyCode" :disabled="countdown > 0">{{
+ countdown > 0 ? `${countdown}绉掑悗閲嶈瘯` : '鑾峰彇楠岃瘉鐮�'
+ }}</el-button>
+ </template>
+ </el-input>
+ </el-form-item>
+ </el-form>
+ </el-tab-pane>
+ </el-tabs>
+
<div class="mt-[24px]">
<el-button type="primary" @click="onSubmit" class="set-login_btn">鐧诲綍</el-button>
</div>
@@ -59,19 +94,19 @@
</template>
<script setup lang="ts">
-import type { FormInstance } from 'element-plus';
+import { ElMessage, type FormInstance } from 'element-plus';
import { computed, onMounted, reactive, ref, watchEffect } from 'vue';
-import { PostLogin } from '/@/api/ai/user';
+import { PostLogin, loginMessageUser, loginVerifyMessage } from '/@/api/ai/user';
import router from '/@/router';
import emitter from '/@/utils/mitt';
import { accessSessionKey, userNameKey } from '/@/utils/request';
import { gotoRoute } from '/@/utils/route';
-import { Local } from '/@/utils/storage';
-
-const loginFormRef = ref<FormInstance>(null);
+import { Local, LoginInfo } from '/@/utils/storage';
+const loginFormRef = ref<FormInstance>(null); //璐︽埛瀵嗙爜鐧诲綍
+const formPhoneRef = ref(); //鎵嬫満鍙风櫥褰�
const isLoginStatus = ref(!!Local.get(accessSessionKey));
-
const userName = ref('');
+const countdown = ref(0);
const firstUserCharacter = computed(() => userName.value?.[0]?.toUpperCase());
watchEffect(() => {
if (!isLoginStatus.value) return;
@@ -79,23 +114,23 @@
});
let state = reactive({
asideTitleList: [
- {
- id: 1,
- icon: '/static/images/wave/AsideIcon.png',
- title: '搴旂敤鍦烘櫙',
- routerName: 'Scenario',
- },
- {
- id: 2,
- icon: '/static/images/wave/AsideIcon.png',
- title: '甯姪涓績',
- // routerName:'Scenario',
- },
- {
- id: 3,
- icon: '/static/images/wave/AsideIcon.png',
- title: '涓汉璁剧疆',
- },
+ // {
+ // id: 1,
+ // icon: '/static/images/wave/AsideIcon.png',
+ // title: '搴旂敤鍦烘櫙',
+ // routerName: 'AllScenario',
+ // },
+ // {
+ // id: 2,
+ // icon: '/static/images/wave/AsideIcon.png',
+ // title: '甯姪涓績',
+ // // routerName:'Scenario',
+ // },
+ // {
+ // id: 3,
+ // icon: '/static/images/wave/AsideIcon.png',
+ // title: '涓汉璁剧疆',
+ // },
{
id: 4,
icon: '/static/images/wave/AsideIcon.png',
@@ -109,14 +144,29 @@
account: '',
pwd: '',
},
+ loginPhoneForm: {
+ phoneUser: '',
+ verifyCode: '',
+ },
+ activeLoginName: 'accountUser',
});
const loginRules = reactive({
account: [{ required: true, message: '璇疯緭鍏ヨ处鍙�', trigger: 'blur' }],
pwd: [{ required: true, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur' }],
});
+const loginPhoneRules = {
+ phoneUser: [
+ { required: true, message: '璇疯緭鍏ユ墜鏈哄彿鐮�', trigger: 'blur' },
+ { pattern: /^1\d{10}$/, message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜', trigger: 'blur' },
+ ],
+ verifyCode: [{ required: true, message: '璇疯緭鍏ラ獙璇佺爜', trigger: 'blur' }],
+};
const handleClick = (item) => {
+ if(!item.routerName) return;
gotoRoute({ name: item.routerName });
};
+const LOGIN_CLIENT = 'Web绔�';
+
//鐧诲綍
const openLoginDlg = async () => {
state.isShowLogin = true;
@@ -126,14 +176,37 @@
};
//鐧诲綍
const onSubmit = async () => {
- const isValid = await loginFormRef.value.validate().catch(() => {});
- if (!isValid) return;
- const res = await PostLogin({
- user: state.loginForm.account,
- pass: state.loginForm.pwd,
- });
- Local.set(accessSessionKey, res.hswatersession);
- Local.set(userNameKey, state.loginForm.account);
+ if (state.activeLoginName === 'accountUser') {
+ //璐︽埛瀵嗙爜鐧诲綍
+ const isValid = await loginFormRef.value.validate().catch(() => {});
+ if (!isValid) return;
+ const res = await PostLogin({
+ user: state.loginForm.account,
+ pass: state.loginForm.pwd,
+ client: LOGIN_CLIENT,
+
+ });
+ if (!res.json_ok) {
+ return ElMessage.error(res.json_msg);
+ }
+
+ LoginInfo.set(res.hswatersession, state.loginForm.account);
+ } else if (state.activeLoginName === 'phoneUser') {
+ //鎵嬫満鐧诲綍
+ const isValid = await formPhoneRef.value.validate().catch(() => {});
+ if (!isValid) return;
+ const res = await loginMessageUser({
+ phone: state.loginPhoneForm.phoneUser,
+ code: state.loginPhoneForm.verifyCode,
+ client: LOGIN_CLIENT,
+
+ });
+ if (!res.json_ok) {
+ return ElMessage.error(res.json_msg);
+ }
+ LoginInfo.set(res.hswatersession, state.loginPhoneForm.phoneUser);
+ }
+
state.isShowLogin = false;
isLoginStatus.value = true;
window.location.reload();
@@ -149,7 +222,7 @@
const logoutClick = () => {
state.isShowExitLogin = false;
isLoginStatus.value = false;
- Local.remove(accessSessionKey);
+ LoginInfo.remove();
};
const toggleExitLoginBtnRef = ref<HTMLDivElement>(null);
@@ -158,7 +231,33 @@
state.isShowExitLogin = false;
}
};
-
+//鍒囨崲鐢ㄦ埛鐧诲綍椤甸潰
+const handleUserClick = (item) => {
+ state.activeLoginName = item;
+ // formPhoneRef?.value?.resetFields();
+ // loginFormRef.value.resetFields();
+};
+//鑾峰彇楠岃瘉鐮�
+const handleSendVerifyCode = async () => {
+ formPhoneRef.value.validateField('phoneUser', async (valid: boolean) => {
+ if (valid) {
+ const res = await loginVerifyMessage({
+ phone: state.loginPhoneForm.phoneUser,
+ });
+ if (res.json_ok) {
+ countdown.value = 60; //寮�鍚�掕鏃�
+ // 鍊掕鏃堕�昏緫
+ const intervalId = setInterval(() => {
+ if (countdown.value > 0) {
+ countdown.value--;
+ } else {
+ clearInterval(intervalId);
+ }
+ }, 1000);
+ }
+ }
+ });
+};
onMounted(() => {
emitter.on('openLoginDlg', () => {
if (state.isShowLogin || isLoginStatus.value) return;
@@ -343,6 +442,7 @@
-ms-flex-pack: center;
justify-content: center;
}
+
.pc-login {
position: fixed;
top: 0;
@@ -405,6 +505,9 @@
background-color: #fff;
border-radius: 5px;
}
+ :deep(.el-form-item--large .el-form-item__error) {
+ padding: unset !important;
+ }
}
.set-pwd {
text-align: right;
--
Gitblit v1.9.3