修正BUG

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/兰山区自然资源数字化监管平台App.iml" filepath="$PROJECT_DIR$/.idea/兰山区自然资源数字化监管平台App.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/兰山区自然资源数字化监管平台App.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

js/JTMapKit.js

@@ -252,7 +252,7 @@ JTMapKit.prototype.extend({
 		/* 此处注意使用TileLayer导致地图放到一定比例后无法放大 */
 		require(["esri/layers/MapImageLayer"], function(MapImageLayer) {
 			var layer = new MapImageLayer({
-				url: 'https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer',
+				url: 'https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer',
 				title: '基础底图',
 			});
 			if (callComplete) callComplete(layer);
@@ -3767,4 +3767,4 @@ JTMapKit.prototype.extend({
 			this.gpsGraphic.symbol = this.gpsSysmbol;
 		}
 	}
-})
+})

js/MapManager.js

@@ -72,6 +72,7 @@ function MapInit(MainDivID, user) {
  * @param {functions} callSuccess 加载成功回调
  */
 function LoadRasterServer(callSuccess) {
+	// console.log(JSON.stringify(layerConfig[0]));
 	if (layerConfig) {
 		let rasterLayer = undefined; /* 加载的影像服务 */
 		/* 寻找当前需要显示的影像图层 */
@@ -1599,4 +1600,4 @@ function _executeFOA(index) {
 			_executeFOA(index + 1);
 		}
 	})
-}
+}

js/app.upload.js

@@ -29,6 +29,7 @@ function asyncCheckAppVerison(appInfo) {
 				/* 需要升级 */
 				var msg = "检测到新版本：" + resData[0].versionName + "，是否现在更新？";
 				muiConfirm(msg, '升级', function() {
+					console.log(resData[0].appDownloadUrl);
 					downloadAppFile(resData[0].appDownloadUrl, resData[0].appName);
 				});
 			} else {
@@ -172,4 +173,4 @@ function onStateChange(download, status) {
 			muiCloseWaitLoading();
 			break;
 	}
-}
+}

manifest.json

@@ -5,9 +5,9 @@
 	"name": "自然资源数字化监管平台",
 	/*应用名称，程序桌面图标名称*/
 	"version": {
-		"name": "3.2.2",
+		"name": "3.2.3",
 		/*应用版本名称*/
-		"code": 91
+		"code": 92
 	},
 	"description": "该App用于兰山区自然资源数字化监管。",
 	/*应用描述信息*/
@@ -274,4 +274,4 @@
 	},
 	"screenOrientation": ["portrait-primary"],
 	"fullscreen": false
-}
+}

pages/map.esri.html

@@ -348,7 +348,6 @@
 		for (let subjectLayer of saveLayer[0].subjectList) {
 			subjectLayerMap.set(subjectLayer.eName, subjectLayer);
 		}
-
 	}
 
 	/**

unpackage/resources/H5EFBB1F4/www/js/JTMapKit.js

@@ -252,7 +252,7 @@ JTMapKit.prototype.extend({
 		/* 此处注意使用TileLayer导致地图放到一定比例后无法放大 */
 		require(["esri/layers/MapImageLayer"], function(MapImageLayer) {
 			var layer = new MapImageLayer({
-				url: 'https://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer',
+				url: 'https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer',
 				title: '基础底图',
 			});
 			if (callComplete) callComplete(layer);
@@ -3767,4 +3767,4 @@ JTMapKit.prototype.extend({
 			this.gpsGraphic.symbol = this.gpsSysmbol;
 		}
 	}
-})
+})

unpackage/resources/H5EFBB1F4/www/js/app.upload.js

@@ -29,6 +29,7 @@ function asyncCheckAppVerison(appInfo) {
 				/* 需要升级 */
 				var msg = "检测到新版本：" + resData[0].versionName + "，是否现在更新？";
 				muiConfirm(msg, '升级', function() {
+					console.log(resData[0].appDownloadUrl);
 					downloadAppFile(resData[0].appDownloadUrl, resData[0].appName);
 				});
 			} else {
@@ -172,4 +173,4 @@ function onStateChange(download, status) {
 			muiCloseWaitLoading();
 			break;
 	}
-}
+}

unpackage/resources/H5EFBB1F4/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"H5EFBB1F4","name":"自然资源数字化监管平台","version":{"name":"3.2.2","code":91},"description":"该App用于兰山区自然资源数字化监管。","icons":{"72":"icon.png"},"launch_path":"login.html","developer":{"name":"金田产业发展（山东）集团有限公司","email":"18954008227@163.com","url":"http://www.sdjintian.com","phone":"18954008227","tel":"(0546)8312677","copyright":"临沂市兰山区自然资源局"},"permissions":{"Cache":{"description":"管理应用缓存"},"Console":{"description":"跟踪调试输出日志"},"Contacts":{"description":"访问系统联系人信息"},"Events":{"description":"应用扩展事件"},"Messaging":{"description":"访问通讯能力"},"Maps":{"description":"管理地图插件"},"Speech":{"description":"管理语音识别插件"},"SQLite":{}},"plus":{"statusbar":{"immersed":"supportedDevice","style":"light","background":"#FF0000"},"launchwebview":{},"splashscreen":{"autoclose":true,"waiting":true,"delay":1000},"runmode":"liberate","signature":"Sk9JTiBVUyBtYWlsdG86aHIyMDEzQGRjbG91ZC5pbw==","error":{"url":"pages/sys-error.html"}},"screenOrientation":["portrait-primary"],"fullscreen":false}
+{"@platforms":["android","iPhone","iPad"],"id":"H5EFBB1F4","name":"自然资源数字化监管平台","version":{"name":"3.2.3","code":92},"description":"该App用于兰山区自然资源数字化监管。","icons":{"72":"icon.png"},"launch_path":"login.html","developer":{"name":"金田产业发展（山东）集团有限公司","email":"18954008227@163.com","url":"http://www.sdjintian.com","phone":"18954008227","tel":"(0546)8312677","copyright":"临沂市兰山区自然资源局"},"permissions":{"Cache":{"description":"管理应用缓存"},"Console":{"description":"跟踪调试输出日志"},"Contacts":{"description":"访问系统联系人信息"},"Events":{"description":"应用扩展事件"},"Messaging":{"description":"访问通讯能力"},"Maps":{"description":"管理地图插件"},"Speech":{"description":"管理语音识别插件"},"SQLite":{}},"plus":{"statusbar":{"immersed":"supportedDevice","style":"light","background":"#FF0000"},"launchwebview":{},"splashscreen":{"autoclose":true,"waiting":true,"delay":1000},"runmode":"liberate","signature":"Sk9JTiBVUyBtYWlsdG86aHIyMDEzQGRjbG91ZC5pbw==","error":{"url":"pages/sys-error.html"}},"screenOrientation":["portrait-primary"],"fullscreen":false}

unpackage/resources/H5EFBB1F4/www/pages/map.esri.html

@@ -10,8 +10,7 @@
 		<link rel="stylesheet" type="text/css" href="../css/app.css" />
 		<link rel="stylesheet" type="text/css" href="../css/app.new.css" />
 		<!-- 引入arcigs在线样式 -->
-		<link rel="stylesheet"
-			href="http://218.59.194.82:9092/arcgis_js_api/javascript/4.21/esri/themes/light/main.css">
+		<link rel="stylesheet" href="http://218.59.194.82:9092/arcgis_js_api/javascript/4.21/esri/themes/light/main.css">
 		<!-- 引入案件样式 -->
 		<link rel="stylesheet" type="text/css" href="../css/case.css" />
 		<!-- 引入弹窗及选择器样式 -->
@@ -66,8 +65,7 @@
 						style="height:103%;width: 103%;position: relative;margin-top: 30px;margin-left: 30px;">
 					</div> -->
 					<!-- 左侧工具栏 -->
-					<div class="ui-content-padded jt-map-tools"
-						style="position: absolute;top: 50px;left: 4px;width: 40px;">
+					<div class="ui-content-padded jt-map-tools" style="position: absolute;top: 50px;left: 4px;width: 40px;">
 						<!-- 测量长度 -->
 						<button data-info="在地图上点击需要测量对象的特征位置,即可实时计算长度并展示" class="mui-btn wc-map-div-btn"
 							onclick="EventClick_MeasureLength()">
@@ -81,8 +79,7 @@
 							<span>面积量测</span>
 						</button>
 						<!-- 地图初始化 -->
-						<button data-info="点击即可重置地图范围为初始显示范围" class="mui-btn wc-map-div-btn"
-							onclick="EventClick_MapInit()">
+						<button data-info="点击即可重置地图范围为初始显示范围" class="mui-btn wc-map-div-btn" onclick="EventClick_MapInit()">
 							<span class="app-icon app-icon-map-initlocation"></span>
 							<span>重置地图</span>
 						</button>
@@ -100,8 +97,7 @@
 						</button>
 					</div>
 					<!-- 右侧工具栏 -->
-					<div class="ui-content-padded jt-map-tools"
-						style="position: absolute;top: 50px;right: 4px;width: 40px;">
+					<div class="ui-content-padded jt-map-tools" style="position: absolute;top: 50px;right: 4px;width: 40px;">
 						<!-- 图层控制 -->
 						<button data-info="点击即可打开图层控制窗口,进行图层及标注的显示/隐藏" class="mui-btn wc-map-div-btn"
 							onclick="EventClick_Layer(this)">
@@ -109,8 +105,8 @@
 							<span>图层控制</span>
 						</button>
 						<!-- 点图查询 -->
-						<button data-info="点击后，在需要查询的位置单击，即可查询该位置的全部可见图层数据"
-							class="mui-btn wc-map-div-btn jt-normal-hide" onclick="EventClick_Query_Point()">
+						<button data-info="点击后，在需要查询的位置单击，即可查询该位置的全部可见图层数据" class="mui-btn wc-map-div-btn jt-normal-hide"
+							onclick="EventClick_Query_Point()">
 							<span class="app-icon app-icon-map-query-point"></span>
 							<span>点击查询</span>
 						</button>
@@ -128,8 +124,7 @@
 						</button>
 						<!-- 通用绘制占压分析 -->
 						<button data-info="点击后,绘制占压区域，单击开始分析,对绘制区域内的占压情况进行分析并展示结果"
-							class="mui-btn wc-map-div-btn jt-normal-hide"
-							onclick="EventClick_Common_Spatial_Analysis()">
+							class="mui-btn wc-map-div-btn jt-normal-hide" onclick="EventClick_Common_Spatial_Analysis()">
 							<span class="app-icon app-icon-map-common-analysis"></span>
 							<span>区域占压</span>
 						</button>
@@ -566,4 +561,4 @@
 	mui.back = function() {
 		closeWindow();
 	}
-</script>
+</script>