From 8aa3edd56c279100c9053576f3e90fa55459fe77 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 16 Jan 2023 16:15:55 +0800
Subject: [PATCH] 修改
---
public/map/index.html | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/public/map/index.html b/public/map/index.html
index 59b8d6a..4d7b14b 100644
--- a/public/map/index.html
+++ b/public/map/index.html
@@ -6,9 +6,9 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>Document</title>
<link rel="stylesheet" type="text/css"
- href="http://36.134.81.48:18000/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/dijit/themes/tundra/tundra.css" />
+ href="https://js.arcgis.com/3.18/dijit/themes/tundra/tundra.css" />
<link rel="stylesheet" type="text/css"
- href="http://36.134.81.48:18000/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/esri/css/esri.css" />
+ href="https://js.arcgis.com/3.18/esri/css/esri.css" />
<link rel="stylesheet" href="./lib/layui/css/layui.css" />
<link rel="stylesheet" href="./css/forestry-map.css" />
<link type="text/css" rel="stylesheet" href="framework.css" />
@@ -24,31 +24,43 @@
<script src="js/layer/layer.js"></script>
<script src="js/laydate/laydate.js"></script>
<script type="text/javascript" src="js/comm/heard.js"></script>
- <script type="text/javascript" src="js/script.js"></script>
+<!-- <script type="text/javascript" src="js/script.js"></script>-->
<script src="./lib/layui/layui.js"></script>
<script src="env.js"></script>
<script type="text/javascript"
- src="http://36.134.81.48:18000/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/init.js"></script>
+ src="https://js.arcgis.com/3.18/init.js"></script>
<script src='./lib/zTree_v3/js/jquery.ztree.all.js'></script>
<script>
var _framework = null;
var _AppEvent = null;
- var locationObj = null
- function init(openId) {
- if (openId && _AppEvent != null) {
- showFun(openId);
- return;
- }
- $.divselect("#divselect", "#inputselect");
+ function getQueryStringByKey(key) {
+ return (document.location.search.match(new RegExp("(?:^\\?|&)" + key + "=(.*?)(?=&|$)")) || ['', null])[1];
+ }
+ var ISinit = getQueryStringByKey('ISinit');
+ var openId = getQueryStringByKey('openid');
+ if(ISinit == null){
+ init(openId,null);
+ }
+
+ function init(openId,locationObj) {
require(["base/framework", "base/AppEvent"],
function (framework, AppEvent) {
_framework = new framework();
_framework.onSiderContainerShow();
_framework.resize();
_AppEvent = AppEvent;
- _AppEvent.addAppEventListener("mapLoad", mapLoad);
+
+ if (locationObj != null){
+ //获取设备id
+ window.clientID = locationObj.clientID;
+ }
+ _AppEvent.addAppEventListener("mapLoad", function(map){
+ if (locationObj && locationObj != null) {
+ map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 16);
+ }
+ });
if (openId) showFun(openId);
}
);
@@ -58,16 +70,11 @@
_AppEvent.dispatchAppEvent(_AppEvent.RUN_WIDGET, id);
}
- function mapLoad(map) {
- if(locationObj) {
- map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 14);
- }
- }
</script>
</head>
-<body onload="init()">
+<body>
<div class="map_content">
@@ -100,17 +107,4 @@
<script src="./js/monitor.js"></script>
<script src="./js/forestry-map.js"></script>
-<script>
- var openId = getQueryStringByKey('openid');
-
- if (openId && openId != '') {
- init(openId)
- }
-
-
- function getQueryStringByKey(key) {
- return (document.location.search.match(new RegExp("(?:^\\?|&)" + key + "=(.*?)(?=&|$)")) || ['', null])[1];
- }
-</script>
-
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.3