提交

src/App.vue

@@ -14,9 +14,7 @@ export default {
     appHeader
   }
 }
-if(!getToken()){
-  setToken(getQueryObject().token)
-}
+setToken(getQueryObject().token)
 
 </script>
 <style lang="scss" scoped>

src/api/goaf/dangerApi.js

@@ -0,0 +1,81 @@
+import request from '@/utils/request'
+
+/**
+ * 获取Danger列表
+ * @param data
+ * @returns
+ */
+export function getDangerByList(data) {
+  return request({
+    url: '/goaf/goafhdanger/list',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 获取Danger分页
+ * @param data
+ * @returns
+ */
+export function getDangerByPage(data) {
+  return request({
+    url: '/goaf/goafhdanger/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 根据Id获取Danger
+ * @param dangerId
+ * @returns
+ */
+export function getDangerById(dangerId) {
+  return request({
+    url: `/goaf/goafhdanger/${dangerId}`,
+    method: 'GET'
+  })
+}
+// export function getDangerById(dangerId) {
+//   return request({
+//     url: `/ent/danger/${dangerId}`,
+//     method: 'GET'
+//   })
+// }
+/**
+ * 删除Danger
+ * @param dangerId
+ * @returns
+ */
+export function deleteDangerById(dangerId) {
+  return request({
+    url: `goaf/goafhdanger/delete/${dangerId}`,
+    method: 'DELETE'
+  })
+}
+
+/**
+ * 处理Danger
+ * @param data
+ * @returns
+ */
+export function handleDanger(data) {
+  return request({
+    url: `/goaf/goafhdanger/add`,
+    method: 'POST',
+    data
+  })
+}
+/**
+ * 修改Danger
+ * @param dangerId
+ * @returns
+ */
+export function updateDanger(data) {
+  return request({
+    url: `/goaf/goafhdanger/update`,
+    method: 'PUT',
+    data
+  })
+}

src/views/home/components/Map/index.vue

@@ -27,9 +27,9 @@
   import MapSelector from '@/components/MapSelector'
   import { getMapLayerById, createMapLayer, delMapLayer, updateMapLayer, getMapLayer } from '@/api/goaf/layer'
   const markerIcon = L.icon({
-    iconUrl: require('@/assets/icon/4.png'),
-    shadowUrl: require('@/assets/icon/4hover.png'),
-    iconSize: [60, 70],
+    iconUrl: require('@/assets/map/default.png'),
+    shadowUrl: require('@/assets/map/default.png'),
+    iconSize: [37.2, 57.6],
     shadowSize: [0, 0],
     iconAnchor: [16, 52],
     popupAnchor: [1, -38]
@@ -174,17 +174,20 @@
             }
           })
           L.geoJSON(feature, {
-            // pointToLayer: function(_feature, latlng) {
-            //   // var smallIcon = L.Icon({
-            //   //   options: {
-            //   //     iconSize: [27, 27],
-            //   //     iconAnchor: [13, 27],
-            //   //     popupAnchor: [1, -24],
-            //   //     iconUrl: 'icone/chapel-2.png'
-            //   //   }
-            //   // })
-            //   // return L.marker(latlng, { icon: smallIcon })
-            // },
+            pointToLayer: function(_feature, latlng) {
+              const goafInfo = _feature.properties.goafInfo
+              let Volume = 0
+              if (goafInfo) {
+                Volume = (goafInfo.goafCanfillVolume - goafInfo.goafRemainVolume) / goafInfo.goafCanfillVolume
+                Volume = (Volume * 100).toFixed(2)
+              }
+              const html = `<div class="goaf-icon-box" style="width:100%;height:100%;position: relative;"><div class="goaf-fill-v" style="height:${Volume}%;"></div></div>`
+              var icon = L.divIcon({
+                html,
+                iconSize: [50, 50]
+              })
+              return L.marker(latlng, { icon })
+            },
             onEachFeature: (_feature, layer) => {
               this.layerGroup.addLayer(layer)
               // layer.on('click', (ev) => {
@@ -307,4 +310,16 @@
       }
       </style>
   
-  
+  <style lang="scss">
+  .goaf-fill-v{
+      width:100%;
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      background-image: url("./goaf/stone.png");
+      background-size: 7px;
+      &.fill{
+        background-image: url("./goaf/stone.png");
+      }
+  }
+</style>

src/views/home/index.vue

@@ -92,6 +92,9 @@ import {
                     localStorage.setItem('user',JSON.stringify(res.data))
                 })
             }
+        },
+        getWarniStatisticsdata(){
+
         }
     }
  }