wangzhe 2 anni fa
parent
commit
84179083da

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

@@ -35,6 +35,9 @@ export const iconList = {
   'sj-icon-map-centerdata_water_pressure_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_pressure_sensor.png'),//水压传感器
 
   //数据中心图标
+  '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-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'),//取水口
   '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'),//地上消火栓

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


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


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


+ 44 - 2
src/assets/iconfont/iconfont.json

@@ -6,9 +6,51 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "6850817",
+      "name": "三角警示",
+      "font_class": "centerdata-t-traffic-warning-sign",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "11858521",
+      "name": "桥梁",
+      "font_class": "centerdata-t-traffic-bridge",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "35253155",
+      "name": "-_新建斜交涵洞",
+      "font_class": "centerdata-t-traffic-culvert",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "1287678",
+      "name": "企业认证",
+      "font_class": "centerdata-t-emergency-enterprise",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "11441202",
+      "name": "仓库库存",
+      "font_class": "centerdata-t-emergency-warehouse",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "26800916",
+      "name": "防汛抗旱应急队伍",
+      "font_class": "centerdata-t-emergency-team",
+      "unicode": "e7df",
+      "unicode_decimal": 59359
+    },
+    {
       "icon_id": "35532604",
       "name": "水鹤",
-      "font_class": "shuihe",
+      "font_class": "centerdata-t-forest-watercrane",
       "unicode": "e64d",
       "unicode_decimal": 58957
     },
@@ -638,7 +680,7 @@
     {
       "icon_id": "30787139",
       "name": "水鹤",
-      "font_class": "centerdata-t-forest-watercrane",
+      "font_class": "watercrane",
       "unicode": "e616",
       "unicode_decimal": 58902
     },

File diff suppressed because it is too large
+ 14 - 2
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-enterprise.png


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


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


+ 108 - 0
src/views/datacenter.vue

@@ -347,6 +347,114 @@ export default {
           '                </div>' +
           '                </div>' +
           '                </span></div>'
+      } else if (resourceTable == 'centerdata_t_emergency_warehouse') { //应急仓库
+        markersMap.icon = 'sj-icon-map-centerdata-t-emergency-warehouse'
+        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.dept_name?item.dept_name:"") + '</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></div>'):'')
+      } else if (resourceTable == 'centerdata_t_emergency_team') { //应急队伍
+        markersMap.icon = 'sj-icon-map-centerdata-t-emergency-team'
+        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.charger?item.charger:"") + '</h4>' +
+          '                </div>' +
+          '                </div>' +
+          '                </span>' + (item.emergency_phone?(
+            '<span>' +
+            '                  <div class="d-l-con">' +
+            '                  <div class="d-l-l-text">' +
+            '                  <h4>联系电话:' + item.emergency_phone + '</h4>' +
+            '                </div>' +
+            '                </div>' +
+            '                </span>'):'')
+          + (item.equipment?(
+            '<span>' +
+            '                  <div class="d-l-con">' +
+            '                  <div class="d-l-l-text">' +
+            '                  <h4>设备数量:' + item.equipment + '</h4>' +
+            '                </div>' +
+            '                </div>' +
+            '                </span>'):'')
+          + '</div>'
+      } else if (resourceTable == 'centerdata_t_emergency_enterprise') { //应急企业
+        markersMap.icon = 'sj-icon-map-centerdata-t-emergency-enterprise'
+        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></div>'):'')
       } else if (resourceTable == 'centerdata_t_forest_waterintake') { //取水口
         markersMap.icon = 'sj-icon-map-centerdata-t-forest-waterintake'
         markersMap.lng = item.longitude