瀏覽代碼

map添加切换底图功能
添加图斑
添加相关法律法规跳转

DESKTOP-6LTVLN7\Liumouren 1 年之前
父節點
當前提交
83b3a969ca

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+unpackage/

+ 32 - 0
css/home.css

@@ -475,6 +475,29 @@
 	color: #FFFFFF;
 	z-index: 999;
 }
+.changeType2 {
+	position: fixed;
+	top: 120px;
+	left: 5px;
+	background-color: #FFF;
+	padding: 0.4rem;
+	/* background-image: linear-gradient(-45deg, #409EFF, #409EFFaa); */
+	font-size: 14px;
+	width: 2rem;
+	height: 2rem;
+	border-radius: 0.15rem;
+	display: flex;
+	flex-direction: column;
+	flex-wrap: nowrap;
+	align-content: center;
+	justify-content: center;
+	align-items: center;
+	box-shadow: 3px 3px 5px #00000064;
+	text-shadow: 1px 1px 2px #00000064;
+	font-weight: bold;
+	color: #000;
+	z-index: 999;
+}
 
 .mui-bar .mui-title {
 	font-weight: bold;
@@ -789,6 +812,15 @@
 	margin-top: 55px;
 }
 
+/* 详细信息 */
+.detailedInformation,.relevantLawsAndRegulations{
+	color: #409EFF !important;
+}
+
+/* 疑点图斑 */
+.patternSpot{
+	max-width: 50vw;
+}
 /* .openMyPhoneMap {
 	position: absolute;
 	padding: 10px;

+ 50 - 2
js/util.js

@@ -8,7 +8,7 @@ mui.plusReady(function() {
 		console.log("plus初始化成功!")
 		// 获取当前定位
 		getLocalAddr();
-		// plus start
+		// plus start真机调试或打包需要注释
 		// 	}
 		// }, true);
 		// plus end
@@ -307,6 +307,19 @@ mui.plusReady(function() {
 			}).on('tap', '.knowledgeRetrieval', function() {
 				// 知识检索页面跳转
 				clearSearchValue();
+				// 关键字过滤
+				// if (this.dataset.searchStr.indexOf('土') != -1) {
+				// 	localStorage.setItem('searchInput', '土地资源');
+				// } else if (this.dataset.searchStr.indexOf('水') != -1) {
+				// 	localStorage.setItem('searchInput', '水资源');
+				// } else if (this.dataset.searchStr.indexOf('林') != -1) {
+				// 	localStorage.setItem('searchInput', '林地资源');
+				// } else if (this.dataset.searchStr.indexOf('生态') != -1) {
+				// 	localStorage.setItem('searchInput', '生态资源');
+				// } else {
+				// 	localStorage.setItem('searchInput', this.dataset.searchStr.substring(0,2));
+				// }
+				localStorage.setItem('searchInput', '土');
 				mui.openWindow("lawsAndRegulations.html", "lawsAndRegulations")
 			}).on('tap', '.myMarks', function() {
 				// 我的标记页面跳转
@@ -475,6 +488,29 @@ mui.plusReady(function() {
 			}).on('tap', '.toBackPage', function() {
 				console.log("utils.toBackPage")
 				mui.back();
+			}).on('tap', '.changeMap', function() {
+				console.log("切换底图")
+				try {
+					changeMap();
+				} catch (e) {
+					//TODO handle the exception
+					console.log("changeMap catch")
+				}
+			}).on('tap', '.detailedInformation', function() {
+				console.log("疑点详细信息", this.dataset.markerData);
+				try {
+					if (this.dataset.markerData != 'undefined') {
+						mui.alert(this.dataset.markerData.substring(1, this.dataset.markerData.length -
+								1)
+							.replaceAll(',', '\n'), '疑点详细信息', '确定', null, 'div')
+					} else {
+						mui.alert('无', '疑点详细信息', '确定', null, 'div')
+					}
+
+				} catch (e) {
+					//TODO handle the exception
+					console.log("detailedInformation catch")
+				}
 			}).on('tap', '.fileBox', function() {
 				console.log('fileUrl', DMS_BASE_RUL + "/proxy_dms" + this.dataset.fileUrl)
 				openRemoteFile(DMS_BASE_RUL + "/proxy_dms" + this.dataset.fileUrl);
@@ -494,6 +530,7 @@ mui.plusReady(function() {
 					document.getElementById('mapBottomBox').style.bottom = "-100%";
 				}
 			}).on('tap', '.paperplane', function() {
+				console.log("用户点击paperplane")
 				let serverDataMap = JSON.parse(localStorage.getItem('serverDataMap'));
 				let myMarkerData = serverDataMap[document.getElementById("myMarkerId").value];
 				let fileList_ = localStorage.getItem("markerDataPropertiesFileList") != 'undefined' ?
@@ -1047,6 +1084,17 @@ mui.plusReady(function() {
 				};
 				searchParam.push(param);
 			}
+			if (localStorage.getItem("searchInput")) {
+				let param = {
+					field: pageParam[pageName].searchColumnName,
+					searchType: "2",
+					content: {
+						value: localStorage.getItem("searchInput")
+					}
+				};
+				searchParam.push(param);
+				localStorage.removeItem('searchInput')
+			}
 			if (document.getElementById('searchInput') && document.getElementById('searchInput').value) {
 				let searchInputValue = document.getElementById('searchInput').value;
 				if (searchInputValue) {
@@ -1518,6 +1566,6 @@ mui.plusReady(function() {
 				fail();
 			}
 		}
-		// plus注释区域
+		// plus注释区域,真机调试或打包需要放开
 	}
 }, true);

+ 398 - 353
pages/map.html

@@ -79,336 +79,381 @@
 			<div class="changeType" id="addMyMarker">
 				<span class="mui-icon mui-icon-upload"></span>
 			</div>
+			<!-- 切换底图按钮 -->
+			<div class="changeType2 changeMap">
+				<span class="mui-icon mui-icon-map"></span>
+			</div>
 		</div>
 	</body>
 	<script type="text/javascript">
-		mui.plusReady(function() {
-			if (plus) {
-				function newPostRequest2(setting, funSuccess, funError) {
-					var xhr = new XMLHttpRequest();
+		// mui.plusReady(function() {
+		// 	if (plus) {
+		function newPostRequest2(setting, funSuccess, funError) {
+			var xhr = new XMLHttpRequest();
 
-					// 请求成功回调函数
-					xhr.onload = e => {
-						console.log('request success');
-					};
-					// 请求结束
-					xhr.onloadend = e => {
-						console.log('request loadend');
-					};
-					// 请求出错
-					xhr.onerror = e => {
-						console.log('request error');
-						funError("request error");
-					};
-					// 请求超时
-					xhr.ontimeout = e => {
-						console.log('request timeout');
-						funError("request timeout");
-					};
-					xhr.open('POST', "http://117.131.26.69:10081/proxy_dms/content/selectContentList", true);
-					if (localStorage.getItem("token")) {
-						xhr.setRequestHeader("token", localStorage.getItem("token"))
-					}
-					xhr.onreadystatechange = function() {
-						if (xhr.readyState == 4 && xhr.status == 200) {
-							funSuccess(JSON.parse(xhr.responseText));
-						}
-					}
-					xhr.send(setting.data);
+			// 请求成功回调函数
+			xhr.onload = e => {
+				console.log('request success');
+			};
+			// 请求结束
+			xhr.onloadend = e => {
+				console.log('request loadend');
+			};
+			// 请求出错
+			xhr.onerror = e => {
+				console.log('request error');
+				funError("request error");
+			};
+			// 请求超时
+			xhr.ontimeout = e => {
+				console.log('request timeout');
+				funError("request timeout");
+			};
+			xhr.open('POST', "http://117.131.26.69:10081/proxy_dms/content/selectContentList", true);
+			if (localStorage.getItem("token")) {
+				xhr.setRequestHeader("token", localStorage.getItem("token"))
+			}
+			xhr.onreadystatechange = function() {
+				if (xhr.readyState == 4 && xhr.status == 200) {
+					funSuccess(JSON.parse(xhr.responseText));
 				}
-				// 动态获取图片(点击疑点或标记marker时)
-				function getFileListUrl2(fileList) {
-					return new Promise((resolve, reject) => {
-						if (fileList) {
-							let fileUrlList = [];
-							let index = 0;
-							for (let fileName in fileList) {
-								index++;
+			}
+			xhr.send(setting.data);
+		}
+		// 动态获取图片(点击疑点或标记marker时)
+		function getFileListUrl2(fileList) {
+			return new Promise((resolve, reject) => {
+				if (fileList) {
+					let fileUrlList = [];
+					let index = 0;
+					for (let fileName in fileList) {
+						index++;
+					}
+					for (let fileName in fileList) {
+						let paramData2 = new FormData();
+						paramData2.append("columnId", 1793);
+						paramData2.append("states", "0,1,2");
+						paramData2.append("pageSize", 10);
+						paramData2.append("page", 0);
+						let searchParam = [];
+						let paramItem = {
+							field: "title",
+							searchType: "1",
+							content: {
+								value: fileList[fileName]
 							}
-							for (let fileName in fileList) {
-								let paramData2 = new FormData();
-								paramData2.append("columnId", 1793);
-								paramData2.append("states", "0,1,2");
-								paramData2.append("pageSize", 10);
-								paramData2.append("page", 0);
-								let searchParam = [];
-								let paramItem = {
-									field: "title",
-									searchType: "1",
-									content: {
-										value: fileList[fileName]
-									}
-								};
-								searchParam.push(paramItem);
-								if (searchParam.length > 0) {
-									paramData2.append("search", JSON.stringify(searchParam));
+						};
+						searchParam.push(paramItem);
+						if (searchParam.length > 0) {
+							paramData2.append("search", JSON.stringify(searchParam));
+						}
+						newPostRequest2({
+							data: paramData2
+						}, function funSuccess(res, textStatus, xhr) {
+							let resJson2 = res;
+							if (resJson2.code == 200) {
+								let fileBase = resJson2.content
+									.data[0].c_file_base64;
+								fileUrlList.push(fileBase);
+								if (fileUrlList.length == index) {
+									resolve(fileUrlList);
 								}
-								newPostRequest2({
-									data: paramData2
-								}, function funSuccess(res, textStatus, xhr) {
-									let resJson2 = res;
-									if (resJson2.code == 200) {
-										let fileBase = resJson2.content
-											.data[0].c_file_base64;
-										fileUrlList.push(fileBase);
-										if (fileUrlList.length == index) {
-											resolve(fileUrlList);
-										}
-									}
-								}, function funerror(res, textStatus, xhr) {});
 							}
-						} else {
-							resolve();
-						}
-					});
+						}, function funerror(res, textStatus, xhr) {});
+					}
+				} else {
+					resolve();
 				}
-				let markers = [];
-				let geometrys = [];
-				// 地图默认中心位置
-				//定义一些常量
-				let center_ = [31.17361258762417, 121.51803731918336];
+			});
+		}
+		let markers = [];
+		let geometrys = [];
+		// 地图默认中心位置
+		//定义一些常量
+		let center_ = [31.17361258762417, 121.51803731918336];
 
-				function getOneLatLng(data, returnFunc) {
-					if (typeof data[0] == "object") {
-						getOneLatLng(data[0], returnFunc);
-					} else {
-						if (data[0] < data[1]) {
-							returnFunc([data[0] + 0.00011, data[1] + 0.19195]);
-							return;
-						} else {
-							returnFunc([data[1] + 0.00011, data[0] + 0.19195]);
-						}
-					}
+		const skew = [0.00011, 0.19195];
+		// const skew = [-0.002,0.198];
+
+		function getOneLatLng(data, returnFunc) {
+			if (typeof data[0] == "object") {
+				getOneLatLng(data[0], returnFunc);
+			} else {
+				if (data[0] < data[1]) {
+					returnFunc([data[0] + skew[0], data[1] + skew[1]]);
+					return;
+				} else {
+					returnFunc([data[1] + skew[0], data[0] + skew[1]]);
+				}
+			}
+		}
+		let gotoOrtherPageState = false;
+		// 得到定位数据
+		if (localStorage.getItem("geometrys") && localStorage.getItem("mapTitle") !== "自定义标记") {
+			let geometrysItem = JSON.parse(localStorage.getItem("geometrys"));
+			let index = 1;
+			if (geometrysItem != null) {
+				if (geometrysItem[0]) {
+					getOneLatLng(geometrysItem[0].coord ? geometrysItem[0].coord : geometrysItem[0].geometry
+						.coordinates,
+						function(res) {
+							center_ = res;
+						});
 				}
-				let gotoOrtherPageState = false;
-				// 得到定位数据
-				if (localStorage.getItem("geometrys") && localStorage.getItem("mapTitle") !== "自定义标记") {
-					let geometrysItem = JSON.parse(localStorage.getItem("geometrys"));
-					// console.log(geometrysItem)
-					let index = 1;
-					if (geometrysItem != null) {
-						if (geometrysItem[0]) {
-							getOneLatLng(geometrysItem[0].coord ? geometrysItem[0].coord : geometrysItem[0].geometry
-								.coordinates,
-								function(res) {
-									center_ = res;
-								});
-						}
 
-						geometrysItem.forEach(item => {
-							//创建多个icon
-							var greenIcon = L.icon({
-									iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-sc.png',
-									iconSize: [25, 41],
-									iconAnchor: [12, 41],
-									popupAnchor: [1, -34],
-									tooltipAnchor: [16, -28],
-									shadowSize: [41, 41]
-								}),
-								redIcon = L.icon({
-									iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-er.png',
-									iconSize: [25, 41],
-									iconAnchor: [12, 41],
-									popupAnchor: [1, -34],
-									tooltipAnchor: [16, -28],
-									shadowSize: [41, 41]
-								}),
-								orangeIcon = L.icon({
-									iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-wr.png',
-									iconSize: [25, 41],
-									iconAnchor: [12, 41],
-									popupAnchor: [1, -34],
-									tooltipAnchor: [16, -28],
-									shadowSize: [41, 41]
-								}),
-								greenIconActive = L.icon({
-									iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-sc.png',
-									iconSize: [25, 41],
-									iconAnchor: [12, 41],
-									popupAnchor: [1, -34],
-									tooltipAnchor: [16, -28],
-									shadowSize: [41, 41],
-									className: "my-div-icon"
-								}),
-								redIconActive = L.icon({
-									iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-er.png',
-									iconSize: [25, 41],
-									iconAnchor: [12, 41],
-									popupAnchor: [1, -34],
-									tooltipAnchor: [16, -28],
-									shadowSize: [41, 41],
-									className: "my-div-icon"
-								}),
-								orangeIconActive = L.icon({
-									iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-wr.png',
-									iconSize: [25, 41],
-									iconAnchor: [12, 41],
-									popupAnchor: [1, -34],
-									tooltipAnchor: [16, -28],
-									shadowSize: [41, 41],
-									className: "my-div-icon"
-								});
-							index++;
-							// 先将点添加到markers对象中
-							let centerItem = [];
-							if (localStorage.getItem("markerId") && item.id == localStorage.getItem(
-									"markerId")) {
-								gotoOrtherPageState = true;
-								getOneLatLng(item.coord ? item.coord : item.geometry.coordinates, function(
-									res) {
-									center_ = res;
-									if (center_[0] && center_[1]) {
-										markers.push(L.marker(center_, {
-											icon: localStorage.getItem("mapTitle") ==
-												"我的标记" || (item
-													.properties && item.properties.state
-												) ?
-												greenIconActive : orangeIconActive,
-											data: item
-										}));
-									}
-								});
-							} else {
-								getOneLatLng(item.coord ? item.coord : item.geometry.coordinates, function(
-									res) {
-									centerItem = res;
-									if (centerItem[0] && centerItem[1]) {
-										markers.push(L.marker(centerItem, {
-											icon: localStorage.getItem("mapTitle") ==
-												"我的标记" || (item
-													.properties && item.properties.state
-												) ? greenIcon : orangeIcon,
-											data: item
-										}));
-									}
-								});
+				geometrysItem.forEach(item => {
+					//创建多个icon
+					var greenIcon = L.icon({
+							iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-sc.png',
+							iconSize: [25, 41],
+							iconAnchor: [12, 41],
+							popupAnchor: [1, -34],
+							tooltipAnchor: [16, -28],
+							shadowSize: [41, 41]
+						}),
+						redIcon = L.icon({
+							iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-er.png',
+							iconSize: [25, 41],
+							iconAnchor: [12, 41],
+							popupAnchor: [1, -34],
+							tooltipAnchor: [16, -28],
+							shadowSize: [41, 41]
+						}),
+						orangeIcon = L.icon({
+							iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-wr.png',
+							iconSize: [25, 41],
+							iconAnchor: [12, 41],
+							popupAnchor: [1, -34],
+							tooltipAnchor: [16, -28],
+							shadowSize: [41, 41]
+						}),
+						greenIconActive = L.icon({
+							iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-sc.png',
+							iconSize: [25, 41],
+							iconAnchor: [12, 41],
+							popupAnchor: [1, -34],
+							tooltipAnchor: [16, -28],
+							shadowSize: [41, 41],
+							className: "my-div-icon"
+						}),
+						redIconActive = L.icon({
+							iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-er.png',
+							iconSize: [25, 41],
+							iconAnchor: [12, 41],
+							popupAnchor: [1, -34],
+							tooltipAnchor: [16, -28],
+							shadowSize: [41, 41],
+							className: "my-div-icon"
+						}),
+						orangeIconActive = L.icon({
+							iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-wr.png',
+							iconSize: [25, 41],
+							iconAnchor: [12, 41],
+							popupAnchor: [1, -34],
+							tooltipAnchor: [16, -28],
+							shadowSize: [41, 41],
+							className: "my-div-icon"
+						});
+					index++;
+					// 先将点添加到markers对象中
+					let centerItem = [];
+					if (localStorage.getItem("markerId") && item.id == localStorage.getItem(
+							"markerId")) {
+						gotoOrtherPageState = true;
+						getOneLatLng(item.coord ? item.coord : item.geometry.coordinates, function(
+							res) {
+							center_ = res;
+							if (center_[0] && center_[1]) {
+								markers.push(L.marker(center_, {
+									icon: localStorage.getItem("mapTitle") ==
+										"我的标记" || (item
+											.properties && item.properties.state
+										) ?
+										greenIconActive : orangeIconActive,
+									data: item
+								}));
 							}
-						})
+						});
+					} else {
+						getOneLatLng(item.coord ? item.coord : item.geometry.coordinates, function(
+							res) {
+							centerItem = res;
+							if (centerItem[0] && centerItem[1]) {
+								markers.push(L.marker(centerItem, {
+									icon: localStorage.getItem("mapTitle") ==
+										"我的标记" || (item
+											.properties && item.properties.state
+										) ? greenIcon : orangeIcon,
+									data: item
+								}));
+							}
+						});
 					}
-				};
-				// 如果得到当前手机定位
-				if (gotoOrtherPageState == false && localStorage.getItem("user_latitude") && localStorage.getItem(
-						"user_longitude")) {
-					center_ = [parseFloat(localStorage.getItem("user_latitude")), parseFloat(localStorage.getItem(
-						"user_longitude"))];
-				}
-				// 地图初始化
-				var map = L.map("map", {
-					center: center_,
-					zoom: 12,
-					minZoom: 9,
-					maxZoom: 16,
-					zoomControl: true,
-					attributionControl: false,
-					doubleClickZoom: false,
-					maxBounds: [
-						[31.95, 120.86],
-						[30.7, 122.12]
-					]
 				})
-				// 初始化地图底图
-				var layer = L.esri
-					.tiledMapLayer({
-						url: "http://121.43.55.7:10011/proxy/?servertype=Street_Purplish_Blue&token=65463DEE-620A-0ED5-2385-17ECD07CD351"
-					})
-					.addTo(map);
-				if (localStorage.getItem("user_latitude") != null && localStorage.getItem("user_longitude") != null) {
-					let myIcon = L.icon({
-						iconUrl: '../js/leaflet1.3.1/images/myMarker00000000.png',
-						iconSize: [10, 10],
-						iconAnchor: [12, 0],
-						popupAnchor: [1, -34],
-						tooltipAnchor: [16, -28],
-						shadowSize: [41, 41],
-						className: "my-div-icon2"
-					})
-					let localAddr = [parseFloat(localStorage.getItem("user_latitude")), parseFloat(localStorage
-						.getItem(
-							"user_longitude"))];
-					L.marker(localAddr, {
-						icon: myIcon
-					}).addTo(map);
-				}
-				// 批量将markers中的点添加到地图中,并添加监听事件打开底部弹窗。
-				markers.forEach(item => {
-					item.on('click', function(item) {
-						// 请求疑点数据和图片
-						let markerData = item.target.options.data;
-						let state = markerData.properties && markerData.properties.state ? markerData
-							.properties
-							.state : 0;
-						let desc = markerData.properties && markerData.properties.desc ? markerData
-							.properties.desc :
-							'';
-						localStorage.setItem("markerDataPropertiesFileList", JSON.stringify(markerData
-							.properties &&
-							markerData.properties.fileList ? markerData.properties.fileList :
-							{}));
-						// 我的标记和标记疑点
-						if (markerData.properties && markerData.properties.title) {
-							let mapBottomBoxInnerHtml = `<div></div><span class="title">${markerData.properties && markerData.properties.title ? markerData.properties.title : '自定义标记' }</span>
+			}
+		};
+		// 如果得到当前手机定位
+		if (gotoOrtherPageState == false && localStorage.getItem("user_latitude") && localStorage.getItem(
+				"user_longitude")) {
+			center_ = [parseFloat(localStorage.getItem("user_latitude")), parseFloat(localStorage.getItem(
+				"user_longitude"))];
+		}
+		// 地图初始化
+		var map = L.map("map", {
+			center: center_,
+			zoom: 12,
+			minZoom: 9,
+			maxZoom: 18,
+			zoomControl: true,
+			attributionControl: false,
+			doubleClickZoom: false,
+			maxBounds: [
+				[31.95, 120.86],
+				[30.7, 122.12]
+			]
+		})
+		// 初始化地图底图
+		// var layer = L.esri
+		// 	.tiledMapLayer({
+		// 		// url: "http://121.43.55.7:10011/proxy/?servertype=Street_Purplish_Blue&token=65463DEE-620A-0ED5-2385-17ECD07CD351"
+		// 		url: "http://t0.tianditu.gov.cn/vec_c/wmts?tk=7e55f62d7d46488299e8caa8d6f0dcf4"
+		// 	})
+		// 	.addTo(map);
+		var initMapLayer = "layer";
+		var layer = L.tileLayer(
+			"http://webrd0{s}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}", {
+				attribution: '&copy; 高德地图',
+				maxZoom: 19,
+				minZoom: 3,
+				subdomains: "1234",
+				zoom: 3
+			});
+		var other = L.tileLayer(
+			"http://webrd0{s}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}", {
+				attribution: '&copy; 高德地图',
+				maxZoom: 19,
+				minZoom: 3,
+				subdomains: "123",
+				zoom: 3
+			});
+			
+		layer.addTo(map);
+
+		function changeMap() {
+			if (initMapLayer == "layer") {
+				initMapLayer = "other";
+				map.removeControl(layer);
+				other.addTo(map);
+				console.log("切换为other")
+			} else {
+				initMapLayer = "layer";
+				map.removeControl(other);
+				layer.addTo(map);
+				console.log("切换为layer")
+				
+			}
+		}
+		if (localStorage.getItem("user_latitude") != null && localStorage.getItem("user_longitude") != null) {
+			let myIcon = L.icon({
+				iconUrl: '../js/leaflet1.3.1/images/myMarker00000000.png',
+				iconSize: [10, 10],
+				iconAnchor: [12, 0],
+				popupAnchor: [1, -34],
+				tooltipAnchor: [16, -28],
+				shadowSize: [41, 41],
+				className: "my-div-icon2"
+			})
+			let localAddr = [parseFloat(localStorage.getItem("user_latitude")), parseFloat(localStorage
+				.getItem(
+					"user_longitude"))];
+			L.marker(localAddr, {
+				icon: myIcon
+			}).addTo(map);
+		}
+		// 批量将markers中的点添加到地图中,并添加监听事件打开底部弹窗。
+		markers.forEach(item => {
+			item.on('click', function(item) {
+				// 请求疑点数据和图片
+				let markerData = item.target.options.data;
+				let state = markerData.properties && markerData.properties.state ? markerData
+					.properties
+					.state : 0;
+				let desc = markerData.properties && markerData.properties.desc ? markerData
+					.properties.desc :
+					'';
+				localStorage.setItem("markerDataPropertiesFileList", JSON.stringify(markerData
+					.properties &&
+					markerData.properties.fileList ? markerData.properties.fileList : {}));
+				// 我的标记和标记疑点
+				if (markerData.properties && markerData.properties.title) {
+					let mapBottomBoxInnerHtml = `<div></div><span class="title">${markerData.properties && markerData.properties.title ? markerData.properties.title : '自定义标记' }</span>
 						<div class="arrowdown" data-state="1"><span class="mui-icon mui-icon-arrowdown"></span></div>
 						<p>位置:${markerData.properties.localAddr ? markerData.properties.localAddr : '未知'}</p>
 						<div id="mapImageList">`;
-							if (markerData.properties && markerData.properties.fileList) {
-								getFileListUrl2(markerData.properties.fileList).then(res => {
-									if (res) {
-										for (let fileBase in res) {
-											mapBottomBoxInnerHtml +=
-												`<div><img src="${res[fileBase]}"/></div>`;
-										}
-									}
-									mapBottomBoxInnerHtml += `
+					if (markerData.properties && markerData.properties.fileList) {
+						getFileListUrl2(markerData.properties.fileList).then(res => {
+							if (res) {
+								for (let fileBase in res) {
+									mapBottomBoxInnerHtml +=
+										`<div><img src="${res[fileBase]}"/></div>`;
+								}
+							}
+							mapBottomBoxInnerHtml += `
 									</div>
 									<input id="myMarkerId" value="${markerData.id}" />
 									<div>
 										<p>描述:</p>
 										<span>${desc}</span>
 									</div>`;
-									document.getElementById('mapBottomBox').innerHTML =
-										mapBottomBoxInnerHtml;
-									document.getElementById('mapBottomBox').style.bottom =
-										"0";
-								})
-							} else {
-								mapBottomBoxInnerHtml += `
+							document.getElementById('mapBottomBox').innerHTML =
+								mapBottomBoxInnerHtml;
+							document.getElementById('mapBottomBox').style.bottom =
+								"0";
+						})
+					} else {
+						mapBottomBoxInnerHtml += `
 									</div>
 									<input id="myMarkerId" value="${markerData.id}" />
 									<div>
 										<p>描述:</p>
 										<span>${desc}</span>
 									</div>`;
-								document.getElementById('mapBottomBox').innerHTML =
-									mapBottomBoxInnerHtml;
-								document.getElementById('mapBottomBox').style.bottom = "0";
-							}
-						} else {
-							// 我的任务疑点
-							let statusMap = {
-								0: {
-									class: "mapWarning",
-									title: "未核实"
-								},
-								1: {
-									class: "mapSuccessTag",
-									title: "已核实"
-								}
-							}
-							let mapBottomBoxInnerHtml = `<div class="${state ? statusMap[state].class : 'mapWarning'}">${state ? statusMap[state].title : '未核实'}</div>
+						document.getElementById('mapBottomBox').innerHTML =
+							mapBottomBoxInnerHtml;
+						document.getElementById('mapBottomBox').style.bottom = "0";
+					}
+				} else {
+					// 我的任务疑点
+					let statusMap = {
+						0: {
+							class: "mapWarning",
+							title: "未核实"
+						},
+						1: {
+							class: "mapSuccessTag",
+							title: "已核实"
+						}
+					}
+					let markerDataPropertiesStr = JSON.stringify(markerData.properties);
+					let mapBottomBoxInnerHtml = `<div class="${state ? statusMap[state].class : 'mapWarning'}">${state ? statusMap[state].title : '未核实'}</div>
 						<span class="title">${markerData.dataTitle}</span>
+						<p class="relevantLawsAndRegulations knowledgeRetrieval" data-search-str="${markerData.dataTitle}">相关法律法规</p>
+						<p class="detailedInformation" data-marker-data='${markerDataPropertiesStr}'>详细信息</p>
 						<div class="arrowdown" data-state="${state}"><span class="mui-icon mui-icon-arrowdown"></span></div>
+						<p>疑点图斑:</p>
+						<div><img class="patternSpot" src="http://47.103.92.60:2102/apps/patternSpot.png"/></div>
 						<p>位置:${markerData.properties && markerData.properties['镇域名称'] ? markerData.properties['镇域名称'] : '未知'}</p>
 						<div id="mapImageList">
 							`;
-							if (markerData.properties && markerData.properties.fileList) {
-								getFileListUrl2(markerData.properties.fileList).then(res => {
-									if (res) {
-										for (let fileBase in res) {
-											mapBottomBoxInnerHtml +=
-												`<div><img src="${res[fileBase]}"/></div>`;
-										}
-									}
-									mapBottomBoxInnerHtml += `
+					if (markerData.properties && markerData.properties.fileList) {
+						getFileListUrl2(markerData.properties.fileList).then(res => {
+							if (res) {
+								for (let fileBase in res) {
+									mapBottomBoxInnerHtml +=
+										`<div><img src="${res[fileBase]}"/></div>`;
+								}
+							}
+							mapBottomBoxInnerHtml += `
 											${state == 0 ? `<div id="uploadImage">
 												<div><span class="mui-icon mui-icon-plus"></span></div>
 												<div><span>上传照片</span></div>
@@ -425,13 +470,13 @@
 											<div class="paperplane"><span class="mui-icon mui-icon-paperplane"></span>提交</div>
 										</div>
 										` : ``}`;
-									document.getElementById('mapBottomBox').innerHTML =
-										mapBottomBoxInnerHtml;
-									document.getElementById('mapBottomBox').style.bottom =
-										"0";
-								})
-							} else {
-								mapBottomBoxInnerHtml += `
+							document.getElementById('mapBottomBox').innerHTML =
+								mapBottomBoxInnerHtml;
+							document.getElementById('mapBottomBox').style.bottom =
+								"0";
+						})
+					} else {
+						mapBottomBoxInnerHtml += `
 										${state == 0 ? `<div id="uploadImage">
 											<div><span class="mui-icon mui-icon-plus"></span></div>
 											<div><span>上传照片</span></div>
@@ -448,60 +493,60 @@
 										<div class="paperplane"><span class="mui-icon mui-icon-paperplane"></span>提交</div>
 									</div>
 									` : ``}`;
-								document.getElementById('mapBottomBox').innerHTML =
-									mapBottomBoxInnerHtml;
-								document.getElementById('mapBottomBox').style.bottom = "0";
-							}
-						}
-					})
-					if (item.options.data.name || item.options.data.properties.title || item.options.data
-						.properties.desc) {
-						item.addTo(map)
-							.bindPopup(item.options.data.name || item.options.data.properties.title || item
-								.options.data
-								.properties.desc, {
-									autoClose: false,
-									closeOnClick: ""
-								})
-							.openPopup();
-					} else {
-						item.addTo(map);
+						document.getElementById('mapBottomBox').innerHTML =
+							mapBottomBoxInnerHtml;
+						document.getElementById('mapBottomBox').style.bottom = "0";
 					}
-				});
-				if (center_) {
-					map.panTo(center_);
 				}
+			})
+			if (item.options.data.name || item.options.data.properties.title || item.options.data
+				.properties.desc) {
+				item.addTo(map)
+					.bindPopup(item.options.data.name || item.options.data.properties.title || item
+						.options.data
+						.properties.desc, {
+							autoClose: false,
+							closeOnClick: ""
+						})
+					.openPopup();
+			} else {
+				item.addTo(map);
+			}
+		});
+		if (center_) {
+			map.panTo(center_);
+		}
 
-				// 自定义标记页面事件
-				if (localStorage.getItem("mapTitle") === "自定义标记") {
-					localStorage.setItem('showMyMarkerBottomBox', 'false');
-					document.getElementById('addMyMarker').style.display = "flex";
-					let markerItem = "";
-					// 地图的点击事件
-					map.on('click', function(e) {
-						if (!localStorage.getItem("showMyMarkerBottomBox") || localStorage.getItem(
-								"showMyMarkerBottomBox") ==
-							"false") {
-							document.getElementById('taskName').innerHTML =
-								`<p>lat:${e.latlng.lat}</p><p>lng:${e.latlng.lng}</p>`;
-							document.getElementById('taskName').style.display = "block";
-							localStorage.setItem("latlngLat", e.latlng.lat - 0.00011);
-							localStorage.setItem("latlngLng", e.latlng.lng - 0.19195);
-							if (markerItem) {
-								markerItem.setLatLng([e.latlng.lat, e.latlng.lng]);
-							} else {
-								markerItem = L.marker([e.latlng.lat, e.latlng.lng]);
-								markerItem.addTo(map);
-							}
-						}
-					})
-				}
-				let myDivIconDoms = document.getElementsByClassName("my-div-icon");
-				if (myDivIconDoms[0]) {
-					myDivIconDoms[0].click();
+		// 自定义标记页面事件
+		if (localStorage.getItem("mapTitle") === "自定义标记") {
+			localStorage.setItem('showMyMarkerBottomBox', 'false');
+			document.getElementById('addMyMarker').style.display = "flex";
+			let markerItem = "";
+			// 地图的点击事件
+			map.on('click', function(e) {
+				if (!localStorage.getItem("showMyMarkerBottomBox") || localStorage.getItem(
+						"showMyMarkerBottomBox") ==
+					"false") {
+					document.getElementById('taskName').innerHTML =
+						`<p>lat:${e.latlng.lat}</p><p>lng:${e.latlng.lng}</p>`;
+					document.getElementById('taskName').style.display = "block";
+					localStorage.setItem("latlngLat", e.latlng.lat - skew[0]);
+					localStorage.setItem("latlngLng", e.latlng.lng - skew[1]);
+					if (markerItem) {
+						markerItem.setLatLng([e.latlng.lat, e.latlng.lng]);
+					} else {
+						markerItem = L.marker([e.latlng.lat, e.latlng.lng]);
+						markerItem.addTo(map);
+					}
 				}
-				// puls加载完成
-			}
-		})
+			})
+		}
+		let myDivIconDoms = document.getElementsByClassName("my-div-icon");
+		if (myDivIconDoms[0]) {
+			myDivIconDoms[0].click();
+		}
+		// puls加载完成
+		// 	}
+		// })
 	</script>
 </html>

+ 0 - 3
unpackage/resources/H5E31842B/www/.idea/.gitignore

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

+ 0 - 6
unpackage/resources/H5E31842B/www/.idea/misc.xml

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

+ 0 - 8
unpackage/resources/H5E31842B/www/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/www.iml" filepath="$PROJECT_DIR$/.idea/www.iml" />
-    </modules>
-  </component>
-</project>

+ 0 - 9
unpackage/resources/H5E31842B/www/.idea/www.iml

@@ -1,9 +0,0 @@
-<?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>

+ 46 - 18
unpackage/resources/H5E31842B/www/css/home.css

@@ -108,7 +108,7 @@
 	width: 60px;
 	height: 60px;
 	padding: 0 10px;
-	margin: 10px;
+	/* margin: 10px; */
 	border-radius: 50%;
 	display: flex;
 	justify-content: center;
@@ -378,14 +378,16 @@
 	position: relative;
 	display: flex;
 	margin: 20px 0px;
-    align-items: center;
+	align-items: center;
 }
+
 .displayFlex3 {
 	position: relative;
 	display: flex;
-    align-items: center;
+	align-items: center;
 }
-.displayFlex2 input{
+
+.displayFlex2 input {
 	font-size: 16px;
 	margin-left: 10px;
 }
@@ -645,6 +647,7 @@
 	padding: 12px;
 	transform: translate(-50%, 0);
 }
+
 /* 隐藏底部菜单 */
 /* .paperplane{
 	position: absolute;
@@ -654,45 +657,48 @@
 	font-weight: bold;
 } */
 /* 提交 */
-.paperplaneMyMarker{
+.paperplaneMyMarker {
 	background-color: #499DF2;
 	width: 100%;
 	color: #FFFFFF;
 	border-radius: 2rem;
 	font-size: 17px;
-    text-align: center;
-    padding: 5px 0;
+	text-align: center;
+	padding: 5px 0;
 	letter-spacing: 10px;
 }
-.paperplaneMyMarker2{
+
+.paperplaneMyMarker2 {
 	border: 1px solid #499DF2;
 	width: 100%;
 	color: #499DF2;
 	border-radius: 2rem;
 	font-size: 17px;
-    text-align: center;
-    padding: 5px 0;
+	text-align: center;
+	padding: 5px 0;
 	letter-spacing: 10px;
 }
-.displayFlex3 .paperplane{
+
+.displayFlex3 .paperplane {
 	background-color: #499DF2;
 	width: 100%;
 	color: #FFFFFF;
 	border-radius: 2rem;
 	font-size: 17px;
-    text-align: center;
-    padding: 5px 0;
+	text-align: center;
+	padding: 5px 0;
 	letter-spacing: 10px;
 	margin-left: 5px;
 }
-.displayFlex3 .paperplaneMyMarker2{
+
+.displayFlex3 .paperplaneMyMarker2 {
 	border: 1px solid #499DF2;
 	width: 100%;
 	color: #499DF2;
 	border-radius: 2rem;
 	font-size: 17px;
-    text-align: center;
-    padding: 5px 0;
+	text-align: center;
+	padding: 5px 0;
 	letter-spacing: 10px;
 	margin-right: 5px;
 }
@@ -702,13 +708,25 @@
 	border-radius: 5px;
 	background-color: #F5F5F5;
 }
-.my-div-icon{
+
+.my-div-icon {
 	animation-name: example;
 	animation-duration: 2s;
 	animation-iteration-count: infinite;
 	/* box-shadow: 0 0 2px 3px #FFF; */
 }
 
+.my-div-icon2 {
+	width: 10px;
+	height: 10px;
+	animation-name: example2;
+	background-color: #FFbb00;
+	animation-duration: 2s;
+	border-radius: 50%;
+	animation-iteration-count: infinite;
+	box-shadow: 0 0 2px 3px #FFbb00cc;
+}
+
 /* 动画代码 */
 @keyframes example {
 	0% {
@@ -718,12 +736,22 @@
 	50% {
 		opacity: 0.5;
 	}
-	
+
 	100% {
 		opacity: 1;
 	}
 }
 
+/* 动画代码 */
+@keyframes example2 {
+	0% {
+		box-shadow: 0 0 2px 3px #FFbb00cc;
+	}
+	100% {
+		box-shadow: 0 0 2px 15px #FFbb0064;
+	}
+}
+
 #myMarkerId,
 #addMyMarker {
 	display: none;

文件差異過大導致無法顯示
+ 1026 - 985
unpackage/resources/H5E31842B/www/js/util.js


+ 1 - 1
unpackage/resources/H5E31842B/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"H5E31842B","name":"外业核查软件","version":{"name":"1.0.0","code":"83"},"description":"","icons":{"72":"icon.png"},"launch_path":"index.html","developer":{"name":"","email":"","url":"http://www.dcloud.io"},"permissions":{"Geolocation":{}},"plus":{"splashscreen":{"autoclose":true,"waiting":true},"runmode":"liberate","signature":"Sk9JTiBVUyBtYWlsdG86aHIyMDEzQGRjbG91ZC5pbw=="},"screenOrientation":["portrait-primary","portrait-secondary"],"fullscreen":true}
+{"@platforms":["android","iPhone","iPad"],"id":"H5E31842B","name":"外业核查软件","version":{"name":"1.0.0","code":"83"},"description":"","icons":{"72":"icon.png"},"launch_path":"index.html","developer":{"name":"","email":"","url":"http://www.dcloud.io"},"permissions":{"Geolocation":{}},"plus":{"splashscreen":{"autoclose":true,"waiting":true},"runmode":"liberate","signature":"Sk9JTiBVUyBtYWlsdG86aHIyMDEzQGRjbG91ZC5pbw=="},"screenOrientation":["portrait-primary","portrait-secondary","landscape-primary","landscape-secondary"],"fullscreen":true}

+ 197 - 79
unpackage/resources/H5E31842B/www/pages/map.html

@@ -8,6 +8,7 @@
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<script src="../js/imageConversion.js"></script>
 		<script src="../js/mui.js"></script>
+		<script src="../js/util.js"></script>
 		<link rel="stylesheet" href="../js/leaflet1.3.1/leaflet.css">
 		<link rel="stylesheet" href="../js/leaflet1.3.1/leaflet.label.css">
 		<link rel="stylesheet" href="../js/leaflet1.3.1/leaflet.measure.css">
@@ -66,7 +67,7 @@
 			<input id="uploadFileInput" type="file" style="z-index: -1;" value=""
 				accept="image/png, image/jpeg, image/jpg" />
 			<!-- 当前任务名称 -->
-			<span id="taskName">老港镇林地审计-任务1</span>
+			<span id="taskName"></span>
 			<!-- 地图底部弹窗 -->
 			<div id="mapBottomBox">
 			</div>
@@ -80,9 +81,87 @@
 			</div>
 		</div>
 	</body>
-
-	<script src="../js/util.js"></script>
 	<script type="text/javascript">
+		mui.plusReady(function() {
+			if (plus) {
+		function newPostRequest2(setting, funSuccess, funError) {
+			var xhr = new XMLHttpRequest();
+
+			// 请求成功回调函数
+			xhr.onload = e => {
+				console.log('request success');
+			};
+			// 请求结束
+			xhr.onloadend = e => {
+				console.log('request loadend');
+			};
+			// 请求出错
+			xhr.onerror = e => {
+				console.log('request error');
+				funError("request error");
+			};
+			// 请求超时
+			xhr.ontimeout = e => {
+				console.log('request timeout');
+				funError("request timeout");
+			};
+			xhr.open('POST', "http://117.131.26.69:10081/proxy_dms/content/selectContentList", true);
+			if (localStorage.getItem("token")) {
+				xhr.setRequestHeader("token", localStorage.getItem("token"))
+			}
+			xhr.onreadystatechange = function() {
+				if (xhr.readyState == 4 && xhr.status == 200) {
+					funSuccess(JSON.parse(xhr.responseText));
+				}
+			}
+			xhr.send(setting.data);
+		}
+		// 动态获取图片(点击疑点或标记marker时)
+		function getFileListUrl2(fileList) {
+			return new Promise((resolve, reject) => {
+				if (fileList) {
+					let fileUrlList = [];
+					let index = 0;
+					for (let fileName in fileList) {
+						index++;
+					}
+					for (let fileName in fileList) {
+						let paramData2 = new FormData();
+						paramData2.append("columnId", 1793);
+						paramData2.append("states", "0,1,2");
+						paramData2.append("pageSize", 10);
+						paramData2.append("page", 0);
+						let searchParam = [];
+						let paramItem = {
+							field: "title",
+							searchType: "1",
+							content: {
+								value: fileList[fileName]
+							}
+						};
+						searchParam.push(paramItem);
+						if (searchParam.length > 0) {
+							paramData2.append("search", JSON.stringify(searchParam));
+						}
+						newPostRequest2({
+							data: paramData2
+						}, function funSuccess(res, textStatus, xhr) {
+							let resJson2 = res;
+							if (resJson2.code == 200) {
+								let fileBase = resJson2.content
+									.data[0].c_file_base64;
+								fileUrlList.push(fileBase);
+								if (fileUrlList.length == index) {
+									resolve(fileUrlList);
+								}
+							}
+						}, function funerror(res, textStatus, xhr) {});
+					}
+				} else {
+					resolve();
+				}
+			});
+		}
 		let markers = [];
 		let geometrys = [];
 		// 地图默认中心位置
@@ -109,7 +188,8 @@
 			let index = 1;
 			if (geometrysItem != null) {
 				if (geometrysItem[0]) {
-					getOneLatLng(geometrysItem[0].coord ? geometrysItem[0].coord : geometrysItem[0].geometry.coordinates,
+					getOneLatLng(geometrysItem[0].coord ? geometrysItem[0].coord : geometrysItem[0].geometry
+						.coordinates,
 						function(res) {
 							center_ = res;
 						});
@@ -171,27 +251,33 @@
 					index++;
 					// 先将点添加到markers对象中
 					let centerItem = [];
-					if (localStorage.getItem("markerId") && item.id == localStorage.getItem("markerId")) {
+					if (localStorage.getItem("markerId") && item.id == localStorage.getItem(
+							"markerId")) {
 						gotoOrtherPageState = true;
-						getOneLatLng(item.coord ? item.coord : item.geometry.coordinates, function(res) {
+						getOneLatLng(item.coord ? item.coord : item.geometry.coordinates, function(
+							res) {
 							center_ = res;
 							if (center_[0] && center_[1]) {
 								markers.push(L.marker(center_, {
-									icon: localStorage.getItem("mapTitle") == "我的标记" || (item
-											.properties && item.properties.state) ?
+									icon: localStorage.getItem("mapTitle") ==
+										"我的标记" || (item
+											.properties && item.properties.state
+										) ?
 										greenIconActive : orangeIconActive,
 									data: item
 								}));
 							}
 						});
 					} else {
-						getOneLatLng(item.coord ? item.coord : item.geometry.coordinates, function(res) {
+						getOneLatLng(item.coord ? item.coord : item.geometry.coordinates, function(
+							res) {
 							centerItem = res;
 							if (centerItem[0] && centerItem[1]) {
 								markers.push(L.marker(centerItem, {
-									icon: localStorage.getItem("mapTitle") == "我的标记" || (item
-											.properties && item.properties.state) ? greenIcon :
-										orangeIcon,
+									icon: localStorage.getItem("mapTitle") ==
+										"我的标记" || (item
+											.properties && item.properties.state
+										) ? greenIcon : orangeIcon,
 									data: item
 								}));
 							}
@@ -201,15 +287,17 @@
 			}
 		};
 		// 如果得到当前手机定位
-		if (gotoOrtherPageState == false && localStorage.getItem("user_latitude") && localStorage.getItem("user_longitude")) {
-			center_ = [parseFloat(localStorage.getItem("user_latitude")), parseFloat(localStorage.getItem("user_longitude"))];
+		if (gotoOrtherPageState == false && localStorage.getItem("user_latitude") && localStorage.getItem(
+				"user_longitude")) {
+			center_ = [parseFloat(localStorage.getItem("user_latitude")), parseFloat(localStorage.getItem(
+				"user_longitude"))];
 		}
 		// 地图初始化
 		var map = L.map("map", {
 			center: center_,
 			zoom: 12,
 			minZoom: 9,
-			maxZoom: 16,
+			maxZoom: 18,
 			zoomControl: true,
 			attributionControl: false,
 			doubleClickZoom: false,
@@ -219,22 +307,33 @@
 			]
 		})
 		// 初始化地图底图
-		var layer = L.esri
-			.tiledMapLayer({
-				url: "http://121.43.55.7:10011/proxy/?servertype=Street_Purplish_Blue&token=65463DEE-620A-0ED5-2385-17ECD07CD351"
-			})
-			.addTo(map);
+		// var layer = L.esri
+		// 	.tiledMapLayer({
+		// 		// url: "http://121.43.55.7:10011/proxy/?servertype=Street_Purplish_Blue&token=65463DEE-620A-0ED5-2385-17ECD07CD351"
+		// 		url: "http://t0.tianditu.gov.cn/vec_c/wmts?tk=7e55f62d7d46488299e8caa8d6f0dcf4"
+		// 	})
+		// 	.addTo(map);
+		var layer = L.tileLayer(
+			"http://webrd0{s}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}", {
+				attribution: '&copy; 高德地图',
+				maxZoom: 19,
+				minZoom: 3,
+				subdomains: "1234",
+				zoom: 3
+			}).addTo(map);
 		if (localStorage.getItem("user_latitude") != null && localStorage.getItem("user_longitude") != null) {
 			let myIcon = L.icon({
-				iconUrl: '../js/leaflet1.3.1/images/marker-icon-2x-sc.png',
-				iconSize: [25, 41],
-				iconAnchor: [12, 41],
+				iconUrl: '../js/leaflet1.3.1/images/myMarker00000000.png',
+				iconSize: [10, 10],
+				iconAnchor: [12, 0],
 				popupAnchor: [1, -34],
 				tooltipAnchor: [16, -28],
-				shadowSize: [41, 41]
+				shadowSize: [41, 41],
+				className: "my-div-icon2"
 			})
-			let localAddr = [parseFloat(localStorage.getItem("user_latitude")), parseFloat(localStorage.getItem(
-				"user_longitude"))];
+			let localAddr = [parseFloat(localStorage.getItem("user_latitude")), parseFloat(localStorage
+				.getItem(
+					"user_longitude"))];
 			L.marker(localAddr, {
 				icon: myIcon
 			}).addTo(map);
@@ -244,20 +343,23 @@
 			item.on('click', function(item) {
 				// 请求疑点数据和图片
 				let markerData = item.target.options.data;
-				let state = markerData.properties && markerData.properties.state ? markerData.properties
+				let state = markerData.properties && markerData.properties.state ? markerData
+					.properties
 					.state : 0;
-				let desc = markerData.properties && markerData.properties.desc ? markerData.properties.desc :
+				let desc = markerData.properties && markerData.properties.desc ? markerData
+					.properties.desc :
 					'';
-				localStorage.setItem("markerDataPropertiesFileList", JSON.stringify(markerData.properties &&
+				localStorage.setItem("markerDataPropertiesFileList", JSON.stringify(markerData
+					.properties &&
 					markerData.properties.fileList ? markerData.properties.fileList : {}));
 				// 我的标记和标记疑点
 				if (markerData.properties && markerData.properties.title) {
 					let mapBottomBoxInnerHtml = `<div></div><span class="title">${markerData.properties && markerData.properties.title ? markerData.properties.title : '自定义标记' }</span>
-					<div class="arrowdown" data-state="1"><span class="mui-icon mui-icon-arrowdown"></span></div>
-					<p>位置:${markerData.properties.localAddr ? markerData.properties.localAddr : '未知'}</p>
-					<div id="mapImageList">`;
+						<div class="arrowdown" data-state="1"><span class="mui-icon mui-icon-arrowdown"></span></div>
+						<p>位置:${markerData.properties.localAddr ? markerData.properties.localAddr : '未知'}</p>
+						<div id="mapImageList">`;
 					if (markerData.properties && markerData.properties.fileList) {
-						getFileListUrl(markerData.properties.fileList).then(res => {
+						getFileListUrl2(markerData.properties.fileList).then(res => {
 							if (res) {
 								for (let fileBase in res) {
 									mapBottomBoxInnerHtml +=
@@ -265,24 +367,27 @@
 								}
 							}
 							mapBottomBoxInnerHtml += `
-								</div>
-								<input id="myMarkerId" value="${markerData.id}" />
-								<div>
-									<p>描述:</p>
-									<span>${desc}</span>
-								</div>`;
-							document.getElementById('mapBottomBox').innerHTML = mapBottomBoxInnerHtml;
-							document.getElementById('mapBottomBox').style.bottom = "0";
+									</div>
+									<input id="myMarkerId" value="${markerData.id}" />
+									<div>
+										<p>描述:</p>
+										<span>${desc}</span>
+									</div>`;
+							document.getElementById('mapBottomBox').innerHTML =
+								mapBottomBoxInnerHtml;
+							document.getElementById('mapBottomBox').style.bottom =
+								"0";
 						})
 					} else {
 						mapBottomBoxInnerHtml += `
-								</div>
-								<input id="myMarkerId" value="${markerData.id}" />
-								<div>
-									<p>描述:</p>
-									<span>${desc}</span>
-								</div>`;
-						document.getElementById('mapBottomBox').innerHTML = mapBottomBoxInnerHtml;
+									</div>
+									<input id="myMarkerId" value="${markerData.id}" />
+									<div>
+										<p>描述:</p>
+										<span>${desc}</span>
+									</div>`;
+						document.getElementById('mapBottomBox').innerHTML =
+							mapBottomBoxInnerHtml;
 						document.getElementById('mapBottomBox').style.bottom = "0";
 					}
 				} else {
@@ -298,13 +403,13 @@
 						}
 					}
 					let mapBottomBoxInnerHtml = `<div class="${state ? statusMap[state].class : 'mapWarning'}">${state ? statusMap[state].title : '未核实'}</div>
-					<span class="title">${markerData.dataTitle}</span>
-					<div class="arrowdown" data-state="${state}"><span class="mui-icon mui-icon-arrowdown"></span></div>
-					<p>位置:${markerData.properties && markerData.properties['镇域名称'] ? markerData.properties['镇域名称'] : '未知'}</p>
-					<div id="mapImageList">
-						`;
+						<span class="title">${markerData.dataTitle}</span>
+						<div class="arrowdown" data-state="${state}"><span class="mui-icon mui-icon-arrowdown"></span></div>
+						<p>位置:${markerData.properties && markerData.properties['镇域名称'] ? markerData.properties['镇域名称'] : '未知'}</p>
+						<div id="mapImageList">
+							`;
 					if (markerData.properties && markerData.properties.fileList) {
-						getFileListUrl(markerData.properties.fileList).then(res => {
+						getFileListUrl2(markerData.properties.fileList).then(res => {
 							if (res) {
 								for (let fileBase in res) {
 									mapBottomBoxInnerHtml +=
@@ -312,6 +417,29 @@
 								}
 							}
 							mapBottomBoxInnerHtml += `
+											${state == 0 ? `<div id="uploadImage">
+												<div><span class="mui-icon mui-icon-plus"></span></div>
+												<div><span>上传照片</span></div>
+											</div>` : ``}
+										</div>
+										<input id="myMarkerId" value="${markerData.id}" />
+										<div>
+											<p>描述:</p>
+											${state == 1 ? `<span>${desc}</span>` : `<textarea name="" id="mapTextArea" placeholder="请添加描述" cols="30" rows="3" >${desc}</textarea>`}
+										</div>
+										${state == 0 ? `
+										<div class="displayFlex3">
+											<div class="paperplaneMyMarker2 openMyPhoneMap" data-lat="${item.latlng.lat}" data-lng="${item.latlng.lng}">导航到这</div>
+											<div class="paperplane"><span class="mui-icon mui-icon-paperplane"></span>提交</div>
+										</div>
+										` : ``}`;
+							document.getElementById('mapBottomBox').innerHTML =
+								mapBottomBoxInnerHtml;
+							document.getElementById('mapBottomBox').style.bottom =
+								"0";
+						})
+					} else {
+						mapBottomBoxInnerHtml += `
 										${state == 0 ? `<div id="uploadImage">
 											<div><span class="mui-icon mui-icon-plus"></span></div>
 											<div><span>上传照片</span></div>
@@ -328,35 +456,17 @@
 										<div class="paperplane"><span class="mui-icon mui-icon-paperplane"></span>提交</div>
 									</div>
 									` : ``}`;
-							document.getElementById('mapBottomBox').innerHTML = mapBottomBoxInnerHtml;
-							document.getElementById('mapBottomBox').style.bottom = "0";
-						})
-					} else {
-						mapBottomBoxInnerHtml += `
-									${state == 0 ? `<div id="uploadImage">
-										<div><span class="mui-icon mui-icon-plus"></span></div>
-										<div><span>上传照片</span></div>
-									</div>` : ``}
-								</div>
-								<input id="myMarkerId" value="${markerData.id}" />
-								<div>
-									<p>描述:</p>
-									${state == 1 ? `<span>${desc}</span>` : `<textarea name="" id="mapTextArea" placeholder="请添加描述" cols="30" rows="3" >${desc}</textarea>`}
-								</div>
-								${state == 0 ? `
-								<div class="displayFlex3">
-									<div class="paperplaneMyMarker2 openMyPhoneMap" data-lat="${item.latlng.lat}" data-lng="${item.latlng.lng}">导航到这</div>
-									<div class="paperplane"><span class="mui-icon mui-icon-paperplane"></span>提交</div>
-								</div>
-								` : ``}`;
-						document.getElementById('mapBottomBox').innerHTML = mapBottomBoxInnerHtml;
+						document.getElementById('mapBottomBox').innerHTML =
+							mapBottomBoxInnerHtml;
 						document.getElementById('mapBottomBox').style.bottom = "0";
 					}
 				}
 			})
-			if (item.options.data.name || item.options.data.properties.title || item.options.data.properties.desc) {
+			if (item.options.data.name || item.options.data.properties.title || item.options.data
+				.properties.desc) {
 				item.addTo(map)
-					.bindPopup(item.options.data.name || item.options.data.properties.title || item.options.data
+					.bindPopup(item.options.data.name || item.options.data.properties.title || item
+						.options.data
 						.properties.desc, {
 							autoClose: false,
 							closeOnClick: ""
@@ -377,7 +487,8 @@
 			let markerItem = "";
 			// 地图的点击事件
 			map.on('click', function(e) {
-				if (!localStorage.getItem("showMyMarkerBottomBox") || localStorage.getItem("showMyMarkerBottomBox") ==
+				if (!localStorage.getItem("showMyMarkerBottomBox") || localStorage.getItem(
+						"showMyMarkerBottomBox") ==
 					"false") {
 					document.getElementById('taskName').innerHTML =
 						`<p>lat:${e.latlng.lat}</p><p>lng:${e.latlng.lng}</p>`;
@@ -393,5 +504,12 @@
 				}
 			})
 		}
+		let myDivIconDoms = document.getElementsByClassName("my-div-icon");
+		if (myDivIconDoms[0]) {
+			myDivIconDoms[0].click();
+		}
+		// puls加载完成
+			}
+		})
 	</script>
 </html>

部分文件因文件數量過多而無法顯示