wang_yp
/
ball_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(check)

This commit is contained in:
wang_yp 2025-04-16 15:02:25 +08:00
parent 50264ec154
commit b418311a81
4 changed files with 88 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

38
src/App.tsx
View File

@ -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 (
<>

97
src/pages/home/home_check.tsx
View File

@ -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));

1
src/store/home.ts
View File

@ -144,7 +144,6 @@ class HomeStore extends BaseStore<TagDataType> {
}
// this.getTaskUserList()
this.showVideoHandler(true)
}
return urls;
} catch (error) {