Browse Source

数字资源 可视化 地图

jiangbo111111 2 years ago
parent
commit
afb20f858c
5 changed files with 31 additions and 25 deletions
  1. 10 1
      public/index.html
  2. 4 0
      src/assets/styles/base.scss
  3. 3 3
      src/views/datacenter.vue
  4. 4 5
      src/views/forest.vue
  5. 10 16
      src/views/monitor.vue

+ 10 - 1
public/index.html

@@ -6,6 +6,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <link href="./SuperMap3D/Build/Cesium/Widgets/widgets.css" rel="stylesheet" />
   <title><%= webpackConfig.name %></title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
@@ -267,7 +268,7 @@
 
   </style>
 </head>
-<body>
+<body oncontextmenu="return false">
 <!--三个必要的js文件引入-->
 <!--<script src="./hk/jquery-1.12.4.min.js"></script>-->
 <script src="hk/jsencrypt.min.js"></script>            <!-- 用于RSA加密 -->
@@ -286,6 +287,14 @@
 <!--  <script type="text/javascript" src="./supermap/libs/plotting/leaflet/10.2.1/iclient-plot-leaflet-es6.min.js"></script>-->
 <script type="text/javascript" include="PlotPanel,StylePanel,SMLInfosPanel,iPortalStylePanel"
         src="./supermap/examples/js/plottingPanel/PlottingPanel.Include.js"></script>
+
+<script type="text/javascript" src="./SuperMap3D/Build/Cesium/Cesium.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/tooltip.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bubble/popup.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/jquery.min.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/config.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="./SuperMap3D/examples/webgl/js/supermap/SuperMap.Include.js"></script>
 <div id="app">
   <div class="loading">
     <div><span></span></div>

+ 4 - 0
src/assets/styles/base.scss

@@ -1351,7 +1351,11 @@ div::-webkit-scrollbar {
     background-color: $searchBG;
     color: $inBlue;
   }
+  // 2.5D地图显示
+  .cesium-infoBox{
+    z-index: 9999 !important;
 
+  }
   .map-tip {
     .d-l-con {
       width: 100%;

+ 3 - 3
src/views/datacenter.vue

@@ -97,7 +97,7 @@
     getResourcePointByDeptId
   } from '@/api/datacenter'
 
-  import supermap from '@/components/supermap' //超图
+  import supermap from '@/components/supermap-2.5d' //超图
   import vheader from '@/components/v-header.vue' //一体化共用头部
   import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
   import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
@@ -392,7 +392,7 @@
           if(this.showSearch == true){
             this.dataChat();
           }
-          that.$refs.supermap.clearM(false)
+          that.$refs.supermap.clearM()
           that.$refs.supermap.setMarkers(that.markersList)
         })
       },
@@ -419,7 +419,7 @@
               // that.markersList.push(markersMap)
             }
           }
-          that.$refs.supermap.clearM(false)
+          that.$refs.supermap.clearM()
           that.$refs.supermap.setMarkers(that.markersList)
         })
       },

+ 4 - 5
src/views/forest.vue

@@ -446,7 +446,7 @@ import {
 import {
   getNearEvent
 } from '@/api/event'
-import supermap from '@/components/supermap' //超图
+import supermap from '@/components/supermap-2.5d' //超图
 // import supermapNotProcessed from '@/components/supermap' //超图
 // import supermapProcessed from '@/components/supermap' //超图
 import vheader from '@/components/v-header.vue' //一体化共用头部
@@ -988,14 +988,12 @@ export default {
             that.markersList.push(markersMap)
           }
           setTimeout(() => {
-            that.$refs.supermap.clearM(false)
-            that.$refs.supermap.clearM(true)
+            that.$refs.supermap.clearM()
             that.$refs.supermap.setMarkers(that.markersList)
           }, 2000)
         } else {
           setTimeout(() => {
-            that.$refs.supermap.clearM(false)
-            that.$refs.supermap.clearM(true)
+            that.$refs.supermap.clearM()
           }, 2000)
         }
       })
@@ -1150,6 +1148,7 @@ export default {
       markersMap.bindPopupHtml += '</div>'
       that.markersList.push(markersMap)
       setTimeout(() => {
+        that.$refs.supermap.clearM()
         that.$refs.supermap.setMarkers(that.markersList)
       }, 1000)
     },

+ 10 - 16
src/views/monitor.vue

@@ -172,7 +172,7 @@ import {
   getRegionalFlag
 } from '@/api/monitor'
 import { treeselect } from '@/api/system/dept'
-import supermap from '@/components/supermap' //超图
+import supermap from '@/components/supermap-2.5d' //超图
 import vheader from '@/components/v-header.vue' //一体化共用头部
 import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
 import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
@@ -424,14 +424,12 @@ export default {
             markersList.push(markersMap);
           }
           setTimeout(() => {
-            that.$refs.supermap.clearM(false);
-            that.$refs.supermap.clearM(true);
+            that.$refs.supermap.clearM();
             that.$refs.supermap.setMarkers(markersList);
           }, 2000);
         } else {
           setTimeout(() => {
-            that.$refs.supermap.clearM(false);
-            that.$refs.supermap.clearM(true);
+            that.$refs.supermap.clearM();
           }, 2000);
         }
       })
@@ -488,14 +486,12 @@ export default {
             markersList.push(markersMap);
           }
           setTimeout(() => {
-            that.$refs.supermap.clearM(false);
-            that.$refs.supermap.clearM(true);
-            that.$refs.supermap.setMarkersA(markersList);
+            that.$refs.supermap.clearM();
+            that.$refs.supermap.setMarkers_cgq(markersList);
           }, 2000);
         } else {
           setTimeout(() => {
-            that.$refs.supermap.clearM(false);
-            that.$refs.supermap.clearM(true);
+            that.$refs.supermap.clearM();
           }, 2000);
         }
       })
@@ -702,9 +698,8 @@ export default {
             // longitude: "125.3333"
           }
           setTimeout(() => {
-            that.$refs.supermap.clearM(true)
-            that.$refs.supermap.clearM(false)
-            that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
+            that.$refs.supermap.clearM()
+            that.$refs.supermap.setMarkers(this.cameraMarkersList)
           }, 1000)
         }
       })
@@ -798,9 +793,8 @@ export default {
             // longitude: "125.3333"
           }
           setTimeout(() => {
-            that.$refs.supermap.clearM(true)
-            that.$refs.supermap.clearM(false)
-            that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
+            that.$refs.supermap.clearM()
+            that.$refs.supermap.setMarkers(this.cameraMarkersList)
           }, 1000)
         }
       })