diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 498f88d..fea0476 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -92,7 +92,7 @@
- +
@@ -837,8 +837,8 @@ export default { }).then(res=>{ if(res.data.code == 200){ res.data.data.forEach((item,index)=>{ - let monitorName = item.forestrytype == 1 ? '防火监控':'卡口监控'; - $(".popup-container").append("
"+monitorName+":"+item.name+"
"); + + $(".popup-container").append("
"+item.name+"
"); }) } }) diff --git a/src/views/home/widget/personnel.vue b/src/views/home/widget/personnel.vue index 8297096..6f5c305 100644 --- a/src/views/home/widget/personnel.vue +++ b/src/views/home/widget/personnel.vue @@ -111,8 +111,12 @@ created(){ // console.log('appConfig',appConfig.gaodeApi) // this.getListData(); + window.videoCall = this.videoCall }, methods:{ + videoCall(phone){ + this.$emit("videoCall",phone); + }, close(){ this.graphicLayerArr.forEach(item =>{ this.personnelGraphicLayer.removeGraphic(item) @@ -219,6 +223,42 @@ clampToGround: true, visibleDepth: false }, + "popup": `
+
+
+
+
+
+
+
+
+
+
${item.username}
+
+
+
电话:
+
${item.phone}
+
+
+
+
+ 视频通话
+
+
+
+
+
+
+
+
+
`, + "popupOptions":{ + "offsetY":-30, + "offsetX":30, + "template":"{content}", + "horizontalOrigin":"Cesium.HorizontalOrigin.LEFT", + "verticalOrigin":"Cesium.VerticalOrigin.CENTER" + }, pointerEvents: true }) this.graphicLayerArr.push(graphic) diff --git a/src/views/home/widget/reportlist.vue b/src/views/home/widget/reportlist.vue index 5352a21..f453a4a 100644 --- a/src/views/home/widget/reportlist.vue +++ b/src/views/home/widget/reportlist.vue @@ -107,7 +107,7 @@ import { parse } from '../lib/handleGeojson'; this.graphicLayer.removeGraphic(this.graphicWinodw); this.graphicLayer.removeGraphic(this.graphicPoint) if(this.graphicLayer){ - this.graphicLayer.clear(); + this.graphicLayer.clear } }, jiankong(e){