Merge branch 'master' of 119.3.70.207:zhangzhaohui/map-property-screen

src/api/wcjd.js

+import axios from "axios";
+
+export function getWcjdToken() {
+  return axios.get("/wcjd/as");
+}

src/utils/cesium.js

 import * as Cesium from "cesium";
+import { getWcjdToken } from '../api/wcjd'
 export let viewer;
 
 export function cesiumInit(id) {
@@ -33,8 +34,26 @@ export function cesiumInit(id) {
   viewer.scene.screenSpaceCameraController.inertiaTranslate = 0;
   viewer._cesiumWidget._creditContainer.style.display = "none"; // 隐藏版权信息
   viewer.scene.postProcessStages.fxaa.enabled = true; //开启抗锯齿
-  viewer.scene.globe.depthTestAgainstTerrain = true; //深度
-
+  // viewer.scene.globe.depthTestAgainstTerrain = true; //深度
+  const getTileset = async () => {
+    const token = (await getWcjdToken()).data.datas.token;
+    const tileset = await Cesium.Cesium3DTileset.fromUrl(
+      "http://10.35.66.214/haishu-map-server/3dtiles/hs_wcjd/tileset.json?tk=" +
+      token,
+      {
+        maximumScreenSpaceError: 16,
+        maximumMemoryUsage: 1024,
+        skipLevelOfDetail: true,
+      }
+    );
+    viewer.scene.primitives.add(tileset);
+    viewer.scene.globe.depthTestAgainstTerrain = false;
+  };
+  try {
+    getTileset();
+  } catch (error) {
+    console.error("3dtiles resources restricted");
+  }
   //提高亮度
   viewer.scene.light = new Cesium.DirectionalLight({
     direction: viewer.scene.camera.directionWC,

src/view/index.vue

@@ -105,8 +105,9 @@ function drawCommunityMarker(arr) {
 // 绘制小区标记
 function drawHouseMarker(arr) {
   arr.forEach((item) => {
-    let position = JSON.parse(item.solid);
-    console.log("position", position);
+    let position = cartesianToDegrees(JSON.parse(item.solid));
+    position = degreesToCartesian(position)
+    console.log(position)
     drawLabel(position, item.name, "#003860", "blue_dw_icon", {
       ...item,
       type: "house",
@@ -142,13 +143,13 @@ function cartesianToDegrees(cartesian) {
   let longitude = Cesium.Math.toDegrees(cartographic.longitude);
   let latitude = Cesium.Math.toDegrees(cartographic.latitude);
   return {
-    longitude,
-    latitude,
+    x: longitude,
+    y: latitude,
   };
 }
 // cesium 经纬度转笛卡尔坐标
 function degreesToCartesian(position) {
-  let cartesian3 = Cesium.Cartesian3.fromDegrees(position.x, position.y);
+  let cartesian3 = Cesium.Cartesian3.fromDegrees(position.x, position.y, 0);
   return cartesian3;
 }
 // 镜头飞到某个位置

vite.config.js

@@ -27,6 +27,11 @@ export default defineConfig({
         changeOrigin: true,
         // rewrite: (path) => path.replace(/^\/prod-api/, ""),
       },
+      "/wcjd": {
+        target: "http://10.35.66.214:8080/",
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/wcjd/, ""),
+      },
     },
   },
   resolve: {