地图对接修改

WebUI/CallCenterWeb.UI/Script/Common/huayi.http.js

@@ -412,42 +412,42 @@ helper.getDropList = {
     },
 
     //区县，主干道、乡镇，路社区村三级联动（目前在来电弹屏中使用）
-    getLocations: function (obj, obj1, obj2) {
+    getLocations: function (obj) {
         var dtd = $.Deferred(); //在函数内部，新建一个Deferred对象
         helper.getDropList.getAreas(obj, 0).then(function () {
             //主干道、乡镇
-            obj.change(function () {
-                if (obj.find("option:selected").val() != 0) {
-                    helper.getDropList.getAreas(obj1, obj.find("option:selected").val());
-                } else {
-                    obj1.empty();
-                    obj1.append('<option selected="selected" value="0">请选择</option>');
-                    $('#sourceaddress').val('');
-                }
-                obj1.trigger('change');
-            });
-
-            //路社区村
-            obj1.change(function () {
-                if (obj1.find("option:selected").val() != 0) {
-                    helper.getDropList.getAreas(obj2, obj1.find("option:selected").val());
-                    $('#sourceaddress').val(obj1.find("option:selected").text());
-                } else if (obj.find("option:selected").val() != 0) {
-                    obj2.empty();
-                    obj2.append('<option selected="selected" value="0">请选择</option>');
-                    $('#sourceaddress').val('');
-                }
-                obj2.trigger('change');
-            });
-
-            obj2.change(function () {
-                if (obj2.find("option:selected").val() != 0) {
-                    $('#sourceaddress').val(obj1.find("option:selected").text() + obj2.find("option:selected").text());
-                } else if (obj1.find("option:selected").val() != 0) {
-                    $('#sourceaddress').val(obj1.find("option:selected").text());
-                }
-                dtd.resolve(); // 改变Deferred对象的执行状态
-            });
+//          obj.change(function () {
+//              if (obj.find("option:selected").val() != 0) {
+//                  helper.getDropList.getAreas(obj1, obj.find("option:selected").val());
+//              } else {
+//                  obj1.empty();
+//                  obj1.append('<option selected="selected" value="0">请选择</option>');
+//                  $('#sourceaddress').val('');
+//              }
+//              obj1.trigger('change');
+//          });
+//
+//          //路社区村
+//          obj1.change(function () {
+//              if (obj1.find("option:selected").val() != 0) {
+//                  helper.getDropList.getAreas(obj2, obj1.find("option:selected").val());
+//                  $('#sourceaddress').val(obj1.find("option:selected").text());
+//              } else if (obj.find("option:selected").val() != 0) {
+//                  obj2.empty();
+//                  obj2.append('<option selected="selected" value="0">请选择</option>');
+//                  $('#sourceaddress').val('');
+//              }
+//              obj2.trigger('change');
+//          });
+//
+//          obj2.change(function () {
+//              if (obj2.find("option:selected").val() != 0) {
+//                  $('#sourceaddress').val(obj1.find("option:selected").text() + obj2.find("option:selected").text());
+//              } else if (obj1.find("option:selected").val() != 0) {
+//                  $('#sourceaddress').val(obj1.find("option:selected").text());
+//              }
+//              dtd.resolve(); // 改变Deferred对象的执行状态
+//          });
 
         });
 

WebUI/CallCenterWeb.UI/js/appeal/index.js

@@ -169,31 +169,39 @@ window.onload = function() {
 			//解析地址
 			var rsaddress = rs.address;
 			console.log(rs);
-			if (rs.addressComponents.district="睢阳区") {
+			console.log(rs.addressComponents.district)
+			if (rs.addressComponents.district=="睢阳区") {
 				$('#sourcearea').val("2");
-			}else if (rs.addressComponents.district="梁园区"){
+			}else if (rs.addressComponents.district=="梁园区"){
 				$('#sourcearea').val("3");
-			}else if (rs.addressComponents.district="永城市"){
+			}else if (rs.addressComponents.district=="永城市"){
 				$('#sourcearea').val("4");
-			}else if (rs.addressComponents.district="民权县"){
+			}else if (rs.addressComponents.district=="民权县"){
 				$('#sourcearea').val("5");
-			}else if (rs.addressComponents.district="睢县"){
+			}else if (rs.addressComponents.district=="睢县"){
 				$('#sourcearea').val("6");
-			}else if (rs.addressComponents.district="宁陵县"){
+			}else if (rs.addressComponents.district=="宁陵县"){
 				$('#sourcearea').val("7");
-			}else if (rs.addressComponents.district="柘城县"){
+			}else if (rs.addressComponents.district=="柘城县"){
 				$('#sourcearea').val("8");
-			}else if (rs.addressComponents.district="虞城县"){
+			}else if (rs.addressComponents.district=="虞城县"){
 				$('#sourcearea').val("9");
-			}else if (rs.addressComponents.district="夏邑县"){
+			}else if (rs.addressComponents.district=="夏邑县"){
 				$('#sourcearea').val("10");
-			}else if (rs.addressComponents.district="城乡一体化示范区"){
+			}else if (rs.addressComponents.district=="城乡一体化示范区"){
 				$('#sourcearea').val("11");
 			}
 			$('#sourcearea').find("option:selected").text(rs.addressComponents.district);
 			//$('#sourcearea').find("option:selected").val(rs.addressComponents.district);
-			if (rs.surroundingPois!=='') {
-				$('#sourceaddress').val(rs.surroundingPois[0].title);
+			if (rs.surroundingPois.length>0) {
+				if (rs.addressComponents.street!="") {
+					$('#sourceaddress').val(rs.addressComponents.street+'-'+rs.surroundingPois[0].title);
+				}else{
+					$('#sourceaddress').val(rs.surroundingPois[0].title);
+				}
+				
+			}else{
+				$('#sourceaddress').val(rs.addressComponents.street);
 			}
 			$(".store_Lng").val(rs.point.lng);
 			$(".store_Lat").val(rs.point.lat);

WebUI/CallCenterWeb.UI/js/appeal/mapIndex.js

@@ -166,33 +166,39 @@ window.onload = function() {
 			//解析地址
 			var rsaddress = rs.address;
 			console.log(rs);
-			if (rs.addressComponents.district="睢阳区") {
+			console.log(rs.addressComponents.district)
+			if (rs.addressComponents.district=="睢阳区") {
 				$('#sourcearea').val("2");
-			}else if (rs.addressComponents.district="梁园区"){
+			}else if (rs.addressComponents.district=="梁园区"){
 				$('#sourcearea').val("3");
-			}else if (rs.addressComponents.district="永城市"){
+			}else if (rs.addressComponents.district=="永城市"){
 				$('#sourcearea').val("4");
-			}else if (rs.addressComponents.district="民权县"){
+			}else if (rs.addressComponents.district=="民权县"){
 				$('#sourcearea').val("5");
-			}else if (rs.addressComponents.district="睢县"){
+			}else if (rs.addressComponents.district=="睢县"){
 				$('#sourcearea').val("6");
-			}else if (rs.addressComponents.district="宁陵县"){
+			}else if (rs.addressComponents.district=="宁陵县"){
 				$('#sourcearea').val("7");
-			}else if (rs.addressComponents.district="柘城县"){
+			}else if (rs.addressComponents.district=="柘城县"){
 				$('#sourcearea').val("8");
-			}else if (rs.addressComponents.district="虞城县"){
+			}else if (rs.addressComponents.district=="虞城县"){
 				$('#sourcearea').val("9");
-			}else if (rs.addressComponents.district="夏邑县"){
+			}else if (rs.addressComponents.district=="夏邑县"){
 				$('#sourcearea').val("10");
-			}else if (rs.addressComponents.district="城乡一体化示范区"){
+			}else if (rs.addressComponents.district=="城乡一体化示范区"){
 				$('#sourcearea').val("11");
 			}
 			$('#sourcearea').find("option:selected").text(rs.addressComponents.district);
 			//$('#sourcearea').find("option:selected").val(rs.addressComponents.district);
 			if (rs.surroundingPois.length>0) {
-				$('#sourceaddress').val(rs.surroundingPois[0].title);
+				if (rs.addressComponents.street!="") {
+					$('#sourceaddress').val(rs.addressComponents.street+'-'+rs.surroundingPois[0].title);
+				}else{
+					$('#sourceaddress').val(rs.surroundingPois[0].title);
+				}
+				
 			}else{
-				$('#sourceaddress').val("");
+				$('#sourceaddress').val(rs.addressComponents.street);
 			}
 			$(".store_Lng").val(rs.point.lng);
 			$(".store_Lat").val(rs.point.lat);