From b418311a816dfb3a6541af584e53b1533fbe76c3 Mon Sep 17 00:00:00 2001
From: wang_yp <357754663@qq.com>
Date: Wed, 16 Apr 2025 15:02:25 +0800
Subject: [PATCH] fix(check)

---
 package.json                  |  2 +-
 src/App.tsx                   | 38 --------------
 src/pages/home/home_check.tsx | 97 +++++++++++++++++++++++++++++++----
 src/store/home.ts             |  1 -
 4 files changed, 88 insertions(+), 50 deletions(-)

diff --git a/package.json b/package.json
index f0db4ab..9394cb4 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "build": "node scripts/build.js",
     "test": "node scripts/test.js"
   },
-  "proxy":"http://127.0.0.1:12214",
+
   "eslintConfig": {
     "extends": [
       "react-app",
diff --git a/src/App.tsx b/src/App.tsx
index ffa5821..303ae9d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,43 +1,5 @@
 import { Outlet } from "react-router";
-import MapUtl from "./components/map/mapUtil";
-import SocketService from "./util/socket";
-const socketService = SocketService.getInstance();
-const onMessage = (e: any) => {
-  let data = JSON.parse(e);
-  if (data.type === "accpt") {
-    let maker: any = null;
-    let body = JSON.parse(data.content.body);
-    MapUtl.makerList?.forEach((e) => {
-      if (e.userIdentity === body?.user.user_identity) {
-        maker = e.marker;
-      }
-    });
-    if (maker) {
-      maker?.setPosition([body.address.long, body.address.lat]);
-    } else {
-      MapUtl.addMaker({
-        lng: body.address.long ?? 103.872802,
-        lat: body.address.lat ?? 30.523876,
-        title: body?.user.user_name,
-        users: body.user,
-        clicks:(v)=>{
-          console.log(v)
-        }
-      });
-    }
-  } else if (data.type === "move") {
-    let maker: any = null;
-    let body = JSON.parse(data.content.body);
-    MapUtl.makerList?.forEach((e) => {
-      if (e.userIdentity === body?.user_identity) {
-        maker = e.marker;
-      }
-    });
-    maker?.setPosition([body.long, body.lat]);
-  }
-};
 
-socketService.on("message", onMessage);
 const App = () => {
   return (
     <>
diff --git a/src/pages/home/home_check.tsx b/src/pages/home/home_check.tsx
index bd23ce0..a4cbcd8 100644
--- a/src/pages/home/home_check.tsx
+++ b/src/pages/home/home_check.tsx
@@ -5,9 +5,10 @@ import { Store } from "antd/es/form/interface";
 import MapUtl from "@/components/map/mapUtil";
 import MapContainerTow from "@/components/map/MapComponentTow";
 import MapUtlTow from "@/components/map/mapUtilTow";
-
+import SocketService from "@/util/socket";
+const socketService = SocketService.getInstance();
 const HomeCheck = (props: Store) => {
-  const { homeStore ,usrStore} = props;
+  const { homeStore, usrStore } = props;
   const [size, changeSize] = useState("1");
   const [id, setId] = useState("");
   const { RangePicker } = DatePicker;
@@ -22,8 +23,57 @@ const HomeCheck = (props: Store) => {
     setTimeout(() => {
       getUlist("1");
     }, 2000);
+
+    socketService.on("message", onMessage);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  const onMessage = (e: any) => {
+    let data = JSON.parse(e);
+    if (data.type === "accpt") {
+      let maker: any = null;
+      let body = JSON.parse(data.content.body);
+      MapUtl.makerList?.forEach((e) => {
+        if (e.userIdentity === body?.user.identity) {
+          maker = e.marker;
+        }
+      });
+      if (maker) {
+        maker?.setPosition([body.address.long, body.address.lat]);
+      } else {
+        MapUtl.addMaker({
+          lng: body.address.long ,
+          lat: body.address.lat,
+          title: body?.user.user_name,
+          users: body.user,
+          clicks: (v) => {
+            setId(v);
+            setOpen(true);
+          },
+        });
+      }
+    } else if (data.type === "move") {
+      let maker: any = null;
+      let body = JSON.parse(data.content.body);
+      MapUtl.makerList?.forEach((e) => {
+        if (e.userIdentity === body?.user?.identity) {
+          maker = e.marker;
+        }
+      });
+      if (!maker) {
+        MapUtl.addMaker({
+          lng: body.address?.long,
+          lat: body.address?.lat,
+          title: body?.user?.user_name,
+          users: body.user,
+          clicks: (v) => {
+            setId(v);
+            setOpen(true);
+          },
+        });
+      }
+      maker?.setPosition([body.address.long, body.address.lat]);
+    }
+  };
   const serchSD = () => {
     if (times.length === 0) {
       message.error("请选择时间区间");
@@ -75,14 +125,14 @@ const HomeCheck = (props: Store) => {
       let list = res.data.record;
       list.forEach((element) => {
         if (!element.lat || !element.long) return;
-        MapUtl.addMaker({ 
+        MapUtl.addMaker({
           lng: element.long,
           lat: element.lat,
           title: element.user_name,
           users: element,
           clicks: (v) => {
-            setId(v)
-            setOpen(true)
+            setId(v);
+            setOpen(true);
           },
         });
       });
@@ -90,10 +140,37 @@ const HomeCheck = (props: Store) => {
   };
   return (
     <>
-      <Radio.Group value={size} onChange={handleSizeChange} >
-        <Radio.Button style={{backgroundColor:"rgba(15,86,147, 0.4)",border:"0px",color:"#fff"}} value="1">民兵</Radio.Button>
-        <Radio.Button style={{backgroundColor:"rgba(15,86,187, 0.4)",border:"0px",color:"#fff"}} value="2">网格员</Radio.Button>
-        <Radio.Button style={{backgroundColor:"rgba(15,86,147, 0.4)",border:"0px",color:"#fff"}} value="3">巡防</Radio.Button>
+      <Radio.Group value={size} onChange={handleSizeChange}>
+        <Radio.Button
+          style={{
+            backgroundColor: "rgba(15,86,147, 0.4)",
+            border: "0px",
+            color: "#fff",
+          }}
+          value="1"
+        >
+          民兵
+        </Radio.Button>
+        <Radio.Button
+          style={{
+            backgroundColor: "rgba(15,86,187, 0.4)",
+            border: "0px",
+            color: "#fff",
+          }}
+          value="2"
+        >
+          网格员
+        </Radio.Button>
+        <Radio.Button
+          style={{
+            backgroundColor: "rgba(15,86,147, 0.4)",
+            border: "0px",
+            color: "#fff",
+          }}
+          value="3"
+        >
+          巡防
+        </Radio.Button>
       </Radio.Group>
       <Modal
         title={"轨迹回放"}
@@ -134,4 +211,4 @@ const HomeCheck = (props: Store) => {
 };
 
 // export default HomeBottom;
-export default inject("homeStore","usrStore")(observer(HomeCheck));
+export default inject("homeStore", "usrStore")(observer(HomeCheck));
diff --git a/src/store/home.ts b/src/store/home.ts
index 73b9f1e..9ae833a 100644
--- a/src/store/home.ts
+++ b/src/store/home.ts
@@ -144,7 +144,6 @@ class HomeStore extends BaseStore<TagDataType> {
                 }
                 // this.getTaskUserList()
                 this.showVideoHandler(true)
-
             }
             return urls;
         } catch (error) {