报警类型:{{ alarmDetailsData.alarmCategory_dictText }}
+
报警类型:{{
+ alarmDetailsData.alarmCategory_dictText
+ }}
报警时间:{{ alarmDetailsData.createTime }}
警情内容:{{ alarmDetailsData.msgContent }}
@@ -46,9 +48,9 @@ import VectorLayer from "ol/layer/Vector";
import VectorSource from "ol/source/Vector";
import XYZ from "ol/source/XYZ";
import {Map, View, Feature} from "ol";
-import {Icon, Fill, Stroke, Style, Circle,Text} from "ol/style";
+import {Icon, Fill, Stroke, Style, Circle, Text} from "ol/style";
import Overlay from "ol/Overlay";
-import {Point, LineString,Polygon} from "ol/geom.js";
+import {Point, LineString, Polygon} from "ol/geom.js";
import {getVectorContext} from "ol/render";
import axios from "axios";
import TileWMS from "ol/source/TileWMS"
@@ -59,7 +61,7 @@ import * as interaction from 'ol/interaction'; // 交互
import {OL as ol} from "plot-ol/plottingol";
import GeoJSON from 'ol/format/GeoJSON'
import service from "@/utils/service";
-import {appInit, getStatisFileUrl,getUrlParam} from "../utils/publicFun";
+import {appInit, getStatisFileUrl, getUrlParam} from "../utils/publicFun";
export default {
data() {
@@ -123,14 +125,15 @@ export default {
parentPostMessageData: [],
isCanDraw: true,
pointsList: "",
+ modify: null
};
},
mounted() {
- this.page = this.$route.query.page||getUrlParam("page");
- this.pageType = this.$route.query.type||getUrlParam("type");
+ this.page = this.$route.query.page || getUrlParam("page");
+ this.pageType = this.$route.query.type || getUrlParam("type");
- this.token = this.$route.query.token ||getUrlParam("token");
- this.pointsList = this.$route.query.pointsList ||getUrlParam("pointsList");
+ this.token = this.$route.query.token || getUrlParam("token");
+ this.pointsList = this.$route.query.pointsList || getUrlParam("pointsList");
localStorage.setItem("hd_token", this.token)
@@ -146,18 +149,26 @@ export default {
this.initMap();
this.pcDrawType = "Polygon"
- if(this.pageType=="edit"){
+ if (this.pageType == "add") {
+ this.isCanDraw = true
+ this.pcPlanningPath();
+ } else if (this.pageType == "edit") {
this.pcDrawType = "Polygon"
window.addEventListener('message', (event) => {
this.isCanDraw = true
- if (this.parentPostMessageData.length == 0) {
- this.map.removeLayer(this.drawPlanningPathLayer);
- this.parentPostMessageData = event.data;
- this.drawPcPostMessageDataLayer()
+ if (event.data instanceof Array) {
+ console.log("接收到父页面数据")
+ console.log(event.data)
+ if (this.parentPostMessageData.length == 0) {
+ // this.map.removeLayer(this.drawPlanningPathLayer);
+ this.parentPostMessageData = event.data;
+ this.pcPlanningPath();
+ // this.drawPcPostMessageDataLayer()
+ }
}
});
- this.pcPlanningPath();
- }else {
+
+ } else {
this.isCanDraw = false
this.pcDrawType = "Polygon"
window.addEventListener('message', (event) => {
@@ -509,14 +520,11 @@ export default {
// this.map.removeInteraction(interaction);
-
// 矢量地图源
let vectorSource = new VectorSource({
- features: [
-
- ],
+ features: [],
});
- if(this.parentPostMessageData.length>0){
+ if (this.parentPostMessageData.length > 0) {
const tempGeometryList = []
@@ -534,7 +542,6 @@ export default {
}
-
// 矢量地图
this.drawPlanningPathLayer = new VectorLayer({
source: vectorSource,
@@ -546,11 +553,11 @@ export default {
})
});
- let modify = new interaction.Modify({
+ this.modify = new interaction.Modify({
source: vectorSource
});
- this.map.addInteraction(modify);
+ this.map.addInteraction(this.modify);
// 绘制图形类型
// Point 点
@@ -563,7 +570,9 @@ export default {
type: this.pcDrawType
});
- this.map.addInteraction(this.draw);
+ if(this.pageType=="add"){
+ this.map.addInteraction(this.draw);
+ }
// 创建一个Snap控件，并加入到Map对象中
this.snap = new interaction.Snap({
@@ -571,46 +580,69 @@ export default {
});
-
-
this.map.addLayer(this.drawPlanningPathLayer);
this.map.addInteraction(this.snap);
- this.draw.on('drawend', (e) => {
- if (!this.isCanDraw) {
- return;
- }
+ this.modify.on('modifyend', function (evt) {
+ // get features:
+ var collection = evt.features;
+ // There's only one feature, so get the first and only one:
+ var featureClone = collection.item(0).clone();
- Dialog.confirm({
- title: '绘制完成',
- message: '取消则会重新绘制',
+ console.log(featureClone)
+
+ const featureGeoJson = JSON.parse(new GeoJSON().writeFeature(featureClone))
+
+ let pointList = []
+
+ featureGeoJson.geometry.coordinates.map(item => {
+ pointList.push(ol.proj.transform(item, 'EPSG:3857', 'EPSG:4326'))
})
- .then(() => {
+ console.log(pointList)
- // on confirm
- const featureGeoJson = JSON.parse(new GeoJSON().writeFeature(e.feature))
+ window.parent.postMessage(JSON.stringify([pointList]), "*");
- let pointList = []
- featureGeoJson.geometry.coordinates.map(item => {
- const _item = ol.proj.transform(item, 'EPSG:3857', 'EPSG:4326');
- pointList.push(_item)
- })
- console.log(pointList)
-
- window.parent.postMessage(JSON.stringify(pointList), "*");
-
- })
- .catch(() => {
- // on cancel
- this.drawPlanningPathLayer.getSource().clear();
- // this.map.removeLayer(this.drawPlanningPathLayer)
- // this.map.addLayer(this.drawPlanningPathLayer)
- });
- // this.map.removeInteraction(draw); // 在此处清除交互会触发地图默认的双击放大
+ // do something after modifying (e.g. saving):
+ // ...
});
+ if (this.pageType == "add") {
+ this.draw.on('drawend', (e) => {
+
+ Dialog.confirm({
+ title: '绘制完成',
+ message: '取消则会重新绘制',
+ })
+ .then(() => {
+
+ // on confirm
+ const featureGeoJson = JSON.parse(new GeoJSON().writeFeature(e.feature))
+
+ let pointList = []
+
+ featureGeoJson.geometry.coordinates.map(item => {
+ console.log(item)
+ item.map(_item => {
+ pointList.push(ol.proj.transform(_item, 'EPSG:3857', 'EPSG:4326'))
+ })
+ })
+ console.log(pointList)
+
+ window.parent.postMessage(JSON.stringify([pointList]), "*");
+
+ })
+ .catch(() => {
+ // on cancel
+ this.drawPlanningPathLayer.getSource().clear();
+ // this.map.removeLayer(this.drawPlanningPathLayer)
+ // this.map.addLayer(this.drawPlanningPathLayer)
+ });
+ // this.map.removeInteraction(draw); // 在此处清除交互会触发地图默认的双击放大
+ })
+ }
+
},
clearPcPlanningPath() {
@@ -861,23 +893,21 @@ export default {
this.map.addLayer(this.drawPlanningPathLayer);
- service.get(`/api/patrol/area/list`, {
-
- }).then((res) => {
+ service.get(`/api/patrol/area/list`, {}).then((res) => {
if (res.status == 200) {
console.log(res.data.result.records)
- res.data.result.records.map((record) =>{
+ res.data.result.records.map((record) => {
console.log(record)
- this.drawAreaLayer(record.areaName,JSON.parse(record.area))
+ this.drawAreaLayer(record.areaName, JSON.parse(record.area))
})
}
})
},
- drawAreaLayer(title,areaList) {
+ drawAreaLayer(title, areaList) {
console.log(title)
- areaList=areaList[0]
+ areaList = areaList[0]
console.log(areaList)
const tempGeometryList = []
@@ -888,7 +918,7 @@ export default {
tempGeometryList.push(tempGeometryList[0])
- const _list=[tempGeometryList]
+ const _list = [tempGeometryList]
console.log(_list)
@@ -898,7 +928,7 @@ export default {
const polygonFeature = new Feature({
geometry: polygonGeometry,
- name:title
+ name: title
})
polygonFeature.setStyle(new Style({
@@ -910,10 +940,10 @@ export default {
color: '#ffffff00'
}),
text: new Text({
- testAlign:'center',
- text:title,
- font:'bold 20px 微软雅黑',
- fill:new Fill({
+ testAlign: 'center',
+ text: title,
+ font: 'bold 20px 微软雅黑',
+ fill: new Fill({
color: '#ffa502',
})
})
diff --git a/hs-im-server/build/docker-compose.yml b/hs-im-server/build/docker-compose.yml
index bb16ac3..a0daa17 100644
--- a/hs-im-server/build/docker-compose.yml
+++ b/hs-im-server/build/docker-compose.yml
@@ -20,7 +20,7 @@ services:
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
TZ: Asia/Shanghai
- IM_HOST: 172.16.3.19
+ IM_HOST: 172.16.3.18
container_name: im-tcp
volumes:
- ./:/hd-znzq/config
@@ -53,7 +53,7 @@ services:
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
TZ: Asia/Shanghai
- SRS_HOST: 172.16.3.19
+ SRS_HOST: 172.16.3.18
container_name: im-service
volumes:
- ./:/hd-znzq/system
diff --git a/hs-im-server/build/hd_1.yml b/hs-im-server/build/hd_1.yml
index 54c34e0..60f3e2e 100644
--- a/hs-im-server/build/hd_1.yml
+++ b/hs-im-server/build/hd_1.yml
@@ -6,7 +6,7 @@ lim:
heartBeatTime: 20000 #心跳超时时间 单位毫秒
brokerId: 1000
loginModel: 3
- logicUrl: http://172.16.3.19:28000/v1
+ logicUrl: http://172.16.3.18:28000/v1
# * 多端同步模式：1 只允许一端在线，手机/电脑/web 踢掉除了本client+imel的设备
# * 2 允许手机/电脑的一台设备 + web在线 踢掉除了本client+imel的非web端设备
# * 3 允许手机和电脑单设备 + web 同时在线 踢掉非本client+imel的同端设备
diff --git a/hs-im-server/im-common/im-common.iml b/hs-im-server/im-common/im-common.iml
deleted file mode 100644
index 2de4d92..0000000
--- a/hs-im-server/im-common/im-common.iml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/hs-im-server/im-service/im-service.iml b/hs-im-server/im-service/im-service.iml
deleted file mode 100644
index d1a4a5f..0000000
--- a/hs-im-server/im-service/im-service.iml
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/hs-im-server/im-service/src/main/resources/application-prod.yml b/hs-im-server/im-service/src/main/resources/application-prod.yml
index be06a09..b552ec7 100644
--- a/hs-im-server/im-service/src/main/resources/application-prod.yml
+++ b/hs-im-server/im-service/src/main/resources/application-prod.yml
@@ -133,4 +133,4 @@ minio:
custom:
- host: 172.16.3.19
+ host: 172.16.3.18
diff --git a/hs-im-server/im-system.iml b/hs-im-server/im-system.iml
deleted file mode 100644
index ea4ee2e..0000000
--- a/hs-im-server/im-system.iml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/hs-im-server/im-tcp/im-tcp.iml b/hs-im-server/im-tcp/im-tcp.iml
deleted file mode 100644
index 3ffa41a..0000000
--- a/hs-im-server/im-tcp/im-tcp.iml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file