物资点

2023-08-27 14:28:24 +08:00 · 2023-08-27 14:28:24 +08:00 · 3d2e01c045
parent 459bd2fea8 7d08eed0e1
commit 3d2e01c045
8 changed files with 136 additions and 12 deletions
--- a/public/img/homeimg/to-position-icon.png
+++ b/public/img/homeimg/to-position-icon.png
--- a/public/img/homeimg/video-call-icon.png
+++ b/public/img/homeimg/video-call-icon.png
--- 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
--- 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;
 }

--- 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 {
--- 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>
--- 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;
        }
       
+ 
      
     
  
--- a/src/views/home/widget/reportlist.vue
+++ b/src/views/home/widget/reportlist.vue
@ -265,9 +265,15 @@ export default {
                                    </div>
                                    <div class="data-li">
                                        <div class="data-value">
+<<<<<<< HEAD
                                            <span id="lablSBZT1" onclick="renyuan([${item.lng},${item.lat}]);" class="label-tag data-value-status-1" >人员调度</span>
                                            <span id="lablCSFM2" onclick="shuiyuan([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" >附近水源</span>
                                            <span id="lablCSFM3" onclick="wuzi([${item.lng},${item.lat}])"  class="label-tag data-value-status-2" >周边物资</span>
+=======
+                                            <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>
+>>>>>>> 7d08eed0e10dd0cb32b78e668b31c45956f1ce0a
                                            <span id="lablSBZT1" onclick="jiankong('${item.createId}')" style="display:${jiankongDisplay}" class="label-tag data-value-status-1" title="视频监控">视频监控</span>
                                        </div>
                                    </div>