刘洋 1 год назад
Родитель
Сommit
d0d53485dc
2 измененных файлов с 13 добавлено и 20 удалено
  1. 11 9
      src/store/modules/user.js
  2. 2 11
      src/views/user/auth-manage/role-manage/add-role-dialog.vue

+ 11 - 9
src/store/modules/user.js

@@ -155,15 +155,17 @@ const useUserStore = defineStore('user', {
     },
 
     login(form) {
-      return login(form)
-        .then((userInfo) => {
-          this.setInfo(userInfo);
-          return true;
-        })
-        .catch((e) => {
-          console.error(e);
-          return false;
-        });
+      return new Promise((resolve, reject) => {
+        login(form)
+          .then((userInfo) => {
+            this.setInfo(userInfo);
+            resolve();
+          })
+          .catch((e) => {
+            console.log('login error', e);
+            reject(e);
+          });
+      });
     },
 
     async logout() {

+ 2 - 11
src/views/user/auth-manage/role-manage/add-role-dialog.vue

@@ -34,7 +34,7 @@
 <script setup name="AddRoleDialog">
 import useClearDialog from '@/hooks/useClearDialog';
 import { ref, watch } from 'vue';
-import { getAllMenuResource } from '@/utils/user';
+import { getAllMenuResource } from '@/api/user';
 import { useRequest } from 'vue-request';
 const props = defineProps({
   visible: Boolean,
@@ -58,16 +58,7 @@ const { formData, isEdit } = useClearDialog(
 const { data: treeData } = useRequest(getAllMenuResource, {
   manual: false,
 });
-const treeData = ref([
-  {
-    label: '系统资源',
-    value: '1',
-    children: [
-      { label: '服务单元管理', value: '2' },
-      { label: 'SOP管理', value: '3' },
-    ],
-  },
-]);
+
 const onTreeChange = (checked, context) => {
   console.info('onChange:', checked, context);
 };