数据中心

src/api/components/supermap.js

@@ -27,9 +27,16 @@ export const iconList = {
 
 
   //数据中心图标
+  'sj-icon-map-centerdata-t-forest-waterintake': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-waterintake.png'),//取水口
+  'sj-icon-map-centerdata-t-forest-watercrane': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-watercrane.png'),//水鹤
+  'sj-icon-map-centerdata-t-forest-firehydrant-1': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant-1.png'),//地上消火栓
+  'sj-icon-map-centerdata-t-forest-firehydrant-2': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant-2.png'),//地下消火栓
+  'sj-icon-map-centerdata-t-forest-firehydrant-3': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant-3.png'),//室内消火栓
   'sj-icon-map-centerdata-t-firecontrol-basic-linkage-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-basic-linkage-force.png'),//基本联动力量
   'sj-icon-map-centerdata-t-firecontrol-foam-liquid': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-foam-liquid.png'),//泡沫液
   'sj-icon-map-centerdata-t-firecontrol-other-linkage-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-other-linkage-force.png'),//其他消防力量
   'sj-icon-map-centerdata-t-firecontrol-fire-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-force.png'),//消防力量
+  'sj-icon-map-centerdata-t-firecontrol-fire-key-places': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-key-places.png'),//重点场所
+  'sj-icon-map-centerdata-t-firecontrol-fire-pressure-sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-pressure-sensor.png'),//压力传感器
   'sj-icon-map-centerdata-t-firecontrol-fulltime-station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fulltime-station.png'),//专职站
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,188 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "35532604",
+      "name": "水鹤",
+      "font_class": "shuihe",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "35530153",
+      "name": "储水池",
+      "font_class": "chushuichi",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "35530154",
+      "name": "水井",
+      "font_class": "shuijing",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "35530155",
+      "name": "室内消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-3",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
+      "icon_id": "35530156",
+      "name": "污水池",
+      "font_class": "wushuichi",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "35530157",
+      "name": "消防水池",
+      "font_class": "xiaofangshuichi",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "35530158",
+      "name": "河流",
+      "font_class": "heliu",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "35530159",
+      "name": "地上消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-1",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "35530160",
+      "name": "湖泊",
+      "font_class": "hubo",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "35530161",
+      "name": "消防水鹤",
+      "font_class": "xiaofangshuihe",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "35530162",
+      "name": "地下消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-2",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "35530163",
+      "name": "消火栓井",
+      "font_class": "xiaohuoshuanjing",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "2761284",
+      "name": "水质监测站",
+      "font_class": "shuizhijiancezhan",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "7335552",
+      "name": "水压",
+      "font_class": "shuiya",
+      "unicode": "eb33",
+      "unicode_decimal": 60211
+    },
+    {
+      "icon_id": "11647823",
+      "name": "多层土壤墒情",
+      "font_class": "duocengturangshangqing",
+      "unicode": "eb61",
+      "unicode_decimal": 60257
+    },
+    {
+      "icon_id": "26805914",
+      "name": "水文站",
+      "font_class": "shuiwenzhan",
+      "unicode": "e7e4",
+      "unicode_decimal": 59364
+    },
+    {
+      "icon_id": "26805955",
+      "name": "电子水尺",
+      "font_class": "dianzishuichi",
+      "unicode": "e7e5",
+      "unicode_decimal": 59365
+    },
+    {
+      "icon_id": "357804",
+      "name": "冶金矿产",
+      "font_class": "centerdata-t-resources-deposit",
+      "unicode": "e6f3",
+      "unicode_decimal": 59123
+    },
+    {
+      "icon_id": "2678644",
+      "name": "违章",
+      "font_class": "centerdata-t-resources-illegal-construction",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "5390820",
+      "name": "地质灾害",
+      "font_class": "centerdata-t-resources-geologic-hazard",
+      "unicode": "e793",
+      "unicode_decimal": 59283
+    },
+    {
+      "icon_id": "20741717",
+      "name": "土地",
+      "font_class": "centerdata-t-resources-land",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "10083087",
+      "name": "GIS-图例、图层icon_排污井",
+      "font_class": "centerdata-t-environment-sewage-outlet",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "2121726",
+      "name": "旅游",
+      "font_class": "lvyou",
+      "unicode": "e637",
+      "unicode_decimal": 58935
+    },
+    {
+      "icon_id": "10164896",
+      "name": "警察",
+      "font_class": "jingcha",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "19657701",
+      "name": "商城管理",
+      "font_class": "shangchengguanli",
+      "unicode": "e638",
+      "unicode_decimal": 58936
+    },
+    {
+      "icon_id": "31461858",
+      "name": "土地",
+      "font_class": "tudi",
+      "unicode": "100e7",
+      "unicode_decimal": 65767
+    },
+    {
       "icon_id": "33191314",
       "name": "重点服务企业",
       "font_class": "centerdata-t-firecontrol-fire-key-places",
@@ -83,23 +265,30 @@
       "unicode_decimal": 59087
     },
     {
+      "icon_id": "35419040",
+      "name": "泡沫液-copy",
+      "font_class": "centerdata-t-firecontrol-foam-liquid-copy",
+      "unicode": "100e8",
+      "unicode_decimal": 65768
+    },
+    {
       "icon_id": "33526953",
       "name": "禁烧区",
-      "font_class": "area",
+      "font_class": "centerdata-t-environment-prohibition-area",
       "unicode": "e62f",
       "unicode_decimal": 58927
     },
     {
       "icon_id": "33526954",
       "name": "重点企业",
-      "font_class": "enterprise",
+      "font_class": "centerdata-t-environment-key-enterprise",
       "unicode": "e630",
       "unicode_decimal": 58928
     },
     {
       "icon_id": "33526955",
       "name": "污染源",
-      "font_class": "pollution",
+      "font_class": "centerdata-t-environment-source-pollution",
       "unicode": "e631",
       "unicode_decimal": 58929
     },

src/views/datacenter.vue

@@ -275,7 +275,7 @@ export default {
         that.resourcesList = res.data
         //截取data.resourceTable字段中“_”分隔符最后一个作为关键字,重新拼接成前端需要的图标:class,格式sj-icon-xxxx,将其set回原数组
         res.data.forEach(function (data, index) {
-          let icon ='sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-");
+          let icon ='sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-").replaceAll("@", "-");
           console.log("icon_" + (index + 1) + "=", icon);
           that.$set(that.resourcesList[index], 'icon', icon);
         })
@@ -389,6 +389,7 @@ export default {
           '                </div>' +
           '                </span></div>'
       } else if (resourceTable == 'centerdata_t_forest_waterintake') { //取水口
+        markersMap.icon = 'sj-icon-map-centerdata-t-forest-waterintake'
         markersMap.lng = item.longitude
         markersMap.lat = item.latitude
         markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -421,6 +422,7 @@ export default {
           '                </div>' +
           '                </span></div>'
       } else if (resourceTable == 'centerdata_t_forest_watercrane') { //水鹤
+        markersMap.icon = 'sj-icon-map-centerdata-t-forest-watercrane'
         markersMap.lng = item.longitude
         markersMap.lat = item.latitude
         markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -452,7 +454,12 @@ export default {
           '                </div>' +
           '                </div>' +
           '                </span></div>'
-      } else if (resourceTable == 'centerdata_t_forest_firehydrant') { //消火栓
+      } else if (resourceTable == 'centerdata_t_forest_firehydrant@1' || resourceTable == 'centerdata_t_forest_firehydrant@2' || resourceTable == 'centerdata_t_forest_firehydrant@3') { //消火栓
+        // markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-foam-liquid'
+        let icon = 'sj-icon-map-centerdata-t-forest-firehydrant-' + resourceTable.slice(-1);
+        // sj-icon-map-centerdata-t-forest-firehydrant-1
+        console.log("icon=", icon)
+        markersMap.icon = icon;
         markersMap.lng = item.longitude
         markersMap.lat = item.latitude
         markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -485,6 +492,7 @@ export default {
           '                </div>' +
           '                </span></div>'
       } else if (resourceTable == 'centerdata_t_firecontrol_fire_key_places') { //重点场所
+        markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-fire-key-places'
         markersMap.lng = item.longitude
         markersMap.lat = item.latitude
         markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -517,6 +525,7 @@ export default {
           '                </div>' +
           '                </span></div>'
       } else if (resourceTable == 'centerdata_t_firecontrol_fire_pressure_sensor') { //压力传感器
+        markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-fire-pressure-sensor'
         markersMap.lng = item.longitude
         markersMap.lat = item.latitude
         markersMap.bindPopupHtml = '<div class="map-tip">' +