From f55c0bd445b43dafccbcae7a1f32dbc78bd2e60f Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 19 六月 2024 10:48:04 +0800
Subject: [PATCH] 登录更新
---
/dev/null | 43 ---------------------
src/views/sys/login/LoginForm.vue | 26 +++++--------
src/layouts/default/header/index.vue | 9 ++--
src/views/sys/login/Login.vue | 2
4 files changed, 16 insertions(+), 64 deletions(-)
diff --git a/src/layouts/default/header/components/AppDept.vue b/src/layouts/default/header/components/AppDept.vue
deleted file mode 100644
index c7a8cb0..0000000
--- a/src/layouts/default/header/components/AppDept.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
- * @Description: file content
- * @Author: your name
- * @version:
- * @Date: 2024-03-24 11:16:46
- * @LastEditors: your name
- * @LastEditTime: 2024-06-12 14:51:42
--->
-<!--
- * @Author: Vben
- * @Description: logo component
--->
-<template>
- <div class="anticon">
- <a-row class="enter-x">
- <a-col :md="24" :xs="24" :span="24">
- <BasicForm @register="registerForm" />
- </a-col>
- </a-row>
- </div>
-</template>
-<script lang="ts" setup>
-import { onMounted } from 'vue';
-import { Row, Col } from 'ant-design-vue';
-import { BasicForm, useForm } from '/@/components/Form/index';
-import { getTreeList, optionsListApi, prodListApi, getProdTreeList } from '/@/api/tigerapi/dept';
-import { appFormDept } from './appFormDept.data';
-import { useUserStore } from '/@/store/modules/user';
-import { useGlobSetting } from '/@/hooks/setting';
-
-const globSetting = useGlobSetting();
-const ARow = Row;
-const ACol = Col;
-
-const [registerForm, { updateSchema, setFieldsValue }] = useForm({
- // labelWidth: 200,
- baseColProps: { span: 24 },
- schemas: appFormDept,
- showActionButtonGroup: false,
- actionColOptions: {
- span: 23,
- },
-});
-onMounted(() => {
- //globSetting.useOrg == 'Y' ? await getTreeList() : await getProdTreeList();
- Promise.all([getProdTreeList(), prodListApi(useUserStore().getUserInfo.userId)]).then((res) => {
- let treeData = res[0];
- treeData = treeData.filter((x) => res[1].Data.Items.some((item) => item.PROD_CODE == x.deptCode));
-
- updateSchema([
- {
- field: 'dept',
- componentProps: { treeData },
- },
- ]);
- setFieldsValue({
- dept: useUserStore().getUserInfo.prodCode,
- // globSetting.useOrg == 'Y'
- // ? useUserStore().getUserInfo.orgCode
- // : useUserStore().getUserInfo.prodCode,
- });
- });
-});
-</script>
-<style lang="less" scoped>
-@prefix-cls: ~'@{namespace}-app-logo';
-
-.@{prefix-cls} {
- display: flex;
- align-items: center;
- padding-left: 7px;
- transition: all 0.2s ease;
- cursor: pointer;
-
- &.light {
- border-bottom: 1px solid @border-color-base;
- }
-
- &.collapsed-show-title {
- padding-left: 20px;
- }
-
- &.light &__title {
- color: @primary-color;
- }
-
- &.dark &__title {
- color: @white;
- font-size: 16px;
- }
-
- &__title {
- transition: all 0.5s;
- // font-size: 16px;
- font-weight: 700;
- line-height: normal;
- }
-}
-</style>
diff --git a/src/layouts/default/header/components/appFormDept.data.ts b/src/layouts/default/header/components/appFormDept.data.ts
deleted file mode 100644
index 6de385c..0000000
--- a/src/layouts/default/header/components/appFormDept.data.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * @Description: file content
- * @Author: your name
- * @version:
- * @Date: 2024-03-24 11:16:46
- * @LastEditors: your name
- * @LastEditTime: 2024-06-12 14:16:49
- */
-import { SwitchOrgCode } from '/@/api/sys/user';
-import { AccountInfo } from '/@/api/tigerapi/model/systemModel';
-import { FormSchema } from '/@/components/Table';
-import { useUserStore } from '/@/store/modules/user';
-import { useGlobSetting } from '/@/hooks/setting';
-
-const globSetting = useGlobSetting();
-export const appFormDept: FormSchema[] = [
- {
- field: 'dept',
- label: '',
- component: 'TreeSelect',
- componentProps: {
- fieldNames: {
- label: 'deptName',
- key: 'id',
- value: 'deptCode',
- },
- placeholder: '璇烽�夋嫨鎹偣',
- getPopupContainer: () => document.body,
- onChange: async (e) => {
- const userInfo = useUserStore().getToken;
- const org = useUserStore().getUserInfo.prodCode;
- // globSetting.useOrg == 'Y'
- // ? useUserStore().getUserInfo.orgCode
- // : useUserStore().getUserInfo.prodCode;
- const res = await SwitchOrgCode(userInfo, e);
- if (org != e) {
- location.reload();
- }
- },
- },
- // required: true,
- },
-];
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index 9ee5d62..9885ee6 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -47,12 +47,12 @@
:showText="false"
:class="`${prefixCls}-action__item`"
/>
- <div style="width: 100px">
- <ApiTreeSelect
+ <div style="width: 120px">
+ <ApiSelect
:api="getProdTree"
+ style="width: 100%"
:params="{ userId: useUserStore().getUserInfo.userId }"
v-model:value="factory"
- optionFilterProp="label"
labelField="deptName"
valueField="deptCode"
placeholder="璇烽�夋嫨宸ュ巶"
@@ -67,6 +67,7 @@
<script lang="ts" setup>
import { Layout } from 'ant-design-vue';
import { computed, onMounted, ref, unref } from 'vue';
+ import { ApiSelect } from '/@/components/Form/index';
import { useUserStore } from '/@/store/modules/user';
import { AppLocalePicker, AppLogo, AppSearch } from '@/components/Application';
import { SettingButtonPositionEnum } from '@/enums/appEnum';
@@ -167,7 +168,7 @@
// globSetting.useOrg == 'Y'
// ? useUserStore().getUserInfo.orgCode
// : useUserStore().getUserInfo.prodCode;
- SwitchOrgCode(userInfo,'', e).then(() => {
+ SwitchOrgCode(userInfo, '', e).then(() => {
if (org != e) {
location.reload();
}
diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue
index 16b6f05..ac33a76 100644
--- a/src/views/sys/login/Login.vue
+++ b/src/views/sys/login/Login.vue
@@ -9,7 +9,7 @@
/>
</div>
- <span class="-enter-x xl:hidden">
+ <span class="mt-5 -enter-x xl:hidden">
<LoginLogo :alwaysShowTitle="false" />
</span>
diff --git a/src/views/sys/login/LoginForm.vue b/src/views/sys/login/LoginForm.vue
index 854335b..b4dbfdb 100644
--- a/src/views/sys/login/LoginForm.vue
+++ b/src/views/sys/login/LoginForm.vue
@@ -25,18 +25,13 @@
/>
</FormItem>
<FormItem name="factory" class="enter-x dept">
- <ARow class="enter-x">
- <ACol :md="24" :xs="24" :span="24">
- <ApiTreeSelect
- :api="getProdTreeList"
- showSearch
- v-model:value="formData.factory"
- optionFilterProp="label"
- labelField="deptName"
- valueField="deptCode"
- />
- </ACol>
- </ARow>
+ <ApiSelect
+ :api="getProdTreeList"
+ v-model:value="formData.factory"
+ labelField="deptName"
+ valueField="deptCode"
+ placeholder="璇烽�夋嫨宸ュ巶"
+ />
</FormItem>
<ARow class="enter-x">
<ACol :span="12">
@@ -97,7 +92,7 @@
<script lang="ts" setup>
import { reactive, ref, unref, computed } from 'vue';
- import { Checkbox, Form, Input, Row, Col, Button, Divider, } from 'ant-design-vue';
+ import { Checkbox, Form, Input, Row, Col, Button, Divider } from 'ant-design-vue';
// import {
// GithubFilled,
// WechatFilled,
@@ -106,15 +101,14 @@
// TwitterCircleFilled,
// } from '@ant-design/icons-vue';
import LoginFormTitle from './LoginFormTitle.vue';
-
+ import { ApiSelect } from '/@/components/Form/index';
import { useI18n } from '@/hooks/web/useI18n';
import { useMessage } from '@/hooks/web/useMessage';
- import { ApiTreeSelect } from '@/components/Form';
import { getProdTreeList } from '/@/api/tigerapi/dept';
import { useUserStore } from '@/store/modules/user';
import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin';
import { useDesign } from '@/hooks/web/useDesign';
-import { AccountInfo } from '/@/api/tigerapi/model/systemModel';
+ import { AccountInfo } from '/@/api/tigerapi/model/systemModel';
//import { onKeyStroke } from '@vueuse/core';
const ACol = Col;
--
Gitblit v1.9.3