Home Explore Help
Register Sign In
wulianwei
/
forward-web
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

init

wulianwei 1 year ago
parent
062c225f9f
commit
a81ce8a53b
27 changed files with 22 additions and 21 deletions
Split View Show Diff Stats
  1. 2 2
      dist/index.html
  2. 1 0
      dist/static/css/device-77cf5d75.css
  3. 0 1
      dist/static/css/device-d5c8123f.css
  4. 1 0
      dist/static/css/deviceMap-d2dc9ec9.css
  5. 0 1
      dist/static/css/deviceMap-fbee3f7b.css
  6. 0 0
      dist/static/js/device-a3c9f90f.js
  7. 0 0
      dist/static/js/device-c64ce3b6.js
  8. 0 0
      dist/static/js/deviceMap-810a788b.js
  9. 0 0
      dist/static/js/deviceMap-da9ee7ce.js
  10. 0 0
      dist/static/js/deviceRecord-3d83dbce.js
  11. 0 0
      dist/static/js/handleLog-d8eb5fc2.js
  12. 0 0
      dist/static/js/hospital-7c0ba6a3.js
  13. BIN
      dist/static/js/index-a04c348c.js.gz
  14. 0 0
      dist/static/js/index-def906b2.js
  15. BIN
      dist/static/js/index-def906b2.js.gz
  16. BIN
      dist/static/js/index-f681b179.js.gz
  17. 0 0
      dist/static/js/index-fb2ec8b0.js
  18. BIN
      dist/static/js/index-fb2ec8b0.js.gz
  19. 0 0
      dist/static/js/permission-aa07b022.js
  20. 0 0
      dist/static/js/product-5e13be53.js
  21. 0 0
      dist/static/js/productModel-16fca475.js
  22. 0 0
      dist/static/js/role-50a7ce80.js
  23. 0 0
      dist/static/js/user-bebf5ffe.js
  24. 0 0
      dist/static/js/userInfo-d4b9e26e.js
  25. 1 1
      index.html
  26. 11 10
      src/views/deviceManage/device.vue
  27. 6 6
      src/views/deviceManage/deviceMap.vue

+ 2 - 2
dist/index.html
View File 

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
   <link href="//at.alicdn.com/t/c/font_3654542_filhj6brvds.css" />
 
   <title>后台管理系统</title>
 
-  <script type="module" crossorigin src="/static/js/index-a04c348c.js"></script>
 
+  <script type="module" crossorigin src="/static/js/index-fb2ec8b0.js"></script>
 
   <link rel="modulepreload" href="/static/js/@vue-60c85ed4.js">
 
   <link rel="modulepreload" href="/static/js/vue-router-f8c94d19.js">
 
   <link rel="modulepreload" href="/static/js/vuex-008bf1a8.js">
 
@@ -40,7 +40,7 @@
 
 <body>
 
   <div id="app"></div>
 
   
-  <script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=UZyauBmbunmSuxGmKedUXmrkNjq5WVKr"></script>
 
+  <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&&ak=UZyauBmbunmSuxGmKedUXmrkNjq5WVKr"></script>
 
 
 </body>

+ 1 - 0
dist/static/css/device-77cf5d75.css
View File 

@@ -0,0 +1 @@
 
+.henader-card[data-v-3b282545]{margin-bottom:20px}.icon-view[data-v-3b282545]{font-size:20px;color:#673ab7;margin:0 10px}.icon-edit[data-v-3b282545]{font-size:20px;color:#2f60c2;margin:0 10px}.icon-dele[data-v-3b282545]{font-size:20px;color:#ff5722}.mt-4[data-v-3b282545]{float:right;text-align:right;margin-top:20px;margin-bottom:20px}.el-button--text[data-v-3b282545]{margin-right:15px}.el-select[data-v-3b282545],.el-input[data-v-3b282545]{width:300px}.dialog-footer button[data-v-3b282545]:first-child{margin-right:10px}

+ 0 - 1
dist/static/css/device-d5c8123f.css
View File 

@@ -1 +0,0 @@
 
-.henader-card[data-v-5ecdadc7]{margin-bottom:20px}.icon-view[data-v-5ecdadc7]{font-size:20px;color:#673ab7;margin:0 10px}.icon-edit[data-v-5ecdadc7]{font-size:20px;color:#2f60c2;margin:0 10px}.icon-dele[data-v-5ecdadc7]{font-size:20px;color:#ff5722}.mt-4[data-v-5ecdadc7]{float:right;text-align:right;margin-top:20px;margin-bottom:20px}.el-button--text[data-v-5ecdadc7]{margin-right:15px}.el-select[data-v-5ecdadc7],.el-input[data-v-5ecdadc7]{width:300px}.dialog-footer button[data-v-5ecdadc7]:first-child{margin-right:10px}

+ 1 - 0
dist/static/css/deviceMap-d2dc9ec9.css
View File 

@@ -0,0 +1 @@
 
+#container[data-v-1ac63a29]{width:100%;height:85vh}

+ 0 - 1
dist/static/css/deviceMap-fbee3f7b.css
View File 

@@ -1 +0,0 @@
 
-#container[data-v-0fcbcc9a]{width:100%;height:85vh}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/device-a3c9f90f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/device-c64ce3b6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/deviceMap-810a788b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/deviceMap-da9ee7ce.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/deviceRecord-3d83dbce.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/handleLog-d8eb5fc2.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/hospital-7c0ba6a3.js


BIN
dist/static/js/index-a04c348c.js.gz
View File


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/index-def906b2.js


BIN
dist/static/js/index-def906b2.js.gz
View File


BIN
dist/static/js/index-f681b179.js.gz
View File


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/index-fb2ec8b0.js


BIN
dist/static/js/index-fb2ec8b0.js.gz
View File


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/permission-aa07b022.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/product-5e13be53.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/productModel-16fca475.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/role-50a7ce80.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/user-bebf5ffe.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/userInfo-d4b9e26e.js


+ 1 - 1
index.html
View File 

@@ -12,7 +12,7 @@
 
 <body>
 
   <div id="app"></div>
 
   <script type="module" src="/src/main.js"></script>
 
-  <script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=UZyauBmbunmSuxGmKedUXmrkNjq5WVKr"></script>
 
+  <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&&ak=UZyauBmbunmSuxGmKedUXmrkNjq5WVKr"></script>
 
 
 </body>

+ 11 - 10
src/views/deviceManage/device.vue
View File 

@@ -222,7 +222,7 @@
 
   
 
   const initMap = () => {
 
-    var map = new BMap.Map("deviceContainer"); // 创建地图实例
 
+    var map = new BMapGL.Map("deviceContainer"); // 创建地图实例
 
     var centerPoint = null; // 创建点坐标
 
     const deviceData = currentDevice.value.data
 
         if(deviceData){
 
@@ -230,14 +230,14 @@
 
             const location = deviceJson.location
 
             if(location != null && location != undefined){
 
                 if(centerPoint == null){
 
-                    centerPoint = new BMap.Point(location.lng, location.lat)
 
+                    centerPoint = new BMapGL.Point(location.lng, location.lat)
 
                 }
 
                 console.log("location:",location)
 
-                var point = new BMap.Point(location.lng, location.lat)
 
-                var circle = new BMap.Circle(point,location.radius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.2});
 
-                var marker = new BMap.Marker(point)
 
-                marker.enableDragging()
 
-                
+                var point = new BMapGL.Point(location.lng, location.lat)
 
+                var circle = new BMapGL.Circle(point, 500, {strokeColor: 'red',strokeWeight: 1,strokeOpacity: 1, fillOpacity: 0});
 
+                var marker = new BMapGL.Marker(point)
 
+                //marker.enableDragging()
 
+                map.clearOverlays()
 
                 map.addOverlay(marker)
 
                 map.addOverlay(circle)
 
                 
@@ -246,7 +246,7 @@
 
                     height: 100,     // 信息窗口高度
 
                     title : currentDevice.value.mac , // 信息窗口标题
 
                 }
 
-                var infoWindow = new BMap.InfoWindow(location.address, opts);  // 创建信息窗口对象 
+                var infoWindow = new BMapGL.InfoWindow(location.address, opts);  // 创建信息窗口对象 
                 marker.addEventListener("click", function(e){  
                     map.openInfoWindow(infoWindow,e.point); //开启信息窗口
 
                 });
 
@@ -266,10 +266,11 @@
 
         }
 
         
     }else{
 
-        map.centerAndZoom(centerPoint, 14); // 初始化地图，设置中心点坐标和地图级别
 
+        map.centerAndZoom(centerPoint, 15); // 初始化地图，设置中心点坐标和地图级别
 
     }
 
     map.enableScrollWheelZoom(true);
 
-    map.addControl(new BMap.NavigationControl());
 
+    map.addControl(new BMapGL.NavigationControl());
 
+    map.setMapType(BMAP_SATELLITE_MAP);
 
 
     
   };

+ 6 - 6
src/views/deviceManage/deviceMap.vue
View File 

@@ -28,7 +28,7 @@
 
   }
 
 
   const initMap = () => {
 
-    var map = new BMap.Map("container"); // 创建地图实例
 
+    var map = new BMapGL.Map("container"); // 创建地图实例
 
     var centerPoint = null; // 创建点坐标
 
     tableData.value.forEach(item=>{
 
         const deviceData = item.data
 
@@ -40,11 +40,11 @@
 
             }
 
             if(location.lng && location.lat){
 
                 if(centerPoint == null){
 
-                    centerPoint = new BMap.Point(location.lng, location.lat)
 
+                    centerPoint = new BMapGL.Point(location.lng, location.lat)
 
                 }
 
                 console.log("location:",location)
 
-                var point = new BMap.Point(location.lng, location.lat)
 
-                var marker = new BMap.Marker(point)
 
+                var point = new BMapGL.Point(location.lng, location.lat)
 
+                var marker = new BMapGL.Marker(point)
 
                 marker.enableDragging()
 
                 map.addOverlay(marker)
 
                 var opts = {
 
@@ -52,7 +52,7 @@
 
                     height: 100,     // 信息窗口高度
 
                     title : item.mac , // 信息窗口标题
 
                 }
 
-                var infoWindow = new BMap.InfoWindow(location.address, opts);  // 创建信息窗口对象 
+                var infoWindow = new BMapGL.InfoWindow(location.address, opts);  // 创建信息窗口对象 
                 marker.addEventListener("click", function(e){  
                     map.openInfoWindow(infoWindow,e.point); //开启信息窗口
 
                 });
 
@@ -76,7 +76,7 @@
 
         map.centerAndZoom(centerPoint, 15); // 初始化地图，设置中心点坐标和地图级别
 
     }
 
     map.enableScrollWheelZoom(true);
 
-    map.addControl(new BMap.NavigationControl());
 
+    map.addControl(new BMapGL.NavigationControl());
 
 
     
   };

Some files were not shown because too many files changed in this diff