qinhouyu 2 anni fa
parent
commit
959f35745f

+ 4 - 2
src/api/components/sookaMapIcon.js

@@ -76,12 +76,14 @@
             return "#58b35d"; //2地质灾害易发区
         case "sj-icon-centerdata-t-resources-illegal-construction":
             return "#0FA2FF"; //3违建信息
-        
+
         //应急
         case "sj-icon-centerdata-t-emergency-warehouse":
             return "#f5ad1b"; //应急仓库(个)
         case "sj-icon-centerdata-t-emergency-team":
             return "#ff6063"; //应急队伍(个)
+        case "sj-icon-centerdata-t-emergency-idlh-enterprises":
+            return "#ff6063"; //危化企业(个)
 
        //水利
         case "sj-icon-centerdata-t-hydraulic-battlefield":
@@ -110,4 +112,4 @@
         case "sj-icon-centerdata-t-traffic-culvert":
             return "#da8ec5"; //涵洞(个)
     }
-}
+}

+ 1 - 0
src/api/components/supermap.js

@@ -39,6 +39,7 @@ export const iconList = {
 
   //数据中心图标
   'sj-icon-map-centerdata-t-emergency-warehouse': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-emergency-warehouse.png'),//应急仓库
+  'sj-icon-map-centerdata-t-emergency-idlh-enterprises': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-emergency-idlh-enterprises.png'),//危化企业
   'sj-icon-map-centerdata-t-emergency-team': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-emergency-team.png'),//应急队伍
   'sj-icon-map-centerdata-t-emergency-enterprise': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-emergency-enterprise.png'),//应急企业
   'sj-icon-map-centerdata-t-forest-waterintake': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-waterintake.png'),//取水口

File diff suppressed because it is too large
+ 50 - 4
src/assets/iconfont/demo_index.html


File diff suppressed because it is too large
+ 12 - 4
src/assets/iconfont/iconfont.css


File diff suppressed because it is too large
+ 1 - 1
src/assets/iconfont/iconfont.js


+ 14 - 0
src/assets/iconfont/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "1104530",
+      "name": "其它类_森林防火 ",
+      "font_class": "centerdata-t-forest-keyfireproofplots",
+      "unicode": "e9d9",
+      "unicode_decimal": 59865
+    },
+    {
+      "icon_id": "12837817",
+      "name": "危险企业",
+      "font_class": "centerdata-t-emergency-idlh-enterprises",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
       "icon_id": "14191056",
       "name": "喇叭广播",
       "font_class": "labaguangbo",

File diff suppressed because it is too large
+ 4 - 0
src/assets/iconfont/iconfont.svg


BIN
src/assets/iconfont/iconfont.ttf


BIN
src/assets/iconfont/iconfont.woff


BIN
src/assets/iconfont/iconfont.woff2


BIN
src/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-emergency-idlh-enterprises.png


+ 61 - 1
src/views/datacenter.vue

@@ -620,7 +620,67 @@ export default {
               "                </span>"
             : "") +
           "</div>";
-      } else if (resourceTable == "centerdata_t_forest_fireteam") {
+      }
+      else if (resourceTable == "centerdata_t_emergency_idlh_enterprises") {
+        //危化企业
+        markersMap.icon = "sj-icon-map-centerdata-t-emergency-idlh-enterprises";
+        markersMap.lng = item.longitude;
+        markersMap.lat = item.latitude;
+        markersMap.bindPopupHtml =
+          '<div class="map-tip">' +
+          "<span>" +
+          '                  <div class="d-l-con">' +
+          '                  <div class="d-l-l-text">' +
+          "                  <h4>经纬度:" +
+          (item.longitude ? item.longitude : "") +
+          "," +
+          (item.latitude ? item.latitude : "") +
+          "</h4>" +
+          "                </div>" +
+          "                </div>" +
+          "                </span>" +
+          "<span>" +
+          '                  <div class="d-l-con">' +
+          '                  <div class="d-l-l-text">' +
+          "                  <h4>企业名称:" +
+          (item.name ? item.name : "") +
+          "</h4>" +
+          "                </div>" +
+          "                </div>" +
+          "                </span>" +
+          "<span>" +
+          '                  <div class="d-l-con">' +
+          '                  <div class="d-l-l-text">' +
+          "                  <h4>负责人:" +
+          (item.contacts ? item.contacts : "") +
+          "</h4>" +
+          "                </div>" +
+          "                </div>" +
+          "                </span>" +
+          (item.phone
+            ? "<span>" +
+            '                  <div class="d-l-con">' +
+            '                  <div class="d-l-l-text">' +
+            "                  <h4>联系电话:" +
+            item.phone +
+            "</h4>" +
+            "                </div>" +
+            "                </div>" +
+            "                </span>"
+            : "") +
+          (item.address
+            ? "<span>" +
+            '                  <div class="d-l-con">' +
+            '                  <div class="d-l-l-text">' +
+            "                  <h4>地址:" +
+            item.address +
+            "</h4>" +
+            "                </div>" +
+            "                </div>" +
+            "                </span>"
+            : "") +
+          "</div>";
+      }else if (resourceTable == "centerdata_t_forest_fireteam") {
         //防火队
         markersMap.icon = "sj-icon-map-centerdata-t-forest-fireteam";
         markersMap.lng = item.longitude;