From 7d08eed0e10dd0cb32b78e668b31c45956f1ce0a Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Sun, 27 Aug 2023 14:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E4=BA=BA=E5=91=98=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E9=80=9A=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/img/homeimg/to-position-icon.png | Bin 0 -> 1188 bytes
 public/img/homeimg/video-call-icon.png  | Bin 0 -> 637 bytes
 public/index.html                       |   4 +
 src/views/home/index.vue                |   9 ++-
 src/views/home/widget/callcenter.vue    |  27 ++++++-
 src/views/home/widget/onebuttoncall.vue |   1 -
 src/views/home/widget/onlineuserbox.vue | 101 +++++++++++++++++++++++-
 src/views/home/widget/reportlist.vue    |   2 +-
 8 files changed, 131 insertions(+), 13 deletions(-)
 create mode 100644 public/img/homeimg/to-position-icon.png
 create mode 100644 public/img/homeimg/video-call-icon.png

diff --git a/public/img/homeimg/to-position-icon.png b/public/img/homeimg/to-position-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..900fb4cb567e9e437d3cf001b3aade93cd7fdd1d
GIT binary patch
literal 1188
zcmV;V1Y7%wP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(UP(kjRCr$1n_W&DF%ZXX0*^uJ4Z<xdkqS6T$sI_gK0%%;HQWI>38@;S-U51p
zO5~9Zt|r=z9PfJP!{c2N2@#0b9{)W5@%SUwWO{x6@o#i^csQ!6FN)#?-v9ajY4iJ|
zysVZXUw*z`z8{z~>+EG)ozA)!>nuQ+0hGRhBmpQpeQllHj<f*iq9}?<Um!#PpySTk
zuf~{jL5E|H^a6qnU_4(vDt9~ta<iNcXNq83t0Ds!&sXQpy1PVoC-uu&cfWpH&$^HW
z2>^877y~2U*$aZ@`fYuY8v+WTkIq+=yMWLNpq$H}I~(?fhH^uQ0)WmBjs}kknqN5U
zMv3)g3ye_!r?;;V@LH3ah-WOUa}RIp^}^RLNXa@kdOt9tyums*`TgzqUfUZR0VKHo
z#d11aU`CGTt7~W7CC4jrNudz{cdnNhC!AK*rBDMP9DUNrhn@kRV2ruJJjVaLD2fx!
zsj&t?p#7v#;kKt83u*wy^Od8H2)O>!)$s|nd{a5D$3d3(bagyQY14mp2LRU?W6WYX
z9bTjwb9(#w%n68^GS~qi&}5SPSKzoZFvf^tPSZez0JtkX6+_D9^&QodG~>Vy0In-)
z8N&5E%{UNx0674{XlWV3%{#PW5A<ORKo9`od6gi@nR!Z?sI<ES0R9jdVp1crWVx;7
zc{Kps7@#48KH7}t0TN@%%0$y4H~4vmi`vUE4Q}h?&Ik#ehc@#75F{iaRCH^*)I2PL
zQnu7p@{d{!;3gz3i3{urz|Su@{W%&8&dXCHI6z71_@>F_bcpU{l9Q^iU_u<AwwY8;
za|Wn+0Q^Hi21y;n9_Gdxw7#%_q71OMYw-iyJk?l!hmAIBsSg=cBa7@8szv__L~Kv6
z^OGRowaYE}%}i146XY2E#u!kM>DmjLv>i;DYExe{6ZAh&JQyLxg0|oWASm1Iq=te*
z=+T(c=@4q0c63J@EDN9sMPkZIwZr%TO4o;k2R&pVHxMa^0)XebfZzl0reZX;?gT)Y
zAhC9CxrRjmRMp%RMe(3{AksPwHW{BgC?Wu0`wecFO|)e}l0XF{rxY*%-k_+;f(0OF
zJYWD&l?59>u6Q5-u#v^VyP2ij8xR4=5f3B)G-M$HkV6Xo?y_`6D!E=K2B0j3omHL`
z0NBKpMG^odDbx-*QUGvekpv)B3b7@w5`Ya0Ocu!i5+O7$aWw&KGd|}g;mtMpOa*{2
z9z=I{asVhnz~XA=XOn6GIPn16-BAVr7d1Cu(y-3`4ZT1O096W<D|G?@t(|OJn5hCF
zLO{2+C;+t12h;(y#RIC*7ywK{oTYdc08R0LV{{t;iiCOx5Rn4v`jz2`2axNbfXLzj
z-u^*#>x^}v(E@-~PwxP#0}k%Z&IkatdqF;!tR6rafu=Gc08aeiwz(GoG;fB6fc61^
zy6*Qz0@S>L>-KvA0KQw4dKI4n=0i#Vj>fwBX8C_0NN8>V*bQ6&0000<MNUMnLSTYo
C5C*~k

literal 0
HcmV?d00001

diff --git a/public/img/homeimg/video-call-icon.png b/public/img/homeimg/video-call-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..999bfca20e11f994ab7536e620cf2ca205a3ba3a
GIT binary patch
literal 637
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U^4e~aSW-5
zdpj%E?~sGQ@p2s-r$?ME(K8x4@36c}@U3y0@6%%az&9hwcMod?lW;}K>lvClhFdS>
zdh=S#%2nK2|MP8q+V;)NtDf1f*!kCsp@S*Q&mm^PGo}d&8hQ$P0mV#@m@=7O_+Q)p
zT#0Ax*H4ch7DZmI`o^`R?%%5l-+Ug9!>iP^4f7Ukl?!E5VskiVF4gPW$r^S~lyUk+
zHK{pLPCN_DV|5u82JaMos?OoG-&Dicr+$+h^P}gtYkyBY#wcF)fBV6x*Li}XZ{Ez&
zT>9uo+Ofvi1GA?u{58Lpu`s3VeAzu_Gd`#Nq6f~N&gx)rIo25;$DmTV^h$D9VIGr0
zveW*rDVwAJo}4wM_JzlD?go|qhRr<(&Ivp4O@GF&;QYyR{X=Gj$|E<AurC#nXJFMY
zvSFCA;{+#zy1vuN>IRJkKc=tQ(XgYTTi#iSSqMn5sB(y%OFyNlu)JXo6W=qIrxHFV
zIpsWS<h*%5a5NorYHDaWEW>ZJhe3ejbjpgvWBd&p*O<o!x>>xQI9<PCuGFTOCUXYv
z=@0l1*!->b&7UVEvz;NPTE_Hc&gm=P_eFZe++ZqLY1h!Da_{}EyL*l;mz}!sephb)
z{}+}oe>(+Mp4lnxd1QB(NW)8aOP1i|4eJF@Rklrwbzb*x%jX6ItJaSvJO58PDahgQ
zM&Ur{y3nu-GrS_r0!2hta%_z4yTW;E(xY2`A_q#-bKeTF-oU|GwU?=m;bzjgfDQIc
RkAdll!PC{xWt~$(695GF5w8FM

literal 0
HcmV?d00001

diff --git a/public/index.html b/public/index.html
index b27640f..0987891 100644
--- a/public/index.html
+++ b/public/index.html
@@ -24,6 +24,10 @@
         word-wrap: break-word!important;
         white-space:normal!important;
       }
+
+      .shortcut-button{
+        display:none!important;
+      }
     </style>
     <!--第三方lib-->
     <script
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ed17bb9..8f91643 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -172,14 +172,14 @@
       </personnel>
     </div>
     <!-- 物资 -->
-    <div class="goods-container" v-if="goodsVisible && finishLoadMap" v-drag>
+    <div class="goods-container" v-if="goodsVisible" v-drag>
       <goodsbox
         :endLngLat="endLngLat"
         @close="goodsVisible = false"
       ></goodsbox>
     </div>
     <!-- 水源 -->
-    <div class="goods-container" v-if="waterVisible && finishLoadMap" v-drag>
+    <div class="goods-container" v-if="waterVisible" v-drag>
       <waterbox
         :waterCenter="waterCenter"
         :firePopup = "firePopupClosed"
@@ -1414,8 +1414,9 @@ export default {
   width: 480px;
   height: 360px;
   position: absolute;
-  top: 410px;
-  right:450px;
+  top:50%;
+  left:50%;
+  transform:translate(-50%,-50%);
   z-index: 99;
 }
 
diff --git a/src/views/home/widget/callcenter.vue b/src/views/home/widget/callcenter.vue
index f3fc757..2deba86 100644
--- a/src/views/home/widget/callcenter.vue
+++ b/src/views/home/widget/callcenter.vue
@@ -24,6 +24,17 @@
     <div class="call-content flex column">
       <el-carousel height="150px" indicator-position="outside">
         <el-carousel-item v-for="(item, index) in BannersArr" :key="index">
+
+         <div class="content-li flex">
+            <div class="content-title flex ai-c">
+              <span class="content-title-span"></span>
+              <span class="fz-14 fw-b fc-w">防火片区</span>
+            </div>
+            <div class="flex-1 fz-14 fc-w" style="line-height: 28px">
+              {{ item.xzqmc }}
+            </div>
+          </div>
+
           <div class="content-li flex">
             <div class="content-title flex ai-c">
               <span class="content-title-span"></span>
@@ -42,15 +53,17 @@
               {{ item.fdcz }}
             </div>
           </div>
+
           <div class="content-li flex">
             <div class="content-title flex ai-c">
               <span class="content-title-span"></span>
-              <span class="fz-14 fw-b fc-w">防火片区</span>
+              <span class="fz-14 fw-b fc-w">县级包保领导</span>
             </div>
             <div class="flex-1 fz-14 fc-w" style="line-height: 28px">
-              {{ item.xzqmc }}
+             {{item.dcz}} {{ item.fdcz }}
             </div>
           </div>
+          
         </el-carousel-item>
       </el-carousel>
     </div>
@@ -163,13 +176,19 @@ export default {
 }
 .call-content {
   height: 185px;
+  overflow:hidden;
+}
+
+::v-deep .el-carousel{
+    overflow:hidden;
 }
 .content-li {
   width: 400px;
-  min-height: 28px;
+  height:24px;
+  min-height: 24px;
   /* background: linear-gradient(270deg, rgba(121,74,14,0) 0%, #442406 100%); */
   background-image: url(/img/call-center-bar.png);
-  background: 100% 100%;
+  background-size: 100% 100%;
   margin-top: 12px;
 }
 .content-title {
diff --git a/src/views/home/widget/onebuttoncall.vue b/src/views/home/widget/onebuttoncall.vue
index 78b731a..e97ec30 100644
--- a/src/views/home/widget/onebuttoncall.vue
+++ b/src/views/home/widget/onebuttoncall.vue
@@ -45,7 +45,6 @@
               <el-pagination
                 background
                 :page-size="listQuery.pageSize"
-                :pager-count="12"
                 layout="prev, pager, next"
                 :total="total">
                 </el-pagination>
diff --git a/src/views/home/widget/onlineuserbox.vue b/src/views/home/widget/onlineuserbox.vue
index c0cca61..e00715b 100644
--- a/src/views/home/widget/onlineuserbox.vue
+++ b/src/views/home/widget/onlineuserbox.vue
@@ -20,7 +20,9 @@
                       <div>{{item.phone}}</div>
                     </div>
                   <div class="flex ai-c jc-e" style="width:75px">
-                    <img class="img-box" src="/img/phone.png" @click="callPhoneOne(item.phone)" />
+                        <img class="img-box" src="/img/homeimg/video-call-icon.png" @click="videoCall(item.phone)" />
+                        <img class="img-box" src="/img/homeimg/to-position-icon.png" @click="toPosition([item.lng,item.lat])" />
+                        <img class="img-box" src="/img/phone.png" @click="callPhoneOne(item.phone)" />
                   </div>
                  </div>
               </div>
@@ -51,13 +53,21 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
             callText:null,
             callTextShow:false,
             phones:null,
+            markGraphicLayerArr:null,
         }
     },
     created(){
         this.getListData();
+
+        window.videoCall = this.videoCall;
     },
     mounted(){
-        
+        let _this = this;
+        setInterval(function(){
+            _this.getListData();
+        },5000)
+
+
     },
     methods:{
         checkChange(){
@@ -71,6 +81,7 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
                 if(res.code == 200){
                     this.list = res.data
                     this.total = res.count
+                    this.addLayerPoint();
                 }
             })
         },
@@ -147,6 +158,87 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
               this.callTextShow = false;
             }
           })
+        },
+        addLayerPoint() {
+            if (this.markGraphicLayer == null) {
+                this.markGraphicLayer = new mars3d.layer.GraphicLayer();
+                window.globalmap.addLayer(this.markGraphicLayer);
+            }
+            this.markGraphicLayer.clear();
+            
+            this.markGraphicLayerArr = [];
+
+            this.list.forEach((item, index) => {
+                let graphic = new mars3d.graphic.BillboardEntity({
+                position: [item.lng, item.lat],
+                style: {
+                    image: "/img/jiuyuanrenyuan.png",
+                    horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+                    verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+                    clampToGround: true,
+                    scale: 0.7,
+                    label: {
+                    text: "",
+                    font_size: 14,
+                    color: "#ffffff",
+                    pixelOffsetY: 10,
+                    distanceDisplayCondition: true,
+                    distanceDisplayCondition_far: 500000,
+                    distanceDisplayCondition_near: 0,
+                    },
+                },
+                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.name}</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,
+                    template: "{content}",
+                    horizontalOrigin: "Cesium.HorizontalOrigin.LEFT",
+                    verticalOrigin: "Cesium.VerticalOrigin.CENTER",
+                },
+                pointerEvents: true,
+                });
+
+                this.markGraphicLayerArr.push(graphic);
+                this.markGraphicLayer.addGraphic(graphic);
+            });
+        },
+        videoCall(phone){
+            let userId = localStorage.getItem("userName");
+
+            let wind = window.open("https://ssl.hopetrytech.com:9233/#/?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
+            wind.onload = function(){
+                wind.document.title = "视频通话";
+            }
+        },
+        toPosition(lngLat){
+            window.globalmap.flyToPoint(lngLat,{radius:2000,"pitch":-90});
         }
     }
   }
@@ -205,10 +297,13 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
        }
 
         .img-box{
-            width:42px;
+            width:28px;
+            margin:0px 4px;
             cursor:pointer;
+            position:relative;
         }
        
+ 
       
      
   
diff --git a/src/views/home/widget/reportlist.vue b/src/views/home/widget/reportlist.vue
index 704ae6e..a43764e 100644
--- a/src/views/home/widget/reportlist.vue
+++ b/src/views/home/widget/reportlist.vue
@@ -266,7 +266,7 @@ export default {
                                     <div class="data-li">
                                         <div class="data-value">
                                             <span id="lablSBZT1" onclick="renyuan([${item.lng},${item.lat}]);" class="label-tag data-value-status-1" title="中间状态">人员调度</span>
-                                        
+                                            <span id="lablCSFM2" onclick="wuzi([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" title="附近物资">附近物资</span>
                                             <span id="lablCSFM2" onclick="shuiyuan([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" title="附近水源">附近水源</span>
                                             <span id="lablSBZT1" onclick="jiankong('${item.createId}')" style="display:${jiankongDisplay}" class="label-tag data-value-status-1" title="视频监控">视频监控</span>
                                         </div>