From 5e697a70c7e49e18bc3bc2f75c2e9ad5bda17489 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 15:40:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/main.js | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/main.js b/javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/main.js
index 95016c1..2bacfb2 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/main.js
+++ b/javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/main.js
@@ -1,15 +1,16 @@
$(function() {
loadMap();
- //getReallyData();
+ getReallyData();
//getRegulatoryUnitChartData("","");
//bindEvent();
})
// 鍔犺浇鍦板浘
+let map=null;
var countries = [];
var countriesOverlay = new T.D3Overlay(init,redraw);
var countriesOverlay1 = new T.D3Overlay(init1,redraw1);
function loadMap() {
- let map = new T.Map('map_div');
+ map = new T.Map('map_div');
map.centerAndZoom(new T.LngLat(116.38, 39.9), 11);
var control = new T.Control.Zoom();
@@ -71,11 +72,24 @@
// 鑾峰彇鏁版嵁搴撶湡瀹炴暟鎹�
function getReallyData() {
- let url = window.location.protocol + "//" + window.location.host + "/bjfw/geotdp/index/indexCollect";
+ let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/project";
$.get(url,function(res){
-
+ var data = res.projects;
+ showProjectPoint(data);
})
}
+//鍦板浘涓婂睍绀洪」鐩偣
+function showProjectPoint(data){
+ var projectIcon = new T.Icon({
+ iconUrl: '/bjfw/images/icons/6.png',
+ iconSize: new T.Point(30, 30),
+ iconAnchor: new T.Point(6, 40),
+ });
+ var centerMarker = new T.Marker(new T.LngLat(center.lng, center.lat), { title: "椤圭洰",icon:icon});
+
+ var proj = infoWindowProject(onProject);
+ addClickHandler(proj, centerMarker);
+}
// 椤甸潰鏁版嵁璧嬪��
function pageAssignment(reallyData) {
for ( let key in reallyData) {
--
Gitblit v1.9.1