- 
- {e.label}
-
- }}
- />
-
- );
-};
-const data = [
- {
- depName: "镇武装部党委",
- depId: 1,
- userList: [
- {
- position: "武装部长",
- userName: "李部长",
- userId: 1,
- },
- {
- position: "教导员",
- userName: "王教导",
- userId: 2,
- },
- ],
- children: [
- {
- depName: " 武装力量党支部",
- depId: 2,
- children: [
- {
- depName: " 文武社区支部",
- depId: 3,
- children: [
- {
- depName: " 一小组",
- depId: 6,
- userList: [
- {
- position: "一小组长",
- userName: "一小组长1",
- userId: 6,
- },
- {
- position: "二小组长12",
- userName: "二小组长2",
- userId: 8,
- },
- {
- position: "战士",
- userName: "王小三3",
- userId: 11,
- },
- {
- position: "战士",
- userName: "王小四4",
- userId: 12,
- },
- {
- position: "二小组长34",
- userName: "二小组长5",
- userId: 8,
- },
- {
- position: "战士",
- userName: "王小三6",
- userId: 11,
- },
- {
- position: "战士",
- userName: "王小四7",
- userId: 13,
- },
- ],
- },
- {
- depName: " 二小组",
- depId: 7,
- userList: [
- {
- position: "二小组长8",
- userName: "二小组长9",
- userId: 7,
- },
- {
- position: "二小组长10",
- userName: "二小组长11",
- userId: 8,
- },
- {
- position: "战士",
- userName: "王小三14",
- userId: 11,
- },
- {
- position: "战士",
- userName: "王小四",
- userId: 12,
- },
- ],
- },
- ],
- userList: [
- {
- position: "文武社区支部书记",
- userName: "书记名称",
- userId: 3,
- },
- ],
- },
- {
- depName: " 花龙村支部",
- depId: 4,
- children: [
- {
- depName: " 一小组",
- depId: 7,
- userList: [
- {
- position: "一小组长",
- userName: "一小组长",
- userId: 7,
- },
- {
- position: "二小组长2",
- userName: "二小组长11",
- userId: 8,
- },
- {
- position: "战士",
- userName: "王小三",
- userId: 11,
- },
- {
- position: "战士",
- userName: "王小四12",
- userId: 12,
- },
- {
- position: "二小组长3",
- userName: "二小组长",
- userId: 8,
- },
-
- {
- position: "战士",
- userName: "王小四32",
- userId: 12,
- },
- ],
- },
- {
- depName: " 二小组",
- depId: 8,
- userList: [
- {
- position: "二小组长4",
- userName: "二小组长4",
- userId: 8,
- },
- {
- position: "战士",
- userName: "王小三",
- userId: 11,
- },
- {
- position: "战士",
- userName: "王小四12",
- userId: 12,
- },
- {
- position: "战士",
- userName: "王小五",
- userId: 13,
- },
- ],
- },
- ],
- userList: [
- {
- position: "花龙村支部书记",
- userName: "书记名称",
- userId: 4,
- },
- ],
- },
- {
- depName: " 云华社区支部",
- depId: 5,
- children: [
- {
- depName: " 一小组",
- depId: 8,
- userList: [
- {
- position: "一小组长",
- userName: "小组长",
- userId: 8,
- },
- {
- position: "战士",
- userName: "王喜哦",
- userId: 12,
- },
- {
- position: "战士",
- userName: "王喜吃",
- userId: 13,
- },
- ],
- },
- {
- depName: " 二小组",
- depId: 9,
- userList: [
- {
- position: "二小组长5",
- userName: "小组长",
- userId: 9,
- },
- {
- position: "战士",
- userName: "王小二",
- userId: 10,
- },
- {
- position: "战士",
- userName: "王小三",
- userId: 11,
- },
- {
- position: "战士",
- userName: "王小四3",
- userId: 12,
- },
- {
- position: "战士",
- userName: "王小五",
- userId: 13,
- },
- ],
- },
- ],
- userList: [
- {
- position: "云华社区支部书记",
- userName: "书记名称",
- userId: 5,
- },
- ],
- },
- ],
- },
- ],
- },
-];
-export default OrgChartSelf;
diff --git a/src/pages/home/home.less b/src/pages/home/home.less
index 90491da..0f58f63 100644
--- a/src/pages/home/home.less
+++ b/src/pages/home/home.less
@@ -21,11 +21,11 @@
.scrolling-text {
white-space: nowrap;
display: block;
- animation: scroll 10s linear infinite;
+ animation: scroll 20s linear infinite;
color: #fff;
> span {
display: inline-block;
- animation: scrollText 10s linear infinite; /* 动画 */
+ animation: scrollText 20s linear infinite; /* 动画 */
}
:hover > span {
animation-play-state: paused;
@@ -152,9 +152,8 @@
.map_video_container {
position: absolute;
- width: 200px;
- height: 400px;
- top: 40px;
- z-index: 9;
- right: 288px;
+ width: 300px;
+ height: 300px;
+ top: 60px;
+ right: 300px;
}
diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx
index c99f7c3..33381e2 100644
--- a/src/pages/home/home.tsx
+++ b/src/pages/home/home.tsx
@@ -7,43 +7,17 @@ import HomeBottom from "@/pages/home/homeBottom/home_bottom";
import image2 from "@/static/title_line@1x.png";
import { SettingOutlined } from "@ant-design/icons";
import { useNavigate } from "react-router";
-import { useEffect, useState } from "react";
-import MapUtl from "@/components/map/mapUtil";
import Video from "./video";
+import Weather from "./homeLeft/weather";
+import Timer from "./homeLeft/timer";
const Home = observer(() => {
const navigate = useNavigate();
- const [times, setTimes] = useState
- {e.label}
-
- {times}
+
- {
navigate("admin/user");
@@ -87,7 +48,7 @@ const Home = observer(() => {
-
+ 天气:{wechaer?.weather}
-风向:{wechaer?.windDirection}
-风级:{wechaer?.windPower}
-湿度:{wechaer?.humidity}
-
-
+
+
+ );
+};
+
+export default Weather;
diff --git a/src/pages/home/video.tsx b/src/pages/home/video.tsx
index b76ae2e..a7c8953 100644
--- a/src/pages/home/video.tsx
+++ b/src/pages/home/video.tsx
@@ -1,27 +1,62 @@
import { Store } from "antd/es/form/interface";
import { inject, observer } from "mobx-react";
-import { useEffect } from "react";
-import ReactPlayer from "react-player";
-
+import { useEffect, useRef } from "react";
+import videojs from "video.js";
+import "video.js/dist/video-js.css";
+const videoJsOptions = {
+ autoplay: true,
+ controls: true,
+ responsive: true,
+ fluid: true,
+ sources: [
+ {
+ src: "http://112.19.145.68:18000/hls/stream_1_0/playlist.m3u8",
+ type: "application/x-mpegURL",
+ },
+ ],
+};
const Video = (props: Store) => {
- const { homeStore } = props;
+ const { homeStore, onReady } = props;
+ const videoRef = useRef天气:{wechaer?.weather}
+风向:{wechaer?.windDirection}
+风级:{wechaer?.windPower}
+湿度:{wechaer?.humidity}
+
+
+
);
};
diff --git a/src/pages/poverPage/pv.less b/src/pages/poverPage/pv.less
index 4d270fa..90c236e 100644
--- a/src/pages/poverPage/pv.less
+++ b/src/pages/poverPage/pv.less
@@ -43,6 +43,7 @@
}
}
.pv_table {
+ height: 430px;
.table {
width: 100%;
overflow-x: auto;
diff --git a/src/pages/system/banner.tsx b/src/pages/system/banner.tsx
index 2068b03..c7cb250 100644
--- a/src/pages/system/banner.tsx
+++ b/src/pages/system/banner.tsx
@@ -19,8 +19,8 @@ const Banner = (props: Store) => {
setFileList(v);
};
useEffect(() => {
- sysStore.getlist().then(() => {
- let data = sysStore.list
+ sysStore.getbanner().then(() => {
+ let data = sysStore.bannerList
data.forEach((e)=>{
e.fileNmae = e.file_name
e.name = e.file_name
@@ -30,7 +30,7 @@ const Banner = (props: Store) => {
});
}, [sysStore]);
const save = () => {
- sysStore.add({ list: files });
+ sysStore.addBanner({ list: files });
};
return (
diff --git a/src/pages/system/dict.tsx b/src/pages/system/dict.tsx
new file mode 100644
index 0000000..c60d03c
--- /dev/null
+++ b/src/pages/system/dict.tsx
@@ -0,0 +1,150 @@
+import { Button, Space, Modal, FormInstance, Form, Select } 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 SimpleForm from "@/components/form/simple_form";
+import React from "react";
+import { columns, defaultCatConfig } from "./dict_column";
+const { Option } = Select;
+const list = [
+ { id: 1, name: "婚姻" },
+ { id: 2, name: "政治面貌" },
+ { id: 3, name: "文化程度" },
+ { id: 4, name: "民族" },
+ { id: 5, name: "单位性质" },
+ { id: 6, name: "服役军兵种" },
+ { id: 7, name: "军衔" },
+ { id: 8, name: "技术职称" },
+ { id: 9, name: "职务级别" },
+];
+const Dict = (props: Store) => {
+ const { sysStore } = props;
+ const [isModalOpen, setIsModalOpen] = useState(false);
+ const [projectConfig, setProjectConfig] = useState([]);
+ const formRef = React.useRef(null);
+ const [record, setRecord] = useState(null);
+ useEffect(() => {
+ sysStore.getlist({ drop_type: 0 });
+ setProjectConfig(defaultCatConfig);
+ }, [sysStore]);
+ const column_widget = (any, record) => {
+ return (
+
+
+
+
+
+ );
+ };
+ const edit = (record) => {
+ setIsModalOpen(true);
+ setRecord(record);
+ };
+ const onFinish = (values: any) => {
+ if (!record?.id) {
+ sysStore.add(values);
+ } else {
+ sysStore.putItem(record.id, values);
+ }
+ setIsModalOpen(false);
+ };
+
+ const onFinishFailed = () => {};
+ return (
+ = [
+ {
+ title: "分类名称",
+ dataIndex: "name",
+ },
+ {
+ title: "分类",
+ dataIndex: "drop_type",
+ render: (drop_type) => <>{[
+ { id: 1, name: "婚姻" },
+ { id: 2, name: "政治面貌" },
+ { id: 3, name: "文化程度" },
+ { id: 4, name: "民族" },
+ { id: 5, name: "单位性质" },
+ { id: 6, name: "服役军兵种" },
+ { id: 7, name: "军衔" },
+ { id: 8, name: "技术职称" },
+ { id: 9, name: "职务级别" },
+ ].find((v) => v.id === drop_type)?.name || ""},
+ },
+];
+
+export const defaultCatConfig = [
+ {
+ type: FormType.input,
+ label: "字典名称",
+ name: "name",
+ value: "",
+ rules: [{ required: true, message: "请输入字典名称!" }],
+ },
+];
diff --git a/src/pages/system/index.tsx b/src/pages/system/index.tsx
index 1ac00c9..030448d 100644
--- a/src/pages/system/index.tsx
+++ b/src/pages/system/index.tsx
@@ -1,5 +1,6 @@
import { Tabs, TabsProps } from "antd";
import Banner from "./banner";
+import Dict from "./dict";
const SystemPage = () => {
const items: TabsProps["items"] = [
@@ -8,7 +9,11 @@ const SystemPage = () => {
label: "banner管理",
children: {
constructor() {
super(SysConfig)
+ makeObservable(this, {
+ addBanner: action,
+ getbanner: action,
+ bannerList: observable,
+ })
}
+
+ async addBanner(param: any) {
+ await baseHttp.post(SysConfig.ADDBanner, param)
+ this.getbanner();
+ }
+ async getbanner() {
+ let res = await baseHttp.get(SysConfig.LISTBannler, {})
+ this.bannerList = res.data.record
+ }
+ bannerList:Array = []
}
export const sysStore = new SysStore()
diff --git a/src/test_socke.html b/src/test_socke.html
index 05df7de..239548c 100644
--- a/src/test_socke.html
+++ b/src/test_socke.html
@@ -27,117 +27,129 @@
+
+
+
+
+ column_widget(any, record),
+ },
+ ]}
+ dataSource={sysStore.list}
+ />
+ formRef.current?.resetFields()}
+ onOk={() => formRef.current?.submit()}
+ okText="确定"
+ cancelText="取消"
+ onCancel={() => {
+ setIsModalOpen(false);
+ }}
+ >
+ {
+ if (record?.id) {
+ formRef.current?.setFieldsValue(record);
+ } else {
+ formRef.current?.setFieldsValue(null);
+ }
+ }}
+ formName="card_basic"
+ colProps={25}
+ subBtnName="提交"
+ formDatas={projectConfig}
+ onFinish={onFinish}
+ initialValues={true}
+ onFinishFailed={onFinishFailed}
+ >
+ <>
+
+
+
+
+
+
+
+
+ );
+};
+
+export default inject("sysStore")(observer(Dict));
diff --git a/src/pages/system/dict_column.tsx b/src/pages/system/dict_column.tsx
new file mode 100644
index 0000000..0c91b75
--- /dev/null
+++ b/src/pages/system/dict_column.tsx
@@ -0,0 +1,34 @@
+import { FormType } from "@/components/form/interface";
+import { UserDataType } from "@/model/userModel";
+import { ColumnsType } from "antd/lib/table";
+export const columns: ColumnsType