gis地图抽屉样式调整

gassafety-web/src/assets/styles/element-ui.scss

@@ -69,7 +69,7 @@
 // dropdown
 .el-dropdown-menu {
   a {
-    display: block
+    display: block;
   }
 }
 
@@ -78,6 +78,19 @@
   display: inline-flex !important;
 }
 
+// gis地图里抽屉的搜索样式
+.search-input {
+  .el-input__inner {
+    height: 28px;
+    min-height: 28px;
+    outline: #053b6a;
+    &:focus {
+      // outline: #053b6a;
+      border-color: #053b6a;
+    }
+
+  }
+}
 // to fix el-date-picker css style
 .el-range-separator {
   box-sizing: content-box;
@@ -89,4 +102,4 @@
   > .el-submenu__title
   .el-submenu__icon-arrow {
   display: none;
-}
+}
\ No newline at end of file

gassafety-web/src/assets/styles/fonticon.scss

 @font-face {
   font-family: "iconfont"; /* Project id 2692138 */
-  src: url('//at.alicdn.com/t/font_2692138_cd9e8nk8yoo.woff2?t=1627718383904') format('woff2'),
-       url('//at.alicdn.com/t/font_2692138_cd9e8nk8yoo.woff?t=1627718383904') format('woff'),
-       url('//at.alicdn.com/t/font_2692138_cd9e8nk8yoo.ttf?t=1627718383904') format('truetype');
+  src: url('//at.alicdn.com/t/font_2692138_spittg1q2rr.woff2?t=1629681541408') format('woff2'),
+       url('//at.alicdn.com/t/font_2692138_spittg1q2rr.woff?t=1629681541408') format('woff'),
+       url('//at.alicdn.com/t/font_2692138_spittg1q2rr.ttf?t=1629681541408') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,19 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-reset:before {
+  content: "\e616";
+}
+
+.icon-search{
+  
+}
+.icon-search:before {
+  content: "\e617";
+  font-size: 13px;
+  
+}
+
 .icon-zhibanrenyuan:before {
   content: "\e613";
 }

gassafety-web/src/utils/gaodeMapView.js

@@ -28,7 +28,8 @@ export const DEVICE_TYPE = {
   WORKORDER: "6",
   PRESSUREGAGE: "7",
   INSPECTOR: "8",
-  SMALLINSPECTOR: "workPoint"
+  SMALLINSPECTOR: "workPoint",
+  TROUBLE:"trouble"
 };
 class gaodeMap {
   // 所有线的数组
@@ -114,11 +115,11 @@ class gaodeMap {
       if (!this.onceFlag) {
         this.onceFlag = true;
         this.view.backFlag = false;
-
-        let options = this.myMap.getStatus();
-        options.scrollWheel = true;
-        this.myMap.setStatus(options);
       }
+      // 每次地图移动结束，就让地图可以缩放
+      let options = this.myMap.getStatus();
+      options.scrollWheel = true;
+      this.myMap.setStatus(options);
     });
     this.districtBoundaries();
   }
@@ -268,10 +269,20 @@ class gaodeMap {
         this.workerManMarkArr.push(marker);
       }
     }
+
+    // 隐患
+    if(DEVICE_TYPE.TROUBLE == markerType){
+      console.log("隐患上图")
+    }
+
+
+
+
     if (
       DEVICE_TYPE.WORKORDER != markerType &&
       DEVICE_TYPE.INSPECTOR != markerType &&
-      DEVICE_TYPE.SMALLINSPECTOR != markerType
+      DEVICE_TYPE.SMALLINSPECTOR != markerType&&
+      DEVICE_TYPE.TROUBLE != markerType
     ) {
       // marker.content = this.getMarketContent(data, markerInfoWindow);
       marker.infoWindow = infoWindow;
@@ -504,6 +515,16 @@ class gaodeMap {
         dom.remove();
         return html;
       }
+      case DEVICE_TYPE.TROUBLE: {
+        const dom = createPop(workerManInfowindow, {
+          title: "隐患",
+          data: data,
+          map: map
+        });
+        const html = dom.$el;
+        dom.remove();
+        return html;
+      }
     }
   }
 
@@ -595,6 +616,16 @@ class gaodeMap {
         marker.setIcon(icon);
         break;
       }
+      //隐患
+      case DEVICE_TYPE.TROUBLE: {
+        let icon = new AMap.Icon({
+          opacity: 0.1,
+          image: require("../assets/images/trouble.png")
+        });
+        marker.workerPoint = true;
+        marker.setIcon(icon);
+        break;
+      }
     }
   }
   changeMarkIcon(marker, iconUrl) {