From c35f690e8f1a04b793ca48839dfb8cd6b324a66d Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Wed, 16 Aug 2023 16:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84,=E5=A4=87?=
=?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/home/index.vue | 6 ++---
src/views/home/widget/personnel.vue | 40 ++++++++++++++++++++++++++++
src/views/home/widget/reportlist.vue | 2 +-
3 files changed, 44 insertions(+), 4 deletions(-)
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 6ef8e21..c724d54 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)
@@ -218,6 +222,42 @@
scaleByDistance: new Cesium.NearFarScalar(1000, 1.0, 200000, 0.2),
clampToGround: true
},
+ "popup": `
`,
+ "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){