lchao 11 mēneši atpakaļ
vecāks
revīzija
42f1da2363

+ 7 - 7
zhsq_qk-ui/src/assets/geoJson/seven.json

@@ -6,7 +6,7 @@
 			"UserID": 0,
 			"name": "前程街道",
 		  	"centroid":[125.12206425844046 , 43.79176559475498],
-			"customColor":"#1ED760",
+      "customColor":"#3D452B",
 			"社区": "pzyc"
 		},
 		"geometry": {
@@ -496,7 +496,7 @@
 		"properties": {
 			"UserID": 0,
 			"name": "锦城街道",
-			"customColor":"#2D4754",
+      "customColor":"#3D452B",
 		  	"centroid":[125.21783175638734,43.83816559475492],
 			"社区": "sqjsq"
 		},
@@ -545,7 +545,7 @@
 		"properties": {
 			"UserID": 0,
 			"name": "东风街道",
-			"customColor":"#6AFFFF",
+      "customColor":"#3D452B",
 		  	"centroid":[125.2423175638734,43.86576559475492],
 			"社区": "ylsq"
 		},
@@ -615,7 +615,7 @@
 		"properties": {
 			"UserID": 0,
 			"name": "锦绣街道",
-			"customColor":"#A7965D",
+      "customColor":"#3D452B",
             "centroid":[125.20783175638734,43.84676559475492],
 			"社区": "xxsq"
 		},
@@ -664,7 +664,7 @@
 		"properties": {
 			"UserID": 0,
 			"name": "zwdt",
-			"customColor":"#6AFFFF",
+      "customColor":"#3D452B",
 			"社区": "yqcq"
 
 		},
@@ -687,7 +687,7 @@
 		"properties": {
 			"UserID": 0,
 			"name": "广兴街道",
-			"customColor":"#C8C0A3",
+      "customColor":"#3D452B",
             "centroid":[125.2523175638734,43.85376559475492],
 			"社区": "yqcq"
 		},
@@ -717,4 +717,4 @@
 			]
 		}
 	}]
-}
+}

+ 5 - 5
zhsq_qk-ui/src/map3d/drawFunc.js

@@ -33,8 +33,8 @@ export function drawExtrudeMesh(
   });
 
   const material = new THREE.MeshPhongMaterial({
-    color: featureColor,
-    // color: mapConfig.mapColorGradient[Math.floor(Math.random() * 4)], // 随机颜色
+    // color: featureColor,
+    color: mapConfig.mapColorGradient[0], // 随机颜色
     // transparent: mapConfig.mapTransparent,
     // opacity: mapConfig.mapOpacity,
   });
@@ -124,7 +124,7 @@ export function generateMapObject3D(
     const featureColor = basicFeatureItem.properties.customColor
     // 每个中心点位置
     const featureCenterCoord =
-      basicFeatureItem.properties.centroid 
+      basicFeatureItem.properties.centroid
       && projectionFn(basicFeatureItem.properties.centroid);
     // 名字
     const featureName = basicFeatureItem.properties.name;
@@ -153,7 +153,7 @@ export function generateMapObject3D(
     // Polygon 类型
     if (featureType === "Polygon") {
       featureCoords.forEach((polygon) => {
-        const { mesh, line } = drawExtrudeMesh(polygon, projectionFn,featureColor);
+        const { mesh, line } = drawExtrudeMesh(polygon, projectionFn,"#3D452B");
         provinceMapObject3D.add(mesh);
         provinceMapObject3D.add(line);
       });
@@ -192,7 +192,7 @@ export function generateMapSpot(label2dData) {
       }
 
       //TODO:渲染铁塔
-      
+
 
   });
   return { spotObject3D, spotList };

+ 2 - 2
zhsq_qk-ui/src/map3d/index.vue

@@ -342,8 +342,8 @@ export default {
 
          const properties = lastPick.object.parent.customProperties;
          if (lastPick.object.material[0]) {
-           // lastPick.object.material[0].color.set(mapConfig.mapHoverColor);
-           // lastPick.object.material[0].opacity = 1; // 设置完全不透明
+           lastPick.object.material[0].color.set("#B8A64F");
+           lastPick.object.material[0].opacity = 1; // 设置完全不透明
          }
          // if (tooltipEl && tooltipEl.style) {
          //   toolTipRef.style.left = e.clientX + 20 + "px";

+ 1 - 1
zhsq_qk-ui/src/map3d/mapConfig.js

@@ -10,7 +10,7 @@ export const mapConfig = {
   mapColor: "#1ED760", // 地图原本颜色
   mapHoverColor: "#0B284E", // 地图hover颜色
   // 地图人数渐变
-  mapColorGradient: ["#1ED760", "#3D452B", "#AD9E67", "#556238","#A7965D"],
+  mapColorGradient: ["#3D452B"],
   // 地图侧面渐变
   mapSideColor1: "#919154",
   mapSideColor2: "#919154",