diff --git a/org.html b/org.html
deleted file mode 100644
index 70b1476..0000000
--- a/org.html
+++ /dev/null
@@ -1,449 +0,0 @@
-
-
-
-
-
- Title
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/package.json b/package.json
index 9b3fc79..41f7fbd 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "ball_admin",
+ "name": "store",
"version": "0.1.0",
"private": true,
"dependencies": {
diff --git a/src/components/form/select.tsx b/src/components/form/select.tsx
index e3b0147..5dac9ce 100644
--- a/src/components/form/select.tsx
+++ b/src/components/form/select.tsx
@@ -1,7 +1,7 @@
import { Form, Select } from "antd";
import { FormDatas } from "./interface";
import { useEffect, useState } from "react";
-import baseHttp from "@/service/base";
+import { base } from "@/service/base";
const { Option } = Select;
export const FormSelect = (v: FormDatas) => {
const [list, setList] = useState([]);
@@ -9,7 +9,7 @@ export const FormSelect = (v: FormDatas) => {
if (v.selectList && v.selectList.length > 0) {
setList(v.selectList);
} else {
- baseHttp.get(`${v.selectUrl}/?size=50&offset=1`, "").then((res) => {
+ base.get(`${v.selectUrl}/?size=50&offset=1`, "").then((res) => {
setList(res.data.record ?? []);
});
}
diff --git a/src/components/layout/layout_config.ts b/src/components/layout/layout_config.ts
index fa1bebb..d4d9ef4 100644
--- a/src/components/layout/layout_config.ts
+++ b/src/components/layout/layout_config.ts
@@ -11,10 +11,10 @@ export const items = [
],
},
{
- key: "/data",
+ key: "/source",
label: `数据管理`,
children: [
- { label: "数据管理", key: "/data/list" },
+ { label: "数据管理", key: "/source/list" },
],
},
{
diff --git a/src/pages/login/login.tsx b/src/pages/login/login.tsx
index a9be432..a667ac5 100644
--- a/src/pages/login/login.tsx
+++ b/src/pages/login/login.tsx
@@ -13,10 +13,9 @@ const Login = (props) => {
userName: values.account,
passWord: values.password,
});
- await usrStore.loginVideo()
if (status) {
usrStore.closeLoginDilog();
- navigate("/admin/user", { replace: true });
+ navigate("/user/list", { replace: true });
}
};
const onFinishFailed = () => {};
diff --git a/src/pages/menu/menu.less b/src/pages/menu/menu.less
new file mode 100644
index 0000000..4a4054f
--- /dev/null
+++ b/src/pages/menu/menu.less
@@ -0,0 +1,8 @@
+.contentBox{
+ overflow-y: auto;
+ height: 100%;
+ .tableName{
+ height: 100%;
+ overflow-y: auto;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/menu/menu.tsx b/src/pages/menu/menu.tsx
new file mode 100644
index 0000000..841255d
--- /dev/null
+++ b/src/pages/menu/menu.tsx
@@ -0,0 +1,50 @@
+import { Button, Space, Modal, FormInstance } from "antd";
+import { inject, observer } from "mobx-react";
+import BTable from "@/components/b_table";
+import { useEffect, useState } from "react";
+import { Store } from "antd/lib/form/interface";
+import React from "react";
+import { columns } from "./menu_config";
+import "./menu.less";
+
+const Menu = (props: Store) => {
+ const { usrStore } = props;
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const formRef = React.useRef(null);
+ const [userId, setId] = useState(null);
+
+ useEffect(() => {}, []);
+
+ const addHandler = () => {};
+ return (
+
+
+
+
+
+ formRef.current?.resetFields()}
+ onOk={() => formRef.current?.submit()}
+ okText="确定"
+ cancelText="取消"
+ onCancel={() => {
+ setId(null);
+ setIsModalOpen(false);
+ }}
+ >
+
+
+ );
+};
+
+export default inject("usrStore")(observer(Menu));
diff --git a/src/pages/menu/menu_config.tsx b/src/pages/menu/menu_config.tsx
new file mode 100644
index 0000000..34761da
--- /dev/null
+++ b/src/pages/menu/menu_config.tsx
@@ -0,0 +1,97 @@
+import { FormType } from "@/components/form/interface";
+import { UserDataType } from "@/model/userModel";
+import { ColumnsType } from "antd/lib/table";
+import { Image } from "antd";
+import { getBirthDateAndGender } from "@/util/util";
+export const defaultConfig = (team, per) => [
+ {
+ type: FormType.input,
+ label: "用户名",
+ name: "user_name",
+ value: "",
+ rules: [{ required: true, message: "请输入用户名称!" }],
+ },
+
+ {
+ type: FormType.inputNumber,
+ label: "年龄",
+ name: "age",
+ value: "",
+ rules: [{ required: true, message: "请输入年龄" }],
+ },
+ {
+ type: FormType.input,
+ label: "身份证",
+ name: "id_card",
+ value: "",
+ rules: [{ required: true, message: "请输入身份证" }],
+ },
+ {
+ type: FormType.input,
+ label: "登录账号",
+ name: "account",
+ value: "",
+ rules: [{ required: true, message: "请输入登录账号" }],
+ },
+
+ {
+ type: FormType.input,
+ label: "联系电话",
+ name: "tel",
+ value: "",
+ },
+
+ {
+ type: FormType.input,
+ label: "邮箱",
+ name: "email",
+ value: "",
+ },
+ {
+ type: FormType.upload,
+ label: "头像",
+ name: "head_img",
+ value: [],
+ },
+];
+
+export const columns: ColumnsType = [
+ {
+ title: "用户名",
+ dataIndex: "user_name",
+ width: 200,
+ fixed: "left",
+ },
+ {
+ title: "性别",
+ width: 150,
+ render: (render) => (
+ {getBirthDateAndGender(render.id_card)?.gender}
+ ),
+ },
+
+ {
+ title: "头像",
+ dataIndex: "head_img",
+ width: 150,
+ render: (head_img) => {
+ return ;
+ },
+ },
+
+ {
+ title: "登录账号",
+ width: 150,
+ dataIndex: "account",
+ },
+ {
+ title: "身份证",
+ width: 150,
+ dataIndex: "id_card",
+ },
+ {
+ title: "联系电话",
+ width: 150,
+ dataIndex: "tel",
+ },
+];
diff --git a/src/pages/permission/permission.less b/src/pages/permission/permission.less
new file mode 100644
index 0000000..4a4054f
--- /dev/null
+++ b/src/pages/permission/permission.less
@@ -0,0 +1,8 @@
+.contentBox{
+ overflow-y: auto;
+ height: 100%;
+ .tableName{
+ height: 100%;
+ overflow-y: auto;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/permission/permission.tsx b/src/pages/permission/permission.tsx
new file mode 100644
index 0000000..5ac69cd
--- /dev/null
+++ b/src/pages/permission/permission.tsx
@@ -0,0 +1,50 @@
+import { Button, Space, Modal, FormInstance } from "antd";
+import { inject, observer } from "mobx-react";
+import BTable from "@/components/b_table";
+import { useEffect, useState } from "react";
+import { Store } from "antd/lib/form/interface";
+import React from "react";
+import { columns } from "./permission_config";
+import "./permission.less";
+
+const Permission = (props: Store) => {
+ const { usrStore } = props;
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const formRef = React.useRef(null);
+ const [userId, setId] = useState(null);
+
+ useEffect(() => {}, []);
+
+ const addHandler = () => {};
+ return (
+
+
+
+
+
+ formRef.current?.resetFields()}
+ onOk={() => formRef.current?.submit()}
+ okText="确定"
+ cancelText="取消"
+ onCancel={() => {
+ setId(null);
+ setIsModalOpen(false);
+ }}
+ >
+
+
+ );
+};
+
+export default inject("usrStore")(observer(Permission));
diff --git a/src/pages/permission/permission_config.tsx b/src/pages/permission/permission_config.tsx
new file mode 100644
index 0000000..34761da
--- /dev/null
+++ b/src/pages/permission/permission_config.tsx
@@ -0,0 +1,97 @@
+import { FormType } from "@/components/form/interface";
+import { UserDataType } from "@/model/userModel";
+import { ColumnsType } from "antd/lib/table";
+import { Image } from "antd";
+import { getBirthDateAndGender } from "@/util/util";
+export const defaultConfig = (team, per) => [
+ {
+ type: FormType.input,
+ label: "用户名",
+ name: "user_name",
+ value: "",
+ rules: [{ required: true, message: "请输入用户名称!" }],
+ },
+
+ {
+ type: FormType.inputNumber,
+ label: "年龄",
+ name: "age",
+ value: "",
+ rules: [{ required: true, message: "请输入年龄" }],
+ },
+ {
+ type: FormType.input,
+ label: "身份证",
+ name: "id_card",
+ value: "",
+ rules: [{ required: true, message: "请输入身份证" }],
+ },
+ {
+ type: FormType.input,
+ label: "登录账号",
+ name: "account",
+ value: "",
+ rules: [{ required: true, message: "请输入登录账号" }],
+ },
+
+ {
+ type: FormType.input,
+ label: "联系电话",
+ name: "tel",
+ value: "",
+ },
+
+ {
+ type: FormType.input,
+ label: "邮箱",
+ name: "email",
+ value: "",
+ },
+ {
+ type: FormType.upload,
+ label: "头像",
+ name: "head_img",
+ value: [],
+ },
+];
+
+export const columns: ColumnsType = [
+ {
+ title: "用户名",
+ dataIndex: "user_name",
+ width: 200,
+ fixed: "left",
+ },
+ {
+ title: "性别",
+ width: 150,
+ render: (render) => (
+ {getBirthDateAndGender(render.id_card)?.gender}
+ ),
+ },
+
+ {
+ title: "头像",
+ dataIndex: "head_img",
+ width: 150,
+ render: (head_img) => {
+ return ;
+ },
+ },
+
+ {
+ title: "登录账号",
+ width: 150,
+ dataIndex: "account",
+ },
+ {
+ title: "身份证",
+ width: 150,
+ dataIndex: "id_card",
+ },
+ {
+ title: "联系电话",
+ width: 150,
+ dataIndex: "tel",
+ },
+];
diff --git a/src/pages/role/role.less b/src/pages/role/role.less
new file mode 100644
index 0000000..4a4054f
--- /dev/null
+++ b/src/pages/role/role.less
@@ -0,0 +1,8 @@
+.contentBox{
+ overflow-y: auto;
+ height: 100%;
+ .tableName{
+ height: 100%;
+ overflow-y: auto;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/role/role.tsx b/src/pages/role/role.tsx
new file mode 100644
index 0000000..b6bebc8
--- /dev/null
+++ b/src/pages/role/role.tsx
@@ -0,0 +1,50 @@
+import { Button, Space, Modal, FormInstance } from "antd";
+import { inject, observer } from "mobx-react";
+import BTable from "@/components/b_table";
+import { useEffect, useState } from "react";
+import { Store } from "antd/lib/form/interface";
+import React from "react";
+import { columns } from "./role_config";
+import "./role.less";
+
+const Role = (props: Store) => {
+ const { usrStore } = props;
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const formRef = React.useRef(null);
+ const [userId, setId] = useState(null);
+
+ useEffect(() => {}, []);
+
+ const addHandler = () => {};
+ return (
+
+
+
+
+
+ formRef.current?.resetFields()}
+ onOk={() => formRef.current?.submit()}
+ okText="确定"
+ cancelText="取消"
+ onCancel={() => {
+ setId(null);
+ setIsModalOpen(false);
+ }}
+ >
+
+
+ );
+};
+
+export default inject("usrStore")(observer(Role));
diff --git a/src/pages/role/role_config.tsx b/src/pages/role/role_config.tsx
new file mode 100644
index 0000000..34761da
--- /dev/null
+++ b/src/pages/role/role_config.tsx
@@ -0,0 +1,97 @@
+import { FormType } from "@/components/form/interface";
+import { UserDataType } from "@/model/userModel";
+import { ColumnsType } from "antd/lib/table";
+import { Image } from "antd";
+import { getBirthDateAndGender } from "@/util/util";
+export const defaultConfig = (team, per) => [
+ {
+ type: FormType.input,
+ label: "用户名",
+ name: "user_name",
+ value: "",
+ rules: [{ required: true, message: "请输入用户名称!" }],
+ },
+
+ {
+ type: FormType.inputNumber,
+ label: "年龄",
+ name: "age",
+ value: "",
+ rules: [{ required: true, message: "请输入年龄" }],
+ },
+ {
+ type: FormType.input,
+ label: "身份证",
+ name: "id_card",
+ value: "",
+ rules: [{ required: true, message: "请输入身份证" }],
+ },
+ {
+ type: FormType.input,
+ label: "登录账号",
+ name: "account",
+ value: "",
+ rules: [{ required: true, message: "请输入登录账号" }],
+ },
+
+ {
+ type: FormType.input,
+ label: "联系电话",
+ name: "tel",
+ value: "",
+ },
+
+ {
+ type: FormType.input,
+ label: "邮箱",
+ name: "email",
+ value: "",
+ },
+ {
+ type: FormType.upload,
+ label: "头像",
+ name: "head_img",
+ value: [],
+ },
+];
+
+export const columns: ColumnsType = [
+ {
+ title: "用户名",
+ dataIndex: "user_name",
+ width: 200,
+ fixed: "left",
+ },
+ {
+ title: "性别",
+ width: 150,
+ render: (render) => (
+ {getBirthDateAndGender(render.id_card)?.gender}
+ ),
+ },
+
+ {
+ title: "头像",
+ dataIndex: "head_img",
+ width: 150,
+ render: (head_img) => {
+ return ;
+ },
+ },
+
+ {
+ title: "登录账号",
+ width: 150,
+ dataIndex: "account",
+ },
+ {
+ title: "身份证",
+ width: 150,
+ dataIndex: "id_card",
+ },
+ {
+ title: "联系电话",
+ width: 150,
+ dataIndex: "tel",
+ },
+];
diff --git a/src/pages/source/source.less b/src/pages/source/source.less
new file mode 100644
index 0000000..4a4054f
--- /dev/null
+++ b/src/pages/source/source.less
@@ -0,0 +1,8 @@
+.contentBox{
+ overflow-y: auto;
+ height: 100%;
+ .tableName{
+ height: 100%;
+ overflow-y: auto;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/source/source.tsx b/src/pages/source/source.tsx
new file mode 100644
index 0000000..6cbce1f
--- /dev/null
+++ b/src/pages/source/source.tsx
@@ -0,0 +1,50 @@
+import { Button, Space, Modal, FormInstance } from "antd";
+import { inject, observer } from "mobx-react";
+import BTable from "@/components/b_table";
+import { useEffect, useState } from "react";
+import { Store } from "antd/lib/form/interface";
+import React from "react";
+import { columns } from "./source_config";
+import "./source.less";
+
+const Source = (props: Store) => {
+ const { usrStore } = props;
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const formRef = React.useRef(null);
+ const [userId, setId] = useState(null);
+
+ useEffect(() => {}, []);
+
+ const addHandler = () => {};
+ return (
+
+
+
+
+
+ formRef.current?.resetFields()}
+ onOk={() => formRef.current?.submit()}
+ okText="确定"
+ cancelText="取消"
+ onCancel={() => {
+ setId(null);
+ setIsModalOpen(false);
+ }}
+ >
+
+
+ );
+};
+
+export default inject("usrStore")(observer(Source));
diff --git a/src/pages/source/source_config.tsx b/src/pages/source/source_config.tsx
new file mode 100644
index 0000000..34761da
--- /dev/null
+++ b/src/pages/source/source_config.tsx
@@ -0,0 +1,97 @@
+import { FormType } from "@/components/form/interface";
+import { UserDataType } from "@/model/userModel";
+import { ColumnsType } from "antd/lib/table";
+import { Image } from "antd";
+import { getBirthDateAndGender } from "@/util/util";
+export const defaultConfig = (team, per) => [
+ {
+ type: FormType.input,
+ label: "用户名",
+ name: "user_name",
+ value: "",
+ rules: [{ required: true, message: "请输入用户名称!" }],
+ },
+
+ {
+ type: FormType.inputNumber,
+ label: "年龄",
+ name: "age",
+ value: "",
+ rules: [{ required: true, message: "请输入年龄" }],
+ },
+ {
+ type: FormType.input,
+ label: "身份证",
+ name: "id_card",
+ value: "",
+ rules: [{ required: true, message: "请输入身份证" }],
+ },
+ {
+ type: FormType.input,
+ label: "登录账号",
+ name: "account",
+ value: "",
+ rules: [{ required: true, message: "请输入登录账号" }],
+ },
+
+ {
+ type: FormType.input,
+ label: "联系电话",
+ name: "tel",
+ value: "",
+ },
+
+ {
+ type: FormType.input,
+ label: "邮箱",
+ name: "email",
+ value: "",
+ },
+ {
+ type: FormType.upload,
+ label: "头像",
+ name: "head_img",
+ value: [],
+ },
+];
+
+export const columns: ColumnsType = [
+ {
+ title: "用户名",
+ dataIndex: "user_name",
+ width: 200,
+ fixed: "left",
+ },
+ {
+ title: "性别",
+ width: 150,
+ render: (render) => (
+ {getBirthDateAndGender(render.id_card)?.gender}
+ ),
+ },
+
+ {
+ title: "头像",
+ dataIndex: "head_img",
+ width: 150,
+ render: (head_img) => {
+ return ;
+ },
+ },
+
+ {
+ title: "登录账号",
+ width: 150,
+ dataIndex: "account",
+ },
+ {
+ title: "身份证",
+ width: 150,
+ dataIndex: "id_card",
+ },
+ {
+ title: "联系电话",
+ width: 150,
+ dataIndex: "tel",
+ },
+];
diff --git a/src/pages/user/move.tsx b/src/pages/user/move.tsx
deleted file mode 100644
index 6e38a54..0000000
--- a/src/pages/user/move.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import MapContainer from "@/components/map/MapComponent";
-import MapUtl from "@/components/map/mapUtil";
-import { Button, message, Modal } from "antd";
-import { inject, observer } from "mobx-react";
-import { useState } from "react";
-
-const Move = (props) => {
- const { usrStore, id } = props;
- const [isOpen, setOpen] = useState(false);
- return (
- <>
-
- {
- setOpen(false);
- }}
- >
-
-
-
-
-
-
- >
- );
-};
-
-// getSite
-export default inject("usrStore")(observer(Move));
diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx
index 3d74f52..994559a 100644
--- a/src/pages/user/user.tsx
+++ b/src/pages/user/user.tsx
@@ -12,8 +12,11 @@ const User = (props: Store) => {
const [isModalOpen, setIsModalOpen] = useState(false);
const formRef = React.useRef(null);
const [userId, setId] = useState(null);
-
- useEffect(() => {}, [usrStore]);
+
+ // 获取列表数据
+ useEffect(() => {
+ usrStore.getlist();
+ }, [usrStore]);
const addHandler = () => {};
return (
diff --git a/src/router/index.tsx b/src/router/index.tsx
index 36283b2..c1c2eb1 100644
--- a/src/router/index.tsx
+++ b/src/router/index.tsx
@@ -3,6 +3,9 @@ import LayOut from "@/components/layout/layout";
import Login from "@/pages/login/login";
import User from "@/pages/user/user";
import Dashbord from "@/pages/dashbord";
+import Source from "@/pages/source/source";
+import Menu from "@/pages/menu/menu";
+import Role from "@/pages/role/role";
const routers = createHashRouter([
{
@@ -19,6 +22,21 @@ const routers = createHashRouter([
index: true,
element: ,
},
+ {
+ path: "/source/list",
+ index: true,
+ element: ,
+ },
+ {
+ path: "/permission/menu",
+ index: true,
+ element: ,
+ },
+ {
+ path: "/permission/role",
+ index: true,
+ element: ,
+ },
],
},
{
diff --git a/src/service/base.ts b/src/service/base.ts
index 5debb8a..3a844ea 100644
--- a/src/service/base.ts
+++ b/src/service/base.ts
@@ -1,6 +1,7 @@
import store from "@/store";
import Config from "@/util/config";
import axios, { AxiosResponse } from "axios";
+// import { baseHttp } from '@/service/base';
// 添加请求拦截器
axios.defaults.headers.common["Content-Type"] = "application/json; charset=utf8";
axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
@@ -31,7 +32,7 @@ axios.interceptors.response.use((res: AxiosResponse) => {
}
return Promise.reject(err);
});
-class BaseHttp {
+class BaseHttps {
async gets(url: string, params: any) {
let res = await axios({
method: 'get',
@@ -48,7 +49,6 @@ class BaseHttp {
let res = await axios({
method: 'get',
url: url,
-
params
});
return res.data;
@@ -96,5 +96,5 @@ class BaseHttp {
};
}
-// eslint-disable-next-line import/no-anonymous-default-export
-export default new BaseHttp()
\ No newline at end of file
+const base = new BaseHttps();
+export { base };
\ No newline at end of file
diff --git a/src/service/user.ts b/src/service/user.ts
new file mode 100644
index 0000000..31dac04
--- /dev/null
+++ b/src/service/user.ts
@@ -0,0 +1,25 @@
+import { base } from '@/service/base';
+
+
+class UserService {
+ static configAdd: string = "/user";
+ static configEdit: string = "/user";
+ static configList: string = "/user/list";
+ static configDelete: string = "/user";
+ static async add(params) {
+ return await base.post(UserService.configAdd, params);
+ }
+
+ static async edit(identity: string, params: any) {
+ return await base.put(UserService.configEdit + "/" + identity, params);
+ }
+
+ static async remove(identity) {
+ return await base.delete(UserService.configEdit + "/" + identity, {});
+ }
+
+ static async list(params) {
+ return await base.get(UserService.configList, params);
+ }
+}
+export default UserService ;
\ No newline at end of file
diff --git a/src/store/baseStore.ts b/src/store/baseStore.ts
index d3bbca6..b7d4368 100644
--- a/src/store/baseStore.ts
+++ b/src/store/baseStore.ts
@@ -1,4 +1,5 @@
-import baseHttp from "@/service/base";
+import { base } from "@/service/base";
+import userService from "@/service/user";
import { Pages } from "@/util/model/interface";
import { message } from "antd";
import { action, makeObservable, observable, runInAction } from "mobx";
@@ -36,7 +37,7 @@ class BaseStore implements BaseStoreInterface {
// 删除
async deleteItem(id: number) {
try {
- await baseHttp.delete(this.urlConfig.DELETE + "/" + id, {})
+ await base.delete(this.urlConfig.DELETE + "/" + id, {})
this.getlist()
} catch (error) {
console.log(error);
@@ -50,7 +51,7 @@ class BaseStore implements BaseStoreInterface {
// 添加
async add(param: any, listParam?: any) {
try {
- let res = await baseHttp.post(this.urlConfig.ADD, param)
+ let res = await userService.add(param);
if (res.code !== 200) {
message.error(res.msg)
return false
@@ -65,7 +66,7 @@ class BaseStore implements BaseStoreInterface {
// 更新
async putItem(id: string, param: any, listParam?: any) {
try {
- let res = await baseHttp.put(this.urlConfig.EDIT + "/" + id, param)
+ let res = await userService.edit(id, param)
if (res.code !== 200) {
message.error(res.msg)
return false
@@ -81,23 +82,23 @@ class BaseStore implements BaseStoreInterface {
async getlist(params?: any) {
this.listStatus = true;
try {
- let res = await baseHttp.get(this.urlConfig.LIST, {
+ let res = await userService.list({
size: this.page?.Size ?? 20,
offset: this.page?.Offset ?? 1,
...params
});
+ this.listStatus = false;
let data: Array = []
- if (!res?.data?.record) {
+ if (!res?.data) {
runInAction(() => {
this.list = data;
})
- this.listStatus = false;
return;
}
- for (let i = 0; i < res.data.record.length; i++) {
+ for (let i = 0; i < res.data.length; i++) {
data.push({
- key: res.data.record[i].id,
- ...res.data.record[i]
+ key: res.data[i].id,
+ ...res.data[i]
})
}
runInAction(() => {
diff --git a/src/store/user.ts b/src/store/user.ts
index aa76faa..15519d7 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -1,22 +1,11 @@
import { action, computed, makeObservable, observable } from "mobx";
// 用户信息
-import baseHttp from "@/service/base";
+import { base } from "@/service/base";
import BaseStore from "./baseStore";
import { UserDataType, UserInfos } from "@/model/userModel";
import { message } from "antd";
class UserConfig {
- static LOGINURI: string = "/v1/anth/login/pc"
- static LIST: string = "/v1/user/list"
- static ADD: string = "/v1/user"
- static DELETE: string = "/v1/user"
- static EDIT: string = "/v1/user"
- static pover: string = "/v1/user/userPower"
- static team: string = "/v1/team/list"
- static per: string = "/v1/persMgmt/list"
- static serch: string = "/v1/user/serch"
- static getPatrol: string = "/v1/user/getPatrol"
- static videoLogin: string = "api/v1/login"
- static siteList: string = "/v1/user/site"
+ static LOGINURI: string = "/anth/login/pc"
}
class UserStore extends BaseStore {
@@ -30,13 +19,6 @@ class UserStore extends BaseStore {
makeObservable(this, {
logOut: action,
login: action,
- getTeam: action,
- getPer: action,
- serchUser: action,
- setPoverDe: action,
- setUserDetaul: action,
- getPatrol: action,
- getSite: action,
_userinfo: observable,
isNeedLogin: observable,
poverDetail: observable,
@@ -45,27 +27,6 @@ class UserStore extends BaseStore {
userInfo: computed,
})
}
- async getTeam() {
- return await baseHttp.get(UserConfig.team, null)
- }
- async getPer() {
- return await baseHttp.get(UserConfig.per, null)
- }
- async getPover() {
- return await baseHttp.get(UserConfig.pover, null)
- }
- async serchUser(params: any) {
- return await baseHttp.get(UserConfig.serch, { user_name: params })
- }
- async getPatrol() {
- return await baseHttp.get(UserConfig.getPatrol, {})
- }
-
- async getSite(id) {
- return await baseHttp.get(UserConfig.siteList + "/" + id, {})
- }
-
-
get userInfo(): UserInfos {
if (!this._userinfo.token) {
@@ -88,12 +49,11 @@ class UserStore extends BaseStore {
genre: 1
}
try {
- let data = await baseHttp.post(UserConfig.LOGINURI, param)
- if (data.code !== 200) {
+ let data = await base.post(UserConfig.LOGINURI, param)
+ if (data.code !== 0) {
message.error(data.msg)
return false
}
-
window.localStorage.setItem("token", data.data.token ?? "");
return true
} catch (error) {
@@ -102,19 +62,6 @@ class UserStore extends BaseStore {
}
}
- async loginVideo() {
- try {
- let data = await baseHttp.get(UserConfig.videoLogin, {
- username: "easycvr",
- password: "4092c09db0af030641a977d76044de4f",
- })
- window.localStorage.setItem("video-token", data.EasyDarwin.Body.Token ?? "");
- return true
- } catch (error) {
- console.log(error)
- return false
- }
- }
openLoginDilog() {
this.isNeedLogin = true;
}
diff --git a/src/util/config.ts b/src/util/config.ts
index 0b63114..9acf9f9 100644
--- a/src/util/config.ts
+++ b/src/util/config.ts
@@ -1,4 +1,4 @@
class Config {
- static baseUrl = "http://127.0.0.1:12016";
+ static baseUrl = "http://127.0.0.1:12214/v1";
}
export default Config;