diff --git a/src/components/form/select.tsx b/src/components/form/select.tsx
index bfbe779..e3b0147 100644
--- a/src/components/form/select.tsx
+++ b/src/components/form/select.tsx
@@ -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) => {
+ baseHttp.get(`${v.selectUrl}/?size=50&offset=1`, "").then((res) => {
setList(res.data.record ?? []);
});
}
diff --git a/src/components/form/simple_form.tsx b/src/components/form/simple_form.tsx
index e938863..858a286 100644
--- a/src/components/form/simple_form.tsx
+++ b/src/components/form/simple_form.tsx
@@ -5,7 +5,7 @@ import { FormSelect } from "./select";
import AliUpload from "../ali_upload";
import MyEditor from "../edittor";
import MapFrom from "../map/MapFrom";
-import VideoSelect from "../video_select";
+// import VideoSelect from "../video_select";
const { TextArea } = Input;
const SimpleForm = (props: SimpleFormData) => {
const [form] = Form.useForm();
@@ -55,18 +55,7 @@ const SimpleForm = (props: SimpleFormData) => {
);
- // case FormType.fetchList:
- // return (
- //
- //
- //
- // );
- case "password":
+ case FormType.password:
return (
{
/>
);
- case FormType.treeVideo:
- return (
-
- {
- form?.setFieldsValue({ task_video: v });
- }}
- />
-
- );
+
case FormType.select:
return FormSelect(v);
case FormType.upload:
diff --git a/src/components/layout/layout.tsx b/src/components/layout/layout.tsx
index 3607775..5e86868 100644
--- a/src/components/layout/layout.tsx
+++ b/src/components/layout/layout.tsx
@@ -1,18 +1,27 @@
-import { Content, Header } from "antd/es/layout/layout";
+import { Content, Footer, Header } from "antd/es/layout/layout";
import "./layout.less";
-import { Menu } from "antd";
-import { Footer } from "antd/lib/layout/layout";
-import { Outlet, useLocation, useNavigate } from "react-router";
-import { HomeTwoTone } from "@ant-design/icons";
import { inject, observer } from "mobx-react";
import { Store } from "antd/es/form/interface";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
+import { Avatar, Breadcrumb, Layout, Menu, theme } from "antd";
+import { UserOutlined } from "@ant-design/icons";
+import Sider from "antd/es/layout/Sider";
import { items } from "./layout_config";
+import { Dropdown } from "antd/lib";
+import { Outlet, useNavigate } from "react-router";
const LayOut = (props: Store) => {
const { usrStore } = props;
+ const [collapsed, setCollapsed] = useState(false);
const nav = useNavigate();
- const location = useLocation();
-
+ const {
+ token: { colorBgContainer, borderRadiusLG },
+ } = theme.useToken();
+ const headStyle = {
+ display: "flex",
+ alignItems: "center",
+ justifyContent: "space-between",
+ };
+ const logoStyle = { width: 60, color: "white" };
useEffect(() => {
// if (usrStore.isNeedLogin) {
// nav("/login");
@@ -21,43 +30,56 @@ const LayOut = (props: Store) => {
}, [usrStore.isNeedLogin]);
return (
-
-
- nav("/")}
- style={{ fontSize: "36px", marginRight: "10px" }}
- />
-
+
+ setCollapsed(value)}
+ >
+
+
+
+
+
+
+
+
+
+
);
};
diff --git a/src/components/layout/layout_config.ts b/src/components/layout/layout_config.ts
index 6abdbee..fa1bebb 100644
--- a/src/components/layout/layout_config.ts
+++ b/src/components/layout/layout_config.ts
@@ -1,87 +1,35 @@
export const items = [
{
- key: "/admin/user",
+ key: "/",
+ label: `首页看板`,
+ },
+ {
+ key: "/user",
label: `用户管理`,
children: [
- {
- key: "/admin/user",
- label: `用户管理`,
- },
- {
- key: "/admin/teamMgmt",
- label: `队伍属性管理`,
- },
- {
- key: "/admin/persMgmt",
- label: `个人身份管理`,
- },
- {
- key: "/admin/community",
- label: `社区管理`,
- },
- {
- key: "/admin/grid",
- label: `网格管理`,
- },
- {
- key: "/admin/patrolBrigade",
- label: `巡防大队`,
- },
+ { key: "/user/list", label: `用户管理` },
],
},
{
- key: "/admin/archives/box",
- label: `档案管理`,
- },
- {
- key: "/admin/material",
- label: `物资管理`,
+ key: "/data",
+ label: `数据管理`,
children: [
- {
- key: "/admin/whse/whseMgmt",
- label: `仓库管理`,
- },
- {
- key: "/admin/materialMgmt",
- label: `物资管理`,
- },
+ { label: "数据管理", key: "/data/list" },
],
},
{
- key: "/admin/leaveApproval",
- label: `请假审批`,
- },
- {
- key: "/admin/political",
- label: `政治法规`,
+ key: "/permission",
+ label: `权限管理`,
children: [
- {
- key: "/admin/politicalStudy",
- label: `政治学习`,
- },
- {
- key: `/admin/polRegulations`,
- label: `政治法规管理`,
- },
+ { label: `角色管理`, key: "/permission/role" },
+ { label: `菜单管理`, key: "/permission/menu" },
],
},
{
- key: "/admin/task",
- label: `任务管理`,
- children: [
- { label: "处突任务", key: "/admin/emergency" },
- { label: "巡逻任务", key: "/admin/patrol" },
- { label: "训练任务", key: "/admin/training" },
- ],
- },
- {
- key: "/admin/sys",
+ key: "/sys",
label: `系统管理`,
children: [
- { label: `部门管理`, key: "/admin/dep" },
- { label: "系统设置", key: "/admin/sys/setting" },
- { label: "光荣牌审核", key: "/admin/sys/gp" },
- { label: "评优审核", key: "/admin/sys/exce_compet" },
+ { label: `部门管理`, key: "/dep" },
],
},
];
\ No newline at end of file
diff --git a/src/components/video_select.tsx b/src/components/video_select.tsx
index 353de77..8642a6b 100644
--- a/src/components/video_select.tsx
+++ b/src/components/video_select.tsx
@@ -1,67 +1,33 @@
-import homeStore from "@/store/home";
-import { TreeSelect, TreeSelectProps } from "antd";
-import { useEffect, useState } from "react";
+// import { TreeSelect, TreeSelectProps } from "antd";
+// import { useEffect, useState } from "react";
const VideoSelect = (props) => {
- const { changes } = props;
- const [value, setValue] = useState
();
- const [treeData, setTreeData] = useState>([]);
- useEffect(() => {
- homeStore.getVideoUrlList().then((res) => {
- let valuList: any = [];
- res.EasyDarwin.Body.Devices.forEach((element) => {
- valuList.push({
- id: element.DeviceID,
- pId: 0,
- value: element.DeviceID,
- title: element.DeviceName,
- disableCheckbox: true,
- });
- });
- setTreeData(valuList);
- });
- }, []);
+// const { changes } = props;
+// const [value, setValue] = useState();
+// useEffect(() => {}, []);
- const onLoadData: TreeSelectProps["loadData"] = async ({ id }) => {
- let reqs = await homeStore.getChannerUrlList(id);
- let valuList: any = [];
- reqs.EasyDarwin.Body.Channels.forEach((item) => {
- valuList.push({
- key: id + "-" + item.ChannelID,
- id: id + "-" + item.ChannelID,
- pId: id,
- value: id + "-" + item.ChannelID,
- title: item.Name,
- treeExpandAction: true,
- });
- });
-
- setTreeData((prev)=>{
- return [...prev,...valuList]
- });
- };
+// const onLoadData: TreeSelectProps["loadData"] = async ({ id }) => {};
- const onChange = (newValue: string) => {
- if (newValue.length > 4) return;
- setValue(newValue);
- changes(newValue);
- };
- return (
-
-
-
- );
+// const onChange = (newValue: string) => {
+// if (newValue.length > 4) return;
+// setValue(newValue);
+// changes(newValue);
+// };
+// return (
+//
+//
+//
+// );
};
export default VideoSelect;
diff --git a/src/index.less b/src/index.less
index 51c671f..991a8bb 100644
--- a/src/index.less
+++ b/src/index.less
@@ -76,7 +76,6 @@ code {
.owner_model {
padding-bottom: 0px !important;
.ant-modal-content {
- background: url("static/frame_s@1x.png");
background-size: 100% 100%;
background-position: center center; /* 可选，确保图片在容器中居中 */
background-repeat: no-repeat; /* 确保图片不会重复 */
diff --git a/src/pages/dashbord/index.less b/src/pages/dashbord/index.less
new file mode 100644
index 0000000..4a4054f
--- /dev/null
+++ b/src/pages/dashbord/index.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/dashbord/index.tsx b/src/pages/dashbord/index.tsx
new file mode 100644
index 0000000..8014209
--- /dev/null
+++ b/src/pages/dashbord/index.tsx
@@ -0,0 +1,19 @@
+import { Button, Space } from "antd";
+import { inject, observer } from "mobx-react";
+import { Store } from "antd/lib/form/interface";
+import React from "react";
+import "./index.less";
+
+const Dashbord = (props: Store) => {
+ return (
+
+
+
+
+
+ );
+};
+
+export default inject("usrStore")(observer(Dashbord));
diff --git a/src/pages/home/home.less b/src/pages/home/home.less
deleted file mode 100644
index 7580d74..0000000
--- a/src/pages/home/home.less
+++ /dev/null
@@ -1,157 +0,0 @@
-@keyframes scroll {
- 0% {
- transform: translateX(100%);
- }
- 100% {
- transform: translateX(-100%);
- }
-}
-.contents_center {
- width: 100%;
- height: 100%;
- overflow: hidden;
- position: relative;
- .scr {
- position: absolute;
- top: 60px;
- z-index: 9;
- left: 0;
- right: 0;
- overflow: hidden;
- .scrolling-text {
- white-space: nowrap;
- display: block;
- animation: scroll 20s linear infinite;
- color: #fff;
- > span {
- display: inline-block;
- animation: scrollText 20s linear infinite; /* 动画 */
- }
- :hover > span {
- animation-play-state: paused;
- }
- }
- }
- .map_container_t {
- position: absolute;
- height: 60px;
- top: 0;
- width: 100%;
- background-image: url("../../static/head.png");
- background-repeat: no-repeat;
- backdrop-filter: blur(10px);
- left: 0;
- right: 0;
- z-index: 1;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .map_container_t_c {
- display: flex;
- align-items: center;
- justify-content: center;
- flex: 5;
- .title_img {
- margin-left: 10px;
- width: 20px;
- height: 20px;
- }
- .on_to {
- transform: rotate(-180deg) rotateY(0deg);
- }
- .twp {
- height: 30px;
- }
- > span {
- margin-left: 15px;
- margin-right: 15px;
- color: #fff;
- font-size:25px;
- font-weight: normal;
- line-height: normal;
- letter-spacing: 0.1em;
- font-variation-settings: "opsz" auto;
- color: #ffffff;
- text-shadow: 0px 0px 10px #29ecb4;
- }
- }
- .map_container_t_l {
- flex: 1;
- > span {
- margin-left: 15px;
- margin-right: 15px;
- color: #fff;
- font-size: 14px;
- font-weight: normal;
- line-height: normal;
- letter-spacing: 0.1em;
- font-variation-settings: "opsz" auto;
- color: #ffffff;
- text-shadow: 0px 0px 10px #29ecb4;
- }
- }
-
- .map_container_t_r {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: space-between;
- text-align: right;
- padding-right: 10px;
- }
- }
- .map_container_l {
- position: absolute;
- left: 0px;
- top: 60px;
- width: 20%;
- bottom: 0px;
- z-index: 2;
- opacity: 1;
- background: rgba(37, 52, 70, 0.4);
- backdrop-filter: blur(10px);
- }
- .map_container_r {
- position: absolute;
- right: 0px;
- top: 60px;
- bottom: 0px;
- width: 20%;
- z-index: 2;
- opacity: 1;
- background: rgba(37, 52, 70, 0.4);
- backdrop-filter: blur(10px);
- }
- .map_container_b {
- position: absolute;
- bottom: 0px;
- backdrop-filter: blur(10px);
- background: rgba(37, 52, 70, 0.4);
- height: 60px;
- width: 100%;
- z-index: 1;
- text-align: center;
- .bottom_content {
- display: inline-block;
- > span {
- background: linear-gradient(
- 180deg,
- rgba(0, 193, 153, 0.1) 0%,
- rgba(0, 239, 151, 0.8) 100%
- );
- padding: 5px 10px;
- color: #fff;
- margin: 0 10px;
- cursor: pointer;
- font-size: 18px;
- }
- }
- }
-}
-
-.map_video_container {
- position: absolute;
- width: 350px;
- top: 70px;
- right: 300px;
-}
diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx
deleted file mode 100644
index 21aa248..0000000
--- a/src/pages/home/home.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { observer } from "mobx-react";
-import "./home.less";
-import MapContainer from "@/components/map/MapComponent";
-import image2 from "@/static/title_line@1x.png";
-import { SettingOutlined } from "@ant-design/icons";
-import { useNavigate } from "react-router";
-
-const Home = observer(() => {
- const navigate = useNavigate();
- return (
-
-
-
-
-
-
黄水镇微网实格应急处突综合指挥服务平台
-
-
-
- {
- navigate("admin/user");
- }}
- style={{ fontSize: "20px", color: "#f9f9f9", cursor: "pointer" }}
- />
-
-
-
-
- 仓库2，3号货架,单兵装备，即将临期
-
-
-
-
-
-
-
-
-
-
-
+
(
-
-
-
-
-
- ),
- },
- ]}
+ columns={columns}
dataSource={usrStore.list}
/>
formRef.current?.resetFields()}
@@ -74,9 +41,7 @@ const User = (props: Store) => {
setId(null);
setIsModalOpen(false);
}}
- >
-
-
+ >
);
diff --git a/src/pages/user/user_config.tsx b/src/pages/user/user_config.tsx
index 017108a..34761da 100644
--- a/src/pages/user/user_config.tsx
+++ b/src/pages/user/user_config.tsx
@@ -2,9 +2,8 @@ import { FormType } from "@/components/form/interface";
import { UserDataType } from "@/model/userModel";
import { ColumnsType } from "antd/lib/table";
import { Image } from "antd";
-import { getAgeByIDCard, getBirthDateAndGender } from "@/util/util";
-export const defaultConfig =(team,per)=>
-[
+import { getBirthDateAndGender } from "@/util/util";
+export const defaultConfig = (team, per) => [
{
type: FormType.input,
label: "用户名",
@@ -12,74 +11,7 @@ export const defaultConfig =(team,per)=>
value: "",
rules: [{ required: true, message: "请输入用户名称!" }],
},
- {
- type: FormType.radio,
- label: "性别",
- name: "sex",
- radioData: [
- {
- key: "男",
- val: 1,
- },
- {
- key: "女",
- val: 2,
- },
- ],
- value: 0,
- rules: [{ required: true, message: "请选择性别" }],
- },
- {
- type: FormType.radio,
- label: "是否网格员",
- name: "grid_user",
- radioData: [
- {
- key: "是",
- val: 1,
- },
- {
- key: "否",
- val: 2,
- },
- ],
- value: 0,
- rules: [{ required: true, message: "请选择是否网格员" }],
- },
- {
- type: FormType.radio,
- label: "是否为巡防大队",
- name: "patrol_user",
- radioData: [
- {
- key: "是",
- val: 1,
- },
- {
- key: "否",
- val: 2,
- },
- ],
- value: 0,
- rules: [{ required: true, message: "请选择是否为巡防大队" }],
- },
- {
- type: FormType.radio,
- label: "是否民兵",
- name: "militia",
- radioData: [
- {
- key: "是",
- val: 1,
- },
- {
- key: "否",
- val: 2,
- },
- ],
- value: 0,
- rules: [{ required: true, message: "请选择是否民兵" }],
- },
+
{
type: FormType.inputNumber,
label: "年龄",
@@ -101,26 +33,7 @@ export const defaultConfig =(team,per)=>
value: "",
rules: [{ required: true, message: "请输入登录账号" }],
},
-
- {
- type: FormType.input,
- label: "家庭住址",
- name: "home_addr",
- value: "",
- },
-
- {
- type: FormType.input,
- label: "担任职务",
- name: "pos_held",
- value: "",
- },
- {
- type: FormType.input,
- label: "通讯地址",
- name: "mail_addr",
- value: "",
- },
+
{
type: FormType.input,
label: "联系电话",
@@ -128,95 +41,12 @@ export const defaultConfig =(team,per)=>
value: "",
},
- {
- type: FormType.cehckboxGroup,
- label: "所属队伍",
- name: "team_link_user",
- checkboxData:team,
- value: "",
- rules: [{ required: true, message: "请选择所属队伍" }],
- },
- {
- type: FormType.cehckboxGroup,
- label: "个人身份属性",
- name: "pers_link_user",
- checkboxData:per,
- value: "",
- rules: [{ required: true, message: "请选择个人身份属性" }],
- },
- {
- type: FormType.radio,
- label: "是否党员",
- name: "p_member",
- value: 1,
- radioData: [
- {
- key: "是",
- val: 1,
- },
- {
- key: "否",
- val: 2,
- },
- ],
- rules: [{ required: true, message: "是否党员不能为空" }],
- },
-
- {
- type: FormType.radio,
- label: "是否退役军人",
- name: "vet",
- value: 0,
- radioData: [
- {
- key: "是",
- val: 1,
- },
- {
- key: "否",
- val: 2,
- },
- ],
- rules: [{ required: true, message: "是否退役军人不能为空" }],
- },
- {
- type: FormType.date,
- label: "入伍时间",
- name: "vet_in_time",
- value: "",
- },
- {
- type: FormType.date,
- label: "退伍时间",
- name: "vet_out_time",
- value: "",
- },
- {
- type: FormType.input,
- label: "服役部队",
- name: "serv_unit",
- value: "",
- },
-
- {
- type: FormType.input,
- label: "专业特长",
- name: "spec",
- value: "",
- },
-
{
type: FormType.input,
label: "邮箱",
name: "email",
value: "",
},
- {
- type: FormType.textarea,
- label: "描述",
- name: "remark",
- value: "",
- },
{
type: FormType.upload,
label: "头像",
@@ -235,19 +65,17 @@ export const columns: ColumnsType = [
{
title: "性别",
width: 150,
- render: (render) => {getBirthDateAndGender(render.id_card)?.gender},
- },
- {
- title: "年龄",
- width: 150,
- render: (render) => {getAgeByIDCard(render.id_card)}岁,
+ render: (render) => (
+ {getBirthDateAndGender(render.id_card)?.gender}
+ ),
},
+
{
title: "头像",
dataIndex: "head_img",
width: 150,
- render: (head_img) =>{
- return
+ render: (head_img) => {
+ return ;
},
},
@@ -256,71 +84,14 @@ export const columns: ColumnsType = [
width: 150,
dataIndex: "account",
},
- {
- title: "家庭住址",
- width: 150,
- dataIndex: "home_addr",
- },
{
title: "身份证",
width: 150,
dataIndex: "id_card",
},
- {
- title: "担任职务",
- width: 150,
- dataIndex: "pos_held",
- },
- {
- title: "通讯地址",
- width: 150,
- dataIndex: "mail_addr",
- },
- {
- title: "服役部队",
- width: 150,
- dataIndex: "serv_unit",
- },
- {
- title: "贯籍",
- width: 150,
- dataIndex: "porig",
- },
- {
- title: "专业特长",
- width: 150,
- dataIndex: "spec",
- },
- {
- title: "邮箱",
- width: 150,
- dataIndex: "email",
- },
{
title: "联系电话",
width: 150,
dataIndex: "tel",
},
- {
- title: "民族",
- width: 150,
- dataIndex: "eth",
- },
- {
- title: "是否党员",
- width: 150,
- dataIndex: "p_member",
- render: (p_member) => {p_member === 1 ? "是" : "否"},
- },
- {
- title: "是否退役军人",
- width: 150,
- dataIndex: "vet",
- render: (vet) => {vet === 1 ? "是" : "否"},
- },
- {
- title: "备注",
- width: 150,
- dataIndex: "remark",
- },
];
diff --git a/src/router/index.tsx b/src/router/index.tsx
index bf3e0cb..36283b2 100644
--- a/src/router/index.tsx
+++ b/src/router/index.tsx
@@ -1,17 +1,30 @@
import { createHashRouter } from "react-router-dom";
-import App from "@/App";
+import LayOut from "@/components/layout/layout";
import Login from "@/pages/login/login";
-import { homeRouter } from "@/router/routers/home_router";
+import User from "@/pages/user/user";
+import Dashbord from "@/pages/dashbord";
+
const routers = createHashRouter([
{
path: "/",
- element: ,
+ element: ,
+ children: [
+ {
+ path: "/",
+ index: true,
+ element: ,
+ },
+ {
+ path: "/user/list",
+ index: true,
+ element: ,
+ },
+ ],
},
{
path: "/login",
element: ,
},
- ...homeRouter
]);
export { routers };
diff --git a/src/router/routers/home_router.tsx b/src/router/routers/home_router.tsx
index 67eb602..dce2b0c 100644
--- a/src/router/routers/home_router.tsx
+++ b/src/router/routers/home_router.tsx
@@ -1,12 +1,6 @@
import LayOut from "@/components/layout/layout";
-import Home from "@/pages/home/home";
import User from "@/pages/user/user";
export const homeRouter = [
- {
- path: "/",
- index: true,
- element: ,
- },
{
path: "/admin",
element: ,
diff --git a/src/static/frame_s@1x.png b/src/static/frame_s@1x.png
deleted file mode 100644
index 0684199..0000000
Binary files a/src/static/frame_s@1x.png and /dev/null differ
diff --git a/src/static/head.png b/src/static/head.png
deleted file mode 100644
index 8522650..0000000
Binary files a/src/static/head.png and /dev/null differ
diff --git a/src/static/jun.png b/src/static/jun.png
deleted file mode 100644
index 7dd8e48..0000000
Binary files a/src/static/jun.png and /dev/null differ
diff --git a/src/static/map-maker.png b/src/static/map-maker.png
deleted file mode 100644
index 7a310b0..0000000
Binary files a/src/static/map-maker.png and /dev/null differ
diff --git a/src/static/map-maker1.png b/src/static/map-maker1.png
deleted file mode 100644
index 428f7fb..0000000
Binary files a/src/static/map-maker1.png and /dev/null differ
diff --git a/src/static/map-maker2.png b/src/static/map-maker2.png
deleted file mode 100644
index ff36446..0000000
Binary files a/src/static/map-maker2.png and /dev/null differ
diff --git a/src/static/org_tow.png b/src/static/org_tow.png
deleted file mode 100644
index 9fcb6bc..0000000
Binary files a/src/static/org_tow.png and /dev/null differ
diff --git a/src/static/orgin.png b/src/static/orgin.png
deleted file mode 100644
index 20653f8..0000000
Binary files a/src/static/orgin.png and /dev/null differ
diff --git a/src/static/orgin2.png b/src/static/orgin2.png
deleted file mode 100644
index 955f03a..0000000
Binary files a/src/static/orgin2.png and /dev/null differ
diff --git a/src/static/tab_pre@1x.png b/src/static/tab_pre@1x.png
deleted file mode 100644
index ef71829..0000000
Binary files a/src/static/tab_pre@1x.png and /dev/null differ
diff --git a/src/static/titie_secend@1x.png b/src/static/titie_secend@1x.png
deleted file mode 100644
index 609588d..0000000
Binary files a/src/static/titie_secend@1x.png and /dev/null differ
diff --git a/src/static/title_jiantou@1x.png b/src/static/title_jiantou@1x.png
deleted file mode 100644
index 07c89aa..0000000
Binary files a/src/static/title_jiantou@1x.png and /dev/null differ
diff --git a/src/static/title_line@1x.png b/src/static/title_line@1x.png
deleted file mode 100644
index cc851ef..0000000
Binary files a/src/static/title_line@1x.png and /dev/null differ
diff --git a/src/static/user_head/刘先良.webp b/src/static/user_head/刘先良.webp
deleted file mode 100644
index 62e9789..0000000
Binary files a/src/static/user_head/刘先良.webp and /dev/null differ
diff --git a/src/static/user_head/晏巍.png b/src/static/user_head/晏巍.png
deleted file mode 100644
index cc325fe..0000000
Binary files a/src/static/user_head/晏巍.png and /dev/null differ
diff --git a/src/store/community.ts b/src/store/community.ts
deleted file mode 100644
index 89eddac..0000000
--- a/src/store/community.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { makeObservable } from "mobx";
-import { TagDataType } from "@/model/userModel";
-import BaseStore from "./baseStore";
-
-// 社区
-class CommunityConfig {
- static LIST: string = "/v1/community/list"
- static ADD: string = "/v1/community"
- static DELETE: string = "/v1/community"
- static EDIT: string = "/v1/community"
-}
-class CommunityStore extends BaseStore {
- constructor() {
- super(CommunityConfig)
- makeObservable(this, {})
- }
-}
-
-export const communityStore = new CommunityStore();
diff --git a/src/store/home.ts b/src/store/home.ts
deleted file mode 100644
index 9d87bea..0000000
--- a/src/store/home.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { action, makeObservable, observable } from "mobx";
-// 档案文件夹
-import baseHttp from "@/service/base";
-import BaseStore from "./baseStore";
-import { TagDataType } from "@/model/userModel";
-import MapUtl from "@/components/map/mapUtil";
-import Config from "@/util/config";
-
-class HomeConfig {
- static os: string = "/v1/public/os"
- static tr: string = "/v1/public/tr"
- static af: string = "/v1/public/af"
- static mm: string = "/v1/public/mm"
- static rm: string = "/v1/public/rm"
- static ae: string = "/v1/public/ae"
- static con: string = "/v1/user/mapMakerUser"
-
- static newTask: string = "/v1/user/newTask"
- static taskulist: string = "/v1/public/taskInUser"
- static deviceList: string = "/api/v1/devicesconfig" //设备列表
- static channerList: string = "/api/v1/channelsconfig" //设备列表
- static channelstream: string = "/api/v1/devices/channelstream" //设备包活
-
-}
-class HomeStore extends BaseStore {
- constructor() {
- super(HomeConfig)
- makeObservable(this, {
- getOgCount: action,
- ogMap: observable,
- alist: observable,
- showVideo: observable,
- ulist: observable,
- showVideoHandler: action,
- getTaskUserList: action,
- })
- }
-
- async getOgCount() {
- let res = await baseHttp.get(HomeConfig.os, {});
- this.ogMap = res.data.record
- }
- async getTr() {
- return await baseHttp.get(HomeConfig.tr, {});
- }
-
- async getAf() {
- return await baseHttp.get(HomeConfig.af, {});
- }
- async getMm() {
- return await baseHttp.get(HomeConfig.mm, {});
- }
- async getRm() {
- return await baseHttp.get(HomeConfig.rm, {});
- }
- async getAe() {
- return await baseHttp.get(HomeConfig.ae, {});
- }
- // 获取联系人
- async getContact(params) {
- return await baseHttp.get(HomeConfig.con, params);
- }
-
- // 获取视频推流连接
- async getVideoUrlList() {
- try {
- let data = await baseHttp.gets(HomeConfig.deviceList, {
- start: 0,
- limit: 30
- })
- return data
- } catch (error) {
- console.log(error)
- return false
- }
- }
- // 通道列表
- async getChannerUrlList(deviceId) {
- try {
- let data = await baseHttp.gets(Config.baseUrl+HomeConfig.channerList, {
- start: 0,
- limit: 30,
- device: deviceId
- })
- return data;
- } catch (error) {
- return false
- }
- }
- // 获取通道流
- async getChannerStrem(deviceId, channel) {
- try {
- let data = await baseHttp.gets(HomeConfig.channelstream, {
- device: deviceId,
- channel: channel,
- protocol: "fmp4"
- })
- return data;
- } catch (error) {
- console.log(error)
- return false
- }
- }
- async getNewTask() {
-
- }
- async getTaskUserList() {
- let res = await baseHttp.get(HomeConfig.taskulist, {});
- if (res.data?.record?.ulist && res.data?.record.ulist.length > 0) {
- res.data?.record?.ulist.forEach(element => {
- MapUtl.addMaker({
- lng: element.long ?? 116.478935,
- lat: element.lat ?? 39.997761,
- title: element.user_name,
- users: element
- })
- });
- }
- }
- showVideoHandler(status) {
- this.showVideo = status
- }
- ogMap!: Object;
- showVideo!: boolean;
- alist!: Array;
- ulist!: Array;
-}
-const homeStore = new HomeStore()
-export default homeStore;
-
diff --git a/src/store/index.ts b/src/store/index.ts
index 30b815e..dfe0f9d 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,11 +1,7 @@
import usrStore from '@/store/user'
-import homeStore from './home';
-import { communityStore } from './community';
const store = {
usrStore,
- homeStore,
- communityStore,
};
export default store;
\ No newline at end of file
diff --git a/src/store/user.ts b/src/store/user.ts
index d407448..aa76faa 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -17,10 +17,8 @@ class UserConfig {
static getPatrol: string = "/v1/user/getPatrol"
static videoLogin: string = "api/v1/login"
static siteList: string = "/v1/user/site"
-
-
-
}
+
class UserStore extends BaseStore {
_userinfo: UserInfos = {}; // 用户信息
userDetail = {}