diff --git a/src/api/mosty-jcz.js b/src/api/mosty-jcz.js index 620207d..310dd84 100644 --- a/src/api/mosty-jcz.js +++ b/src/api/mosty-jcz.js @@ -738,3 +738,48 @@ export const feignQueryById = (params) => { }); }; +// 人员轨迹查询 +export const RyGjTrajectory = (params) => { + return request({ + url: api + "/tbJczRyGj/trajectory", + method: "get", + params + }); +}; + +// 人员轨迹CRUD +export const RyGjSelectPage = (params) => { + return request({ + url: api + "/tbJczRyGj/selectPage", + method: "get", + params + }); +}; +export const RyGjQueryById = (params) => { + return request({ + url: api + "/tbJczRyGj/queryById", + method: "get", + params + }); +}; +export const RyGjInsertEntity = (data) => { + return request({ + url: api + "/tbJczRyGj/insertEntity", + method: "post", + data + }); +}; +export const RyGjEditEntity = (data) => { + return request({ + url: api + "/tbJczRyGj/editEntity", + method: "post", + data + }); +}; +export const RyGjDeleteById = (id) => { + return request({ + url: api + `/tbJczRyGj/deleteById/${id}`, + method: "delete" + }); +}; + diff --git a/src/components/GdMap/index copy.vue b/src/components/GdMap/index copy.vue index 020046f..6e96ea0 100644 --- a/src/components/GdMap/index copy.vue +++ b/src/components/GdMap/index copy.vue @@ -1,8 +1,8 @@ @@ -71,18 +71,11 @@ const props = defineProps({ type: Boolean, default: false }, - minZoom: { - type: Number, - default: 7 - }, - maxZoom: { - type: Number, - default: 18 - }, + }); try { const userInfo = getItem("deptId")[0].deptCode; -} catch (error) { } +} catch (error) {} let map; let mapLayer; let mapLayer1; @@ -96,37 +89,66 @@ onMounted(() => { map = new EliMap({ id: props.mapid, - crs: "EPSG:4490", + crs: "EPSG:3857", style: { glyphs: "./fonts/{fontstack}/{range}.pbf", - center: [94.36057012, 29.64276831], - zoom: 15 + center: [94.36,29.65], + zoom: 11 }, - minZoom: props.minZoom, - maxZoom: props.maxZoom, + minZoom: 7, + maxZoom: 18, + transformRequest: (url) => { + if (url.indexOf("TileMatrix=") != -1) { + const arr = url.split("TileMatrix="); + const arr1 = arr[1].split("&"); + const nurl = `${arr[0]}&TileMatrix=${Number(arr1[0])}&${arr1[1]}&${arr1[2]}`; + + } + } }); + window.map = map; map.mapboxGLMap.on("load", () => { - map.addWMTSLayer( - "/PGIS_S_TileMapServer/Maps/XZDJ_DJ/EzMap" - , - { - Service: "getImage", - Type: "RGB", - ZoomOffset: "0", - V: "0.3", - Zoom: "{z}", - Row: "{y}", - Col: "{x}" - }, - { - tileSize: 300 - } - ); + map.addGaudLayer({ + url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}', + }) zoomTarget.value = map.mapboxGLMap.getZoom(); + // 地图加载完成后发出事件 + // emit('mapLoaded') }); mapUtil.value = new MapUtil(map); - + // map = new EliMap({ + // id: props.mapid, + // crs: "EPSG:4490", + // style: { + // glyphs: "./fonts/{fontstack}/{range}.pbf", + // center: [94.36057012, 29.64276831], + // zoom: 15 + // }, + // minZoom: 7, + // maxZoom: 18, + // }); + // window.map = map; + // map.mapboxGLMap.on("load", () => { + // map.addWMTSLayer( + // "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap" + // , + // { + // Service: "getImage", + // Type: "RGB", + // ZoomOffset: "0", + // V: "0.3", + // Zoom: "{z}", + // Row: "{y}", + // Col: "{x}" + // }, + // { + // tileSize: 300 + // } + // ); + // zoomTarget.value = map.mapboxGLMap.getZoom(); + // }); + // mapUtil.value = new MapUtil(map); mapUtil.value.Drawplot(); //初始化加载绘制工具 // 设置地图中心点及图层 @@ -267,6 +289,7 @@ const mapSetLayer = (id, source) => { //获取地图绘制的数据 const resFun = (coord, type, flag, data) => { + emitter.emit("coordString", { coord: coord, type: type, @@ -280,6 +303,12 @@ const handleZoom = (val) => { map.mapboxGLMap.setZoom(val); }; +emitter.on("map-resize", () => { + if (map && map.mapboxGLMap) { + map.mapboxGLMap.resize(); + } +}); + // 是否打开或者关闭路况 const handleSwitch = (val) => { if (val) { @@ -309,6 +338,7 @@ onUnmounted(() => { emitter.off("diffusionCircle"); emitter.off("SsCircle"); emitter.off("ClearssCircle"); + emitter.off("map-resize"); }); @@ -331,35 +361,29 @@ onUnmounted(() => { right: 398px; bottom: 4px; z-index: 9; - .mapImageItem { border: 1px solid #08aae8; background: rgb(9, 26, 70); - - &>img { + & > img { width: 100%; height: 50px; } - - &>div { + & > div { text-align: center; position: relative; top: -3px; } } - .zoomTargetBox { margin-top: 10px; margin-left: 23px; } - ::v-deep .el-input-number__decrease, ::v-deep .el-input-number__increase { background: #133362; color: #fff; border: none; } - ::v-deep .el-input__inner { background: #0c1641; } diff --git a/src/components/GdMap/indexn.vue b/src/components/GdMap/indexn.vue index d5ae8d8..4378f6e 100644 --- a/src/components/GdMap/indexn.vue +++ b/src/components/GdMap/indexn.vue @@ -1,7 +1,7 @@ + + + + diff --git a/src/views/backOfficeSystem/peopleManag/TrackPerson/index.vue b/src/views/backOfficeSystem/peopleManag/TrackPerson/index.vue new file mode 100644 index 0000000..815cb9a --- /dev/null +++ b/src/views/backOfficeSystem/peopleManag/TrackPerson/index.vue @@ -0,0 +1,126 @@ + + + + +