1、广告牌分析：修复打开地形后，文字标注会被抬高；

2、三维报建：体量调整功能完善；
3、三维报建：报建页面修复模型对比无法选中；
4.三维报建：添加新提供的荣华四季模型

src/utils/MapHelper/MapHelper.js

@@ -3,11 +3,12 @@ import { Notification, MessageBox, Message, Loading } from "element-ui";
 
 const CTservice = axios.create({
   // 超时
-  timeout: 1000,
+  timeout: 60000,
 });
 // 响应拦截器
 CTservice.interceptors.response.use(
   (res) => {
+    debugger;
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 二进制数据则直接返回

src/views/ConstructionApplication3D/BuildingStretchingAnalysis/BuildingStretchingAnalysis.vue

@@ -46,11 +46,21 @@ import {
   mercator2lonLat,
   undergroundMode,
 } from "@/utils/MapHelper/MapHelper.js";
+import {
+  point,
+  buffer,
+  bboxPolygon,
+  square,
+  destination,
+  polygon,
+  booleanPointInPolygon,
+} from "@turf/turf";
 let polygonids = [];
 export default {
   data() {
     return {
-      form: { FLOORH: 3, AddFLOOR: 1, BuildingHeight: 0 },
+      form: { FLOORH: 3, BuildingHeight: 0 },
+      loutiInfo: null,
     };
   },
   props: {
@@ -83,260 +93,322 @@ export default {
   },
   methods: {
     async init() {
+      debugger;
+
       let that = this;
+      var pt = point([that.info.xyz.lng, that.info.xyz.lat]);
       this.info.layerDataList.forEach((element) => {
-        let FLOORH = element.data.find((c) => c.label == "FLOORH");
-        if (FLOORH && FLOORH.value) {
-          that.form.FLOORH = FLOORH.value;
+        let ps = [];
+        element.geometry.points.forEach((points) => {
+          ps.push([points.x, points.y]);
+        });
+        var poly = polygon([ps]);
+        let isInclude = booleanPointInPolygon(pt, poly);
+        if (isInclude) {
+          debugger;
+          that.loutiInfo = element;
+          let FLOORH = element.data.find((c) => c.label == "FLOORH");
+          if (FLOORH && FLOORH.value) {
+            that.form.FLOORH = Number(FLOORH.value);
+          }
         }
       });
 
       that.removeEntities();
-      if (that.info.layerDataList.length == 0) {
+      debugger;
+      if (!that.loutiInfo) {
         that.$message({
           message: "未查询到模型数据，请重试加载模型",
           type: "warning",
         });
         return;
       }
-      for (
-        let layerDataListindex = 0;
-        layerDataListindex < that.info.layerDataList.length;
-        layerDataListindex++
-      ) {
-        const element = that.info.layerDataList[layerDataListindex];
 
-        //基础高度（地形高度）加入地形后可删除
-        let jcgd = 0;
-        let bm = element.data.find((c) => c.label == "LANDNO");
-        if (bm && bm.value) {
-          //获取模型信息
-          let queryBySQLParameters = {
-            getFeatureMode: "SQL",
-            datasetNames: [that.info.Minfo.dataSourceName + ":项目范围"],
-            queryParameter: {
-              attributeFilter: " DKBM = '" + bm.value + "'",
-            },
-            hasGeometry: true,
-          };
-          let e = await mapQuery(
-            that.info.Minfo.dataurl + "/featureResults.json?returnContent=true",
-            queryBySQLParameters
-          );
+      const element = that.loutiInfo;
 
-          debugger;
-          if (e && e.totalCount > 0) {
-            e.features.forEach((feature) => {
-              feature.fieldNames.forEach((fieldName, i) => {
-                if (
-                  fieldName == "BASEH" &&
-                  Number(feature.fieldValues[i]) > jcgd
-                ) {
-                  jcgd = Number(feature.fieldValues[i]);
-                }
-              });
+      //基础高度（地形高度）加入地形后可删除
+      let jcgd = 0;
+      let bm = element.data.find((c) => c.label == "LANDNO");
+      if (bm && bm.value) {
+        //获取模型信息
+        let queryBySQLParameters = {
+          getFeatureMode: "SQL",
+          datasetNames: [that.info.Minfo.dataSourceName + ":项目范围"],
+          queryParameter: {
+            attributeFilter: " DKBM = '" + bm.value + "'",
+          },
+          hasGeometry: true,
+        };
+        let e = await mapQuery(
+          that.info.Minfo.dataurl + "/featureResults.json?returnContent=true",
+          queryBySQLParameters
+        );
+
+        debugger;
+        if (e && e.totalCount > 0) {
+          e.features.forEach((feature) => {
+            feature.fieldNames.forEach((fieldName, i) => {
+              if (
+                fieldName == "BASEH" &&
+                Number(feature.fieldValues[i]) > jcgd
+              ) {
+                jcgd = Number(feature.fieldValues[i]);
+              }
             });
-          }
-        } else {
-          that.$message({
-            message: "未找到模型基础高度，默认高程为0",
-            type: "warning",
           });
         }
+      } else {
+        that.$message({
+          message: "未找到模型基础高度，默认高程为0",
+          type: "warning",
+        });
+      }
 
-        let HEIGHT = element.data.find((c) => c.label == "HEIGHT");
-        if (HEIGHT && HEIGHT.value) {
-          HEIGHT = HEIGHT.value;
-        }
-        that.form.BuildingHeight = HEIGHT;
+      let HEIGHT = element.data.find((c) => c.label == "HEIGHT");
+      if (HEIGHT && HEIGHT.value) {
+        HEIGHT = HEIGHT.value;
+      }
+      that.form.BuildingHeight = HEIGHT;
+
+      //顶部高度，底部高度
+      let maxH = jcgd,
+        minH = jcgd;
+      for (
+        let FLOORindex = 1;
+        FLOORindex <= Math.ceil(that.form.BuildingHeight / that.form.FLOORH);
+        FLOORindex++
+      ) {
+        debugger;
+        maxH += that.form.FLOORH;
+        minH = maxH - that.form.FLOORH;
+        console.log("maxH:" + maxH + "----minH:" + minH);
         let ps = [];
-        //顶部高度，底部高度
-        let maxH = jcgd,
-          minH = jcgd;
-        for (
-          let FLOORindex = 1;
-          FLOORindex <= Math.ceil(that.form.BuildingHeight / that.form.FLOORH);
-          FLOORindex++
-        ) {
-          debugger;
-          maxH += that.form.FLOORH;
-          minH = maxH - that.form.FLOORH;
-          console.log("maxH:" + maxH + "----minH:" + minH);
-          for (let index = 0; index < element.geometry.points.length; index++) {
-            const point = element.geometry.points[index];
-            ps.push(point.x);
-            ps.push(point.y);
-            // ps.push(minH);
-          }
-          // let id = uuidv4();
+        for (let index = 0; index < element.geometry.points.length; index++) {
+          const point = element.geometry.points[index];
+          ps.push(point.x);
+          ps.push(point.y);
+          // ps.push(minH);
+        }
+        // let id = uuidv4();
 
-          // 定义多边形的顶点（经纬度）
-          var polygonHierarchy = new Cesium.PolygonHierarchy(
-            Cesium.Cartesian3.fromDegreesArray(ps)
-          );
+        // 定义多边形的顶点（经纬度）
+        var polygonHierarchy = new Cesium.PolygonHierarchy(
+          Cesium.Cartesian3.fromDegreesArray(ps)
+        );
 
-          // 创建带有高度的多边形
-          var extrudedPolygon = new Cesium.GeometryInstance({
-            geometry: new Cesium.PolygonGeometry({
-              polygonHierarchy: polygonHierarchy,
-              height: minH, // 多边形底面的高度
-              extrudedHeight: maxH, // 拉伸到的高度
-            }),
-            attributes: {
-              color: Cesium.ColorGeometryInstanceAttribute.fromColor(
-                Cesium.Color.BLUE.withAlpha(0.1)
-              ),
-            },
-          });
+        // 创建带有高度的多边形
+        var extrudedPolygon = new Cesium.GeometryInstance({
+          geometry: new Cesium.PolygonGeometry({
+            polygonHierarchy: polygonHierarchy,
+            height: minH, // 多边形底面的高度
+            extrudedHeight: maxH, // 拉伸到的高度
+          }),
+          attributes: {
+            color: Cesium.ColorGeometryInstanceAttribute.fromColor(
+              Cesium.Color.CHARTREUSE.withAlpha(0.1)
+            ),
+          },
+        });
 
-          // 添加到场景中
-          let Primitive = new Cesium.Primitive({
-            geometryInstances: [extrudedPolygon],
-            appearance: new Cesium.PerInstanceColorAppearance({
-              flat: true,
-            }),
-          });
-          viewer.scene.primitives.add(Primitive);
-          polygonids.push(Primitive);
-          // viewer.entities.add({
-          //   id: id,
-          //   polygon: {
-          //     hierarchy: Cesium.Cartesian3.fromDegreesArrayHeights(ps),
-          //     extrudedHeight: Number(maxH),
-          //     perPositionHeight: true,
-          //     material: Cesium.Color.CHARTREUSE.withAlpha(0.1),
-          //     outline: true,
-          //     outlineColor: Cesium.Color.MEDIUMSPRINGGREEN,
-          //     outlineWidth: 1.0,
-          //     shadows: Cesium.ShadowMode.ENABLED,
-          //   },
-          // });
+        // 添加到场景中
+        let Primitive = new Cesium.Primitive({
+          geometryInstances: [extrudedPolygon],
+          appearance: new Cesium.PerInstanceColorAppearance({
+            flat: true,
+          }),
+          shadows: Cesium.ShadowMode.ENABLED, // 开启阴影
+        });
+        viewer.scene.primitives.add(Primitive);
+        polygonids.push(Primitive);
+        // 创建多边形的边界线
+
+        let pss = [];
+        for (let index = 0; index < element.geometry.points.length; index++) {
+          const point = element.geometry.points[index];
+          pss.push(point.x);
+          pss.push(point.y);
+          pss.push(maxH);
         }
+        var boundaryPolyline = new Cesium.GeometryInstance({
+          geometry: new Cesium.PolylineGeometry({
+            positions: Cesium.Cartesian3.fromDegreesArrayHeights(pss), // 注意这里需要处理高度为0的情况，因为边界线通常在地表
+            width: 1, // 边界线的宽度
+          }),
+          attributes: {
+            color: Cesium.ColorGeometryInstanceAttribute.fromColor(
+              Cesium.Color.CHARTREUSE.withAlpha(0.8)
+            ),
+          },
+        });
+        let boundaryPolylinePrimitive = new Cesium.Primitive({
+          geometryInstances: [boundaryPolyline],
+          appearance: new Cesium.PolylineColorAppearance({
+            edgeWidth: 1,
+            // vertexFormat: Cesium.PolylineVertexFormat.POSITION_AND_COLOR,
+            vertexFormat: Cesium.PolylineColorAppearance.VERTEX_FORMAT,
+          }),
+        });
+        viewer.scene.primitives.add(boundaryPolylinePrimitive);
+        polygonids.push(boundaryPolylinePrimitive);
+        // viewer.entities.add({
+        //   id: id,
+        //   polygon: {
+        //     hierarchy: Cesium.Cartesian3.fromDegreesArrayHeights(ps),
+        //     extrudedHeight: Number(maxH),
+        //     perPositionHeight: true,
+        //     material: Cesium.Color.CHARTREUSE.withAlpha(0.1),
+        //     outline: true,
+        //     outlineColor: Cesium.Color.MEDIUMSPRINGGREEN,
+        //     outlineWidth: 1.0,
+        //     shadows: Cesium.ShadowMode.ENABLED,
+        //   },
+        // });
       }
     },
     async onSubmit() {
-      debugger;
       let that = this;
       that.removeEntities();
-      if (that.info.layerDataList.length == 0) {
+      if (!that.loutiInfo) {
         that.$message({
           message: "未查询到模型数据，请重试加载模型",
           type: "warning",
         });
         return;
       }
-      for (
-        let layerDataListindex = 0;
-        layerDataListindex < that.info.layerDataList.length;
-        layerDataListindex++
-      ) {
-        const element = that.info.layerDataList[layerDataListindex];
+      const element = that.loutiInfo;
+      //基础高度（地形高度）加入地形后可删除
+      let jcgd = 0;
+      //地块编码
+      let bm = element.data.find((c) => c.label == "LANDNO");
+      if (bm && bm.value) {
+        //获取模型信息
+        let queryBySQLParameters = {
+          getFeatureMode: "SQL",
+          datasetNames: [that.info.Minfo.dataSourceName + ":项目范围"],
+          queryParameter: {
+            attributeFilter: " DKBM = '" + bm.value + "'",
+          },
+          hasGeometry: true,
+        };
+        let e = await mapQuery(
+          that.info.Minfo.dataurl + "/featureResults.json?returnContent=true",
+          queryBySQLParameters
+        );
 
-        //基础高度（地形高度）加入地形后可删除
-        let jcgd = 0;
-        let bm = element.data.find((c) => c.label == "LANDNO");
-        if (bm && bm.value) {
-          //获取模型信息
-          let queryBySQLParameters = {
-            getFeatureMode: "SQL",
-            datasetNames: [that.info.Minfo.dataSourceName + ":项目范围"],
-            queryParameter: {
-              attributeFilter: " DKBM = '" + bm.value + "'",
-            },
-            hasGeometry: true,
-          };
-          let e = await mapQuery(
-            that.info.Minfo.dataurl + "/featureResults.json?returnContent=true",
-            queryBySQLParameters
-          );
-
-          debugger;
-          if (e && e.totalCount > 0) {
-            e.features.forEach((feature) => {
-              feature.fieldNames.forEach((fieldName, i) => {
-                if (
-                  fieldName == "BASEH" &&
-                  Number(feature.fieldValues[i]) > jcgd
-                ) {
-                  jcgd = Number(feature.fieldValues[i]);
-                }
-              });
+        debugger;
+        if (e && e.totalCount > 0) {
+          e.features.forEach((feature) => {
+            feature.fieldNames.forEach((fieldName, i) => {
+              if (
+                fieldName == "BASEH" &&
+                Number(feature.fieldValues[i]) > jcgd
+              ) {
+                jcgd = Number(feature.fieldValues[i]);
+              }
             });
-          }
-        } else {
-          that.$message({
-            message: "未找到模型基础高度，默认高程为0",
-            type: "warning",
           });
         }
+      } else {
+        that.$message({
+          message: "未找到模型基础高度，默认高程为0",
+          type: "warning",
+        });
+      }
 
-        let HEIGHT = element.data.find((c) => c.label == "HEIGHT");
-        if (HEIGHT && HEIGHT.value) {
-          HEIGHT = HEIGHT.value;
-        }
-        // that.form.BuildingHeight = HEIGHT;
+      //顶部高度，底部高度
+      let maxH = jcgd,
+        minH = jcgd;
+      for (
+        let FLOORindex = 1;
+        FLOORindex <= Math.ceil(that.form.BuildingHeight / that.form.FLOORH);
+        FLOORindex++
+      ) {
+        debugger;
+        maxH += that.form.FLOORH;
+        minH = maxH - that.form.FLOORH;
+        console.log("maxH:" + maxH + "----minH:" + minH);
         let ps = [];
-        //顶部高度，底部高度
-        let maxH = jcgd,
-          minH = jcgd;
-        for (
-          let FLOORindex = 1;
-          FLOORindex <= Math.ceil(that.form.BuildingHeight / that.form.FLOORH);
-          FLOORindex++
-        ) {
-          maxH += that.form.FLOORH;
-          minH = maxH - that.form.FLOORH;
-          console.log("maxH:" + maxH + "----minH:" + minH);
-          for (let index = 0; index < element.geometry.points.length; index++) {
-            const point = element.geometry.points[index];
-            ps.push(point.x);
-            ps.push(point.y);
-            // ps.push(minH);
-          }
-          // let id = uuidv4();
+        for (let index = 0; index < element.geometry.points.length; index++) {
+          const point = element.geometry.points[index];
+          ps.push(point.x);
+          ps.push(point.y);
+          // ps.push(minH);
+        }
+        // let id = uuidv4();
 
-          // 定义多边形的顶点（经纬度）
-          var polygonHierarchy = new Cesium.PolygonHierarchy(
-            Cesium.Cartesian3.fromDegreesArray(ps)
-          );
+        // 定义多边形的顶点（经纬度）
+        var polygonHierarchy = new Cesium.PolygonHierarchy(
+          Cesium.Cartesian3.fromDegreesArray(ps)
+        );
 
-          // 创建带有高度的多边形
-          var extrudedPolygon = new Cesium.GeometryInstance({
-            geometry: new Cesium.PolygonGeometry({
-              polygonHierarchy: polygonHierarchy,
-              height: minH, // 多边形底面的高度
-              extrudedHeight: maxH, // 拉伸到的高度
-            }),
-            attributes: {
-              color: Cesium.ColorGeometryInstanceAttribute.fromColor(
-                Cesium.Color.BLUE.withAlpha(0.1)
-              ),
-            },
-          });
+        // 创建带有高度的多边形
+        var extrudedPolygon = new Cesium.GeometryInstance({
+          geometry: new Cesium.PolygonGeometry({
+            polygonHierarchy: polygonHierarchy,
+            height: minH, // 多边形底面的高度
+            extrudedHeight: maxH, // 拉伸到的高度
+          }),
+          attributes: {
+            color: Cesium.ColorGeometryInstanceAttribute.fromColor(
+              Cesium.Color.CHARTREUSE.withAlpha(0.1)
+            ),
+          },
+        });
 
-          // 添加到场景中
-          let Primitive = new Cesium.Primitive({
-            geometryInstances: [extrudedPolygon],
-            appearance: new Cesium.PerInstanceColorAppearance({
-              flat: true,
-            }),
-          });
-          viewer.scene.primitives.add(Primitive);
-          polygonids.push(Primitive);
-          // viewer.entities.add({
-          //   id: id,
-          //   polygon: {
-          //     hierarchy: Cesium.Cartesian3.fromDegreesArrayHeights(ps),
-          //     extrudedHeight: Number(maxH),
-          //     perPositionHeight: true,
-          //     material: Cesium.Color.CHARTREUSE.withAlpha(0.1),
-          //     outline: true,
-          //     outlineColor: Cesium.Color.MEDIUMSPRINGGREEN,
-          //     outlineWidth: 1.0,
-          //     shadows: Cesium.ShadowMode.ENABLED,
-          //   },
-          // });
+        // 添加到场景中
+        let Primitive = new Cesium.Primitive({
+          geometryInstances: [extrudedPolygon],
+          appearance: new Cesium.PerInstanceColorAppearance({
+            flat: true,
+          }),
+          shadows: Cesium.ShadowMode.ENABLED, // 开启阴影
+        });
+        viewer.scene.primitives.add(Primitive);
+        polygonids.push(Primitive);
+
+        // 创建多边形的边界线
+
+        let pss = [];
+        for (let index = 0; index < element.geometry.points.length; index++) {
+          const point = element.geometry.points[index];
+          pss.push(point.x);
+          pss.push(point.y);
+          pss.push(maxH);
         }
+        var boundaryPolyline = new Cesium.GeometryInstance({
+          geometry: new Cesium.PolylineGeometry({
+            positions: Cesium.Cartesian3.fromDegreesArrayHeights(pss), // 注意这里需要处理高度为0的情况，因为边界线通常在地表
+            width: 1, // 边界线的宽度
+          }),
+          attributes: {
+            color: Cesium.ColorGeometryInstanceAttribute.fromColor(
+              Cesium.Color.CHARTREUSE.withAlpha(0.8)
+            ),
+          },
+        });
+        let boundaryPolylinePrimitive = new Cesium.Primitive({
+          geometryInstances: [boundaryPolyline],
+          appearance: new Cesium.PolylineColorAppearance({
+            edgeWidth: 1,
+            // vertexFormat: Cesium.PolylineVertexFormat.POSITION_AND_COLOR,
+            vertexFormat: Cesium.PolylineColorAppearance.VERTEX_FORMAT,
+          }),
+        });
+        viewer.scene.primitives.add(boundaryPolylinePrimitive);
+        polygonids.push(boundaryPolylinePrimitive);
+        // viewer.entities.add({
+        //   id: id,
+        //   polygon: {
+        //     hierarchy: Cesium.Cartesian3.fromDegreesArrayHeights(ps),
+        //     extrudedHeight: Number(maxH),
+        //     perPositionHeight: true,
+        //     material: Cesium.Color.CHARTREUSE.withAlpha(0.1),
+        //     outline: true,
+        //     outlineColor: Cesium.Color.MEDIUMSPRINGGREEN,
+        //     outlineWidth: 1.0,
+        //     shadows: Cesium.ShadowMode.ENABLED,
+        //   },
+        // });
       }
     },
     removeEntities() {

src/views/ConstructionApplication3D/billboard/billboardDesign.vue

@@ -408,7 +408,7 @@ export default {
           backgroundColor: new Cesium.Color(0.0, 0.0, 0.0, 0.0),
           //打开背景  打开背景 （不会被线段覆盖）
           showBackground: true,
-          heightReference: Cesium.HeightReference.RELATIVE_TO_GROUND,
+          // heightReference: Cesium.HeightReference.RELATIVE_TO_GROUND,
           distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
             0.0,
             300.0

src/views/ConstructionApplication3D/projectManagement/projectManagement.vue

@@ -97,6 +97,7 @@
                           <el-col :span="24">
                             <el-checkbox
                               @click.stop.native=""
+                              v-model="itemModel.checked"
                               :key="'itemModelChecked' + itemModel.id"
                               >{{ itemModel.modelname }}</el-checkbox
                             >
@@ -990,6 +991,7 @@ export default {
       Cesium.when(modelLayer, async function (layers) {
         debugger;
         layers.forEach((layer) => {
+          layer.shadowType = 2;
           that.layerList.push(layer.name);
         });
 
@@ -1109,8 +1111,10 @@ export default {
             const Minfo = Minfos[index];
             modelData.Minfo = Minfo;
             const layer = modelLayers[index];
+
             if (layer) {
               layer.forEach((element) => {
+                // element.shadowType = 2;
                 //不同视口显隐
                 for (let n = 0; n < modelLayers.length; n++) {
                   if (index == n) {

static/Config/config.js

@@ -767,54 +767,54 @@ window.layersDataUrl = [
     tcwType: "",
   },
 }),
-  /**
-   * //项目信息
-   * meetingProgress (未上会：0,已上会：1)
-   */
-  (window.projectinformation = [
-    {
-      id: "ertyuiop",
-      meetingProgress: 0,
-      applicant: "三亚投资发展有限公司",
-      projectname: "东岸卓越城项目",
-      projectaddress: "抱坡路",
-      plotnumber: "BP08-03,BP08-11",
-      landarea: "45540平方米",
-      landusenature: "商服用地",
-      projectpositioning: "商业",
-      landsituation: "",
-      totalprojectinvestment: "约19亿元",
-      fundingsource: "企业投资",
-    },
-    {
-      id: "222ertyuiop",
-      projectname: "三亚投资发展有限公司",
-      meetingProgress: 1,
-      applicant: "东岸卓越城项目",
-      projectaddress: "抱坡路",
-      plotnumber: "BP08-03,BP08-11",
-      landarea: "45540平方米",
-      landusenature: "商服用地",
-      projectpositioning: "商业",
-      landsituation: "",
-      totalprojectinvestment: "约19亿元",
-      fundingsource: "企业投资",
-    },
-    {
-      id: "A1",
-      projectname: "三亚投资发展有限公;;;l司",
-      meetingProgress: 0,
-      applicant: "东岸卓越城项目",
-      projectaddress: "抱坡路",
-      plotnumber: "BP08-03,BP08-11",
-      landarea: "45540平方米",
-      landusenature: "商服用地",
-      projectpositioning: "商业",
-      landsituation: "",
-      totalprojectinvestment: "约19亿元",
-      fundingsource: "企业投资",
-    },
-  ]);
+/**
+ * //项目信息
+ * meetingProgress (未上会：0,已上会：1)
+ */
+window.projectinformation = [
+  {
+    id: "ertyuiop",
+    meetingProgress: 0,
+    applicant: "三亚投资发展有限公司",
+    projectname: "东岸卓越城项目",
+    projectaddress: "抱坡路",
+    plotnumber: "BP08-03,BP08-11",
+    landarea: "45540平方米",
+    landusenature: "商服用地",
+    projectpositioning: "商业",
+    landsituation: "",
+    totalprojectinvestment: "约19亿元",
+    fundingsource: "企业投资",
+  },
+  {
+    id: "222ertyuiop",
+    projectname: "三亚投资发展有限公司",
+    meetingProgress: 1,
+    applicant: "东岸卓越城项目",
+    projectaddress: "抱坡路",
+    plotnumber: "BP08-03,BP08-11",
+    landarea: "45540平方米",
+    landusenature: "商服用地",
+    projectpositioning: "商业",
+    landsituation: "",
+    totalprojectinvestment: "约19亿元",
+    fundingsource: "企业投资",
+  },
+  {
+    id: "A1",
+    projectname: "榕华四季",
+    meetingProgress: 0,
+    applicant: "榕华四季",
+    projectaddress: "抱坡路",
+    plotnumber: "BP08-11-2",
+    landarea: "",
+    landusenature: "",
+    projectpositioning: "商业",
+    landsituation: "",
+    totalprojectinvestment: "",
+    fundingsource: "企业投资",
+  },
+];
 //报建模型
 window.constructionmodel = [
   {
@@ -875,45 +875,43 @@ window.constructionmodel = [
   // },
 
   {
+    // 榕华四季
     id: "A",
     projectinformationid: "A1",
     modelname: "A1",
     creationtime: "2024-04-24 17:22:13",
-
-    url: "http://192.168.60.2:8090/iserver/services/3D-fangan/rest/realspace",
-    dataurl: "http://192.168.60.2:8090/iserver/services/data-fangan/rest/data",
-    dataSourceName: "DongAnZhuoYueCheng",
+    url: "http://192.168.60.2:8090/iserver/services/3D-RHSJ/rest/realspace",
+    dataurl: "http://192.168.60.2:8090/iserver/services/data-RHSJ/rest/data",
+    dataSourceName: "RHSJ",
     datasetName: "建筑轮廓",
     selectionStatus: false,
-    designunit: "筑博设计股份有限公司",
+    designunit: "",
     totalarea: "",
     groundarea: "",
     groundcapacity: "",
     buildingarea: "",
-    plandescription:
-      "拟建15栋25-26层安居房、 1栋3层幼儿园、 1栋1层配套用房、 1栋1层开闭所及1个2层整体地下室。总建筑面积约23.81万平方米， 其中计容建筑面积约17.41万平方米， 不计容建筑面积约6.40万平方米。 容积率3.0， 建筑密度17.59%， 建筑高度80米， 绿地率40%， 总户数1552户。机动车停车位1944个(地上154个， 地下1790个） ， 非机动车位3270个",
+    plandescription:"",
   },
-  {
-    id: "B",
-    projectinformationid: "A1",
-    modelname: "B1",
-    creationtime: "2024-04-24 17:22:13",
+  // {
+  //   id: "B",
+  //   projectinformationid: "A1",
+  //   modelname: "B1",
+  //   creationtime: "2024-04-24 17:22:13",
 
-    url: "http://192.168.60.2:8090/iserver/services/3D-fangan2/rest/realspace",
-    dataurl: "http://192.168.60.2:8090/iserver/services/data-fangan2/rest/data",
-    dataSourceName: "DongAnZhuoYueCheng2",
-    datasetName: "建筑轮廓",
-    selectionStatus: false,
-    designunit: "筑博设计股份有限公司",
-    totalarea: "",
-    groundarea: "",
-    groundcapacity: "",
-    buildingarea: "",
-    plandescription:
-      "拟建15栋25-26层安居房、 1栋3层幼儿园、 1栋1层配套用房、 1栋1层开闭所及1个2层整体地下室。总建筑面积约23.81万平方米， 其中计容建筑面积约17.41万平方米， 不计容建筑面积约6.40万平方米。 容积率3.0， 建筑密度17.59%， 建筑高度80米， 绿地率40%， 总户数1552户。机动车停车位1944个(地上154个， 地下1790个） ， 非机动车位3270个",
-  },
+  //   url: "http://192.168.60.2:8090/iserver/services/3D-fangan2/rest/realspace",
+  //   dataurl: "http://192.168.60.2:8090/iserver/services/data-fangan4/rest/data",
+  //   dataSourceName: "DongAnZhuoYueCheng2",
+  //   datasetName: "建筑轮廓",
+  //   selectionStatus: false,
+  //   designunit: "筑博设计股份有限公司",
+  //   totalarea: "",
+  //   groundarea: "",
+  //   groundcapacity: "",
+  //   buildingarea: "",
+  //   plandescription:
+  //     "拟建15栋25-26层安居房、 1栋3层幼儿园、 1栋1层配套用房、 1栋1层开闭所及1个2层整体地下室。总建筑面积约23.81万平方米， 其中计容建筑面积约17.41万平方米， 不计容建筑面积约6.40万平方米。 容积率3.0， 建筑密度17.59%， 建筑高度80米， 绿地率40%， 总户数1552户。机动车停车位1944个(地上154个， 地下1790个） ， 非机动车位3270个",
+  // },
 ];
-
 //图层服务查询分组树
 window.layerTree = [
   {