up

src/api/goaf/layer.js

@@ -50,6 +50,7 @@ export function getMapLayerInfoById(params) {
   return request({
     url: '/goaf/goafbaseinfostatis',
     method: 'GET',
+    headers:{hidemask:true},
     params
   })
 }

src/utils/request.js

@@ -20,7 +20,9 @@ service.interceptors.request.use(
     config.headers['AppID'] = appID
     config.headers['AppKey'] = appKey
     config.headers['AppSecret'] = appSecret
-    loadingInstance = ElLoading.service({ fullscreen: true })
+    if(!config.headers['hidemask']){
+      loadingInstance = ElLoading.service({ fullscreen: true })
+    }
     if (getToken()) {
       config.headers['Authorization'] = 'Bearer ' + getToken()
     }

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

@@ -27,7 +27,7 @@
   import MapSelector from '@/components/MapSelector'
   import { getMapLayerById, getMapLayer,getMapLayerInfoById } from '@/api/goaf/layer'
   import { NumConvertLM } from '@/utils'
-  const iconSize=[110,110]
+  const iconSize = [65, 65]
   export default {
     name: 'GoafVisualEditor',
     components: {
@@ -225,7 +225,8 @@
               const goafOreheight = _feature.properties.goafOreheight
               const goafName = _feature.properties.goafName
 
-              const goaf_icon_tag = `<div class="goaf-icon-tag" title="${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}">${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}</div>`
+              const goaf_icon_tag = ""
+              //`<div class="goaf-icon-tag" title="${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}">${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}</div>`
               const html = `<div data-layer="${layerId}" gid="${goafId}" class="goaf-icon-box ${goafAlarmStatus}" style="width:100%;height:100%;position: relative;">${goaf_icon_tag}<div class="goaf-fill-v" style="height:${Volume}%;"></div></div>`
               var icon = L.divIcon({
                 html,
@@ -327,11 +328,12 @@
               height: calc(100vh - 190px);
               position: relative;
               #vmap {
+                  width: 100%;
                   height: 100%;
-                  flex: 1;
+                  // flex: 1;
                   background: #8c939d;
                   box-sizing: border-box;
-                  z-index: 99999;
+                  z-index: 999;
               }
               #marker-tip{
                 width: 200px;
@@ -412,7 +414,7 @@
     background-image:url(@/assets/map/warn.png);
     background-repeat: no-repeat;
     background-position: center center;
-    background-size: 30px 60px;
+    background-size: 24px 48px;
     // border-radius: 50% 50% 10% 10%;
     animation: twinkle 0.5s infinite alternate;
     position: absolute;
@@ -430,7 +432,7 @@
   }
 
   to {
-    margin-top: 10px;
+    margin-top: 8px;
   }
 }
 @keyframes twinkle {

src/views/home/index.vue

@@ -163,6 +163,7 @@ import {
     justify-content: space-between;
     .side-left,.side-right{
         width: 26.66%;
+        width: calc((100% - 878px)/2);
         height: 100%;
         background-image: url(./images/home/leftbg.png);
         background-size: 100% 100%;
@@ -370,7 +371,8 @@ import {
         }
     }
     .main{
-        width: 46.68%;
+        // width: 46.68%;
+        width: 878px;
         height: 100%;
         flex:1;
         padding: 0 14px;