Merge branch 'master' of http://120.78.165.83:8123/git/nazw

nngkxxdp/src/main/resources/application.yml

@@ -1,6 +1,8 @@
 spring:
   profiles:
     active: dev
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
 
 mybatis:
   mapper-locations: classpath:mapper/*.xml

nngkxxdp/src/main/resources/static/district/css/district.css

@@ -393,8 +393,8 @@ body {
 
 .title-first1>ul>li:nth-child(1){
 	color: #2775CC;
-	height: 24px;
-	line-height: 24px;
+	/* height: 24px; */
+	/* line-height: 24px; */
 	margin-bottom: 0;
 }
 

nngkxxdp/src/main/resources/static/district/js/map.json

@@ -4343,7 +4343,8 @@
 			"tel": "023-62752338",
 			"time": "周一至周五：全天：8：30-16:00；周末/节假日：全天：8：30-16:00",
 			"img": "./image/naqnsfz.jpg",
-			"sptype": "民政服务"
+			"sptype": "民政服务",
+			"url": "https://cqns.fsygroup.com/"
 		},
 		{
 			"dep": "南岸区南山龙园",
@@ -4375,7 +4376,8 @@
 			"tel": "023-62391200",
 			"time": "周一至周五：上午：9：00-12:00，下午：13:30-17:00 ；周末/节假日： 上午：9：00-12:00，下午：13:30-17:00。",
 			"img": "./image/naqaly.jpg",
-			"sptype": "民政服务"
+			"sptype": "民政服务",
+			"url": "www.cqlingan.com"
 		},
 		{
 			"dep": "南岸区殡仪馆",

nngkxxdp/src/main/resources/static/district/js/sy.js

@@ -376,9 +376,10 @@ $(function() {
 						var arrtel = arr[index].tel;
 						var arrtime = arr[index].time;
 						var arrIndex = arr[index].clickIndex;
+						var arrUrl = arr[index].url;
 						var sContnet = ''
 						sContnet += "<ul class='titleFirst'>"
-						sContnet += "<li class='title_flex'>"
+						sContnet += "<li class='title_flex' title='"+arrdep+"'>"
 						sContnet += arrdep
 						if (arrtype == "" || arrtype == undefined) {
 							sContnet += ''
@@ -464,6 +465,11 @@ $(function() {
 							sContnet += arrtel
 							sContnet += "</p>"
 						}
+						if (arrUrl == undefined) {
+							sContnet += ''
+						} else {
+							sContnet += "<a href='http://"+arrUrl+"' target='_blank' style='color: #2775CC;text-decoration:underline;'>预约祭扫</a>"
+						}
 						sContnet += "</li>"
 						sContnet += "<li class='btn_box'>"
 						sContnet += "<button class='one_bus'>公交</button>"
@@ -524,7 +530,7 @@ $(function() {
 			var address = arrey[item].address;
 			sum += 1;
 			html += "<ul class='title-first'>"
-			html += "<li>"
+			html += "<li title='"+dep+"'>"
 			html += "<span>" + sum + "." + "</span>" + dep + "</li>"
 			html += "<li>"
 			if (tel == ''){
@@ -532,7 +538,7 @@ $(function() {
 			} else {
 				html += "<p>" + "电话：" + tel + "</p>"
 			}
-			html += "<div class='differentdz'>" + "地址：" + "<p  class='jzdz'>" + address + "</p>" + "</div>"
+			html += "<div class='differentdz'>" + "地址：" + "<p  class='jzdz' title='"+address+"'>" + address + "</p>" + "</div>"
 			html += "</li>"
 			html += "</ul>"
 		};
@@ -578,7 +584,7 @@ $(function() {
 			var sum = 1;
 			sum += item;
 			html += "<ul class='title-first'>"
-			html += "<li>"
+			html += "<li title='"+jzdep+"'>"
 			html += "<span>" + sum + "." + "</span>" + jzdep + "</li>"
 			html += "<li>"
 			if (jzdhs == '' || jzdhs == undefined){
@@ -586,7 +592,7 @@ $(function() {
 			} else {
 				html += "<p>" + "电话：" + jzdhs + "</p>"
 			}
-			html += "<div class='differentdz'>" + "地址：" + "<p  class='jzdz'>" + jzdzs + "</p>" + "</div>"
+			html += "<div class='differentdz'>" + "地址：" + "<p  class='jzdz' title='"+jzdzs+"'>" + jzdzs + "</p>" + "</div>"
 			html += "</li>"
 			html += "</ul>"
 		};
@@ -1982,7 +1988,7 @@ $(function() {
 					html += "<p class='typeFirst'>"+sptype+"</p>"
 				}
 				html += "<ul>"
-				html += "<li>"
+				html += "<li title='"+jzdep+"'>"
 				html += "<span>" + sum + "." + "</span>" + jzdep + "</li>"
 				html += "<li>"
 				if (jzdhs == undefined || jzdhs == '') {

nngkxxdp/src/main/resources/static/district/js/sy_mobile.js

@@ -840,29 +840,31 @@ $(function () {
                 $('.show-first').show().siblings().hide();
                 $('.top_search').show().siblings('.right-map').show();
                 $('.right-search').css('top',msHeight).siblings('.right-map').css('top','0px');
+                map.centerAndZoom(new BMap.Point(106.563, 29.523), 14);
                 $('#gj-one').val(startZJ);
                 $('#gj-two').val(endZJ);
             } else if (startZJ == '' || endZJ == '') {
                 $('.show-first').show().siblings().hide();
                 $('.top_search').show().siblings('.right-map').show();
                 $('.right-search').css('top',msHeight).siblings('.right-map').css('top','0px');
+                map.centerAndZoom(new BMap.Point(106.563, 29.523), 14);
                 $('#gj-one').val(startZJ);
                 $('#gj-two').val(endZJ);
             } else if (startZJ == line[0] && endZJ == line[1]){
-                console.log(1111)
+                // console.log(1111)
                 $('.show-third').hide().siblings('.show-second').show();
                 $('.show-second .content-third').show();
                 $("#gj-one").val(startZJ);
                 $("#gj-two").val(endZJ);
             } else if (lineText[0] == '' && lineText[1] == '') {
-                console.log(2222)
+                // console.log(2222)
                 $('.show-first').show().siblings().hide();
                 $('.top_search').show().siblings('.right-map').show();
                 $('.right-search').css('top',msHeight).siblings('.right-map').css('top','0px');
                 $("#gj-one").val(startZJ);
                 $("#gj-two").val(endZJ);
             } else if(startZJ != lineText[0] || endZJ != lineText[1]){
-                console.log(3333)
+                // console.log(3333)
                 busResultLine(startZJ,endZJ);
                 $("#gj-one").val(startZJ);
                 $("#gj-two").val(endZJ);
@@ -873,29 +875,31 @@ $(function () {
                 $('.show-first').show().siblings().hide();
                 $('.top_search').show().siblings('.right-map').show();
                 $('.right-search').css('top',msHeight).siblings('.right-map').css('top','0px');
+                map.centerAndZoom(new BMap.Point(106.563, 29.523), 14);
                 $("#zj-one").val(startGJ);
                 $("#zj-two").val(endGJ);
             } else if (startGJ == '' || endGJ == '') {
                 $('.show-first').show().siblings().hide();
                 $('.top_search').show().siblings('.right-map').show();
                 $('.right-search').css('top',msHeight).siblings('.right-map').css('top','0px');
+                map.centerAndZoom(new BMap.Point(106.563, 29.523), 14);
                 $("#zj-one").val(startGJ);
                 $("#zj-two").val(endGJ);
             } else if (startGJ == line[0] && endGJ == line[1]){
-                console.log(4444)
+                // console.log(4444)
                 $('.show-second').hide().siblings('.show-third').show();
                 $('.show-third .content-third').show();
                 $("#zj-one").val(startGJ);
                 $("#zj-two").val(endGJ);
             } else if (lineText[0] == '' && lineText[1] == '') {
-                console.log(5555)
+                // console.log(5555)
                 $('.show-first').show().siblings().hide();
                 $('.top_search').show().siblings('.right-map').show();
                 $('.right-search').css('top',msHeight).siblings('.right-map').css('top','0px');
                 $("#zj-one").val(startGJ);
                 $("#zj-two").val(endGJ);
             } else if(startGJ != lineText[0] || endGJ != lineText[1]){
-                console.log(6666)
+                // console.log(6666)
                 drivingResultLine(startGJ,endGJ)
                 $("#zj-one").val(startGJ);
                 $("#zj-two").val(endGJ);