slowslo 5 лет назад
Родитель
Сommit
4cf115bd03

+ 33 - 9
src/components/3DMap/Map3D.vue

@@ -46,7 +46,7 @@ export default {
       viewer.imageryLayers.removeAll();
       viewer.imageryLayers.addImageryProvider(
         new Cesium.BaiduImageryProvider({
-          style: 'midnight',
+          // style: 'midnight',
           crs: 'WGS84'
         })
       )
@@ -114,30 +114,54 @@ export default {
       this.initMap();
       //添加建筑矢量数据
       this.addBuildingData('http://139.9.103.171/mapData/zhengzhou/tileset.json')
-      //定位建筑群位置
-      this.flyToPosition(113.682062,34.662187, 2000.0,0,-20.0,0.0);
+      //郑州定位建筑群位置
+      // this.flyToPosition(113.682062,34.662187, 2000.0,0,-20.0,0.0);
+      //汤阴定位建筑群位置
+      this.flyToPosition(114.368177,35.927104,2000.0,0,-20.0,0.0);
 
-      this.addBillBoard(113.682062,34.662187,0,'/data/device.png',{
+      this.addBillBoard(114.359385,35.927175,0,'/data/device.png',{
         scale: 0.05
       },"device");
       //疫苗接种点
-      this.addBillBoard(113.670852,34.781468,0,'/data/epidemic.png',{
+      this.addBillBoard(114.385863,35.945096,0,'/data/epidemic.png',{
         scale: 0.35
       },"epidemic");
-      this.addBillBoard(113.74715,34.719967,0,'/data/epidemic.png',{
+      this.addBillBoard(114.367823,35.949846,0,'/data/epidemic.png',{
         scale: 0.35
       },"epidemic");
-      this.addBillBoard(113.646203,34.727969,0,'/data/epidemic.png',{
+      this.addBillBoard(114.399198,35.922389,0,'/data/epidemic.png',{
         scale: 0.35
       },"epidemic");
       //政府部门
-      this.addBillBoard(113.631557,34.75261,0,'/data/government.png',{
+      this.addBillBoard(114.364023,35.930939,0,'/data/government.png',{
         scale: 0.35
       },"government");
       //垃圾场
-      this.addBillBoard(113.829591,34.713823,0,'/data/environment.png',{
+      this.addBillBoard(114.381959,35.925363,0,'/data/environment.png',{
         scale: 0.35
       },"environment");
+
+      // this.addBillBoard(113.682062,34.662187,0,'/data/device.png',{
+      //   scale: 0.05
+      // },"device");
+      // //疫苗接种点
+      // this.addBillBoard(113.670852,34.781468,0,'/data/epidemic.png',{
+      //   scale: 0.35
+      // },"epidemic");
+      // this.addBillBoard(113.74715,34.719967,0,'/data/epidemic.png',{
+      //   scale: 0.35
+      // },"epidemic");
+      // this.addBillBoard(113.646203,34.727969,0,'/data/epidemic.png',{
+      //   scale: 0.35
+      // },"epidemic");
+      // //政府部门
+      // this.addBillBoard(113.631557,34.75261,0,'/data/government.png',{
+      //   scale: 0.35
+      // },"government");
+      // //垃圾场
+      // this.addBillBoard(113.829591,34.713823,0,'/data/environment.png',{
+      //   scale: 0.35
+      // },"environment");
     },
   }
 }

+ 3 - 3
src/components/scene/EventScreen.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
 
-    <div style="position:absolute;width: 20%;height: 25%;top: 70%;right: 10px;background: linear-gradient(to right, rgba(0,0,0,0.7),rgba(0,0,0,0.2));">
+    <div style="position:absolute;width: 26%;height: 25%;top: 62%;right: 1%;background: linear-gradient(to right, rgba(0,0,0,0.7),rgba(0,0,0,0.2));">
       <div class="full center" style="flex-direction: column">
         <dv-scroll-board :config="dataConfigA" style="width: 98%;height: 95%" />
       </div>
@@ -37,13 +37,13 @@
       </div>
     </div>
 
-    <div style="position:absolute;width: 30%;height: 5%;top: 7%;right: 1%;background: linear-gradient(to right, rgba(0,0,0,0.7),rgba(0,0,0,0.2));">
+    <div style="position:absolute;width: 26%;height: 5%;top: 10%;right: 1%;background: linear-gradient(to right, rgba(0,0,0,0.7),rgba(0,0,0,0.2));">
       <div class=" full center" style="justify-content: left;font-size: 22px;color: #00f9cf;text-indent: 20px;font-style: italic">
         现场视频指挥
       </div>
     </div>
 
-    <dv-border-box-1 :color="['#49baa5', 'white']" backgroundColor="rgba(0, 0, 0, 0.5)" style="position:absolute;width: 30%;height: 55%;top: 12%;right: 1%;">
+    <dv-border-box-1 :color="['#49baa5', 'white']" backgroundColor="rgba(0, 0, 0, 0.5)" style="position:absolute;width: 26%;height: 45%;top: 15%;right: 1%;">
       <div class="center full">
         <div  style="width: 91%;height: 92%;">
           <div @click="videoShow" v-for="(item,index) of eventList" :key="item" class="click" style="width: 50%;height: 33.3%;float: left;"

+ 0 - 1
src/components/scene/TraficScreen.vue

@@ -7,7 +7,6 @@
         <dv-border-box-7
           class="click"
           :color="['#42c3b6', 'white']"
-          
           v-for="(item,index) of carList" :key="item"
                          style="width: 100px;height: 100px;margin: 10px;"
         >