diff --git a/src/components/layout/layout_config.ts b/src/components/layout/layout_config.ts index aebcdce..f49dc2b 100644 --- a/src/components/layout/layout_config.ts +++ b/src/components/layout/layout_config.ts @@ -91,6 +91,9 @@ export const items = [ { label: `部门管理`, key: "/admin/dep" }, { label: `通知管理`, key: "/admin/sys/notic" }, { label: "系统设置", key: "/admin/sys/setting" }, + { label: "关于我们设置", key: "/admin/sys/about" }, + { label: "操作说明设置", key: "/admin/sys/actionAbout" }, + { label: "隐私政策设置", key: "/admin/sys/privacy" }, { label: "光荣牌审核", key: "/admin/sys/gp" }, { label: "评优审核", key: "/admin/sys/exce_compet" }, ], diff --git a/src/components/map/MapComponentTow.tsx b/src/components/map/MapComponentTow.tsx index 1b016ea..19256b0 100644 --- a/src/components/map/MapComponentTow.tsx +++ b/src/components/map/MapComponentTow.tsx @@ -22,8 +22,8 @@ export default function MapContainerTow() { amap = new Amap.Map("containerTow", { viewMode: "2D", // 是否为3D地图模式 - zoom: 15, // 初始化地图级别 - center: [103.872802, 30.523876], // 初始化地图中心点位置 + zoom: 17, // 初始化地图级别 + center: [103.87940594787575, 30.502048008027348], // 初始化地图中心点位置 mapStyle: "amap://styles/darkblue", resizeEnable: true, }); diff --git a/src/components/map/mapUtilTow.ts b/src/components/map/mapUtilTow.ts index eda8355..fafa07c 100644 --- a/src/components/map/mapUtilTow.ts +++ b/src/components/map/mapUtilTow.ts @@ -101,9 +101,9 @@ class MapUtlTow { static polyline = (lineArr) => { let markerp = new MapUtlTow.loadMap.Marker({ map: MapUtlTow.amap, - position: [116.478935, 39.997761], + position: lineArr[0], icon: "https://a.amap.com/jsapi_demos/static/demo-center-v2/car.png", - offset: new MapUtlTow.loadMap.Pixel(-13, -26), + imageSize: MapUtlTow.loadMap.Size(20, 26), }); new MapUtlTow.loadMap.Polyline({ map: MapUtlTow.amap, @@ -123,7 +123,7 @@ class MapUtlTow { }); MapUtlTow.amap.setFitView(); markerp.moveAlong(lineArr, { - duration: 500,//可根据实际采集时间间隔设置 + duration: 1000,//可根据实际采集时间间隔设置 autoRotation: true, }); } diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx new file mode 100644 index 0000000..6f6d169 --- /dev/null +++ b/src/pages/about/index.tsx @@ -0,0 +1,35 @@ +import { useEffect, useState } from "react"; +import { Button, Space } from "antd"; +import MyEditor from "@/components/edittor"; +import base from "@/service/base"; + +const About = () => { + const [content, setContent] = useState(""); + const [identity, setIdentity] = useState(""); + useEffect(() => { + getContent() + }, []); + + const getContent = () => { + base.get("/v1/about", {}).then((res) => { + setContent(res.data.record.content); + setIdentity(res.data.record.identity) + }); + }; + const save =()=>{ + base.post("/v1/about", { identity,content }).then((res) => { + getContent() + }); + } + return ( +
+ + + setContent(v)} /> + + +
+ ); +}; + +export default About; diff --git a/src/pages/actionAbout/index.tsx b/src/pages/actionAbout/index.tsx new file mode 100644 index 0000000..0b9583b --- /dev/null +++ b/src/pages/actionAbout/index.tsx @@ -0,0 +1,35 @@ +import { useEffect, useState } from "react"; +import { Button, Space } from "antd"; +import MyEditor from "@/components/edittor"; +import base from "@/service/base"; + +const ActionAbout = () => { + const [content, setContent] = useState(""); + const [identity, setIdentity] = useState(""); + useEffect(() => { + getContent() + }, []); + + const getContent = () => { + base.get("/v1/actionAbout", {}).then((res) => { + setContent(res.data.record.content); + setIdentity(res.data.record.identity) + }); + }; + const save =()=>{ + base.post("/v1/actionAbout", { identity,content }).then((res) => { + getContent() + }); + } + return ( +
+ + + setContent(v)} /> + + +
+ ); +}; + +export default ActionAbout; diff --git a/src/pages/privacy/index.tsx b/src/pages/privacy/index.tsx new file mode 100644 index 0000000..00f7e5d --- /dev/null +++ b/src/pages/privacy/index.tsx @@ -0,0 +1,35 @@ +import { useEffect, useState } from "react"; +import { Button, Space } from "antd"; +import MyEditor from "@/components/edittor"; +import base from "@/service/base"; + +const Privacy = () => { + const [content, setContent] = useState(""); + const [identity, setIdentity] = useState(""); + useEffect(() => { + getContent() + }, []); + + const getContent = () => { + base.get("/v1/privacyPolicy", {}).then((res) => { + setContent(res.data.record.content); + setIdentity(res.data.record.identity) + }); + }; + const save =()=>{ + base.post("/v1/privacyPolicy", { identity,content }).then((res) => { + getContent() + }); + } + return ( +
+ + + setContent(v)} /> + + +
+ ); +}; + +export default Privacy; diff --git a/src/router/routers/home_router.tsx b/src/router/routers/home_router.tsx index 02d774f..4bd7d78 100644 --- a/src/router/routers/home_router.tsx +++ b/src/router/routers/home_router.tsx @@ -29,6 +29,9 @@ import PatrolBrigade from "@/pages/patrolBrigade"; import ExceCompet from "@/pages/exce_compet"; import Signin from "@/pages/signin"; import Notic from "@/pages/notic"; +import About from "@/pages/about"; +import ActionAbout from "@/pages/actionAbout"; +import Privacy from "@/pages/privacy"; export const homeRouter = [ { path: "/", @@ -196,6 +199,21 @@ export const homeRouter = [ index: true, element: , }, + { + path: "/admin/sys/about", + index: true, + element: , + }, + { + path: "/admin/sys/actionAbout", + index: true, + element: , + }, + { + path: "/admin/sys/privacy", + index: true, + element: , + }, ], }, ], diff --git a/src/static/zoulu.gif b/src/static/zoulu.gif new file mode 100644 index 0000000..659843a Binary files /dev/null and b/src/static/zoulu.gif differ diff --git a/src/util/config.ts b/src/util/config.ts index 4660882..d45812c 100644 --- a/src/util/config.ts +++ b/src/util/config.ts @@ -1,11 +1,11 @@ class Config { - static baseUrl = "/"; // static baseUrl = "https://www.hswzct.cn:12016/"; - // static baseUrl = "http://127.0.0.1:12214/"; + static baseUrl = "/"; static ws = "wss://www.hswzct.cn:12016/wsadmin?id=admin"; static userStatic = "https://www.hswzct.cn:12016/api/uploads/user/"; static videoApi = "https://sprh.hswzct.cn:4443"; // static videoApis = "https://sprh.hswzct.cn:4443"; // } + export default Config;