update: 写入工人信息的页面同步到表单布局

seal-service/src/main/resources/template/js/sealWorker/serviceworkermap.js → seal-service/src/main/resources/template/js/sealWorker/sealWorkerMap.js

@@ -7,7 +7,7 @@ layui.config({
 }).define(['window', 'jquery', 'winui'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$;
-	
+	// 人员分布图
 	var userList = new Array();
 	
     AjaxPostUtil.request({url: flowableBasePath + "sealseserviceworker007", params: {}, type: 'json', callback: function (json) {
@@ -46,7 +46,7 @@ layui.config({
 		var rowId = $(this).attr('rowid');
 		$.each(userList, function(i, item) {
 			if(rowId === item.id) {
-				document.getElementById('tips').innerHTML = '员工姓名：' + item.userName + '<br>'
+				document.getElementById('tips').innerHTML = '员工姓名：' + item.name + '<br>'
 															+ '工单数：' + item.orderNumber + '<br>'
 															+ '状态：' + item.stateName + '<br>'
 															+ '详细地址：' + item.addDetail;
@@ -63,5 +63,5 @@ layui.config({
 		        '</div>';
 	}
 	
-    exports('serviceworkermap', {});
+    exports('sealWorkerMap', {});
 });
\ No newline at end of file

seal-service/src/main/resources/template/js/sealWorker/writeSealWorker.js

-
-var map, district, polygons = [];
-var citySelect;
-var districtSelect;
-var marker = null;
-
-var userList = new Array();//选择用户返回的集合或者进行回显的集合
-
-var longitude = "";//经度
-var latitude = "";//纬度
-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'form', 'fullscreen'], function (exports) {
-	winui.renderColor();
-	var index = parent.layer.getFrameIndex(window.name);
-	var $ = layui.$,
-		form = layui.form;
-	var id = GetUrlParam("id");
-
-	if (!isNull(id)) {
-		AjaxPostUtil.request({url: sysMainMation.sealServiceBasePath + "querySealWorkerById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
-			longitude = json.bean.longitude;
-			latitude = json.bean.latitude;
-			userList.push(json.bean.userMation);
-			$.each(userList, function(i, item) {
-				$("#userName").val(item.name);
-			});
-
-			initMap();
-			$("#longitude").val(longitude);
-			$("#latitude").val(latitude);
-			$("#absoluteAddress").val(json.bean.absoluteAddress);
-		}});
-	}
-	matchingLanguage();
-	form.render();
-
-	form.on('submit(formAddBean)', function (data) {
-		if (winui.verifyForm(data.elem)) {
-			var lnglatXY = [$("#longitude").val(), $("#latitude").val()];//地图上所标点的坐标
-			geocoder.getAddress(lnglatXY, function(status, result) {
-				if (status === 'complete' && result.info === 'OK') {
-					var params = {
-						id: isNull(id) ? '' : id,
-						userId: userList[0].id,
-						longitude: $("#longitude").val(),
-						latitude: $("#latitude").val(),
-						provinceId: result.regeocode.addressComponent.province,
-						cityId: result.regeocode.addressComponent.city,
-						areaId: result.regeocode.addressComponent.district,
-						townshipId: '',
-						absoluteAddress: $("#absoluteAddress").val()
-					};
-					AjaxPostUtil.request({url: sysMainMation.sealServiceBasePath + "writeSealWorker", params: params, type: 'json', method: 'POST', callback: function (json) {
-						parent.layer.close(index);
-						parent.refreshCode = '0';
-					}});
-				} else {
-					winui.window.msg('地图信息获取失败.', {icon: 2, time: 2000});
-				}
-			});
-		}
-		return false;
-	});
-
-	//人员选择
-	$("body").on("click", "#userIdSelPeople", function (e) {
-		systemCommonUtil.userReturnList = [].concat(userList);
-		systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
-		systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要
-		systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选
-		systemCommonUtil.openSysUserStaffChoosePage(function (userReturnList) {
-			userList = [].concat(userReturnList);
-			$.each(userList, function(i, item) {
-				$("#userName").val(item.name);
-			});
-		});
-	});
-
-	initMap();
-	function initMap(){
-		if (!isNull(latitude) && !isNull(longitude)){
-			map = new AMap.Map('container', {
-				resizeEnable: true,
-				zoom: 11,
-				center: [longitude, latitude]
-			});
-		} else {
-			map = new AMap.Map('container', {
-				resizeEnable: true,
-				zoom: 5,
-				center: [113.65, 34.76]
-			});
-		}
-		//加载插件
-		AMap.service('AMap.Geocoder',function(){//回调函数
-			//实例化Geocoder
-			geocoder = new AMap.Geocoder({
-			});
-		});
-		//在地图上进行标记
-		marker = new AMap.Marker({
-			map:map,
-			bubble:true
-		});
-		//通过地址获取经纬度
-		var input = document.getElementById('absoluteAddress');
-		map.on('click', function (e) {
-		  geocoder.getAddress(e.lnglat, function(status,result){
-				if(status=='complete'){
-					input.value = result.regeocode.formattedAddress;
-					var address = input.value;
-					geocoder.getLocation(address, function(status, result){
-						if(status == 'complete' && result.geocodes.length){
-							marker.setPosition(result.geocodes[0].location);
-							map.setCenter(marker.getPosition());
-							$("#longitude").val(result.geocodes[0].location.lng);
-							$("#latitude").val(result.geocodes[0].location.lat);
-						}
-					})
-				} else {
-				}
-		  });
-		});
-		input.onchange = function (e) {
-			var address = input.value;
-			geocoder.getLocation(address, function(status, result){
-				if(status == 'complete' && result.geocodes.length){
-					marker.setPosition(result.geocodes[0].location);
-					map.setCenter(marker.getPosition());
-					$("#longitude").val(result.geocodes[0].location.lng);
-					$("#latitude").val(result.geocodes[0].location.lat);
-				}
-			})
-		};
-
-		citySelect = document.getElementById('city');
-		districtSelect = document.getElementById('district');
-		 //行政区划查询
-		var opts = {
-			subdistrict: 1,   //返回下一级行政区
-			showbiz:false  //最后一级返回街道信息
-		};
-		district = new AMap.DistrictSearch(opts);//注意：需要使用插件同步下发功能才能这样直接使用
-		district.search('中国', function(status, result) {
-			if(status=='complete'){
-				getData(result.districtList[0]);
-			}
-		});
-		$("#qp").click(function (e) {
-			$("#qpDiv").fullScreen();
-		});
-	}
-
-	function getData(data, level) {
-		var bounds = data.boundaries;
-		if (level === 'district') {
-			for (var i = 0, l = bounds.length; i < l; i++) {
-				var polygon = new AMap.Polygon({
-					map: map,
-					fillColor: '#CCF3FF',
-					fillOpacity: 0.5,
-					path: bounds[i],
-					strokeColor: "#FF33FF",//线颜色
-					strokeOpacity: 1,//线透明度
-					strokeWeight: 3,//线宽
-					strokeStyle: "solid"//线样式
-				});
-				var input = document.getElementById('absoluteAddress');
-				polygon.on('click', function(e) {
-					geocoder.getAddress(e.lnglat, function(status, result){
-						if(status=='complete'){
-							input.value = result.regeocode.formattedAddress;
-							var address = input.value;
-							geocoder.getLocation(address, function(status, result){
-								if(status == 'complete' && result.geocodes.length){
-									marker.setPosition(result.geocodes[0].location);
-									map.setCenter(marker.getPosition());
-									$("#longitude").val(result.geocodes[0].location.lng);
-									$("#latitude").val(result.geocodes[0].location.lat);
-								}
-							})
-						} else {
-						}
-				  });
-				});
-				polygons.push(polygon);
-			}
-			map.setFitView();//地图自适应
-		}
-
-		var subList = data.districtList;
-		if (subList) {
-			var contentSub = new Option('--请选择--');
-			var curlevel = subList[0].level;
-			var curList =  document.querySelector('#' + curlevel);
-			if (!isNull(curList)){
-				curList.add(contentSub);
-			}
-			for (var i = 0, l = subList.length; i < l; i++) {
-				var name = subList[i].name;
-				var levelSub = subList[i].level;
-				var cityCode = subList[i].citycode;
-				contentSub = new Option(name);
-				contentSub.setAttribute("value", levelSub + i);
-				contentSub.center = subList[i].center;
-				contentSub.adcode = subList[i].adcode;
-				if (!isNull(curList)){
-					curList.add(contentSub);
-				}
-				if(level != 'district'){
-					district.search(subList[i].adcode, function(status, result) {
-						if(status === 'complete'){
-							var bounds = result.districtList[0].boundaries;
-							if (bounds) {
-								for (var i = 0, l = bounds.length; i < l; i++) {
-									var polygon = new AMap.Polygon({
-										map: map,
-										fillColor: '#CCF3FF',
-										fillOpacity: 0.5,
-										path: bounds[i],
-										strokeColor: "#FF33FF",//线颜色
-										strokeOpacity: 1,//线透明度
-										strokeWeight: 3,//线宽
-										strokeStyle: "solid"//线样式
-									});
-									var input = document.getElementById('absoluteAddress');
-									polygon.on('click', function(e) {
-										geocoder.getAddress(e.lnglat, function(status, result){
-											if(status == 'complete'){
-												input.value = result.regeocode.formattedAddress;
-												var address = input.value;
-												geocoder.getLocation(address, function(status, result){
-													if(status == 'complete' && result.geocodes.length){
-														marker.setPosition(result.geocodes[0].location);
-														map.setCenter(marker.getPosition());
-														$("#longitude").val(result.geocodes[0].location.lng);
-														$("#latitude").val(result.geocodes[0].location.lat);
-													}
-												})
-											} else {
-											}
-										});
-									});
-									polygons.push(polygon);
-								}
-								map.setFitView();//地图自适应
-							}
-						}
-					});
-				}
-			}
-		}
-		form.render("select");
-	}
-
-	form.on('select(province)', function(data) {
-		citySelect.innerHTML = '';
-		districtSelect.innerHTML = '';
-		form.render("select");
-		search(document.getElementById('province'));
-	});
-	form.on('select(city)', function(data) {
-		districtSelect.innerHTML = '';
-		form.render("select");
-		search(document.getElementById('city'));
-	});
-	form.on('select(district)', function(data) {
-		search(document.getElementById('district'));
-	});
-
-	function search(obj) {
-		//清除地图上所有覆盖物
-		for (var i = 0, l = polygons.length; i < l; i++) {
-			polygons[i].setMap(null);
-		}
-		var option = obj[obj.options.selectedIndex];
-		var keyword = option.text; //关键字
-		var adcode = option.adcode;
-		district.setLevel(option.value); //行政区级别
-		district.setExtensions('all');
-		//行政区查询
-		//按照adcode进行查询可以保证数据返回的唯一性
-		district.search(adcode, function(status, result) {
-			if(status === 'complete'){
-				getData(result.districtList[0], obj.id);
-			}
-		});
-	}
-
-	$("body").on("click", "#cancle", function() {
-		parent.layer.close(index);
-	});
-});
\ No newline at end of file

seal-service/src/main/resources/template/tpl/sealWorker/serviceworkermap.html → seal-service/src/main/resources/template/tpl/sealWorker/sealWorkerMap.html

@@ -57,10 +57,16 @@
     
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
+
+	<script type="text/javascript">
+		window._AMapSecurityConfig = {
+			securityJsCode: sysMainMation.skyeyeMapKey
+		}
+	</script>
     <script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.6&key=7e3eb4aa298949346daf89edeeb3dec8&plugin=AMap.DistrictSearch"></script>
 	<script type="text/javascript" src="https://webapi.amap.com/demos/js/liteToolbar.js"></script>
     <script type="text/javascript">
-        layui.config({base: '../../js/serviceworker/'}).use('serviceworkermap');
+        layui.config({base: '../../js/sealWorker/'}).use('sealWorkerMap');
     </script>
 </body>
 </html>
\ No newline at end of file

seal-service/src/main/resources/template/tpl/sealWorker/writeSealWorker.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-    <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main.css?v=1.0?v=1.0"/>
-    <style type="text/css">
-    	#tip .layui-form-select{
-    		width:100px;
-    		float: left;
-    		height:28px;
-    		padding-left: 0px;
-    		padding-right: 0px;
-    	}
-    </style>
-</head>
-<body>
-	<div style="padding:20px; margin:0 auto;">
-	    <form class="layui-form" action="" id="showForm">
-		    <div class="layui-form-item layui-col-xs12">
-		        <label class="layui-form-label">人员<i class="red">*</i></label>
-		        <div class="layui-input-block">
-		            <input type="text" id="userName" name="userName" win-verify="required" placeholder="请选择人员" disabled class="layui-input"/>
-		            <i class="fa fa-user-plus input-icon" id="userIdSelPeople"></i>
-		        </div>
-		    </div>
-			<div class="layui-form-item layui-col-xs6">
-				<label class="layui-form-label">经度<i class="red">*</i></label>
-				<div class="layui-input-block">
-					<input type="text" id="longitude" win-verify="required" placeholder="请进行地图定位" disabled class="layui-input"/>
-				</div>
-			</div>
-			<div class="layui-form-item layui-col-xs6">
-				<label class="layui-form-label">纬度<i class="red">*</i></label>
-				<div class="layui-input-block">
-					<input type="text" id="latitude" win-verify="required" placeholder="请进行地图定位" disabled class="layui-input"/>
-				</div>
-			</div>
-			<div class="layui-form-item layui-col-xs12">
-				<label class="layui-form-label">地址<i class="red">*</i></label>
-				<div class="layui-input-block">
-					<input type="text" id="absoluteAddress" win-verify="required" placeholder="请进行地图定位" disabled class="layui-input"/>
-				</div>
-			</div>
-			<div class="layui-form-item layui-col-xs12">
-				<label class="layui-form-label">地图定位<i class="red">*</i></label>
-				<div class="layui-input-block ver-center">
-					<div class="layui-col-xs12" style="height:400px;">
-						<div class="col-sm-12" style="height:100%;" id="qpDiv">
-							<div id="container" class="form-group" style="height:100%;">
-
-							</div>
-							<div id="tip">
-								<font style="float: left;">省：</font><select id='province' win-verify="required" lay-filter="province" lay-search=""></select>
-								<font style="float: left;">市：</font><select id='city' win-verify="required" lay-filter="city" lay-search=""></select>
-								<font style="float: left;">区：</font><select id='district' win-verify="required" lay-filter="district" lay-search=""></select>
-								<font style="float: left;" id="qp">全屏</font>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		    <div class="layui-form-item layui-col-xs12">
-		        <div class="layui-input-block">
-		            <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-		            <button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
-		        </div>
-		    </div>
-	    </form>
-	</div>
-	<script src="../../assets/lib/layui/layui.js"></script>
-   	<script src="../../assets/lib/layui/custom.js"></script>
-
-	<script type="text/javascript">
-		window._AMapSecurityConfig = {
-			securityJsCode: sysMainMation.skyeyeMapKey
-		}
-	</script>
-   	<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.6&key=7e3eb4aa298949346daf89edeeb3dec8&plugin=AMap.DistrictSearch"></script>
-	<script type="text/javascript" src="https://webapi.amap.com/demos/js/liteToolbar.js"></script>
-   	<script type="text/javascript">
-        layui.config({base: '../../js/sealWorker/'}).use('writeSealWorker');
-    </script>
-</body>
-</html>
\ No newline at end of file