From bf61fd7815e261d5d9753352527c5f3c6e5ad0f9 Mon Sep 17 00:00:00 2001
From: wang_yp <357754663@qq.com>
Date: Mon, 2 Dec 2024 16:03:04 +0800
Subject: [PATCH] first commit
---
src/components/map/mapUtil.ts | 25 +++++++++++++++++++++++++
src/pages/home/homeBottom/dispath.tsx | 9 ++++++---
src/pages/home/homeBottom/emr.tsx | 6 ++++--
src/pages/home/homeLeft/orgin.tsx | 19 ++++++++++++++++++-
src/pages/home/home_video.tsx | 1 -
src/pages/home/video.tsx | 1 -
src/static/map-maker (1).png | Bin 0 -> 3510 bytes
src/static/map-maker (2).png | Bin 0 -> 3878 bytes
src/static/map-maker.png | Bin 0 -> 3481 bytes
src/store/home.ts | 6 ++++++
src/store/user.ts | 2 +-
11 files changed, 60 insertions(+), 9 deletions(-)
create mode 100644 src/static/map-maker (1).png
create mode 100644 src/static/map-maker (2).png
create mode 100644 src/static/map-maker.png
diff --git a/src/components/map/mapUtil.ts b/src/components/map/mapUtil.ts
index 554cc07..f9bfca3 100644
--- a/src/components/map/mapUtil.ts
+++ b/src/components/map/mapUtil.ts
@@ -1,3 +1,6 @@
+import makers from "../../static/map-maker.png";
+import makers1 from "../../static/map-maker (1).png";
+import makers2 from "../../static/map-maker (2).png";
interface makersInf {
userIdentity: string,
marker: any
@@ -10,15 +13,37 @@ class MapUtl {
static addMaker(data: any) {
const { lng, lat, title, users } = data;
+ let mk,dep = "";
+ if(users?.militia_type===1){
+ mk = makers
+ dep = "民兵"
+ }
+ if(users?.grid_user===1){
+ mk = makers1
+ dep = "网格员"
+ }
+ if(users?.patrol_user===1){
+ mk = makers2
+ dep = "巡防大队"
+ }
+
// if (MapUtl.loadMap === null) return;
const marker = new MapUtl.loadMap.Marker({
position: new MapUtl.loadMap.LngLat(lng, lat),
title: title,
+ icon: new MapUtl.loadMap.Icon({
+ imageSize: [20, 20],
+ image: mk,
+ style: {
+ backgroundImage:"red"
+ }// 默认的样式名
+ }),
});
var content = [
"
姓名 :" + users?.user_name + "",
"职位 : " + users.pos_held,
"电话 : " + users.tel,
+ "部门 : " + dep,
"
",
];
var infoWindow = new MapUtl.loadMap.InfoWindow({
diff --git a/src/pages/home/homeBottom/dispath.tsx b/src/pages/home/homeBottom/dispath.tsx
index 8841025..8662ff1 100644
--- a/src/pages/home/homeBottom/dispath.tsx
+++ b/src/pages/home/homeBottom/dispath.tsx
@@ -21,7 +21,7 @@ import MinusCircleOutlined from "@ant-design/icons/lib/icons/MinusCircleOutlined
const { Option } = Select;
const Dispath = (props: Store) => {
- const { trainingStore, trainingCatStore } = props;
+ const { trainingStore, trainingCatStore,homeStore } = props;
const formRef = React.useRef(null);
const [isModalOpen, setIsModalOpen] = useState(false);
const [projectConfig, setProjectConfig] = useState([]);
@@ -97,7 +97,10 @@ const Dispath = (props: Store) => {
count: Number(values.count),
};
data.task_video = task_videos;
- trainingStore.add(data);
+ trainingStore.add(data).then(()=>{
+ homeStore.getNewTask()
+ });
+
setIsModalOpen(false);
};
const handleSearch = (newValue: string) => {
@@ -253,4 +256,4 @@ const Dispath = (props: Store) => {
>
);
};
-export default inject("trainingStore", "trainingCatStore")(observer(Dispath));
+export default inject("trainingStore", "trainingCatStore","homeStore")(observer(Dispath));
diff --git a/src/pages/home/homeBottom/emr.tsx b/src/pages/home/homeBottom/emr.tsx
index afdc05a..a98bc98 100644
--- a/src/pages/home/homeBottom/emr.tsx
+++ b/src/pages/home/homeBottom/emr.tsx
@@ -44,9 +44,11 @@ const Emr = (props: Store) => {
});
}
data.task_video = task_video;
- emergencyStore.add(data);
+ emergencyStore.add(data).then(()=>{
+ homeStore.getNewTask()
+ });
setIsModalOpen(false);
- homeStore.getNewTask();
+
};
const handleSearch = (newValue: string) => {
if (newValue === "") return;
diff --git a/src/pages/home/homeLeft/orgin.tsx b/src/pages/home/homeLeft/orgin.tsx
index 43c6603..b907454 100644
--- a/src/pages/home/homeLeft/orgin.tsx
+++ b/src/pages/home/homeLeft/orgin.tsx
@@ -6,14 +6,31 @@ import { Modal } from "antd";
import { Store } from "antd/es/form/interface";
import { inject, observer } from "mobx-react";
import { useEffect, useState } from "react";
+import MapUtl from "@/components/map/mapUtil";
const Orgin = (props: Store) => {
const { homeStore } = props;
const [isModalOpen, setIsModalOpen] = useState(false);
const [isSelf, setIsSelf] = useState(false);
-
+ const getRaud = (m: number,n:number) => {
+ var num = Math.floor(Math.random()*(m - n) + n);
+ return num
+ };
useEffect(() => {
homeStore.getOgCount();
homeStore.getVideoUrlList();
+ homeStore.getContact().then((res)=>{
+ let list = res.data.record;
+ list.forEach(element => {
+ let lng = "103.8"+getRaud(2000,12000)
+ let lat = "30.5"+getRaud(1000,12000)
+ MapUtl.addMaker({
+ lng:lng,
+ lat:lat,
+ title:element.user_name,
+ users:element
+ })
+ });
+ })
}, [homeStore]);
const showModal = () => {
setIsModalOpen(true);
diff --git a/src/pages/home/home_video.tsx b/src/pages/home/home_video.tsx
index 62a9548..c32bc73 100644
--- a/src/pages/home/home_video.tsx
+++ b/src/pages/home/home_video.tsx
@@ -15,7 +15,6 @@ const HomeVideo = (props: Store) => {
}, [homeStore]);
return (
-
隐藏
{homeStore.showVideo ? (
{
player?.autoplay(videoJsOptions?.autoplay);
player.src(videoJsOptions?.sources);
}
- console.log(videoJsOptions.sources)
return () => {
if (playerRef.current) {
playerRef.current.dispose();
diff --git a/src/static/map-maker (1).png b/src/static/map-maker (1).png
new file mode 100644
index 0000000000000000000000000000000000000000..428f7fb633fe097f727f0f32f560f93d859898b0
GIT binary patch
literal 3510
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
literal 0
HcmV?d00001
diff --git a/src/static/map-maker (2).png b/src/static/map-maker (2).png
new file mode 100644
index 0000000000000000000000000000000000000000..ff36446132e6b6138585a3475575758e982015d2
GIT binary patch
literal 3878
zcmbVP_dgqo7fm80cFfvMNvtSp&nI@wsuH588nG4C+HC|+gc2#9y+_q5FiG8k3*R5^Irsi@@A>I`?n$+?HRog#VFLgFoE8`p`#(JVUqM;^V54(W
z$sYpVvNtyZG||Pj006EP3ll?!DEFOWVECE_m#K_QA!DRfdmeAwp{t@a
zFFV$SEmna+zj@$Dt9w6IQY6YCA7WOxzyJMT6H6f2i68bSL!i*lhTJe%070T(ub+c>
zdcRj=4*;A;Oo&OZ13~}qyvKf6+I+SB-aW3`oxXd%BL*+e^|>2#F5mAv5q*XCm4v?m
z_oV%529ka0hd@iFlnK3+8z9e(w=BsJSfpU2$FKNzl;!0=A{Wm#ADO1CHd#*z%1ndkn;KLe#dJA@dc@BWB-
zR22Z))-{E4(7LwS8MPgyopfnkrYZa~OUmb3<2?k->G+t#i}Q5{g~3Kr7qdZ6h6uLN
z6|NbzO2M(A-cRKwc(Zrl^PI5yS5ao=&I!~oMyPNvA6zihVQ#+sJopI%MCxd8>HSwQ
zDWa=RF#Dp)2p7Tc<3k0oQMhWU10*SQ49P#(*?BJo7hvbth@FzbE>xcBX9^5oVp({BZQ=(
z*aqir&X~Z3Wq>WD!|_W9+CI7Mm$$|3jSm78OzSW?YVnk@f96Q5AM|5|qrg%lAtDAn
z+oJJfb!z{N&ix~akXwq4<6S5rRGy#i&dy3-SkTBR?Pab~!9MBTE~X>%$6s(q4t?YI
zoL51K!g+aOaz%K%cawsTdQZTYuDQf4RPX!xp!IwwaA8Hv+l-?iY%}hl2!ZgyiY!%M
zQv3FuX