Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/naxsb/css/qjt.css

@@ -19,38 +19,38 @@ body {
 
 .building-box {
     text-align: center;
-    font-size: 0.75rem;
-    width: 7.5rem;
+    font-size: 12px;
+    width: 120px;
     position: absolute;
-    top: -5.25rem;
-    left: -3.625rem;
+    top: -84px;
+    left: -58px;
 }
 
 .building-text {
     background: #18A65A;
     color: #fff;
-    padding: 0.25rem;
+    padding: 4px;
     border-radius: 8px;
-    margin-bottom: -0.5rem;
+    margin-bottom: -8px;
     display: flex;
     flex-direction: column;
 }
 
 .building-bottom {
     background: #18A65A;
-    width: 0.625rem;
-    height: 0.625rem;
+    width: 10px;
+    height: 10px;
     border-radius: 5px;
-    margin-left: calc(50% - 0.3125rem);
+    margin-left: calc(50% - 5px);
 }
 
 .building-line {
-    width: 0.0625rem;
-    height: 2.5rem;
+    width: 1px;
+    height: 40px;
     border-left: 1px dashed #18A65A;
     position: absolute;
-    top: -2.5625rem;
-    left: 0.125rem;
+    top: -41px;
+    left: 2px;
 }
 
 .container {

nngkxxdp/src/main/resources/static/naxsb/qjt.html

@@ -207,7 +207,8 @@
         let scene = new THREE.Scene();
         // 初始化摄像机
         let camera = new THREE.PerspectiveCamera(10, mwidth / mheight, 1, 1000000);
-        camera.position.set(90000, 41120, 81120);
+        // camera.position.set(90000, 41120, 81120);
+        camera.position.set(60000, 81120, 61120);
         camera.lookAt(new THREE.Vector3(0, 0, 0));
         let renderer = new THREE.WebGLRenderer({
             canvas: document.getElementById("canvas-model-view"),

nngkxxdp/src/main/resources/static/naxsb/syyggyy.html

@@ -255,7 +255,14 @@
                     result.push(new BMap.Point(arr[0], arr[1]));
                 });
                 // 创建多边形
-                let polygon = new BMap.Polygon(result, { strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5, fillColor: "blue", fillOpacity: 0.15 });
+                let polygon = new BMap.Polygon(result, {
+                    strokeColor: "blue",
+                    strokeWeight: 2,
+                    strokeOpacity: 0.5,
+                    strokeStyle: "dashed",
+                    fillColor: "#C9E1F6",
+                    fillOpacity: 0.9
+                });
                 // 将多边形添加到地图中
                 map.addOverlay(polygon);
             },

nngkxxdp/src/main/resources/static/naxsb/tdcr.html

@@ -202,7 +202,14 @@
                     result.push(new BMap.Point(arr[0], arr[1]));
                 });
                 // 创建多边形
-                let polygon = new BMap.Polygon(result, { strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5, fillColor: "blue", fillOpacity: 0.15 });
+                let polygon = new BMap.Polygon(result, {
+                    strokeColor: "blue",
+                    strokeWeight: 2,
+                    strokeOpacity: 0.5,
+                    strokeStyle: "dashed",
+                    fillColor: "#C9E1F6",
+                    fillOpacity: 0.9
+                });
                 // 将多边形添加到地图中
                 map.addOverlay(polygon);
 

nngkxxdp/src/main/resources/static/naxsb/ztcrdetail.html

@@ -246,7 +246,14 @@
                     result.push(new BMap.Point(arr[0], arr[1]));
                 });
                 // 创建多边形
-                let polygon = new BMap.Polygon(result, { strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5, fillColor: "blue", fillOpacity: 0.15 });
+                let polygon = new BMap.Polygon(result, {
+                    strokeColor: "blue",
+                    strokeWeight: 2,
+                    strokeOpacity: 0.5,
+                    strokeStyle: "dashed",
+                    fillColor: "#C9E1F6",
+                    fillOpacity: 0.9
+                });
                 // 将多边形添加到地图中
                 map.addOverlay(polygon);
 

nngkxxdp/src/main/resources/static/naxsb/ztcrlist.html

@@ -320,7 +320,14 @@
                     result.push(new BMap.Point(arr[0], arr[1]));
                 });
                 // 创建多边形
-                let polygon = new BMap.Polygon(result, { strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5, fillColor: "blue", fillOpacity: 0.15 });
+                let polygon = new BMap.Polygon(result, {
+                    strokeColor: "blue",
+                    strokeWeight: 2,
+                    strokeOpacity: 0.5,
+                    strokeStyle: "dashed",
+                    fillColor: "#C9E1F6",
+                    fillOpacity: 0.9
+                });
                 // 将多边形添加到地图中
                 that.parkMap.addOverlay(polygon);