中图代码20250529代码更新并删除debugger

src/views/ConstructionApplication3D/ArchitecturaAnalysis/ArchitecturaAnalysis.vue

@@ -126,7 +126,7 @@ export default {
       }
     },
     qcbinput(val) {
-       
+      debugger;
       if (Number(val) == 0) {
         this.qcbData.jg = "";
       } else if (Number(val) <= 0.65) {

src/views/ConstructionApplication3D/BenchmarkLandPriceAnalysis/BenchmarkLandPrice.js

@@ -363,7 +363,7 @@ const BenchmarkLandPrice = {
    * @param Points3
    */
   async calculateIntersectArea(Points1, Points2, Points3) {
-    //  
+    // debugger;
     // var geometry1;
     // if (Points1 && Points2) {
     //   var sd1 = {
@@ -432,9 +432,9 @@ const BenchmarkLandPrice = {
       areaPs = intersect(areaPs, geometry3);
     }
     if (areaPs) {
-       
+      debugger;
       let areadifference = area(areaPs) * window.earthRadius;
-       
+      debugger;
       return Number(areadifference.toFixed(2));
     } else {
       return 0;

src/views/ConstructionApplication3D/BenchmarkLandPriceAnalysis/BenchmarkLandPrice.vue

@@ -466,7 +466,7 @@ export default {
 
       reader.readAsArrayBuffer(fileName);
       reader.onload = function (e) {
-         
+        debugger;
         let res = e.target.result; //ArrayBuffer
         shp(res)
           .then(function (res) {

src/views/ConstructionApplication3D/BenchmarkLandPriceAnalysis/jzdjfxsmjg.vue

@@ -462,7 +462,7 @@ export default {
     },
     rowClick(row) {
       let that = this;
-       
+      debugger;
       if (that.entitieid != "") {
         var entitie = viewer.entities.getById(that.entitieid);
         var data = {
@@ -718,7 +718,7 @@ export default {
       };
       this.myChart.setOption(option);
       this.myChart.on("legendselectchanged", function (parmas) {
-         
+        debugger;
         var name = parmas.name;
         var state = parmas.selected[name];
         that.tableData.forEach((element) => {

src/views/ConstructionApplication3D/BuildingStretchingAnalysis/BuildingStretchingAnalysis.vue

@@ -95,7 +95,7 @@ export default {
   },
   methods: {
     async init() {
-       
+      debugger;
 
       let that = this;
       var pt = point([that.info.xyz.lng, that.info.xyz.lat]);
@@ -107,7 +107,7 @@ export default {
         var poly = polygon([ps]);
         let isInclude = booleanPointInPolygon(pt, poly);
         if (isInclude) {
-           
+
           that.loutiInfo = element;
           let FLOORH = element.data.find((c) => c.label == "FLOORH");
           if (FLOORH && FLOORH.value) {
@@ -117,7 +117,7 @@ export default {
       });
 
       that.removeEntities();
-       
+      debugger;
       if (!that.loutiInfo) {
         that.$message({
           message: "未查询到模型数据，请重试加载模型",
@@ -146,7 +146,7 @@ export default {
           queryBySQLParameters
         );
 
-         
+        debugger;
         if (e && e.totalCount > 0) {
           e.features.forEach((feature) => {
             feature.fieldNames.forEach((fieldName, i) => {
@@ -180,7 +180,7 @@ export default {
         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);
@@ -297,7 +297,7 @@ export default {
           queryBySQLParameters
         );
 
-         
+        debugger;
         if (e && e.totalCount > 0) {
           e.features.forEach((feature) => {
             feature.fieldNames.forEach((fieldName, i) => {
@@ -325,7 +325,7 @@ export default {
         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);

src/views/ConstructionApplication3D/Demolition/CQSetInfo.vue

@@ -360,7 +360,7 @@ export default {
      * 初始化
      */
     initForm() {
-       
+      debugger;
 
       // if (this.cqValue && this.cqValue != "") {
       //   this.bcbz = this.cqValue;
@@ -433,7 +433,7 @@ export default {
      * 选择标准下拉框
      */
     selectZDBZ(key) {
-       
+      debugger;
       var that = this;
       this.TemporarilyDeleteIds = [];
       if (that.bcbz && that.bcbz != "") {
@@ -475,7 +475,7 @@ export default {
      * 重置
      */
     reset: debounce(function () {
-       
+      debugger;
       let that = this;
       if (window.isUseDB) {
         var queryParams = {
@@ -498,7 +498,7 @@ export default {
       } else {
         this.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.CQBCList));
         var item = this.bcbzList.find((t) => t.id == this.bcbz);
-         
+        debugger;
         this.curBCBZ = item;
       }
     }, 500),
@@ -513,7 +513,7 @@ export default {
         return;
       }
       if (window.isUseDB) {
-         
+        debugger;
         var item = {
           id: that.curBCBZ.id,
           name: that.curBCBZ.name,
@@ -562,7 +562,7 @@ export default {
         })
         .catch(() => {});
 
-      //  
+      // debugger;
       // // if (this.bcbz == "") {
       // //     this.$layer.alert("请选择补偿标准");
       // //     return
@@ -588,7 +588,7 @@ export default {
      * 另存数据
      */
     saveData() {
-       
+      debugger;
       // var date = new Date();
       // var val = date.getTime().toString();
       var val = uuidv4();
@@ -602,7 +602,7 @@ export default {
         addCqBcbz(newBCBZ)
           .then((res) => {
             if (res) {
-               
+    
               that.cqValue = newBCBZ.id;
               that.getInitData();
             }
@@ -649,14 +649,14 @@ export default {
      * 编辑按钮
      */
     handleClick(row) {
-       
+      debugger;
 
       this.oldRow = JSON.parse(JSON.stringify(row));
       this.editFormVisible = true;
     },
     //临时删除一条
     handleDeleteClick(row) {
-       
+      debugger;
       var that = this;
       if (row == undefined) return;
 
@@ -747,7 +747,7 @@ export default {
       //   .then((res) => {
       //     if (res) {
       //       that.$layer.alert("保存完成");
-      //        
+      //       debugger;
       //       let bcbz = that.curBCBZ.bcbz.find((c) => c.id == model.id);
       //       bcbz.bz = model.bz;
       //       bcbz.des = model.des;

src/views/ConstructionApplication3D/Demolition/CQShowInfo.vue

@@ -260,7 +260,7 @@ export default {
      * 初始化
      */
     initForm() {
-       
+      debugger;
       this.getInitData();
     },
     getInitData() {
@@ -310,7 +310,7 @@ export default {
      * 选择标准下拉框
      */
     selectZDBZ() {
-       
+      debugger;
       var that = this;
       if (that.bcbz == undefined && that.bcbz == "") {
         that.$message.warning("请选择标准")
@@ -356,7 +356,7 @@ export default {
         this.$layer.alert("请选择补偿标准");
         return;
       }
-       
+      debugger;
       if (window.isUseDB) {
         var model = {
         }
@@ -399,7 +399,7 @@ export default {
      * 另存数据
      */
     saveData() {
-       
+      debugger;
       var val = (window.ZSBC.CQBCList.length + 1).toString();
       var newBCBZ = {
         label: this.ruleForm.name,

src/views/ConstructionApplication3D/Demolition/DemolitionList.vue

@@ -4322,9 +4322,9 @@ var jdResult = await getZDAnalyseResult(dataparam);
       })
 
       // .then((response) => {
-      //      
+      //     debugger;
       //     var fileName = projectInfo.projectName;
-      //      
+      //     debugger;
       //     const contentDisposition = response.headers["content-disposition"];
       //     if (contentDisposition) {
       //       fileName = window.decodeURI(
@@ -4333,7 +4333,7 @@ var jdResult = await getZDAnalyseResult(dataparam);
       //       );
       //     }
       //     const isBlob = blobValidate(response.data);
-      //      
+      //     debugger;
       //     if (isBlob) {
       //       const blob = new Blob([response.data]);
       //       saveAs(blob, fileName);

src/views/ConstructionApplication3D/Demolition/QMSetInfo.vue

@@ -145,7 +145,7 @@ export default {
   },
   methods: {
     initForm() {
-       
+      debugger;
       this.getInitData();
     },
     getInitData() {
@@ -235,7 +235,7 @@ export default {
         return;
       }
       if (!that.changeBCBZ()) return;
-       
+      debugger;
       var model = {
         id: that.curBCBZ.id,
         name: that.curBCBZ.name,
@@ -290,7 +290,7 @@ export default {
     },
 
     submitForm: debounce(function (formName) {
-       
+      debugger;
       var that = this;
       that.$refs[formName].validate((valid) => {
         if (valid) {
@@ -310,7 +310,7 @@ export default {
      * 另存数据
      */
     saveData() {
-       
+      debugger;
       var that = this;
       var date = new Date();
       var val = date.getTime().toString();

src/views/ConstructionApplication3D/Demolition/QMShowInfo.vue

@@ -94,7 +94,7 @@ export default {
   },
   methods: {
     initForm() {
-       
+      debugger;
       this.getInitData();
     },
     getInitData() {

src/views/ConstructionApplication3D/Demolition/ZDSetInfo.vue

@@ -229,7 +229,7 @@ export default {
   },
   methods: {
     initForm() {
-       
+      debugger;
       this.getInitData();
     },
     selectZDBZ() {
@@ -349,7 +349,7 @@ export default {
         return;
       }
       if (!that.changeZDBZ()) return;
-       
+      debugger;
       if (window.isUseDB) {
         var Model = {
           id: that.curBCBZ.id,
@@ -423,7 +423,7 @@ export default {
      * 另存数据
      */
     saveData() {
-       
+      debugger;
       var date = new Date();
       var val = date.getTime().toString();
       var that = this;

src/views/ConstructionApplication3D/Demolition/zdAnalyse.js

@@ -289,7 +289,7 @@ const zdAnalyse = {
         qsResult.collectiveUsedFeatures = collectiveUsedFeatures;
       }
     });
-     
+    debugger;
     if (bdcFeatures != null && bdcFeatures.length > 0) {
       //建筑计算
       zdAnalyse.jzComputer(
@@ -695,7 +695,7 @@ const zdAnalyse = {
   },
   //范围面积
   getRegionArea() {
-     
+    debugger;
     var points1 = regions;
     var parts1 = [];
     var poly1;

src/views/ConstructionApplication3D/Demolition/zdCompute copy 2.js

@@ -675,7 +675,7 @@ const zdAnalyse = {
   },
   //范围面积
   getRegionArea() {
-     
+    debugger;
     var points1 = regions;
     var parts1 = [];
     var poly1;

src/views/ConstructionApplication3D/HighLimitAnalysis/HighLimitAnalysis.vue

@@ -83,7 +83,7 @@ export default {
   methods: {
     init() {
       let that = this;
-       
+      debugger;
       that.info.layerDataList.forEach((layerData) => {
         let LANDNO = layerData.data.find((c) => c.label == "LANDNO");
         if (LANDNO && LANDNO.value) {

src/views/ConstructionApplication3D/MXDBinfo/MXDBinfo.vue

@@ -85,12 +85,12 @@ export default {
   },
   computed: {},
   mounted() {
-     
+    debugger;
     this.init();
   },
   methods: {
     init() {
-       
+      debugger;
     },
     openskylineAnalysis() {
       this.removeAll();
@@ -141,7 +141,7 @@ export default {
     },
     // 获取指标
     async getnorm(Minfo) {
-       
+      debugger;
       //组装指标对象
       let tableDataList = [];
       for (let index = 0; index < this.LandPlanningList.length; index++) {
@@ -371,7 +371,7 @@ export default {
           if (land == null) continue;
           tableDataList[i].FA_Data.JZMJ = land.mj;
           tableDataList[i].FA_Data.JRJZMJ = land.jrmj;
-           
+
           //20240814改为使用建筑面积计算容积率
           // tableDataList[i].FA_Data.RJL = (land.jrmj / item.FA_Data.YDMJ).toFixed(2);
           tableDataList[i].FA_Data.RJL = (
@@ -379,7 +379,7 @@ export default {
             item.FA_Data.YDMJ
           ).toFixed(2);
           //开发商提交的方案文档指标
-           
+
           tableDataList[i].TJFA_Data.JZMJ = land.famj;
           tableDataList[i].TJFA_Data.JRJZMJ = land.fajrmj;
           tableDataList[i].infoData = land;
@@ -395,7 +395,7 @@ export default {
      * @param Minfo
      */
     openZBFXInfo(tableDataList) {
-       
+      debugger;
       let that = this;
       let wpx = 850;
       let hpx = 430;

src/views/ConstructionApplication3D/NightscapeAnalysis/NightscapeAnalysis.vue

@@ -244,7 +244,7 @@ export default {
     async init() {
       this.hyp = new Cesium.HypsometricSetting();
       this.startNight(false);
-       
+      debugger;
       await this.getModelLightData();
     },
     //获取模型灯光数据
@@ -285,7 +285,7 @@ export default {
     },
 
     async onSubmit(formName) {
-       
+      debugger;
       if (this.dgyform.location == null) {
         this.$message({
           message: "请点击添加光源位置按钮添加光源",
@@ -339,7 +339,7 @@ export default {
           }
           //添加
           else {
-             
+  
             this.dgyform.id = uuidv4();
             // let data = JSON.parse(JSON.stringify(this.dgyform));
             // data.LightSource = this.dgyform.LightSource;
@@ -391,14 +391,14 @@ export default {
     },
     //点光源表选中
     handleCurrentChange(row) {
-       
+      debugger;
       this.currentRow = row;
 
       this.clearLightSource();
 
       if (row) {
         let data = JSON.parse(JSON.stringify(row));
-         
+        debugger;
         if (data.location instanceof Array) {
           viewer.camera.flyTo({
             destination: Cesium.Cartesian3.fromDegrees(
@@ -748,7 +748,7 @@ export default {
       var latitude = Cesium.Math.toDegrees(positionWGS84.latitude);
       var height = positionWGS84.height;
       console.log(longitude + "," + latitude + "," + height);
-       
+      debugger;
       return { x: longitude, y: latitude, z: height };
     },
   },

src/views/ConstructionApplication3D/RSAnalysis/RSAnalysis.vue

@@ -273,7 +273,7 @@ export default {
         var point = result.object;
         // point.show = false;
         var position = result.object.position;
-         
+        debugger;
         //将获取的点的位置转化成经纬度
         var cartographic = that.Cartesian2toDegrees(position);
         // if (cartographic[2] < 0) cartographic[2] = 0;
@@ -433,7 +433,7 @@ export default {
       this.changCount++;
       var point1;
       var point2;
-       
+      debugger;
       if (
         sightline.viewPosition[0] == 0 ||
         sightline.viewPosition[1] == 0 ||
@@ -724,7 +724,7 @@ export default {
       handlerPoint = new Cesium.DrawHandler(viewer, Cesium.DrawMode.Line);
       handlerPoint.activate();
       handlerPoint.drawEvt.addEventListener(function (result) {
-         
+        debugger;
 
         var positions = result.object.positions;
         for (var i = 0; i < positions.length; i++) {
@@ -750,7 +750,7 @@ export default {
         that.$message.warning("请绘制飞行路线!");
         return;
       }
-       
+      debugger;
       var speed = Number(that.flySpeed) / 3.6;
 
       // var totalDuration = that.lineLength / speed;
@@ -885,7 +885,7 @@ export default {
         return;
       }
 
-       
+      debugger;
       flyManager.currentRoute.stopCollection.forEach((stop, index) => {
         stop.altitude = that.lineFylPoints[index][2] + that.flyH;
         stop.point = new Cesium.Cartesian3.fromDegrees(

src/views/ConstructionApplication3D/SunlightAnalysis/SunlightAnalysis.vue

@@ -411,7 +411,7 @@ export default {
       var that = this;
       that.clear();
       this.removehandlerPolygon();
-       
+      debugger;
       var coordinates = geojson.geometry.coordinates;
       var positions = [];
       that.ProjectScope.positions = [];
@@ -455,7 +455,7 @@ export default {
       //     })
       //   )
       //   .then(function (kmlDatasource) {
-      //      
+      //     debugger;
       //     kmlDatasource.entities.values.add(polygonEntity);
       //     var entity = kmlDatasource.entities.values[0];
       //     // kmlDatasource.setVisibleInViewport(0, false);
@@ -708,7 +708,7 @@ export default {
         );
       });
       handlerPolygon.drawEvt.addEventListener(async (result) => {
-         
+        debugger;
         that.tooltip.setVisible(false);
         that.resetForm();
         // that.Drawpolygons = result.object;
@@ -773,7 +773,7 @@ export default {
       //     );
       //   });
       //   handlerPolygon.drawEvt.addEventListener(async (result) => {
-      //      
+      //     debugger;
       //     that.tooltip.setVisible(false);
       //     that.resetForm();
       //     that.imptAnalysis(result.object);
@@ -1066,7 +1066,7 @@ export default {
                     var bytes2 = new TextEncoder().encode(kml2);
                     // 创建一个Blob对象
                     var blob2 = new Blob([bytes2], { type: "text/plain" });
-                     
+          
                     //恢复原样
                     for (
                       var modelsloadDataindex = 0;
@@ -1099,7 +1099,7 @@ export default {
                       )
                       .then(function (kmlDatasource) {
                         eids.push(kmlDatasource);
-                         
+              
                         // kmlDatasource.entities.values.add(polygonEntity);
                         // var entity = kmlDatasource.entities.values[0];
                         for (
@@ -1124,7 +1124,7 @@ export default {
                       )
                       .then(function (kmlDatasource) {
                         eids.push(kmlDatasource);
-                         
+              
                         // kmlDatasource.entities.values.add(polygonEntity);
                         // var entity = kmlDatasource.entities.values[0];
                         for (
@@ -1201,7 +1201,7 @@ export default {
                   )
                   .then(function (kmlDatasource) {
                     eids.push(kmlDatasource);
-                     
+          
                     // kmlDatasource.entities.values.add(polygonEntity);
                     // var entity = kmlDatasource.entities.values[0];
                     for (
@@ -1218,7 +1218,7 @@ export default {
               }
             },
           });
-        }, 100);
+        }, 500);
       } catch (error) {
         that.loading = false;
       }
@@ -1413,7 +1413,7 @@ export default {
         shour = that.proValue;
       }
 
-      //  
+      // debugger;
       this.nIntervId = setInterval(function () {
         that.proValue = shour;
         if (shour < ehour) {

src/views/ConstructionApplication3D/SunlightAnalysis/SunlightAnalysisCT.vue

@@ -688,7 +688,7 @@ export default {
           // } else {
           //   result = sdfff;
           // }
-           
+
           that.tooltip.setVisible(false);
           that.resetForm();
           result.object.show = false;
@@ -793,7 +793,7 @@ export default {
               }
             }
             // var sdfsdfasf = sssssd;
-             
+  
             console.log(new Date().getSeconds());
             setTimeout(function () {
               if (shadowQuery) {
@@ -1074,7 +1074,7 @@ export default {
       if (this.nIntervId) {
         clearInterval(this.nIntervId);
       }
-       
+      debugger;
       this.nIntervId = setInterval(function () {
         if (shour < ehour) {
           startTime.setHours(shour);

src/views/ConstructionApplication3D/SunlightAnalysis/SunlightAnalysisSX.vue

@@ -542,7 +542,7 @@ export default {
         );
       });
       handlerPolygon.drawEvt.addEventListener(async (result) => {
-         
+        debugger;
         that.tooltip.setVisible(false);
         that.resetForm();
         // that.loading = true;
@@ -600,7 +600,7 @@ export default {
           this.datavalue[1]
         );
 
-         
+        debugger;
         var trufPoints = [];
         for (var index = 0; index < ret.length; index++) {
           const a = ret[index];
@@ -823,7 +823,7 @@ export default {
       if (this.nIntervId) {
         clearInterval(this.nIntervId);
       }
-       
+      debugger;
       this.nIntervId = setInterval(function () {
         if (shour < ehour) {
           startTime.setHours(shour);

src/views/ConstructionApplication3D/ZBFXAnalysisinfo/ZBFXAnalysisinfo.vue

@@ -185,7 +185,7 @@ export default {
     async init() {
       let that = this;
       that.MXDKZBDataList = [];
-       
+      debugger;
       for (let index = 0; index < this.info.tableDataList.length; index++) {
         const element = this.info.tableDataList[index];
         // this.info.tableDataList.forEach((element) => {
@@ -310,7 +310,7 @@ export default {
           JRJZMJrow.zbmc = "计容建筑面积";
           JRJZMJrow.tjfazb = Number(Data.TJFA_Data.JRJZMJ).toFixed(2);
           JRJZMJrow.fazbyg = Number(Data.FA_Data.JRJZMJ).toFixed(2);
-           
+
 
           if (Data.KG_Data.JRJZMJX && Data.KG_Data.JRJZMJD) {
             JRJZMJrow.kgyq = Data.KG_Data.JRJZMJX + "/" + Data.KG_Data.JRJZMJD;
@@ -346,7 +346,7 @@ export default {
           }
 
           TableData.push(JRJZMJrow);
-           
+
           let RJLrow = {};
           RJLrow.zbmc = "容积率";
           if (!Data.TJFA_Data.RJL || Data.TJFA_Data.RJL == "NaN") {
@@ -512,7 +512,7 @@ export default {
       }
     },
     async handleSave(row, TableData) {
-       
+      debugger;
       let rgzb = {};
       for (let index = 0; index < TableData.length; index++) {
         const data = TableData[index];

src/views/ConstructionApplication3D/ZBFXAnalysisinfo/detailedInfo.vue

@@ -168,12 +168,12 @@ export default {
   },
   computed: {},
   mounted() {
-     
+    debugger;
     this.init();
   },
   methods: {
     init() {
-       
+      debugger;
       this.tableData = this.info.infoData;
       this.ParkData = this.info.ParkData;
     },

src/views/ConstructionApplication3D/ZYAnalysisinfo/ZYAnalysisinfo.vue

@@ -103,7 +103,7 @@ export default {
   },
   computed: {},
   mounted() {
-     
+    debugger;
     this.init();
   },
   methods: {
@@ -172,7 +172,7 @@ export default {
     },
 
     async JSArea(points) {
-       
+      debugger;
       var pointArr = new Array();
       var sdgh = [
         { x: 109.513901747847, y: 18.3138227456355 },
@@ -184,7 +184,7 @@ export default {
         { x: 109.513907590019, y: 18.3153036780715 },
         { x: 109.513901747847, y: 18.3138227456355 },
       ];
-       
+      debugger;
       for (let index = 0; index < 500; index++) {
         var sdfsdfs = await mapArea(sdgh);
       }

src/views/ConstructionApplication3D/backLineAnalysis/backLineAnalysisinfo.vue

@@ -230,7 +230,7 @@ export default {
   },
   computed: {},
   mounted() {
-     
+    debugger;
     this.init();
   },
   methods: {
@@ -240,7 +240,7 @@ export default {
       let jzlkList = [];
       if (this.info.Minfo.dataurl && this.info.Minfo.datasourcename) {
         if (this.info.DKBM.length > 0) {
-           
+
           let queryByGeometryParameters = {
             getFeatureMode: "SQL",
             datasetNames: [this.info.Minfo.datasourcename + ":" + "建筑轮廓"],
@@ -294,7 +294,7 @@ export default {
             else {
               FLOOR = 1;
             }
-             
+  
             jzlkData.ccmj = Area * FLOOR;
             if (jzlkData.ccmj > 0) {
               this.cczmj += jzlkData.ccmj;

src/views/ConstructionApplication3D/billboard/addBiillboardModel.vue

@@ -235,9 +235,9 @@
       <!--顶部广告牌-->
       <div v-if="JSON.stringify(billboardModel.templateTop) != '{}'">
         <el-divider v-if="JSON.stringify(billboardModel.templateCentre) != '{}'"
-          >顶部模型参数</el-divider
+          >广告牌面模型参数</el-divider
         >
-        <el-divider v-else>模型参数</el-divider>
+        <el-divider v-else>广告模型参数</el-divider>
         <!--如果模型是广告牌类型-->
         <div
           v-if="
@@ -427,7 +427,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="7"> <span>宽/高(米)：</span></el-col>
+            <el-col :span="7"> <span>高(米)：</span></el-col>
             <el-col :span="17">
               <el-input-number
                 name="yL"
@@ -464,7 +464,7 @@
       </div>
       <!--中部模型-->
       <div v-if="JSON.stringify(billboardModel.templateCentre) != '{}'">
-        <el-divider>中部模型参数</el-divider>
+        <el-divider>底座/立柱模型参数</el-divider>
         <!--如果模型是圆柱类型-->
         <div
           v-if="
@@ -508,8 +508,67 @@
           </el-row>
           <!--cylinder-->
         </div>
+
+        <!--如果模型是box类型-->
+        <div
+          v-if="
+            selectbillboardModelRule &&
+            selectbillboardModelRule.templateCentreType == 'box'
+          "
+        >
+          <!--box-->
+          <el-row>
+            <el-col :span="7"> <span>长(米)：</span></el-col>
+            <el-col :span="17">
+              <el-input-number
+                name="xL"
+                v-model="billboardModel.templateCentre.xL"
+                size="mini"
+                precision="2"
+                :min="0"
+                :max="100"
+                step="0.1"
+                @change="handleChange"
+                label="长(米)"
+              ></el-input-number>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="7"><span>宽(米)：</span></el-col>
+            <el-col :span="17">
+              <el-input-number
+                name="zL"
+                v-model="billboardModel.templateCentre.zL"
+                size="mini"
+                precision="2"
+                :min="0"
+                :max="100"
+                step="0.1"
+                @change="handleChange"
+              ></el-input-number>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="7"> <span>厚度(米)：</span></el-col>
+            <el-col :span="17">
+              <el-input-number
+                name="yL"
+                v-model="billboardModel.templateCentre.yL"
+                size="mini"
+                precision="2"
+                :min="0"
+                :max="50"
+                step="0.1"
+                @change="handleChange"
+              ></el-input-number>
+            </el-col>
+          </el-row>
+          <!--box-->
+        </div>
       </div>
       <!--底部模型-->
+      <!-- 弃用 -->
       <div v-if="JSON.stringify(billboardModel.templateBottom) != '{}'">
         <el-divider>底部模型参数</el-divider>
         <!--如果模型是box类型-->
@@ -729,13 +788,13 @@ export default {
 
       //校验添加文件完整性
       let gltffile = this.fileList.find((c) => c.name.includes(".gltf"));
-       
+      debugger;
       if (gltffile) {
         try {
           var reader = new FileReader();
           reader.onload = function () {
             if (reader.result) {
-               
+    
               //打印文件内容
               if (reader.result) {
                 let contentJson = JSON.parse(reader.result);
@@ -859,7 +918,7 @@ export default {
 
       if (that.thisfileurl) {
         that.billboardModel.template.isImportModel = "true";
-         
+        debugger;
       }
       viewer._container.style.cursor = "pointer";
       that.GUID = uuidv4();
@@ -876,7 +935,7 @@ export default {
         //   Cesium.defined(pickedObject) &&
         //   pickedObject.primitive
         // ) {
-        //    
+        //   debugger;
 
         // }
 
@@ -932,7 +991,7 @@ export default {
                   that.selectbillboardModelRule.templateTopUrl =
                     that.thisfileurl;
                 }
-                 
+      
                 var entity = viewer.entities.add({
                   id: "top_billboard_" + that.GUID,
                   name: "gltf",
@@ -1043,7 +1102,7 @@ export default {
                   that.selectbillboardModelRule.templateTopUrl =
                     that.thisfileurl;
                 }
-                 
+      
                 var topentity = viewer.entities.add({
                   id: "top_billboard_" + that.GUID,
                   name: "gltf",
@@ -1087,20 +1146,20 @@ export default {
               break;
             //底座型立杆广告
             case "ColumnWithaseBillboard":
-              that.billboardModel.templateBottom.templateType =
+              that.billboardModel.templateCentre.templateType =
                 that.selectbillboardModelRule.templateBottomType;
               //计算当前实体的xyz
-              that.billboardModel.templateBottom.x = that.billboardModel.x;
-              that.billboardModel.templateBottom.y = that.billboardModel.y;
-              that.billboardModel.templateBottom.z =
+              that.billboardModel.templateCentre.x = that.billboardModel.x;
+              that.billboardModel.templateCentre.y = that.billboardModel.y;
+              that.billboardModel.templateCentre.z =
                 that.billboardModel.z +
-                that.billboardModel.templateBottom.yL / 2;
+                that.billboardModel.templateCentre.yL / 2;
 
               if (that.billboardModel.template.isImportModel != "true") {
                 var b_p = Cesium.Cartesian3.fromDegrees(
-                  that.billboardModel.templateBottom.x,
-                  that.billboardModel.templateBottom.y,
-                  that.billboardModel.templateBottom.z
+                  that.billboardModel.templateCentre.x,
+                  that.billboardModel.templateCentre.y,
+                  that.billboardModel.templateCentre.z
                 );
                 var bottomentity = viewer.entities.add({
                   id: "bottom_billboard_" + that.GUID,
@@ -1112,9 +1171,9 @@ export default {
                    */
                   box: {
                     dimensions: new Cesium.Cartesian3(
-                      that.billboardModel.templateBottom.xL,
-                      that.billboardModel.templateBottom.zL,
-                      that.billboardModel.templateBottom.yL
+                      that.billboardModel.templateCentre.xL,
+                      that.billboardModel.templateCentre.zL,
+                      that.billboardModel.templateCentre.yL
                     ),
                     material: Cesium.Color.LIGHTGREEN,
                     // outline: false,
@@ -1133,47 +1192,47 @@ export default {
                 modelList.push(bottomentity);
               }
 
-              that.billboardModel.templateCentre.templateType =
-                that.selectbillboardModelRule.templateCentreType;
-              that.billboardModel.templateCentre.x = that.billboardModel.x;
-              that.billboardModel.templateCentre.y = that.billboardModel.y;
-              that.billboardModel.templateCentre.z =
-                that.billboardModel.templateBottom.z +
-                that.billboardModel.templateBottom.yL / 2 +
-                that.billboardModel.templateCentre.yL / 2;
-
-              if (that.billboardModel.template.isImportModel != "true") {
-                var c_p = Cesium.Cartesian3.fromDegrees(
-                  that.billboardModel.templateCentre.x,
-                  that.billboardModel.templateCentre.y,
-                  that.billboardModel.templateCentre.z
-                );
-                var Centreentity = viewer.entities.add({
-                  id: "Centre_billboard_" + that.GUID,
-                  name: "gltf",
-                  show: true,
-                  position: c_p,
-                  /**
-                   * 圆柱
-                   */
-                  cylinder: {
-                    length: that.billboardModel.templateCentre.yL, //圆柱体长度
-                    topRadius: that.billboardModel.templateCentre.rL, //圆柱顶部半径
-                    bottomRadius: that.billboardModel.templateCentre.rL, //圆柱体底部半径
-                    material: Cesium.Color.LIGHTGREEN,
-                    shadows: Cesium.ShadowMode.DISABLED, //指定圆柱体是否从每个光源投射或接收阴影
-                  },
-                  orientation: Cesium.Transforms.headingPitchRollQuaternion(
-                    newposition,
-                    new Cesium.HeadingPitchRoll(
-                      Cesium.Math.toRadians(that.billboardModel.rotateZ),
-                      Cesium.Math.toRadians(0),
-                      Cesium.Math.toRadians(0)
-                    )
-                  ),
-                });
-                modelList.push(Centreentity);
-              }
+              // that.billboardModel.templateCentre.templateType =
+              //   that.selectbillboardModelRule.templateCentreType;
+              // that.billboardModel.templateCentre.x = that.billboardModel.x;
+              // that.billboardModel.templateCentre.y = that.billboardModel.y;
+              // that.billboardModel.templateCentre.z =
+              //   that.billboardModel.templateBottom.z +
+              //   that.billboardModel.templateBottom.yL / 2 +
+              //   that.billboardModel.templateCentre.yL / 2;
+
+              // if (that.billboardModel.template.isImportModel != "true") {
+              //   var c_p = Cesium.Cartesian3.fromDegrees(
+              //     that.billboardModel.templateCentre.x,
+              //     that.billboardModel.templateCentre.y,
+              //     that.billboardModel.templateCentre.z
+              //   );
+              //   var Centreentity = viewer.entities.add({
+              //     id: "Centre_billboard_" + that.GUID,
+              //     name: "gltf",
+              //     show: true,
+              //     position: c_p,
+              //     /**
+              //      * 圆柱
+              //      */
+              //     cylinder: {
+              //       length: that.billboardModel.templateCentre.yL, //圆柱体长度
+              //       topRadius: that.billboardModel.templateCentre.rL, //圆柱顶部半径
+              //       bottomRadius: that.billboardModel.templateCentre.rL, //圆柱体底部半径
+              //       material: Cesium.Color.LIGHTGREEN,
+              //       shadows: Cesium.ShadowMode.DISABLED, //指定圆柱体是否从每个光源投射或接收阴影
+              //     },
+              //     orientation: Cesium.Transforms.headingPitchRollQuaternion(
+              //       newposition,
+              //       new Cesium.HeadingPitchRoll(
+              //         Cesium.Math.toRadians(that.billboardModel.rotateZ),
+              //         Cesium.Math.toRadians(0),
+              //         Cesium.Math.toRadians(0)
+              //       )
+              //     ),
+              //   });
+              //   modelList.push(Centreentity);
+              // }
 
               that.billboardModel.templateTop.templateType =
                 that.selectbillboardModelRule.templateTopType;
@@ -1211,7 +1270,7 @@ export default {
                   that.selectbillboardModelRule.templateTopUrl =
                     that.thisfileurl;
                 }
-                 
+      
                 var entity = viewer.entities.add({
                   id: "top_billboard_" + that.GUID,
                   name: "gltf",
@@ -1272,7 +1331,7 @@ export default {
                 url = window.ZTaxiosURI + that.thisfileurl;
                 that.selectbillboardModelRule.templateTopUrl = that.thisfileurl;
               }
-               
+    
               var entity = viewer.entities.add({
                 id: "top_billboard_" + that.GUID,
                 name: "gltf",
@@ -1394,7 +1453,7 @@ export default {
                   that.selectbillboardModelRule.templateTopUrl =
                     that.thisfileurl;
                 }
-                 
+      
                 var entity = viewer.entities.add({
                   id: "top_billboard_" + that.GUID,
                   name: "gltf",
@@ -1452,7 +1511,7 @@ export default {
     handleChange() {
       this.$forceUpdate(); //解决点击计数器失效问题
       var that = this;
-       
+      debugger;
       // modelList.forEach(model => {
 
       // });
@@ -1656,25 +1715,25 @@ export default {
           //底座型立杆广告
           case "ColumnWithaseBillboard":
             //计算当前实体的xyz
-            that.billboardModel.templateBottom.x = that.billboardModel.x;
-            that.billboardModel.templateBottom.y = that.billboardModel.y;
-            that.billboardModel.templateBottom.z =
-              that.billboardModel.z + that.billboardModel.templateBottom.yL / 2;
+            that.billboardModel.templateCentre.x = that.billboardModel.x;
+            that.billboardModel.templateCentre.y = that.billboardModel.y;
+            that.billboardModel.templateCentre.z =
+              that.billboardModel.z + that.billboardModel.templateCentre.yL / 2;
 
             if (that.billboardModel.template.isImportModel != "true") {
               var b_p = Cesium.Cartesian3.fromDegrees(
-                that.billboardModel.templateBottom.x,
-                that.billboardModel.templateBottom.y,
-                that.billboardModel.templateBottom.z
+                that.billboardModel.templateCentre.x,
+                that.billboardModel.templateCentre.y,
+                that.billboardModel.templateCentre.z
               );
               var bottomentity = viewer.entities.getById(
                 "bottom_billboard_" + that.GUID
               );
               bottomentity.position = b_p;
               bottomentity.box.dimensions = new Cesium.Cartesian3(
-                that.billboardModel.templateBottom.xL,
-                that.billboardModel.templateBottom.zL,
-                that.billboardModel.templateBottom.yL
+                that.billboardModel.templateCentre.xL,
+                that.billboardModel.templateCentre.zL,
+                that.billboardModel.templateCentre.yL
               );
               bottomentity.orientation =
                 Cesium.Transforms.headingPitchRollQuaternion(
@@ -1687,41 +1746,41 @@ export default {
                 );
             }
 
-            that.billboardModel.templateCentre.x = that.billboardModel.x;
-            that.billboardModel.templateCentre.y = that.billboardModel.y;
+            // that.billboardModel.templateCentre.x = that.billboardModel.x;
+            // that.billboardModel.templateCentre.y = that.billboardModel.y;
 
-            that.billboardModel.templateCentre.z =
-              that.billboardModel.templateBottom.z +
-              that.billboardModel.templateBottom.yL / 2 +
-              that.billboardModel.templateCentre.yL / 2;
+            // that.billboardModel.templateCentre.z =
+            //   that.billboardModel.templateBottom.z +
+            //   that.billboardModel.templateBottom.yL / 2 +
+            //   that.billboardModel.templateCentre.yL / 2;
 
-            if (that.billboardModel.template.isImportModel != "true") {
-              var c_p = Cesium.Cartesian3.fromDegrees(
-                that.billboardModel.templateCentre.x,
-                that.billboardModel.templateCentre.y,
-                that.billboardModel.templateCentre.z
-              );
-              var Centreentity = viewer.entities.getById(
-                "Centre_billboard_" + that.GUID
-              );
-              Centreentity.position = c_p;
-              Centreentity.cylinder = {
-                length: that.billboardModel.templateCentre.yL, //圆柱体长度
-                topRadius: that.billboardModel.templateCentre.rL, //圆柱顶部半径
-                bottomRadius: that.billboardModel.templateCentre.rL, //圆柱体底部半径
-                material: Cesium.Color.LIGHTGREEN,
-                shadows: Cesium.ShadowMode.DISABLED, //指定圆柱体是否从每个光源投射或接收阴影
-              };
-              Centreentity.orientation =
-                Cesium.Transforms.headingPitchRollQuaternion(
-                  newposition,
-                  new Cesium.HeadingPitchRoll(
-                    Cesium.Math.toRadians(that.billboardModel.rotateZ),
-                    Cesium.Math.toRadians(0),
-                    Cesium.Math.toRadians(0)
-                  )
-                );
-            }
+            // if (that.billboardModel.template.isImportModel != "true") {
+            //   var c_p = Cesium.Cartesian3.fromDegrees(
+            //     that.billboardModel.templateCentre.x,
+            //     that.billboardModel.templateCentre.y,
+            //     that.billboardModel.templateCentre.z
+            //   );
+            //   var Centreentity = viewer.entities.getById(
+            //     "Centre_billboard_" + that.GUID
+            //   );
+            //   Centreentity.position = c_p;
+            //   Centreentity.cylinder = {
+            //     length: that.billboardModel.templateCentre.yL, //圆柱体长度
+            //     topRadius: that.billboardModel.templateCentre.rL, //圆柱顶部半径
+            //     bottomRadius: that.billboardModel.templateCentre.rL, //圆柱体底部半径
+            //     material: Cesium.Color.LIGHTGREEN,
+            //     shadows: Cesium.ShadowMode.DISABLED, //指定圆柱体是否从每个光源投射或接收阴影
+            //   };
+            //   Centreentity.orientation =
+            //     Cesium.Transforms.headingPitchRollQuaternion(
+            //       newposition,
+            //       new Cesium.HeadingPitchRoll(
+            //         Cesium.Math.toRadians(that.billboardModel.rotateZ),
+            //         Cesium.Math.toRadians(0),
+            //         Cesium.Math.toRadians(0)
+            //       )
+            //     );
+            // }
 
             //计算当前实体的xyz
             that.billboardModel.templateTop.x = that.billboardModel.x;
@@ -1735,19 +1794,19 @@ export default {
                 that.billboardModel.templateTop.yL / 2;
             }
 
-            if (that.billboardModel.rotateX > 10) {
-              // var sd =
-              //   (that.billboardModel.templateTop.yL / 2) *
-              //   Math.cos(that.billboardModel.rotateX);
-              // that.billboardModel.templateTop.z =
-              //   that.billboardModel.templateTop.z -
-              //   sd +
-              //   that.billboardModel.templateTop.zL;
-              that.billboardModel.templateTop.z =
-                that.billboardModel.templateTop.z -
-                that.billboardModel.templateTop.yL / 2 +
-                that.billboardModel.templateTop.zL;
-            }
+            // if (that.billboardModel.rotateX > 10) {
+            //   // var sd =
+            //   //   (that.billboardModel.templateTop.yL / 2) *
+            //   //   Math.cos(that.billboardModel.rotateX);
+            //   // that.billboardModel.templateTop.z =
+            //   //   that.billboardModel.templateTop.z -
+            //   //   sd +
+            //   //   that.billboardModel.templateTop.zL;
+            //   that.billboardModel.templateTop.z =
+            //     that.billboardModel.templateTop.z -
+            //     that.billboardModel.templateTop.yL / 2 +
+            //     that.billboardModel.templateTop.zL;
+            // }
 
             var t_p = Cesium.Cartesian3.fromDegrees(
               that.billboardModel.templateTop.x,
@@ -1875,7 +1934,7 @@ export default {
      * 类型修改时触发
      */
     changeBillboardType() {
-       
+      debugger;
 
       let sds = this.$refs["billboardTypeCascader"].getCheckedNodes()[0].data;
       this.billboardReview = JSON.parse(JSON.stringify(sds));
@@ -1904,7 +1963,7 @@ export default {
     },
     //模板默认值
     TemplateDefaultValues(ModelType) {
-       
+      debugger;
       this.billboardModel.AttachedData = {};
       this.billboardModel.rotateX = 0;
       this.billboardModel.rotateY = 0;
@@ -1943,14 +2002,15 @@ export default {
         //底座型立杆广告
         case "ColumnWithaseBillboard":
           this.billboardModel.templateBottom = {
-            xL: 1,
-            yL: 0.1,
-            zL: 1,
+            // xL: 1,
+            // yL: 0.1,
+            // zL: 1,
           };
 
           this.billboardModel.templateCentre = {
-            yL: 1,
-            rL: 0.1,
+            xL: 1,
+            yL: 0.1,
+            zL: 1,
           };
 
           this.billboardModel.templateTop = {
@@ -2007,7 +2067,7 @@ export default {
      * 保存编辑
      */
     async saveMode() {
-       
+      debugger;
       let that = this;
       if (that.billboardReview.AttachedData) {
         for (
@@ -2049,7 +2109,7 @@ export default {
           return;
         }
       }
-       
+      debugger;
       let data = JSON.parse(JSON.stringify(that.billboardModel));
       data.id = uuidv4();
       data.billboardInfoId = that.project.id;
@@ -2101,9 +2161,9 @@ export default {
           roll: viewer.camera.roll,
         },
       });
-       
+      debugger;
       let result = await addBillboardModelList(data);
-       
+      debugger;
       if (result.code) {
         that.$message({
           message: "添加成功",
@@ -2112,7 +2172,7 @@ export default {
         viewer.entities.removeAll();
         // that.lyoption.cancel();
         //添加截图提醒
-         
+        debugger;
         if (
           that.billboardReview.isAddModel &&
           that.lyoption.content.parent.jttx
@@ -2145,6 +2205,9 @@ export default {
     },
   },
   components: { Image },
+  beforeDestroy() {
+    this.removeModel();
+  },
 };
 </script>
 <style lang="scss">

src/views/ConstructionApplication3D/billboard/addBillboardPoject.vue

@@ -269,7 +269,7 @@ export default {
       }
     },
     changebjmxid(sdf) {
-       
+      debugger;
       let bjmxNode = this.$refs["bjmxidRef"].getCheckedNodes(true);
       if (bjmxNode.length > 0) {
         let bjmxid = bjmxNode[0];
@@ -323,10 +323,10 @@ export default {
       return data;
     },
     async changeIsbjmx(val) {
-       
+      debugger;
       if (val) {
         this.options = await this.getshProjectinformations();
-         
+        debugger;
       } else {
         this.form.bjmxid = "";
         this.form.bjmxname = "";
@@ -405,7 +405,7 @@ export default {
                   });
                   featureDataList.push(featureData);
                 });
-                 
+      
                 let billboardModelList = [];
                 featureDataList.forEach((featureData) => {
                   let billboardModel = {};

src/views/ConstructionApplication3D/billboard/billboardCheckList.vue

@@ -135,7 +135,7 @@ export default {
     },
   },
   mounted() {
-     
+    debugger;
     this.init();
   },
   methods: {
@@ -143,7 +143,7 @@ export default {
      * 计算个数
      */
     async init() {
-       
+      debugger;
       let that = this;
       if (that.info) {
         let BillboardModels = await listBillboardModelList({

src/views/ConstructionApplication3D/billboard/billboardChekInfo.vue

@@ -154,7 +154,7 @@ export default {
       let that = this;
       let Cartesian3 = await getGroundPoint(that.info.x, that.info.y);
       let Elevation = 19.4; //地形高程
-       
+      debugger;
       if (Cartesian3) {
         Elevation = cartesian3ToWGS84(Cartesian3).alt;
       }
@@ -191,7 +191,7 @@ export default {
                 switch (ReviewItem.code) {
                   case "001234": //筑高度不超过24米的多层建筑墙面和高层建筑裙楼的主体墙面
                     var ltData = await this.getloutiData();
-                     
+          
                     if (ltData.length > 0) {
                       //多层高
                       var MHEIGHT = ltData[0].data.find(
@@ -231,7 +231,7 @@ export default {
                   //   }
                   //   break;
                   // case "0010104": //广告设施宽度应与墙面相协调，周围不应超出墙面外轮廓线，垂直方向突出墙面距离不宜大于0.5米
-                  //    
+                  //   debugger;
                   //   var points = [];
                   //   var ltData = await this.getloutiData();
                   //   if (ltData.length > 0) {
@@ -278,19 +278,34 @@ export default {
                   case "00102020102": //一层建筑层高≤4.5m并且广告高度≤1.5m 或者一层建筑层高＞4.5m并且广告高度小于等于2m
                     var ltData = await this.getloutiData();
                     if (ltData.length > 0) {
-                      //层高
-                      var FLOORH = ltData[0].data.find(
-                        (c) => c.label == "FLOORH"
-                      );
-
-                      if (FLOORH && FLOORH.value) {
-                        if (Number(FLOORH.value) <= 4.5) {
+            
+
+                      var floorhValues = ltData
+                        .flatMap((topItem) => topItem.floorttData || []) // 展开 floorttData 数组
+                        .filter((floorItem) => {
+                          // 先筛选出 floorttData 中 label: "FLOOR" 且 value: "F1" 的项
+                          const floorItemData = floorItem.data || [];
+                          const hasFloorF1 = floorItemData.some(
+                            (item) =>
+                              item.label === "FLOOR" &&
+                              (item.value === "F1" || item.value === "1F")
+                          );
+                          return hasFloorF1;
+                        })
+                        .flatMap((floorItem) => floorItem.data || []) // 展开当前 floorttData 项的 data 数组
+                        .filter((item) => item.label === "FLOORH") // 再筛选出 label: "FLOORH" 的项
+                        .map((item) => Number(item.value)); // 提取 value 值
+                      //最大层高，一般每层高度一致，这里兼容一下
+                      var FLOORH = Math.max.apply(null, floorhValues);
+
+                      if (FLOORH) {
+                        if (Number(FLOORH) <= 4.5) {
                           if (that.info.templateTop.yL <= 1.5) {
                             ruleResult = "true";
                           } else {
                             ruleResult = "false";
                           }
-                        } else if (Number(FLOORH.value) > 4.5) {
+                        } else if (Number(FLOORH) > 4.5) {
                           if (that.info.templateTop.yL <= 2) {
                             ruleResult = "true";
                           } else {
@@ -305,7 +320,7 @@ export default {
                   // case "001020103": //户外广告外表面距离墙面不得超过0.3米（霓虹灯户外广告则外表面距离墙面不得超过0.5米）
                   // case "00102020205": //户外广告外表面距离墙面不得超过0.3米（霓虹灯户外广告外表面距离墙面不得超过0.5米）
                   // case "00102020104": //户外广告外表面距离墙面不得超过0.3米（霓虹灯户外广告则外表面距离墙面不得超过0.5米）
-                  //   //  
+                  //   // debugger;
                   //   // var points1 = [];
                   //   // var ltData = await this.getloutiData();
                   //   // if (ltData.length > 0) {
@@ -330,18 +345,17 @@ export default {
                   //   // }
 
                   //   break;
-
-                  case "00102020201": //出挑部分的底部距离地面小于3米
-                    var ggxygd =
-                      that.info.templateTop.z -
-                      Elevation -
-                      that.info.templateTop.yL / 2;
-                    if (ggxygd > 3) {
-                      ruleResult = "true";
-                    } else {
-                      ruleResult = "false";
-                    }
-                    break;
+                  // case "00102020201": //出挑部分的底部距离地面小于3米
+                  //   var ggxygd =
+                  //     that.info.templateTop.z -
+                  //     Elevation -
+                  //     that.info.templateTop.yL / 2;
+                  //   if (ggxygd > 3) {
+                  //     ruleResult = "true";
+                  //   } else {
+                  //     ruleResult = "false";
+                  //   }
+                  //   break;
                   case "00102020204": //广告高度不得大于3米
                     if (that.info.templateTop.yL <= 3) {
                       ruleResult = "true";
@@ -375,7 +389,7 @@ export default {
                   case "003020101": //广告牌面下缘距离地面高度大于等于0.5米
                   case "003020201": //广告牌面下缘距离地面高度大于等于0.5米
                   case "0030101": //广告牌面下缘距离地面高度大于等于0.5米
-                     
+          
                     //广告下沿高度
                     var ggxygd =
                       that.info.templateTop.z -
@@ -388,7 +402,7 @@ export default {
                     }
                     break;
                   case "0030102": //广告总体高度（含广告牌面和支撑结构）不得超过4米
-                     
+          
                     //广告高度
                     var topgd = that.info.templateTop.yL
                       ? that.info.templateTop.yL
@@ -396,10 +410,10 @@ export default {
                     var Centregd = that.info.templateCentre.yL
                       ? that.info.templateCentre.yL
                       : 0;
-                    var Bottomgd = that.info.templateBottom.yL
-                      ? that.info.templateBottom.yL
-                      : 0;
-                    var ggxygd = topgd + Centregd + Bottomgd;
+                    // var Bottomgd = that.info.templateBottom.yL
+                    //   ? that.info.templateBottom.yL
+                    //   : 0;
+                    var ggxygd = topgd + Centregd; // + Bottomgd;
                     if (ggxygd <= 4) {
                       ruleResult = "true";
                     } else {
@@ -418,8 +432,7 @@ export default {
                   case "0030104": //任意一边长度不应大于2米
                     if (
                       that.info.templateTop.xL <= 2 &&
-                      that.info.templateTop.yL <= 2 &&
-                      that.info.templateTop.zL <= 2
+                      that.info.templateTop.yL <= 2
                     ) {
                       ruleResult = "true";
                     } else {
@@ -441,10 +454,10 @@ export default {
                     var Centregd = that.info.templateCentre.yL
                       ? that.info.templateCentre.yL
                       : 0;
-                    var Bottomgd = that.info.templateBottom.yL
-                      ? that.info.templateBottom.yL
-                      : 0;
-                    var ggxygd = topgd + Centregd + Bottomgd;
+                    // var Bottomgd = that.info.templateBottom.yL
+                    //   ? that.info.templateBottom.yL
+                    //   : 0;
+                    var ggxygd = topgd + Centregd; // + Bottomgd;
                     if (ggxygd <= 2.4) {
                       ruleResult = "true";
                     } else {
@@ -453,7 +466,7 @@ export default {
                     break;
                   case "003020206": //底座占地面积不得大于1平方米
                     var area =
-                      that.info.templateBottom.xL * that.info.templateBottom.zL;
+                      that.info.templateCentre.xL * that.info.templateCentre.zL;
                     if (area <= 1) {
                       ruleResult = "true";
                     } else {
@@ -462,7 +475,10 @@ export default {
                     break;
                   case "003030103": //广告长度不得大于1.5米
                   case "003020207": //长度不得大于1.5米
-                    if (that.info.templateTop.xL <= 1.5) {
+                    if (
+                      that.info.templateTop.xL <= 1.5 &&
+                      that.info.templateTop.yL <= 1.5
+                    ) {
                       ruleResult = "true";
                     } else {
                       ruleResult = "false";
@@ -501,10 +517,10 @@ export default {
                     var Centregd = that.info.templateCentre.yL
                       ? that.info.templateCentre.yL
                       : 0;
-                    var Bottomgd = that.info.templateBottom.yL
-                      ? that.info.templateBottom.yL
-                      : 0;
-                    var ggxygd = topgd + Centregd + Bottomgd;
+                    // var Bottomgd = that.info.templateBottom.yL
+                    //   ? that.info.templateBottom.yL
+                    //   : 0;
+                    var ggxygd = topgd + Centregd; // + Bottomgd;
                     if (ggxygd >= 1.2 && ggxygd <= 3) {
                       ruleResult = "true";
                     } else {
@@ -512,7 +528,7 @@ export default {
                     }
                     break;
                   case "0050103": //
-                     
+          
                     var AttachedData = {};
                     if (that.info.AttachedData) {
                       if (typeof that.info.AttachedData === "string") {
@@ -547,12 +563,12 @@ export default {
                 this.$set(ReviewItem, "ruleResult", ruleResult);
                 // ReviewItem.ruleResult = ruleResult;
               } else {
-                 
+      
                 //加载辅助决策
                 // switch (ReviewItem.code) {
                 //   case "0030109":
                 //   case "0030108": //当用地内建筑退让红线距离不得小于15米时，广告仅允许设置于建筑退让红线的距离内，且广告实体或最大水平投影不得超出用地红线；
-                //      
+                //     debugger;
                 //     //避免重复加载
                 //     if (this.layerDatas.filter((c) => c.includes("JZTX_")) > 0)
                 //       break;
@@ -639,7 +655,7 @@ export default {
                 //     }
                 //     break;
                 //   case "0030109": //设置立杆型广告的用地，沿城市道路用地面宽不得小于15米
-                //      
+                //     debugger;
                 //     //避免重复加载
                 //     if (this.layerDatas.filter((c) => c.includes("DLM_")) > 0)
                 //       break;
@@ -671,7 +687,7 @@ export default {
 
                 //       if (e && e.totalCount > 0) {
                 //         e.features.forEach((feature) => {
-                //            
+                // 
                 //           var DLKDindex = feature.fieldNames.findIndex(
                 //             (c) => c == "DLKD"
                 //           );
@@ -697,7 +713,7 @@ export default {
                 //             units: "kilometers",
                 //           });
                 //           var po = buffered.geometry.coordinates[0].flat();
-                //            
+                // 
                 //           var id = uuidv4();
                 //           that.layerids.push(id);
                 //           //添加道路面
@@ -743,7 +759,7 @@ export default {
                 //   default:
                 //     break;
                 // }
-                 
+      
                 this.$set(ReviewItem, "ruleResult", "1");
                 // ReviewItem.ruleResult = "1";
               }
@@ -788,7 +804,7 @@ export default {
         results: JSON.stringify(that.tableData),
         review_date: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
       });
-       
+      debugger;
       if (result.code == 200) {
         // this.lyoption.cancel();
         this.$layer.close(this.layerid);
@@ -803,19 +819,18 @@ export default {
      */
     async getloutiData() {
       this.messageNum = this.messageNum + 1;
-      let xminfo = this.pinfo;
-       
+      var xminfo = this.pinfo;
+
       if (this.layerDataList.length > 0) {
         return this.layerDataList;
       }
-       
+
       if (xminfo.dataurl && xminfo.datasourcename && xminfo.datasetname) {
         if (this.messageNum > 1) {
           return this.layerDataList;
         }
-         
         //获取模型信息
-        let queryBySQLParameters = {
+        var queryByBUFFERParameters = {
           getFeatureMode: "BUFFER",
           datasetNames: [xminfo.datasourcename + ":" + xminfo.datasetname],
           geometry: {
@@ -826,16 +841,16 @@ export default {
           bufferDistance: 0.000005,
           hasGeometry: true,
         };
-        let e = await mapQuery(
+        var e = await mapQuery(
           xminfo.dataurl + "/featureResults.json?returnContent=true",
-          queryBySQLParameters
+          queryByBUFFERParameters
         );
-         
+
         if (e && e.totalCount > 0) {
           e.features.forEach((feature) => {
-            let layerData = { data: [], geometry: feature.geometry };
+            var layerData = { data: [], geometry: feature.geometry };
             feature.fieldNames.forEach((fieldName, i) => {
-              let Field = e.datasetInfos
+              var Field = e.datasetInfos
                 ? e.datasetInfos[0].fieldInfos.find(
                     (c) =>
                       c.name && c.name.toUpperCase() == fieldName.toUpperCase()
@@ -853,6 +868,52 @@ export default {
           });
         }
 
+        //直选第一个赋值
+        if (this.layerDataList.length > 0) {
+          var LANDNO = this.layerDataList[0].data.find(
+            (c) => c.label == "LANDNO"
+          ).value;
+          var BUILDNO = this.layerDataList[0].data.find(
+            (c) => c.label == "BUILDNO"
+          ).value;
+          var queryBySQLParameters = {
+            getFeatureMode: "SQL",
+            datasetNames: [xminfo.datasourcename + ":" + "FLOORTT"],
+            queryParameter: {
+              attributeFilter:
+                "LANDNO ='" + LANDNO + "' and BUILDNO ='" + BUILDNO + "'",
+            },
+            hasGeometry: "true",
+          };
+          var floortte = await mapQuery(
+            xminfo.dataurl + "/featureResults.json?returnContent=true",
+            queryBySQLParameters
+          );
+          if (floortte && floortte.totalCount > 0) {
+            this.layerDataList[0].floorttData = [];
+            floortte.features.forEach((feature) => {
+              var layerData = { data: [], geometry: feature.geometry };
+              feature.fieldNames.forEach((fieldName, i) => {
+                var Field = floortte.datasetInfos
+                  ? floortte.datasetInfos[0].fieldInfos.find(
+                      (c) =>
+                        c.name &&
+                        c.name.toUpperCase() == fieldName.toUpperCase()
+                    )
+                  : null;
+                if (Field) {
+                  layerData.data.push({
+                    label: fieldName,
+                    labelCN: Field ? Field.caption : fieldName,
+                    value: feature.fieldValues[i],
+                  });
+                }
+              });
+              this.layerDataList[0].floorttData.push(layerData);
+            });
+          }
+        }
+
         return this.layerDataList;
       } else {
         if (this.messageNum == 1) {

src/views/ConstructionApplication3D/billboard/billboardChekResults.vue

@@ -134,7 +134,7 @@ export default {
   mounted() {},
   methods: {
     async init() {
-       
+      debugger;
       let that = this;
       that.tableData = that.info.results;
     },

src/views/ConstructionApplication3D/billboard/billboardDesign.vue

@@ -215,7 +215,7 @@ export default {
      * 获取广告项目信息
      */
     async getZtBillboardInfoList(mid) {
-       
+      debugger;
       let BenchmarkLandPrices = await listZtBillboardInfoList({
         projectname: this.input3,
         bjmxid: mid,
@@ -264,7 +264,7 @@ export default {
      * @param isPosition 默认定位
      */
     async locationModel(item, isPosition) {
-       
+      debugger;
       this.intoModel(item, isPosition);
       this.removeAllentities();
       //渲染范围
@@ -369,16 +369,16 @@ export default {
      *删除广告牌
      */
     deleteBillard(model) {
-       
+      debugger;
       var that = this;
       var confirmid = that.$layer.confirm(
         "确定要删除当前广告吗？, 是否继续?",
         {},
         async function () {
           that.$layer.close(confirmid);
-           
+
           let result = await delZtBillboardInfoList(model.id);
-           
+
           if (result.code == 200) {
             that.getZtBillboardInfoList();
             viewer.entities.removeAll();
@@ -407,9 +407,9 @@ export default {
       //   type: "warning",
       // })
       //   .then(async () => {
-      //      
+      //     debugger;
       //     let result = await delZtBillboardInfoList(model.id);
-      //      
+      //     debugger;
       //     if (result.code == 200) {
       //       that.getZtBillboardInfoList();
       //       viewer.entities.removeAll();
@@ -422,7 +422,7 @@ export default {
       //     }
       //   })
       //   .catch(() => {
-      //      
+      //     debugger;
       //     this.$message({
       //       type: "info",
       //       message: "已取消删除",
@@ -521,7 +521,7 @@ export default {
           billboardModel.templateTop = {};
         }
 
-         
+        debugger;
         var newposition = Cesium.Cartesian3.fromDegrees(
           billboardModel.x,
           billboardModel.y,
@@ -531,7 +531,7 @@ export default {
         if (billboardModel.template) {
           var imageurl = "../../../../static/ModelData/billboard/1.jpg";
           var modelurl = "../../../../static/ModelData/billboard/box.gltf";
-           
+
           var sd = billboardModel.template.ModelType;
 
           //接下来处理下面的
@@ -712,9 +712,9 @@ export default {
               );
               if (billboardModel.template.isImportModel != "true") {
                 var b_p = Cesium.Cartesian3.fromDegrees(
-                  billboardModel.templateBottom.x,
-                  billboardModel.templateBottom.y,
-                  billboardModel.templateBottom.z
+                  billboardModel.templateCentre.x,
+                  billboardModel.templateCentre.y,
+                  billboardModel.templateCentre.z
                 );
 
                 var bottomentity = viewer.entities.add({
@@ -727,9 +727,9 @@ export default {
                    */
                   box: {
                     dimensions: new Cesium.Cartesian3(
-                      billboardModel.templateBottom.xL,
-                      billboardModel.templateBottom.zL,
-                      billboardModel.templateBottom.yL
+                      billboardModel.templateCentre.xL,
+                      billboardModel.templateCentre.zL,
+                      billboardModel.templateCentre.yL
                     ),
                     material: Cesium.Color.LIGHTGREEN,
                     // outline: false,
@@ -747,39 +747,39 @@ export default {
                 });
                 entityList.push(bottomentity);
               }
-              if (billboardModel.template.isImportModel != "true") {
-                var c_p = Cesium.Cartesian3.fromDegrees(
-                  billboardModel.templateCentre.x,
-                  billboardModel.templateCentre.y,
-                  billboardModel.templateCentre.z
-                );
+              // if (billboardModel.template.isImportModel != "true") {
+              //   var c_p = Cesium.Cartesian3.fromDegrees(
+              //     billboardModel.templateCentre.x,
+              //     billboardModel.templateCentre.y,
+              //     billboardModel.templateCentre.z
+              //   );
 
-                var Centreentity = viewer.entities.add({
-                  id: "Centre_billboard_" + billboardModel.id,
-                  name: "gltf",
-                  show: true,
-                  position: c_p,
-                  /**
-                   * 圆柱
-                   */
-                  cylinder: {
-                    length: billboardModel.templateCentre.yL, //圆柱体长度
-                    topRadius: billboardModel.templateCentre.rL, //圆柱顶部半径
-                    bottomRadius: billboardModel.templateCentre.rL, //圆柱体底部半径
-                    material: Cesium.Color.LIGHTGREEN,
-                    shadows: Cesium.ShadowMode.DISABLED, //指定圆柱体是否从每个光源投射或接收阴影
-                  },
-                  orientation: Cesium.Transforms.headingPitchRollQuaternion(
-                    newposition,
-                    new Cesium.HeadingPitchRoll(
-                      Cesium.Math.toRadians(billboardModel.rotateZ),
-                      Cesium.Math.toRadians(0),
-                      Cesium.Math.toRadians(0)
-                    )
-                  ),
-                });
-                entityList.push(Centreentity);
-              }
+              //   var Centreentity = viewer.entities.add({
+              //     id: "Centre_billboard_" + billboardModel.id,
+              //     name: "gltf",
+              //     show: true,
+              //     position: c_p,
+              //     /**
+              //      * 圆柱
+              //      */
+              //     cylinder: {
+              //       length: billboardModel.templateCentre.yL, //圆柱体长度
+              //       topRadius: billboardModel.templateCentre.rL, //圆柱顶部半径
+              //       bottomRadius: billboardModel.templateCentre.rL, //圆柱体底部半径
+              //       material: Cesium.Color.LIGHTGREEN,
+              //       shadows: Cesium.ShadowMode.DISABLED, //指定圆柱体是否从每个光源投射或接收阴影
+              //     },
+              //     orientation: Cesium.Transforms.headingPitchRollQuaternion(
+              //       newposition,
+              //       new Cesium.HeadingPitchRoll(
+              //         Cesium.Math.toRadians(billboardModel.rotateZ),
+              //         Cesium.Math.toRadians(0),
+              //         Cesium.Math.toRadians(0)
+              //       )
+              //     ),
+              //   });
+              //   entityList.push(Centreentity);
+              // }
 
               var t_p = Cesium.Cartesian3.fromDegrees(
                 Number(billboardModel.templateTop.x),
@@ -1149,7 +1149,7 @@ export default {
      * @param isPosition
      */
     intoModel(info, isPosition) {
-       
+      debugger;
       let that = this;
       if (info.url && this.selectBillardId != info.id) {
         this.selectBillardId = info.id;
@@ -1167,7 +1167,7 @@ export default {
               autoSetView: dingwei,
             });
             Cesium.when(promisse11w, function (layers) {
-               
+    
               layers.forEach((element) => {
                 that.thislayers.push(element.name);
                 // window.viewer.flyTo(element);
@@ -1246,7 +1246,7 @@ export default {
     }
     this.qxyp();
     this.removeAllentities();
-     
+    debugger;
     this.thislayers.forEach((element) => {
       scene.layers.remove(element);
     });

src/views/ConstructionApplication3D/billboard/billboardJTList.vue

@@ -130,7 +130,7 @@ export default {
      * 获取广告截图信息
      */
     async getZtBillboardJtList() {
-       
+      debugger;
       this.loading = true;
       let dataList = await listZtBillboardJt({
         modelid: this.info.id,
@@ -146,7 +146,7 @@ export default {
      */
     addJTInfo() {
       let that = this;
-       
+      debugger;
       var promise = scene.outputSceneToFile();
       Cesium.when(promise, function (base64data) {
         if (!that.info.id) {
@@ -215,7 +215,7 @@ export default {
      *删除广告牌
      */
     deleteBillardJT(model) {
-       
+      debugger;
 
       var that = this;
       var confirmid = that.$layer.confirm(
@@ -223,9 +223,9 @@ export default {
         {},
         async function () {
           that.$layer.close(confirmid);
-           
+
           let result = await delZtBillboardJt(model.id);
-           
+
           if (result.code == 200) {
             that.getZtBillboardJtList(that.info.id);
             that.$message({
@@ -252,9 +252,9 @@ export default {
       //   type: "warning",
       // })
       //   .then(async () => {
-      //      
+      //     debugger;
       //     let result = await delZtBillboardJt(model.id);
-      //      
+      //     debugger;
       //     if (result.code == 200) {
       //       that.getZtBillboardJtList(that.info.id);
       //       that.$message({
@@ -264,7 +264,7 @@ export default {
       //     }
       //   })
       //   .catch(() => {
-      //      
+      //     debugger;
       //     this.$message({
       //       type: "info",
       //       message: "已取消删除",

src/views/ConstructionApplication3D/billboard/billboarddetail.vue

@@ -145,11 +145,11 @@ export default {
   methods: {
     async init() {
       let that = this;
-       
+      debugger;
       let data = await listBillboardModelList({
         billboardInfoId: that.info.projectInfo.id,
       });
-       
+      debugger;
       this.billboardModelList = data.rows;
 
       // this.billboardModelList = window.billboardModelList.filter(
@@ -217,7 +217,7 @@ export default {
      * 维护广告牌截图位置
      */
     maintainjt(row) {
-       
+      debugger;
 
       let w = document.body.offsetWidth;
       let h = document.body.offsetHeight;

src/views/ConstructionApplication3D/billboard/billboarddetailInfo.vue

@@ -32,9 +32,9 @@
         <!--顶部模型-->
         <div v-if="JSON.stringify(info.templateTop) != '{}'">
           <el-divider v-if="JSON.stringify(info.templateCentre) != '{}'"
-            >顶部模型参数</el-divider
+            >广告牌面模型参数</el-divider
           >
-          <el-divider v-else>模型参数</el-divider>
+          <el-divider v-else>广告模型参数</el-divider>
           <!--如果模型是广告牌类型-->
           <div
             v-if="info.template && info.template.templateTopType == 'billboard'"
@@ -103,7 +103,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="7"> <span>宽/高(米)：</span></el-col>
+              <el-col :span="7"> <span>高(米)：</span></el-col>
               <el-col :span="17">
                 {{ info.templateTop.yL }}
               </el-col>
@@ -119,7 +119,7 @@
         </div>
         <!--中部模型-->
         <div v-if="JSON.stringify(info.templateCentre) != '{}'">
-          <el-divider>中部模型参数</el-divider>
+          <el-divider>底座/立柱模型参数</el-divider>
           <!--如果模型是圆柱类型-->
           <div
             v-if="
@@ -141,6 +141,32 @@
             </el-row>
             <!--cylinder-->
           </div>
+
+          <!--如果模型是box类型-->
+          <div
+            v-if="info.template && info.template.templateCentreType == 'box'"
+          >
+            <!--box-->
+            <el-row>
+              <el-col :span="7"> <span>长(米)：</span></el-col>
+              <el-col :span="17">
+                {{ info.templateCentre.xL }}
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="7"> <span>宽(米)：</span></el-col>
+              <el-col :span="17">
+                {{ info.templateCentre.zL }}
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="7"><span>厚度(米)：</span></el-col>
+              <el-col :span="17">
+                {{ info.templateCentre.yL }}
+              </el-col>
+            </el-row>
+            <!--box-->
+          </div>
         </div>
         <!--底部模型-->
         <div v-if="JSON.stringify(info.templateBottom) != '{}'">
@@ -253,7 +279,7 @@ export default {
     } else {
       this.info.templateTop = {};
     }
-     
+    debugger;
     if (this.info.AttachedData) {
       if (typeof this.info.AttachedData === "string") {
         this.AttachedData = JSON.parse(this.info.AttachedData);

src/views/ConstructionApplication3D/billboard/editBiillboardModel.vue

@@ -193,9 +193,9 @@
       <!--顶部模型-->
       <div v-if="JSON.stringify(billboardModel.templateTop) != '{}'">
         <el-divider v-if="JSON.stringify(billboardModel.templateCentre) != '{}'"
-          >顶部模型参数</el-divider
+          >广告牌面模型参数</el-divider
         >
-        <el-divider v-else>模型参数</el-divider>
+        <el-divider v-else>广告模型参数</el-divider>
         <!--如果模型是广告牌类型-->
         <div
           v-if="
@@ -385,7 +385,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="7"> <span>宽/高(米)：</span></el-col>
+            <el-col :span="7"> <span>高(米)：</span></el-col>
             <el-col :span="17">
               <el-input-number
                 name="yL"
@@ -422,7 +422,7 @@
       </div>
       <!--中部模型-->
       <div v-if="JSON.stringify(billboardModel.templateCentre) != '{}'">
-        <el-divider>中部模型参数</el-divider>
+        <el-divider>底座/立柱模型参数</el-divider>
         <!--如果模型是圆柱类型-->
         <div
           v-if="
@@ -466,8 +466,66 @@
           </el-row>
           <!--cylinder-->
         </div>
+        <!--如果模型是box类型-->
+        <div
+          v-if="
+            selectbillboardModelRule &&
+            selectbillboardModelRule.templateCentreType == 'box'
+          "
+        >
+          <!--box-->
+          <el-row>
+            <el-col :span="7"> <span>长(米)：</span></el-col>
+            <el-col :span="17">
+              <el-input-number
+                name="xL"
+                v-model="billboardModel.templateCentre.xL"
+                size="mini"
+                precision="2"
+                :min="0"
+                :max="100"
+                step="0.1"
+                @change="handleChange"
+                label="长(米)"
+              ></el-input-number>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="7"><span>宽(米)：</span></el-col>
+            <el-col :span="17">
+              <el-input-number
+                name="zL"
+                v-model="billboardModel.templateCentre.zL"
+                size="mini"
+                precision="2"
+                :min="0"
+                :max="100"
+                step="0.1"
+                @change="handleChange"
+              ></el-input-number>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="7"> <span>厚度(米)：</span></el-col>
+            <el-col :span="17">
+              <el-input-number
+                name="yL"
+                v-model="billboardModel.templateCentre.yL"
+                size="mini"
+                precision="2"
+                :min="0"
+                :max="50"
+                step="0.1"
+                @change="handleChange"
+              ></el-input-number>
+            </el-col>
+          </el-row>
+          <!--box-->
+        </div>
       </div>
       <!--底部模型-->
+      <!-- 弃用 -->
       <div v-if="JSON.stringify(billboardModel.templateBottom) != '{}'">
         <el-divider>底部模型参数</el-divider>
         <!--如果模型是box类型-->
@@ -753,7 +811,7 @@ export default {
           newposition,
           hpr
         );
-         
+        debugger;
         var sd = that.billboardReview.ModelType;
         // if (that.billboardModel.template.isImportModel == "true") {
         //   sd = "ModelBillboard";
@@ -878,25 +936,25 @@ export default {
           //底座型立杆广告
           case "ColumnWithaseBillboard":
             //计算当前实体的xyz
-            that.billboardModel.templateBottom.x = that.billboardModel.x;
-            that.billboardModel.templateBottom.y = that.billboardModel.y;
-            that.billboardModel.templateBottom.z =
-              that.billboardModel.z + that.billboardModel.templateBottom.yL / 2;
+            that.billboardModel.templateCentre.x = that.billboardModel.x;
+            that.billboardModel.templateCentre.y = that.billboardModel.y;
+            that.billboardModel.templateCentre.z =
+              that.billboardModel.z + that.billboardModel.templateCentre.yL / 2;
 
             if (that.billboardModel.template.isImportModel != "true") {
               var b_p = Cesium.Cartesian3.fromDegrees(
-                that.billboardModel.templateBottom.x,
-                that.billboardModel.templateBottom.y,
-                that.billboardModel.templateBottom.z
+                that.billboardModel.templateCentre.x,
+                that.billboardModel.templateCentre.y,
+                that.billboardModel.templateCentre.z
               );
               var bottomentity = viewer.entities.getById(
                 "bottom_billboard_" + that.billboardModel.id
               );
               bottomentity.position = b_p;
               bottomentity.box.dimensions = new Cesium.Cartesian3(
-                that.billboardModel.templateBottom.xL,
-                that.billboardModel.templateBottom.zL,
-                that.billboardModel.templateBottom.yL
+                that.billboardModel.templateCentre.xL,
+                that.billboardModel.templateCentre.zL,
+                that.billboardModel.templateCentre.yL
               );
               bottomentity.orientation =
                 Cesium.Transforms.headingPitchRollQuaternion(
@@ -909,41 +967,41 @@ export default {
                 );
             }
 
-            that.billboardModel.templateCentre.x = that.billboardModel.x;
-            that.billboardModel.templateCentre.y = that.billboardModel.y;
+            // that.billboardModel.templateCentre.x = that.billboardModel.x;
+            // that.billboardModel.templateCentre.y = that.billboardModel.y;
 
-            that.billboardModel.templateCentre.z =
-              that.billboardModel.templateBottom.z +
-              that.billboardModel.templateBottom.yL / 2 +
-              that.billboardModel.templateCentre.yL / 2;
+            // that.billboardModel.templateCentre.z =
+            //   that.billboardModel.templateBottom.z +
+            //   that.billboardModel.templateBottom.yL / 2 +
+            //   that.billboardModel.templateCentre.yL / 2;
 
-            if (that.billboardModel.template.isImportModel != "true") {
-              var c_p = Cesium.Cartesian3.fromDegrees(
-                that.billboardModel.templateCentre.x,
-                that.billboardModel.templateCentre.y,
-                that.billboardModel.templateCentre.z
-              );
-              var Centreentity = viewer.entities.getById(
-                "Centre_billboard_" + that.billboardModel.id
-              );
-              Centreentity.position = c_p;
-              Centreentity.cylinder = {
-                length: that.billboardModel.templateCentre.yL, //圆柱体长度
-                topRadius: that.billboardModel.templateCentre.rL, //圆柱顶部半径
-                bottomRadius: that.billboardModel.templateCentre.rL, //圆柱体底部半径
-                material: Cesium.Color.LIGHTGREEN,
-                shadows: Cesium.ShadowMode.DISABLED, //指定圆柱体是否从每个光源投射或接收阴影
-              };
-              Centreentity.orientation =
-                Cesium.Transforms.headingPitchRollQuaternion(
-                  newposition,
-                  new Cesium.HeadingPitchRoll(
-                    Cesium.Math.toRadians(that.billboardModel.rotateZ),
-                    Cesium.Math.toRadians(0),
-                    Cesium.Math.toRadians(0)
-                  )
-                );
-            }
+            // if (that.billboardModel.template.isImportModel != "true") {
+            //   var c_p = Cesium.Cartesian3.fromDegrees(
+            //     that.billboardModel.templateCentre.x,
+            //     that.billboardModel.templateCentre.y,
+            //     that.billboardModel.templateCentre.z
+            //   );
+            //   var Centreentity = viewer.entities.getById(
+            //     "Centre_billboard_" + that.billboardModel.id
+            //   );
+            //   Centreentity.position = c_p;
+            //   Centreentity.cylinder = {
+            //     length: that.billboardModel.templateCentre.yL, //圆柱体长度
+            //     topRadius: that.billboardModel.templateCentre.rL, //圆柱顶部半径
+            //     bottomRadius: that.billboardModel.templateCentre.rL, //圆柱体底部半径
+            //     material: Cesium.Color.LIGHTGREEN,
+            //     shadows: Cesium.ShadowMode.DISABLED, //指定圆柱体是否从每个光源投射或接收阴影
+            //   };
+            //   Centreentity.orientation =
+            //     Cesium.Transforms.headingPitchRollQuaternion(
+            //       newposition,
+            //       new Cesium.HeadingPitchRoll(
+            //         Cesium.Math.toRadians(that.billboardModel.rotateZ),
+            //         Cesium.Math.toRadians(0),
+            //         Cesium.Math.toRadians(0)
+            //       )
+            //     );
+            // }
 
             //计算当前实体的xyz
             that.billboardModel.templateTop.x = that.billboardModel.x;
@@ -957,19 +1015,19 @@ export default {
                 that.billboardModel.templateTop.yL / 2;
             }
 
-            if (that.billboardModel.rotateX > 10) {
-              // var sd =
-              //   (that.billboardModel.templateTop.yL / 2) *
-              //   Math.cos(that.billboardModel.rotateX);
-              // that.billboardModel.templateTop.z =
-              //   that.billboardModel.templateTop.z -
-              //   sd +
-              //   that.billboardModel.templateTop.zL;
-              that.billboardModel.templateTop.z =
-                that.billboardModel.templateTop.z -
-                that.billboardModel.templateTop.yL / 2 +
-                that.billboardModel.templateTop.zL;
-            }
+            // if (that.billboardModel.rotateX > 10) {
+            //   // var sd =
+            //   //   (that.billboardModel.templateTop.yL / 2) *
+            //   //   Math.cos(that.billboardModel.rotateX);
+            //   // that.billboardModel.templateTop.z =
+            //   //   that.billboardModel.templateTop.z -
+            //   //   sd +
+            //   //   that.billboardModel.templateTop.zL;
+            //   that.billboardModel.templateTop.z =
+            //     that.billboardModel.templateTop.z -
+            //     that.billboardModel.templateTop.yL / 2 +
+            //     that.billboardModel.templateTop.zL;
+            // }
 
             var t_p = Cesium.Cartesian3.fromDegrees(
               that.billboardModel.templateTop.x,
@@ -1122,7 +1180,7 @@ export default {
      * 类型修改时触发
      */
     changeBillboardType() {
-       
+      debugger;
 
       this.billboardReview = {
         isAddModel: this.billboardModel.isAddModel,
@@ -1174,7 +1232,7 @@ export default {
      * 保存编辑
      */
     async saveMode() {
-       
+      debugger;
       let that = this;
       if (that.billboardReview.AttachedData) {
         for (
@@ -1198,7 +1256,7 @@ export default {
         return;
       }
 
-       
+      debugger;
       if (
         that.billboardReview.ModelType == "ModelBillboard" ||
         that.billboardReview.ModelType == "imgBillboard"
@@ -1212,7 +1270,7 @@ export default {
           return;
         }
       }
-       
+      debugger;
       let data = JSON.parse(JSON.stringify(that.billboardModel));
 
       data.template = {
@@ -1261,9 +1319,9 @@ export default {
           roll: viewer.camera.roll,
         },
       });
-       
+      debugger;
       let result = await updateBillboardModelList(data);
-       
+      debugger;
       if (result.code) {
         that.$message({
           message: "添加成功",
@@ -1280,7 +1338,7 @@ export default {
 
         // this.originalbillboardModel.id = uuidv4();
         await addbillboardModelListHistory(this.originalbillboardModel);
-         
+        debugger;
 
         if (that.lyoption.content.parent.init) {
           that.lyoption.content.parent.init();

src/views/ConstructionApplication3D/clipboxByEditor/clipboxByEditor.vue

@@ -229,7 +229,7 @@ export default {
         this.underground = !this.underground;
       }
       window.QXLayerNames.forEach((QXLayerName) => {
-         
+        debugger;
         let layer = scene.layers.find(QXLayerName);
         if (this.underground) {
           if (layer && layer.style3D) {

src/views/ConstructionApplication3D/parkCheck/parkResult.vue

@@ -1,5 +1,10 @@
 <template>
   <div class="ZTGlobal" style="padding: 1rem; font-size: small">
+    <el-col :span="24">
+      <div class="titleHeader" style="line-height: 3.4rem">
+        <h3>特殊停车位配建指标对比</h3>
+      </div></el-col
+    >
     <el-table
       :data="tableData"
       :header-cell-style="{ 'text-align': 'center' }"
@@ -175,7 +180,7 @@ export default {
     init() {
       var data = this.info;
       console.log(data);
-       
+      debugger;
       if (data == null) return;
       this.tableData = [];
       var parks = data.parks;

src/views/ConstructionApplication3D/projectInfo/addProjectInfo.vue

@@ -192,7 +192,7 @@ export default {
   },
   computed: {},
   mounted() {
-     
+    debugger;
     this.init();
   },
   methods: {
@@ -229,7 +229,7 @@ export default {
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
           if (this.info.id) {
-             
+  
             let result = await updateProjectinformation(that.form);
             if (result.code) {
               that.$message({
@@ -251,7 +251,7 @@ export default {
               that.$layer.close(that.layerid);
             }
           }
-           
+
           // that.lyoption.cancel();
         } else {
           that.isWC = false;

src/views/ConstructionApplication3D/projectManagement/CheckParkAnalyse.js

@@ -8,7 +8,7 @@ const CheckParkAnalyse = {
    * @param {Boolean} isJSPark
    */
   async buidAreaAndParksComputer(Minfo, isJSPark) {
-     
+    debugger;
     var datasourcename = Minfo.datasourcename; //模型数据集
     var dataurl = Minfo.dataurl; //报建项目服务地址
     var tcwLayerName = window.CarPark.tcwLayer; //停车位图层
@@ -39,7 +39,7 @@ const CheckParkAnalyse = {
       Minfo.dataurl + "/featureResults.json?returnContent=true",
       queryByGeometryParameters
     );
-     
+    debugger;
     if (result && result.totalCount == 0) {
       Message({
         message: "未查询到停车位和报建分层数据数据,请重新尝试",
@@ -843,7 +843,7 @@ const CheckParkAnalyse = {
         statistic.jdcCount += jdcCount;
       }
     });
-     
+    debugger;
     statistics.forEach((statistic) => {
       var cwinfo = {
         landNo: statistic.landNo,

src/views/ConstructionApplication3D/projectManagement/ghqk.js

@@ -14,7 +14,7 @@ const ghqk = {
    */
   async getPlanning(LandPlanningList, Minfo) {
     this.removeCZKFBJDatasList();
-     
+    debugger;
 
     let geo = LandPlanningList[0].geometry;
     this.getczkfbj(geo);
@@ -27,7 +27,7 @@ const ghqk = {
    */
   async getczkfbj(geo) {
     let layer = flatten(window.layerTree).find((item) => item.core == "004001");
-     
+    debugger;
     if (layer && layer.date_server.url) {
       let queryByGeometryParameters = {
         getFeatureMode: "BUFFER",
@@ -44,7 +44,7 @@ const ghqk = {
         layer.date_server.url + "/featureResults.json?returnContent=true",
         queryByGeometryParameters
       );
-       
+      debugger;
 
       if (e && e.totalCount > 0) {
         e.features.forEach((feature) => {
@@ -159,7 +159,7 @@ const ghqk = {
    */
   async getyjjbnt(geo) {
     let layer = flatten(window.layerTree).find((item) => item.core == "004003");
-     
+    debugger;
     if (layer && layer.date_server.url) {
       let queryByGeometryParameters = {
         getFeatureMode: "BUFFER",
@@ -176,7 +176,7 @@ const ghqk = {
         layer.date_server.url + "/featureResults.json?returnContent=true",
         queryByGeometryParameters
       );
-       
+      debugger;
 
       if (e && e.totalCount > 0) {
         e.features.forEach((feature) => {
@@ -291,7 +291,7 @@ const ghqk = {
    */
   async getstbhhx(geo) {
     let layer = flatten(window.layerTree).find((item) => item.core == "004002");
-     
+    debugger;
     if (layer && layer.date_server.url) {
       let queryByGeometryParameters = {
         getFeatureMode: "BUFFER",
@@ -308,7 +308,7 @@ const ghqk = {
         layer.date_server.url + "/featureResults.json?returnContent=true",
         queryByGeometryParameters
       );
-       
+      debugger;
 
       if (e && e.totalCount > 0) {
         e.features.forEach((feature) => {

src/views/ConstructionApplication3D/projectManagement/projectManagement.vue

@@ -2852,7 +2852,7 @@ export default {
             Minfo.dataurl + "/featureResults.json?returnContent=true",
             queryByGeometryParameters2
           );
-           
+
 
           //建筑基底总面积
           let jzjdzmj = 0;
@@ -2928,7 +2928,7 @@ export default {
                 let areaPs = area(polygonPs);
                 jzjdzmj += areaPs;
               }
-               
+    
               let FAJDIndex = feature.fieldNames.findIndex(
                 (c) => c == "FAJDAREA"
               );
@@ -3495,7 +3495,7 @@ export default {
           layerDataList: item.layerDataList,
         };
       });
-       
+      debugger;
       //弹窗最小化
       this.$layer.min(this.layerid);
       if (this.MXDBInfolayerid) {

src/views/ConstructionApplication3D/skylineAnalysis/skylineAnalysis.vue

@@ -163,7 +163,7 @@ export default {
           }
           return;
         }
-         
+        debugger;
         startPoint = result.object.positions[0];
         endPoint = result.object.positions[1];
         var point1 = that.Cartesian2toDegrees(startPoint);
@@ -297,12 +297,12 @@ export default {
           });
         });
       } else {
-         
+        debugger;
         if (that.info.modelsloadData) {
           if (that.layerid1) that.$layer.close(that.layerid1);
           if (that.layerid2) that.$layer.close(that.layerid2);
           //左侧模型出图
-           
+
           let mx1 = scene.layers.layerQueue.filter(
             (c) => c.Minfoid == that.info.modelsloadData[0].Minfo.id
           );
@@ -363,7 +363,7 @@ export default {
                 facade.endPoint = thisendPoint;
                 facade.startPoint = thisstartPoint;
                 setTimeout(() => {
-                   
+        
                   facade.readyPromise.then(function (base64data2) {
                     let left1 = w - w * 0.5 + (w * 0.5) / 2;
                     that.layerid2 = that.$layer.iframe({

src/views/ConstructionApplication3D/skylineAnalysis/skylineExecute.js

@@ -23,7 +23,7 @@ const skylineExecute = {
     var image = new Image();
     image.src = data;
     image.onload = function () {
-       
+      debugger;
       var context = canvas.getContext("2d");
       var context2 = canvas2.getContext("2d");
       canvas.width = image.width;
@@ -88,7 +88,7 @@ const skylineExecute = {
         imageRealHeight = maxY - imageTopHeight;
       }
       imageScaleH = imageRealHeight / viewH;
-       
+      debugger;
       imageData = context.getImageData(
         0,
         imageTopHeight,

static/Config/config.js

@@ -1426,9 +1426,9 @@ window.bjConfig = {
 //         projectinformationid: "ertyuiop",
 //         modelname: "报建模型1",
 //         creationtime: "2024-04-24 17:22:13",
-//         url: "http://192.168.60.2:8090/iserver/services/3D-fangan/rest/realspace",
+//         url: "http://192.168.2.130:8091/iserver/services/3D-fangan/rest/realspace",
 //         dataurl:
-//           "http://192.168.60.2:8090/iserver/services/data-fangan/rest/data",
+//           "http://192.168.2.130:8091/iserver/services/data-fangan/rest/data",
 //         datasourcename: "DongAnZhuoYueCheng",
 //         datasetname: "建筑轮廓",
 //         selectionStatus: false,
@@ -1446,9 +1446,9 @@ window.bjConfig = {
 //         modelname: "报建模型2",
 //         creationtime: "2024-04-24 17:22:13",
 
-//         url: "http://192.168.60.2:8090/iserver/services/3D-fangan2/rest/realspace",
+//         url: "http://192.168.2.130:8091/iserver/services/3D-fangan2/rest/realspace",
 //         dataurl:
-//           "http://192.168.60.2:8090/iserver/services/data-fangan2/rest/data",
+//           "http://192.168.2.130:8091/iserver/services/data-fangan2/rest/data",
 //         datasourcename: "DongAnZhuoYueCheng2",
 //         datasetname: "建筑轮廓",
 //         selectionStatus: false,
@@ -1481,9 +1481,9 @@ window.bjConfig = {
 //         projectinformationid: "ertyuiop",
 //         modelname: "报建模型1",
 //         creationtime: "2024-04-24 17:22:13",
-//         url: "http://192.168.60.2:8090/iserver/services/3D-fangan/rest/realspace",
+//         url: "http://192.168.2.130:8091/iserver/services/3D-fangan/rest/realspace",
 //         dataurl:
-//           "http://192.168.60.2:8090/iserver/services/data-fangan/rest/data",
+//           "http://192.168.2.130:8091/iserver/services/data-fangan/rest/data",
 //         datasourcename: "DongAnZhuoYueCheng",
 //         datasetname: "建筑轮廓",
 //         selectionStatus: true,
@@ -1501,9 +1501,9 @@ window.bjConfig = {
 //         modelname: "报建模型2",
 //         creationtime: "2024-04-24 17:22:13",
 
-//         url: "http://192.168.60.2:8090/iserver/services/3D-fangan2/rest/realspace",
+//         url: "http://192.168.2.130:8091/iserver/services/3D-fangan2/rest/realspace",
 //         dataurl:
-//           "http://192.168.60.2:8090/iserver/services/data-fangan2/rest/data",
+//           "http://192.168.2.130:8091/iserver/services/data-fangan2/rest/data",
 //         datasourcename: "DongAnZhuoYueCheng2",
 //         datasetname: "建筑轮廓",
 //         selectionStatus: false,
@@ -1537,9 +1537,9 @@ window.bjConfig = {
 //         projectinformationid: "A1",
 //         modelname: "A1",
 //         creationtime: "2024-04-24 17:22:13",
-//         url: "http://192.168.60.2:8090/iserver/services/3D-RHSJ/rest/realspace",
+//         url: "http://192.168.2.130:8091/iserver/services/3D-RHSJ/rest/realspace",
 //         dataurl:
-//           "http://192.168.60.2:8090/iserver/services/data-RHSJ/rest/data",
+//           "http://192.168.2.130:8091/iserver/services/data-RHSJ/rest/data",
 //         datasourcename: "RHSJ",
 //         datasetname: "建筑轮廓",
 //         selectionStatus: false,
@@ -2484,8 +2484,8 @@ window.NightViewLayerName = [
 //     checkDate: "2024-01-02 12:00:00",
 //     design: "设计单位",
 //     description: "简介",
-//     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",
+//     url: "http://192.168.2.130:8091/iserver/services/3D-fangan/rest/realspace",
+//     dataurl: "http://192.168.2.130:8091/iserver/services/data-fangan/rest/data",
 //     datasourcename: "DongAnZhuoYueCheng",
 //     datasetname: "建筑轮廓",
 //   },
@@ -2496,8 +2496,8 @@ window.NightViewLayerName = [
 //     checkDate: "2024-01-02 12:00:00",
 //     design: "设计单位",
 //     description: "简介",
-//     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",
+//     url: "http://192.168.2.130:8091/iserver/services/3D-fangan/rest/realspace",
+//     dataurl: "http://192.168.2.130:8091/iserver/services/data-fangan/rest/data",
 //     datasourcename: "DongAnZhuoYueCheng",
 //     datasetname: "建筑轮廓",
 //   },
@@ -2715,8 +2715,9 @@ window.billboardReviewList = [
                   {
                     id: "4534553",
                     code: "00102020201",
-                    ReviewMethod: "自动审查",
-                    ReviewContent: "出挑部分的底部距离地面小于3米",
+                    ReviewMethod: "手动审查",
+                    ReviewContent:
+                      "出挑部分的底部距离地面小于3米时，允许将户外广告设于建筑出挑部分的墙面上",
                   },
                   {
                     id: "453bmbnsd4553",
@@ -2725,12 +2726,6 @@ window.billboardReviewList = [
                     ReviewContent:
                       "户外广告的下沿不得低于建筑出挑部分的楼板，上沿不得高于二层窗户下沿",
                   },
-                  {
-                    id: "453sd45xcv53",
-                    code: "00102020203",
-                    ReviewMethod: "手动审查",
-                    ReviewContent: "允许将户外广告设于建筑出挑部分的墙面上",
-                  },
                   {
                     id: "453sd45xcv53",
                     code: "00102020204",
@@ -3814,8 +3809,9 @@ window.billboardReviewList = [
                       {
                         id: "4534fyj553",
                         code: "00102020201",
-                        ReviewMethod: "自动审查",
-                        ReviewContent: "出挑部分的底部距离地面小于3米",
+                        ReviewMethod: "手动审查",
+                        ReviewContent:
+                          "出挑部分的底部距离地面小于3米时，允许将户外广告设于建筑出挑部分的墙面上",
                       },
                       {
                         id: "453b53",
@@ -3824,12 +3820,7 @@ window.billboardReviewList = [
                         ReviewContent:
                           "户外广告的下沿不得低于建筑出挑部分的楼板，上沿不得高于二层窗户下沿",
                       },
-                      {
-                        id: "445xcv53",
-                        code: "00102020203",
-                        ReviewMethod: "手动审查",
-                        ReviewContent: "允许将户外广告设于建筑出挑部分的墙面上",
-                      },
+
                       {
                         id: "453sd453",
                         code: "00102020204",
@@ -4401,9 +4392,9 @@ window.billboardModelRuleList = [
         //模板顶部类型
         templateTopType: "box",
         //模板中部类型
-        templateCentreType: "cylinder",
-        //模板底类型
-        templateBottomType: "box",
+        templateCentreType: "box",
+        // //模板底类型
+        // templateBottomType: "box",
       },
     ],
   },
@@ -4420,7 +4411,7 @@ window.ZSBC = {
    * 征地补偿数据服务
    */
   dataServiceUrl:
-    'http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data/featureResults.rjson?returnContent=true&hasGeometry=true"',
+    'http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data/featureResults.rjson?returnContent=true&hasGeometry=true"',
 
   /**征地补偿标准 */
   ZDBCList: [