wangzhe пре 2 година
родитељ
комит
826d052c13
1 измењених фајлова са 42 додато и 24 уклоњено
  1. 42 24
      src/views/datacenter.vue

+ 42 - 24
src/views/datacenter.vue

@@ -322,6 +322,8 @@ export default {
       }else {
         this.showSearch = true;
       }
+      // 搜索类型
+      this.searchType = resourceTable;
       this.iconCurrentIndex = resourceTable
       let that = this
       that.resourceTable = resourceTable
@@ -383,20 +385,36 @@ export default {
     getMarkersMap(resourceTable, markersMap, item){
       if (resourceTable == 'centerdata_t_environment_key_enterprise') { //重点企业
         markersMap.icon = 'sj-icon-map-centerdata-t-environment-key-enterprise'
-        markersMap.lng = item.longitude
-        markersMap.lat = item.latitude
+        markersMap.lng = (item.longitude?item.longitude:"")
+        markersMap.lat = (item.latitude?item.latitude:"")
         markersMap.bindPopupHtml = '<div class="map-tip">' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>经纬度:' + item.longitude + ',' + item.latitude + '</h4>' +
+          '                  <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.contacts?item.name:"") +
+          '</h4>' +
+          '                </div>' +
+          '                </div>' +
+          '                </span>' +
+          '<span>' +
+          '                  <div class="d-l-con">' +
+          '                  <div class="d-l-l-text">' +
+          '                  <h4>地址:' + (item.address?item.address:"") +
+          '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span>' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>企业名称:' + item.name +
+          '                  <h4>联系人:' + (item.contacts?contacts_phone:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -404,7 +422,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>地址:' + item.address +
+          '                  <h4>联系人电话:' + (item.contacts_phone?item.contacts_phone:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -412,7 +430,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>企业法人:' + item.legalPerson +
+          '                  <h4>企业法人:' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -420,67 +438,67 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系电话:' + item.contactsPhone +
+          '                  <h4>联系电话:' + (item.contacts_phone?item.contacts_phone:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span></div>'
       } else if (resourceTable == 'centerdata_t_environment_prohibition_area') { //禁烧区
         markersMap.icon = 'sj-icon-map-centerdata-t-environment-prohibition-area'
-        markersMap.lng = item.longitude
-        markersMap.lat = item.latitude
+        markersMap.lng = (item.longitude?item.longitude:"")
+        markersMap.lat = (item.latitude?item.latitude:"")
         markersMap.bindPopupHtml = '<div class="map-tip">' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>经纬度:' + item.longitude + ',' + item.latitude + '</h4>' +
+          '                  <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 + '</h4>' +
+          '                  <h4>禁烧区名称:' + (item.name?item.name:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span>' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>地址:' + item.address + '</h4>' +
+          '                  <h4>地址:' + (item.address?item.address:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span>' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>区域负责人:' + item.principal + '</h4>' +
+          '                  <h4>区域负责人:' + (item.principal?item.principal:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span>' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系电话:' + item.contactsPhone + '</h4>' +
+          '                  <h4>联系电话:' + (item.contactsPhone?item.contactsPhone:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span></div>'
       } else if (resourceTable == 'centerdata_t_environment_source_pollution') { //污染源
         markersMap.icon = 'sj-icon-map-centerdata-t-environment-source-pollution'
-        markersMap.lng = item.longitude
-        markersMap.lat = item.latitude
+        markersMap.lng = (item.longitude?item.longitude:"")
+        markersMap.lat = (item.latitude?item.latitude:"")
         markersMap.bindPopupHtml = '<div class="map-tip">' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>经纬度:' + item.longitude + ',' + item.latitude + '</h4>' +
+          '                  <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 +
+          '                  <h4>污染源名称:' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -488,7 +506,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>地址:' + item.address +
+          '                  <h4>地址:' + (item.address?item.address:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -497,20 +515,20 @@ export default {
           '</div>'
       } else if (resourceTable == 'centerdata_t_environment_sewage_outlet') { //排污口
         markersMap.icon = 'sj-icon-map-centerdata_t_environment_sewage_outlet'
-        markersMap.lng = item.longitude
-        markersMap.lat = item.latitude
+        markersMap.lng = (item.longitude?item.longitude:"")
+        markersMap.lat = (item.latitude?item.latitude:"")
         markersMap.bindPopupHtml = '<div class="map-tip">' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>经纬度:' + item.longitude + ',' + item.latitude + '</h4>' +
+          '                  <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 +
+          '                  <h4>排污口名称:' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -518,7 +536,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>地址:' + item.address +
+          '                  <h4>地址:' + (item.address?item.address:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +