Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp
This commit is contained in:
@@ -194,7 +194,9 @@
|
|||||||
const selectRoleRef = ref();
|
const selectRoleRef = ref();
|
||||||
const formSchema = formConfig(disabled as any);
|
const formSchema = formConfig(disabled as any);
|
||||||
const formSchema2 = formConfig2(roleDisabled as any);
|
const formSchema2 = formConfig2(roleDisabled as any);
|
||||||
const { orgName, projectId, orgId } = JSON.parse(sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH));
|
const { orgName, projectId, orgId } = JSON.parse(
|
||||||
|
sessionStorage.getItem(import.meta.env.VITE_PUBLIC_PATH),
|
||||||
|
);
|
||||||
// const orgId = JSON.parse(sessionStorage.getItem('ORGID'));
|
// const orgId = JSON.parse(sessionStorage.getItem('ORGID'));
|
||||||
const roleTreeData = ref([]);
|
const roleTreeData = ref([]);
|
||||||
const rolePermissionTreeData = ref([]);
|
const rolePermissionTreeData = ref([]);
|
||||||
@@ -340,7 +342,7 @@
|
|||||||
const info = {
|
const info = {
|
||||||
node: { key: '0-0-0', dataRef: { ...roleTreeData.value[0].children[0] } },
|
node: { key: '0-0-0', dataRef: { ...roleTreeData.value[0].children[0] } },
|
||||||
};
|
};
|
||||||
SelectUserTree([''], info);
|
// SelectUserTree([''], info);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@@ -138,8 +138,8 @@
|
|||||||
loading.value = true;
|
loading.value = true;
|
||||||
async function logins() {
|
async function logins() {
|
||||||
try {
|
try {
|
||||||
const res = await configStore.userLogin(JSON.parse(data));
|
|
||||||
verifyRef.value?.reload();
|
verifyRef.value?.reload();
|
||||||
|
const res = await configStore.userLogin(JSON.parse(data));
|
||||||
if (res.data?.token) {
|
if (res.data?.token) {
|
||||||
if (res.data?.token) {
|
if (res.data?.token) {
|
||||||
Cookies.set(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`, res.data?.token);
|
Cookies.set(`${import.meta.env.VITE_PUBLIC_PATH}-nervsid`, res.data?.token);
|
||||||
|
Reference in New Issue
Block a user