Merge remote-tracking branch 'origin/visu_environment' into visu_environment

src/assets/iconfont/iconfont.json

@@ -8,7 +8,7 @@
     {
       "icon_id": "10083087",
       "name": "GIS-图例、图层icon_排污井",
-      "font_class": "paiwukou",
+      "font_class": "centerdata-t-environment-sewage-outlet",
       "unicode": "e63c",
       "unicode_decimal": 58940
     },
@@ -127,21 +127,21 @@
     {
       "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

@@ -279,8 +279,6 @@ export default {
         console.log("that.resourcesList=", that.resourcesList)
         //截取data.resourceTable字段中“_”分隔符最后一个作为关键字,重新拼接成前端需要的图标:class,格式sj-icon-xxxx,将其set回原数组
         res.data.forEach(function(data, index) {
-          // that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data.resourceTable.split('_').slice(-1))
-          console.log("data.type.split('_').slice(-1)", data.type.split('_').slice(-1));
           that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-"));
         })
       })
@@ -343,7 +341,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>企业法人：' + res.data.resourceList[i].legalPerson +
+                '                  <h4>企业法人：' + res.data.resourceList[i].contacts +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -351,7 +349,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系电话：' + res.data.resourceList[i].contactsPhone +
+                '                  <h4>联系电话：' + res.data.resourceList[i].contacts_phone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -473,6 +471,7 @@ export default {
       let that = this
       //点击左侧地图落点
       getResourcePointByDeptId(that.resourceTable, deptId).then(res => {
+        console.log("1===============dituluodian===============", res.data.resourceList);
         that.markersList = []
         if (res.data.resourceList != null && res.data.resourceList.length > 0) {
           for (let i = 0; i < res.data.resourceList.length; i++) {
@@ -517,7 +516,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>企业法人：' + res.data.resourceList[i].legalPerson +
+                '                  <h4>企业法人：' + res.data.resourceList[i].contacts +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -525,7 +524,7 @@ export default {
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>联系电话：' + res.data.resourceList[i].contactsPhone +
+                '                  <h4>联系电话：' + res.data.resourceList[i].contacts_phone +
                 '</h4>' +
                 '                </div>' +
                 '                </div>' +