From 64e7e6b80bb68e6d07302de1cd8983eb272c2ee3 Mon Sep 17 00:00:00 2001
From: ChangFeng <752492631@qq.com>
Date: Thu, 11 Apr 2024 23:16:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86node=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=BB=84=E5=90=88=E6=9D=A1=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/interface/index.ts               |  4 ++++
 src/api/interface/node.ts                |  7 ++++---
 src/stores/interface/index.ts            | 10 +++++++++-
 src/stores/modules/user.ts               |  5 +++--
 src/views/login/components/LoginForm.vue |  3 ++-
 src/views/node/nodelist.vue              |  3 +--
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/api/interface/index.ts b/src/api/interface/index.ts
index 903b99d..0cc8c36 100644
--- a/src/api/interface/index.ts
+++ b/src/api/interface/index.ts
@@ -37,7 +37,11 @@ export namespace Login {
     password: string;
   }
   export interface ResLogin {
+    userid: number;
+    username: string;
+    name: string;
     access_token: string;
+    expire_datetime: string;
   }
   export interface ResAuthButtons {
     [key: string]: string[];
diff --git a/src/api/interface/node.ts b/src/api/interface/node.ts
index 4e46e07..f3833b4 100644
--- a/src/api/interface/node.ts
+++ b/src/api/interface/node.ts
@@ -4,12 +4,13 @@ import { ReqPage } from ".";
 export namespace Node {
   //这是节点查询时的请求参数，存放查询条件
   export interface ReqNode extends ReqPage {
-    nodeName: string;
+    pageNum: number;
+    pageSize: number;
+    nodename?: string;
   }
 
   export interface Record {
     id?: number; //id，有就是修改，没有就是新增
-    nodeName: string;
-    defaultLevel: number; //默认任务的优先级
+    nodename: string;
   }
 }
diff --git a/src/stores/interface/index.ts b/src/stores/interface/index.ts
index 0afd490..d9af804 100644
--- a/src/stores/interface/index.ts
+++ b/src/stores/interface/index.ts
@@ -1,3 +1,4 @@
+import { Login } from "./../../api/interface/index";
 export type LayoutType = "vertical" | "classic" | "transverse" | "columns";
 
 export type AssemblySizeType = "large" | "default" | "small";
@@ -28,7 +29,14 @@ export interface GlobalState {
 /* UserState */
 export interface UserState {
   token: string;
-  userInfo: { name: string };
+  // userInfo: {
+  //   userid: number;
+  //   username: string;
+  //   name: string;
+  //   access_token: string;
+  //   expire_datetime: string;
+  // };
+  userInfo: Login.ResLogin;
 }
 
 /* tabsMenuProps */
diff --git a/src/stores/modules/user.ts b/src/stores/modules/user.ts
index 6c2d073..fcee028 100644
--- a/src/stores/modules/user.ts
+++ b/src/stores/modules/user.ts
@@ -1,3 +1,4 @@
+import { Login } from "./../../api/interface/index";
 import { defineStore } from "pinia";
 import { UserState } from "@/stores/interface";
 import piniaPersistConfig from "@/config/piniaPersist";
@@ -6,7 +7,7 @@ export const useUserStore = defineStore({
   id: "geeker-user",
   state: (): UserState => ({
     token: "",
-    userInfo: { name: "张三" }
+    userInfo: { userid: 0, username: "", name: "", access_token: "", expire_datetime: "" }
   }),
   getters: {},
   actions: {
@@ -15,7 +16,7 @@ export const useUserStore = defineStore({
       this.token = token;
     },
     // Set setUserInfo
-    setUserInfo(userInfo: UserState["userInfo"]) {
+    setUserInfo(userInfo: Login.ResLogin) {
       this.userInfo = userInfo;
     }
   },
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 19b6976..868dd21 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -71,8 +71,9 @@ const login = (formEl: FormInstance | undefined) => {
       // 1.执行登录接口
       // console.log("password:md5:" + md5(loginForm.password));
       const { data } = await loginApi({ ...loginForm, password: md5(loginForm.password) });
-      console.log("login data:" + JSON.stringify(data));
+      // console.log("login data:" + JSON.stringify(data));
       userStore.setToken(data.access_token);
+      userStore.setUserInfo(data);
 
       // 2.添加动态路由
       await initDynamicRouter();
diff --git a/src/views/node/nodelist.vue b/src/views/node/nodelist.vue
index 933ab62..30d2bee 100644
--- a/src/views/node/nodelist.vue
+++ b/src/views/node/nodelist.vue
@@ -42,11 +42,10 @@ const columns: ColumnProps<Node.Record>[] = [
   { type: "index", label: "序号", width: 80 },
   { prop: "id", label: "ID", width: 50 },
   {
-    prop: "nodeName",
+    prop: "nodename",
     label: "节点名称",
     search: { el: "input" }
   },
-  { prop: "defaultLevel", label: "级别", width: 200 },
   { prop: "operation", label: "操作", fixed: "right", width: 200 }
 ];