1

leiSP-admin/src/main/resources/application-druid.yml

@@ -13,14 +13,14 @@ spring:
 #                username: senlinfanghuo
 #                password: slfh123456
 
-#                url: jdbc:mysql://218.27.1.157:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: senlinfanghuo
-#                password: slfh123456
+                url: jdbc:mysql://218.27.1.157:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: senlinfanghuo
+                password: slfh123456
 
 
-                url: jdbc:mysql://36.97.65.105:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: sjkj
-                password: sjkj123456
+#                url: jdbc:mysql://36.97.65.105:53306/senlinfanghuo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: sjkj
+#                password: sjkj123456
 
 
 

mybusiness/src/main/resources/templates/business/manager/firemanager/historyFire.html

@@ -68,9 +68,9 @@
         map = L.map('map', {
             preferCanvas: true,
             crs: L.CRS.EPSG4326,
-            center: [43.15, 124.78],
-            maxZoom: 10,
-            zoom: 10
+            center: [43.10, 124.60],
+            maxZoom: 15,
+            zoom: 10.5
         });
         L.supermap.tiledMapLayer(url).addTo(map);
         resultLayer = L.featureGroup().addTo(map);

mybusiness/src/main/resources/templates/business/visualization/map.html

@@ -1281,6 +1281,9 @@
                 return;
             }
             var car_count = parent.$("#"+fea.attributes.SMID).val();
+            if(car_count == undefined){
+                car_count =0;
+            }
             // console.log(fea.attributes.SMID);
             var innerHtml = fea.attributes.省+""+fea.attributes.县+"<br/>";
             innerHtml += fea.attributes.林场+"林场<br/>";