Merge branch 'master' of http://123.132.248.154:10000/xujingliang/Lin_Ye_Fang_Huo

src/views/home/index.vue

@@ -92,7 +92,7 @@
         </div>
         <!-- 人员 -->
         <div class="personnel-container" v-if="personVisible">
-          <personnel :fireData="currentInfo" :globalmap="globalmap" @close="personVisible = false"></personnel>
+          <personnel :fireData="currentInfo" :globalmap="globalmap" @close="personVisible = false"  @videoCall="videoCall"></personnel>
         </div>
         <!-- 物资 -->
         <div class="goods-container" v-if="goodsVisible">
@@ -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("<div onclick='lookMonitorByMonitorLayer("+item.type+",\""+item.num+"\","+item.road+");' class='monitor-btn' data-channelId='"+item.type+"' data-deviceId="+item.id+" style='padding:4px 8px;text-align:center;font-size:14px;border-radius:2px;background:#108eff;color:#fff;margin:6px 0px;cursor:pointer;'><img src='/img/monitor-video.png' width='24px' style='position:relative;top:-2px;left:-4px;'/>"+monitorName+"："+item.name+"</div>");
+              $(".popup-container").append("<div onclick='lookMonitorByMonitorLayer("+item.type+",\""+item.num+"\","+item.road+");' class='monitor-btn' data-channelId='"+item.type+"' data-deviceId="+item.id+" style='padding:4px 8px;text-align:center;font-size:14px;border-radius:2px;background:#108eff;color:#fff;margin:6px 0px;cursor:pointer;'><img src='/img/monitor-video.png' width='24px' style='position:relative;top:-2px;left:-4px;'/>"+item.name+"</div>");
             })
           }
       })

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": `<div class="marsTiltPanel marsTiltPanel-theme-green">
+                  <div class="marsTiltPanel-wrap">
+                      <div class="area">
+                          <div class="arrow-lt"></div>
+                          <div class="b-t"></div>
+                          <div class="b-r"></div>
+                          <div class="b-b"></div>
+                          <div class="b-l"></div>
+                          <div class="arrow-rb"></div>
+                          <div class="label-wrap">
+                              <div class="title">${item.username}</div>
+                              <div class="label-content">
+                                  <div class="data-li">
+                                      <div class="data-label">电话：</div>
+                                      <div class="data-value">${item.phone}</div>
+                                  </div>
+                                  <div class="data-li">
+                                      <div class="data-label"></div>
+                                      <div class="data-value">
+                                          <span class="label-tag data-value-status-2" title="视频通话" onclick="videoCall('${item.phone}')">视频通话</span></div>
+                                  </div>
+                              </div>
+                          </div>
+                      </div>
+                      <div class="b-t-l"></div>
+                      <div class="b-b-r"></div>
+                  </div>
+                  <div class="arrow" ></div>
+              </div>`,
+                  "popupOptions":{
+                    "offsetY":-30,
+                    "offsetX":30,
+                    "template":"{content}",
+                    "horizontalOrigin":"Cesium.HorizontalOrigin.LEFT",
+                    "verticalOrigin":"Cesium.VerticalOrigin.CENTER"
+                  },
                   pointerEvents: true
               })
               this.graphicLayerArr.push(graphic)

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){