From 0fdd42e318f51f9e3c6581473416af1cca69877f Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期四, 16 五月 2024 15:44:13 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/resources/static/js/custom/main.js | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 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 40bf88b..ed593dd 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,8 +1,8 @@
$(function() {
loadMap();
- getReallyData();
- getRegulatoryUnitChartData("","");
- bindEvent();
+ //getReallyData();
+ //getRegulatoryUnitChartData("","");
+ //bindEvent();
})
// 鍔犺浇鍦板浘
function loadMap() {
@@ -14,32 +14,28 @@
map.addControl(control);// 娣诲姞缂╂斁骞崇Щ鎺т欢
var scale = new T.Control.Scale();// 鍒涘缓姣斾緥灏烘帶浠跺璞�
- var ctrl = new T.Control.MapType();
- ctrl.setPosition(T_ANCHOR_BOTTOM_RIGHT);
+ // var ctrl = new T.Control.MapType();
+ // ctrl.setPosition(T_ANCHOR_BOTTOM_RIGHT);
// 娣诲姞鎺т欢
map.addControl(ctrl);
+
+
+ // const sourceGeoJson = new VectorSource({
+ // format: new GeoJSON(),
+ // url:'/beijing.geojson'
+ // });
+ //
+ // const layerGeoJson = new VectorLayer({
+ // source:sourceGeoJson,
+ // });
+ //
+ // map.addLayer(layerGeoJson);
}
// 鑾峰彇鏁版嵁搴撶湡瀹炴暟鎹�
function getReallyData() {
let url = window.location.protocol + "//" + window.location.host + "/bjfw/geotdp/index/indexCollect";
$.get(url,function(res){
- if(res.status && res.message === "鎿嶄綔鎴愬姛"){
- let reallyData = {
- "project-num" : res.result.projectNum,
- "all-project-num" : res.result.allProjectNum,
- "enterprise-num" : res.result.companyNum,
- "all-enterprise-num" : res.result.allCompanyNum,
- "exploration-num" : res.result.holeNum,
- "all-exploration-num" : res.result.allHoleNum,
- "jinchi-num" : Number(res.result.jinChiNum),
- "all-jinchi-num" : Number(res.result.allJinChiNum),
- "abnormal-num" : res.result.exceptionNum,
- "all-abnormal-num" : res.result.allExceptionNum
- }
- pageAssignment(reallyData);
- }else{
- $.modal.alertError("璇锋眰鍑洪敊");
- }
+
})
}
// 椤甸潰鏁版嵁璧嬪��
--
Gitblit v1.9.1