Merge branch 'master' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization

src/api/datacenter.js

@@ -11,7 +11,16 @@ export function getResource() {
 //点击左侧菜单列表查询落点
 export function getResourcePoint(resourceTable) {
   return request({
-    url: '/center-fire/VisuForestDataCenterController/getResourcePoint?resourceTable='+resourceTable,
-    method: 'get',
+    url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
+    method: 'post',
+    data:{"resourceTable":resourceTable}
+  })
+}
+//点击右侧菜单列表查询落点
+export function getResourcePointByDeptId(resourceTable,deptId) {
+  return request({
+    url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
+    method: 'post',
+    data:{"resourceTable":resourceTable,"deptId":deptId}
   })
 }

src/components/supermap.vue

@@ -365,10 +365,17 @@
             }
           }
           if (markersList[i].click != null && markersList[i].click !== "") {
-            markerClick.on('click', function () {
-              let clickName = markersList[i].click;
-              _that.$emit(clickName);
-            })
+            if(markersList[i].parameter != null && markersList[i].parameter !== ""){
+              markerClick.on('click', function () {
+                let clickName = markersList[i].click;
+                _that.$emit(clickName,markersList[i].parameter);
+              })
+            }else{
+              markerClick.on('click', function () {
+                let clickName = markersList[i].click;
+                _that.$emit(clickName);
+              })
+            }
           }
           if (isAggregation) {
             _that.isAggregationLayers.addLayer(markerClick)
@@ -417,9 +424,17 @@
             }
           }
           if (markersList[i].click != null && markersList[i].click != "") {
-            marker.on('click', function () {
-              _that.$emit(markersList[i].click);
-            })
+            if(markersList[i].parameter != null && markersList[i].parameter !== ""){
+              marker.on('click', function () {
+                let clickName = markersList[i].click;
+                _that.$emit(clickName,markersList[i].parameter);
+              })
+            }else{
+              marker.on('click', function () {
+                let clickName = markersList[i].click;
+                _that.$emit(clickName);
+              })
+            }
           }
           marker.addTo(this.map);