Sfoglia il codice sorgente

合并中途代码

zpf 10 mesi fa
parent
commit
699607fd18

+ 116 - 4
src/components/Combinations/NightscapeAnalysis/index.js

@@ -1,6 +1,8 @@
 const Nightscape = {
   GeoJsonLayerList: [],
   liudongGntities: [],
+
+  buildTopLines: [],
   routesGroupByAirline: {},
   tiyuchangdg: [],
   tiyuchangdg1: [],
@@ -49,7 +51,40 @@ const Nightscape = {
       let roadLine1 = Cesium.GeoJsonDataSource.load(
         window.NightLightUrl.csfgx.url
       );
-
+      debugger
+      var layer = scene.layers.find("BaoPo@BaoPo0621N");
+
+      // //修改线框
+      // layer.style3D.lineWidth = 1.5;
+      // layer.style3D.lineColor = new Cesium.Color(0 / 255, 0 / 255, 0 / 255, 1);
+      // layer.style3D.fillStyle = Cesium.FillStyle.Fill_And_WireFrame ;
+      // layer.wireFrameMode = Cesium.WireFrameType.EffectOutline;
+
+      // var customJGD = new Cesium.SpotLight(new Cesium.Cartesian3.fromDegrees(109.51265531383535, 18.311520512333716, 100),
+      //   new Cesium.Cartesian3.fromDegrees(109.53073971317, 18.3524456120148, 300), {
+      //   color: new Cesium.Color(0.2, 0.3, 0.3, 1),
+      //   cutoffDistance: 2000,
+      //   decay: 0,
+      //   intensity: 100
+      // })
+      // customJGD.angle = Math.PI / 100
+      // var x = 109.53073971317
+      // var y = 18.3524456120148
+      // var z = 300
+      // var ount = 1
+      // setInterval(function () {
+      //   scene.po
+      //   var xx = x + ount * 0.003
+      //   var yy = y + 0.002 * ount
+      //   if (xx > 109.35600) {
+      //     xx = x
+      //     yy = y
+      //     ount = 1
+      //   }
+      //   ount++
+      //   customJGD.targetPosition = new Cesium.Cartesian3.fromDegrees(xx, yy, 300)
+      // }, 1000)
+      // scene.addLightSource(customJGD);
       roadLine1
         .then(function (dataSource) {
           viewer.dataSources.add(dataSource);
@@ -59,7 +94,7 @@ const Nightscape = {
             let line = lines_1[i];
             line.polyline.material = new Cesium.PolylineGlowMaterialProperty({
               //设置Glow材质
-              glowPower: 0.005,
+              glowPower: window.NightLightUrl.csfgx.glowPower,
               color: new Cesium.Color(
                 window.NightLightUrl.csfgx.fgxColor.r,
                 window.NightLightUrl.csfgx.fgxColor.g,
@@ -86,7 +121,7 @@ const Nightscape = {
             let line = lines_1[i];
             line.polyline.material = new Cesium.PolylineGlowMaterialProperty({
               //设置Glow材质
-              glowPower: 0.001,
+              glowPower:  window.NightLightUrl.csfgx.glowPower,
               color: new Cesium.Color(
                 window.NightLightUrl.csfgx.fgdxColor.r,
                 window.NightLightUrl.csfgx.fgdxColor.g,
@@ -136,7 +171,41 @@ const Nightscape = {
           scene.addLightSource(SpotLight33);
         });
       });
+    //小区灯光
+    Cesium.loadJson(window.NightLightUrl.residential.url).then((response) => {
+      let features = response.features;
+      features.forEach((element) => {
+        let p = element.geometry.coordinates;
+        var SpotLightPos3 = new Cesium.Cartesian3.fromDegrees(
+          p[0],
+          p[1],
+          p[2]+3
+        );
+        // var SpotLightPos32 = new Cesium.Cartesian3.fromDegrees(
+        //   p[0],
+        //   p[1],
+        //   p[2]
+        // );
+        var SpotLightOptions3 = {
+          cutoffDistance: window.NightLightUrl.yshdg.cutoffDistance,
+          color: new Cesium.Color(
+            window.NightLightUrl.residential.LightColor.r,
+            window.NightLightUrl.residential.LightColor.g,
+            window.NightLightUrl.residential.LightColor.b,
+            window.NightLightUrl.residential.LightColor.a
+          ),
+          decay: window.NightLightUrl.residential.decay,
+          intensity: window.NightLightUrl.residential.intensity,
+        };
 
+        let SpotLightresidential = new Cesium.PointLight(
+          SpotLightPos3,
+          // SpotLightPos32,
+          SpotLightOptions3
+        );
+        scene.addLightSource(SpotLightresidential);
+      });
+    });
       // 体育场灯光
       Cesium.loadJson(window.NightLightUrl.tycdg.url).then((response) => {
         let features = response.features;
@@ -586,11 +655,12 @@ const Nightscape = {
    */
   loadldx() {
     let that = this;
+  //道路中线流动
     Cesium.loadJson(window.NightLightUrl.dlzxx.url).then((jsonData) => {
       debugger;
       jsonData.features.forEach((route) => {
         let list = route.geometry.coordinates.flat(Infinity);
-        debugger;
+        
         let dl = viewer.entities.add({
           // 用于打底的线
           polyline: {
@@ -632,7 +702,46 @@ const Nightscape = {
         this.liudongGntities.push(dls);
       });
     });
+    //楼顶流动线
+    var liness=[]
+    
+    Cesium.loadJson(window.NightLightUrl.buildTopLine.url).then((jsonData) => {
+      debugger;
+      liness=jsonData
+      jsonData.features.forEach((route) => {
+        let list = route.geometry.coordinates.flat(Infinity);
+        let topLine = viewer.entities.add({
+          id: route.properties.OBJECTID,
+          polyline: {
+            positions: Cesium.Cartesian3.fromDegreesArrayHeights(list),
+            width: window.NightLightUrl.dlzxx.ldxWidth,
+            material: new Cesium.PolylineTrailMaterialProperty({
+              outlineColor: new Cesium.Color(
+                window.NightLightUrl.buildTopLine.ldxOutlineColor.r,
+                window.NightLightUrl.buildTopLine.ldxOutlineColor.g,
+                window.NightLightUrl.buildTopLine.ldxOutlineColor.b,
+                window.NightLightUrl.buildTopLine.ldxOutlineColor.a
+              ),
+              outlineWidth: window.NightLightUrl.dlzxx.ldxOutlineWidth,
+              color: new Cesium.Color(
+                window.NightLightUrl.buildTopLine.ldxColor.r,
+                window.NightLightUrl.buildTopLine.ldxColor.g,
+                window.NightLightUrl.buildTopLine.ldxColor.b,
+                window.NightLightUrl.buildTopLine.ldxColor.a
+              ),
+              trailLength: window.NightLightUrl.buildTopLine.trailLength,
+              period: window.NightLightUrl.buildTopLine.period,
+            }),
+          },
+        });
+        this.buildTopLines.push(topLine);
+      });
+    });
+    
+
   },
+  // changlineColor(){},
+
   /**
    * 添加光源
    * @param {} gyData
@@ -702,6 +811,9 @@ const Nightscape = {
       this.liudongGntities.forEach((element) => {
         viewer.entities.remove(element);
       });
+      this.buildTopLines.forEach((element) => {
+        viewer.entities.remove(element);
+      });
     }
   },
 

+ 223 - 51
src/views/ConstructionApplication3D/BenchmarkLandPriceAnalysis/jzdjfxsmjg.vue

@@ -16,7 +16,7 @@
     <el-row :gutter="10" style="display: flex; align-items: center">
       <el-col :span="24">
         土地用途:
-        <el-select
+        <!-- <el-select
           size="mini"
           v-model="jzdj_LandUse"
           placeholder="请选择土地用途"
@@ -29,7 +29,22 @@
             :label="dict.label"
             :value="dict.value"
           />
-        </el-select>
+        </el-select> -->
+
+        <el-cascader
+          placeholder="请选择土地用途"
+          v-model="jzdj_LandUse"
+          :options="landUseNatureRelation"
+          :show-all-levels="false"
+          clearable
+          @change="handleChange"
+          :props="{
+            value: 'tdyt',
+            label: 'tdyt',
+            children: 'children',
+            emitPath: false,
+          }"
+        ></el-cascader>
       </el-col>
     </el-row>
     <el-row :gutter="10">
@@ -52,7 +67,7 @@
             style="justify-content: flex-start"
           >
             <div class="con-col" style="align-items: flex-start">
-              <a style="color: white">分析面积(亩)</a>
+              <a style="color: white">分析范围(亩)</a>
               <a style="font-weight: bold; color: rgba(2, 167, 240, 1)">{{
                 (Number(formData.fxzmj) / 666.67).toFixed(2)
               }}</a>
@@ -146,6 +161,64 @@
         </el-row>
       </el-col>
     </el-row>
+    <el-row :gutter="10">
+      <el-col :span="12">
+        <el-row :gutter="10" class="container_center">
+          <el-col
+            :span="8"
+            class="container_center"
+            style="
+              height: 3rem;
+              background-color: rgba(2, 167, 240, 1);
+              border-radius: 6px;
+            "
+          >
+            <i style="font-size: 2rem" class="el-icon-discount"></i>
+          </el-col>
+          <el-col
+            :span="16"
+            class="container_center"
+            style="justify-content: flex-start"
+          >
+            <div class="con-col" style="align-items: flex-start">
+              <a style="color: white">国有建设</a>
+              <a style="color: white">用地面积(亩)</a>
+              <a style="font-weight: bold; color: rgba(2, 167, 240, 1)">{{
+                (formData.gyzmj / 666.67).toFixed(2)
+              }}</a>
+            </div>
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col :span="12">
+        <el-row :gutter="10" class="container_center">
+          <el-col
+            :span="8"
+            class="container_center"
+            style="
+              height: 3rem;
+              background-color: rgba(2, 167, 240, 1);
+              border-radius: 6px;
+            "
+          >
+            <i style="font-size: 2rem" class="el-icon-price-tag"></i>
+          </el-col>
+          <el-col
+            :span="16"
+            class="container_center"
+            style="justify-content: flex-start"
+          >
+            <div class="con-col" style="align-items: flex-start">
+              <a style="color: white">集体建设</a>
+              <a style="color: white">用地面积(亩)</a>
+              <a style="font-weight: bold; color: rgba(2, 167, 240, 1)">{{
+                (formData.jtzmj / 666.67).toFixed(2)
+              }}</a>
+            </div>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
     <!-- <el-row :gutter="10" style="display: flex; align-items: center">
       <el-col :span="24">
         土地用途:
@@ -218,6 +291,7 @@ export default {
       getEntitiesHandler: {},
       tooltip: createTooltip(document.body),
       zt_jzdj_LandUse: window.dict.zt_jzdj_LandUse,
+      landUseNatureRelation: window.landUseNatureRelation,
       jzdj_LandUse: "商服用地",
       GYmyChart: null,
       JTmyChart: null,
@@ -226,12 +300,14 @@ export default {
         zdj: 0,
         gyzdj: 0, //国有总地价
         jtzdj: 0, //集体总地价
+        gyzmj: 0, //国有总面积
+        jtzmj: 0, //集体面积
       },
       LayerData: {
         GYData: [],
         JTData: [],
         GHDKData: [],
-        JZDJData: [],
+        JZDJData: { GY: [], JT: [] },
       },
     };
   },
@@ -347,13 +423,14 @@ export default {
         }
         let polygonPs = polygon([DataPs]);
         let areaPs = area(polygonPs);
-        this.formData.fxzmj += +Number(areaPs).toFixed(2);
+        this.formData.fxzmj += Number(areaPs).toFixed(2);
       }
     },
     /**
      * 计算基准地价
      */
     async CalculateJZDJ() {
+      debugger;
       let that = this;
       if (that.jzdj_LandUse) {
         let landUseNatureRelation = flatten(window.landUseNatureRelation).find(
@@ -429,17 +506,11 @@ export default {
                     ps.push(element.x);
                     ps.push(element.y);
                   }
-                  // var orangePolygon1 = viewer.entities.add({
-                  //   id: uuidv4(),
-                  //   polygon: {
-                  //     hierarchy: Cesium.Cartesian3.fromDegreesArray(ps),
-                  //     material: Cesium.Color.FUCHSIA.withAlpha(0.4),
-                  //     outline: true,
-                  //     outlineColor: Cesium.Color.BLACK,
-                  //     outlineWidth: 2.0,
-                  //   },
-                  // });
-                  that.LayerData.JZDJData.push(layerData);
+                  if (layerinfo.qsTYPE == "JT") {
+                    that.LayerData.JZDJData.JT.push(layerData);
+                  } else if (layerinfo.qsTYPE == "GY") {
+                    that.LayerData.JZDJData.GY.push(layerData);
+                  }
                 });
               }
             } else {
@@ -459,7 +530,7 @@ export default {
           };
           // 循环国有土地
           that.LayerData.GYData.forEach((Data) => {
-            that.LayerData.JZDJData.forEach((JZDJ) => {
+            that.LayerData.JZDJData.GY.forEach((JZDJ) => {
               let area = that.calculateIntersectArea(
                 Data.geometry,
                 JZDJ.geometry,
@@ -483,9 +554,9 @@ export default {
               }
             });
           });
-          // 循环国有土地
+          // 循环集体土地
           that.LayerData.JTData.forEach((Data) => {
-            that.LayerData.JZDJData.forEach((JZDJ) => {
+            that.LayerData.JZDJData.JT.forEach((JZDJ) => {
               let area = that.calculateIntersectArea(
                 Data.geometry,
                 JZDJ.geometry,
@@ -532,44 +603,51 @@ export default {
     },
     //计算国有和集体分别总地价
     gyjtzdj() {
+      debugger;
       this.formData.zdj = 0;
       this.formData.gyzdj = 0;
       this.formData.jtzdj = 0;
+      this.formData.jtzmj = 0;
+      this.formData.gyzmj = 0;
       this.LayerData.GYData.forEach((gyelement) => {
         gyelement.fromData.forEach((element) => {
+          this.formData.gyzmj += element.area;
           this.formData.gyzdj += element.zdj;
         });
       });
       this.LayerData.JTData.forEach((jtelement) => {
         jtelement.fromData.forEach((element) => {
+          this.formData.jtzmj += element.area;
           this.formData.jtzdj += element.zdj;
         });
       });
-      // 循环得出总地价
-      //转换成超图格式面
-      let HZgeometry = {
-        partTopo: [1],
-        parts: [this.BenchmarkLandPrice.ProjectScope.length],
-        points: this.BenchmarkLandPrice.ProjectScope,
-      };
-      this.LayerData.JZDJData.forEach((JZDJ) => {
-        let area = this.calculateIntersectArea(JZDJ.geometry, HZgeometry);
-        if (Number(area) > 0) {
-          //单价
-          let djval = JZDJ.data.find(
-            (c) => c.label == JZDJ.layerInfo.ydlxPriceField
-          );
-          if (djval) {
-            this.formData.zdj += Number(area * Number(djval.value));
-          }
-        }
-      });
+      this.formData.zdj = this.formData.gyzdj + this.formData.jtzdj;
+      // // 循环得出总地价
+      // //转换成超图格式面
+      // let HZgeometry = {
+      //   partTopo: [1],
+      //   parts: [this.BenchmarkLandPrice.ProjectScope.length],
+      //   points: this.BenchmarkLandPrice.ProjectScope,
+      // };
+      // this.LayerData.JZDJData.forEach((JZDJ) => {
+      //   let area = this.calculateIntersectArea(JZDJ.geometry, HZgeometry);
+      //   if (Number(area) > 0) {
+      //     //单价
+      //     let djval = JZDJ.data.find(
+      //       (c) => c.label == JZDJ.layerInfo.ydlxPriceField
+      //     );
+      //     if (djval) {
+      //       this.formData.zdj += Number(area * Number(djval.value));
+      //     }
+      //   }
+      // });
     },
 
     /**
      * 查询区域内国有土地权属
      */
     async getGYLandOwnership() {
+      debugger;
       let that = this;
       //查询国有使用权
       let layer = flatten(window.layerTree).find(
@@ -659,13 +737,14 @@ export default {
      * 查询区域内集体土地权属
      */
     async getJTLandOwnership() {
+      debugger;
       let that = this;
       //查询集体使用权
-      let layer = flatten(window.layerTree).find(
+      var layer = flatten(window.layerTree).find(
         (item) => item.core == "007002"
       );
-      let points = this.BenchmarkLandPrice.ProjectScope;
-      let geo = {
+      var points = this.BenchmarkLandPrice.ProjectScope;
+      var geo = {
         id: 0,
         style: null,
         parts: [points.length],
@@ -675,7 +754,7 @@ export default {
           epsgCode: null,
         },
       };
-      let queryByGeometryParameters = {
+      var queryByGeometryParameters = {
         getFeatureMode: "SPATIAL",
         datasetNames: [
           layer.date_server.dataSourceName +
@@ -686,13 +765,13 @@ export default {
         spatialQueryMode: "INTERSECT",
         hasGeometry: "true",
       };
-      let e = await mapQuery(
+      var e = await mapQuery(
         layer.date_server.url + "/featureResults.json?returnContent=true",
         queryByGeometryParameters
       );
       if (e && e.totalCount > 0) {
         e.features.forEach((feature) => {
-          let featureData = {
+          var featureData = {
             id: uuidv4(),
             layerInfo: layer,
             data: [],
@@ -701,7 +780,7 @@ export default {
           };
 
           feature.fieldNames.forEach((fieldName, i) => {
-            let Field = e.datasetInfos
+            var Field = e.datasetInfos
               ? e.datasetInfos[0].fieldInfos.find(
                   (c) =>
                     c.name &&
@@ -718,9 +797,9 @@ export default {
             }
           });
 
-          let ps = [];
+          var ps = [];
           for (
-            let index = 0;
+            var index = 0;
             index < featureData.geometry.points.length;
             index++
           ) {
@@ -743,6 +822,90 @@ export default {
           that.LayerData.JTData.push(featureData);
         });
       }
+
+      //查询集体使用权
+      var layer = flatten(window.layerTree).find(
+        (item) => item.core == "007003"
+      );
+      var points = this.BenchmarkLandPrice.ProjectScope;
+      var geo = {
+        id: 0,
+        style: null,
+        parts: [points.length],
+        points: points,
+        type: "REGION",
+        prjCoordSys: {
+          epsgCode: null,
+        },
+      };
+      var queryByGeometryParameters = {
+        getFeatureMode: "SPATIAL",
+        datasetNames: [
+          layer.date_server.dataSourceName +
+            ":" +
+            layer.date_server.datasetName,
+        ],
+        geometry: geo,
+        spatialQueryMode: "INTERSECT",
+        hasGeometry: "true",
+      };
+      var e = await mapQuery(
+        layer.date_server.url + "/featureResults.json?returnContent=true",
+        queryByGeometryParameters
+      );
+      if (e && e.totalCount > 0) {
+        e.features.forEach((feature) => {
+          var featureData = {
+            id: uuidv4(),
+            layerInfo: layer,
+            data: [],
+            fromData: [],
+            geometry: feature.geometry,
+          };
+
+          feature.fieldNames.forEach((fieldName, i) => {
+            var Field = e.datasetInfos
+              ? e.datasetInfos[0].fieldInfos.find(
+                  (c) =>
+                    c.name &&
+                    c.name.toUpperCase() == fieldName.toUpperCase() &&
+                    c.name.toUpperCase().indexOf("SM") == -1
+                )
+              : null;
+            if (Field) {
+              featureData.data.push({
+                label: fieldName,
+                labelCN: Field ? Field.caption : fieldName,
+                value: e.features[0].fieldValues[i],
+              });
+            }
+          });
+
+          var ps = [];
+          for (
+            var index = 0;
+            index < featureData.geometry.points.length;
+            index++
+          ) {
+            const element = featureData.geometry.points[index];
+            ps.push(element.x);
+            ps.push(element.y);
+          }
+
+          var orangePolygon1 = viewer.entities.add({
+            id: "JTSYTD-" + featureData.id,
+            polygon: {
+              hierarchy: Cesium.Cartesian3.fromDegreesArray(ps),
+              material: Cesium.Color.ORANGE.withAlpha(0.4),
+              outline: true,
+              outlineColor: Cesium.Color.BLACK,
+              outlineWidth: 2.0,
+            },
+          });
+
+          that.LayerData.JTData.push(featureData);
+        });
+      }
     },
 
     initEntitiesHandler() {
@@ -753,6 +916,12 @@ export default {
       this.getEntitiesHandler.setInputAction(function (click) {
         let pick = viewer.scene.pick(click.position);
         let id, info;
+        //集体使用权信息弹窗
+        if (pick && pick.id.id && pick.id.id.indexOf("JTSYTD") !== -1) {
+          id = pick.id.id.split("JTSYTD-")[1];
+          info = that.LayerData.JTData.find((c) => c.id == id);
+          that.openOBJInfo("集体使用权详情", info.data);
+        }
         //集体所有权信息弹窗
         if (pick && pick.id.id && pick.id.id.indexOf("JTTD") !== -1) {
           id = pick.id.id.split("JTTD-")[1];
@@ -969,6 +1138,7 @@ export default {
       for (let index = 0; index < this.LayerData.JTData.length; index++) {
         const element = this.LayerData.JTData[index];
         viewer.entities.removeById("JTTD-" + element.id);
+        viewer.entities.removeById("JTSYTD-" + element.id);
       }
       this.LayerData.JTData = [];
       //删除规划地块图层
@@ -1028,7 +1198,7 @@ export default {
         series: [
           {
             type: "pie",
-            radius: ["40%", "70%"],
+            radius: ["50%", "80%"],
             center: ["35%", "50%"], // 将饼图的中心点向左调整到容器宽度的30%,纵坐标保持在中心
             avoidLabelOverlap: false,
             itemStyle: {
@@ -1118,7 +1288,7 @@ export default {
         series: [
           {
             type: "pie",
-            radius: ["40%", "70%"],
+            radius: ["50%", "80%"],
             center: ["35%", "50%"], // 将饼图的中心点向左调整到容器宽度的30%,纵坐标保持在中心
             avoidLabelOverlap: false,
             itemStyle: {
@@ -1165,13 +1335,15 @@ export default {
       //先清空数据
       this.formData.gyzdj = 0;
       this.formData.jtzdj = 0;
+      this.formData.gyzmj = 0;
+      this.formData.jtzmj = 0;
       this.LayerData.GYData.forEach((element) => {
         element.fromData = [];
       });
       this.LayerData.JTData.forEach((element) => {
         element.fromData = [];
       });
-      this.LayerData.JZDJData = [];
+      this.LayerData.JZDJData = { GY: [], JT: [] };
 
       await this.CalculateJZDJ();
       await this.initGY();
@@ -1245,6 +1417,6 @@ export default {
 }
 .EchartsWH {
   width: 100%;
-  height: 16rem;
+  height: 13rem;
 }
 </style>

File diff suppressed because it is too large
+ 28 - 8
src/views/ConstructionApplication3D/Demolition/DemolitionList.vue


+ 36 - 21
src/views/ConstructionApplication3D/billboard/billboardChekInfo.vue

@@ -91,7 +91,7 @@ export default {
     async init() {
       let that = this;
       debugger;
-
+      let Z = Number(that.info.z) - 19.4;
       let ltData = await this.getloutiData(that.info);
       //过滤规则
       let billboardReviewList = flatten(window.window.billboardReviewList);
@@ -131,7 +131,7 @@ export default {
                     break;
                   case "0010101": //户外广告上沿不得突出墙面(包括女儿墙)的外轮廓线
                     //广告上沿高度
-                    let ggsygd = that.info.z + that.info.yL / 2;
+                    let ggsygd = Z + that.info.yL / 2;
                     //楼高
                     if (ltData.length > 0) {
                       //多层高
@@ -172,7 +172,7 @@ export default {
                     break;
                   case "0010105": //户外广告下端距地面净高不得低于3米,且不得防碍行人安全;
                     //广告下沿高度
-                    let ggxygd = that.info.z - that.info.yL / 2;
+                    let ggxygd = Z - that.info.yL / 2;
                     if (ggxygd > 3) {
                       ruleResult = "true";
                     } else {
@@ -193,28 +193,43 @@ export default {
                       let FLOORH = ltData[0].data.find(
                         (c) => c.label == "FLOORH"
                       );
-                      //广告上沿高度
-                      let ggsygd1 =
-                        Number(that.info.z) + Number(that.info.yL) / 2;
+
                       if (FLOORH && FLOORH.value) {
-                        if (Number(FLOORH.value) > ggsygd1) {
-                          if (Number(FLOORH.value) <= 4.5) {
-                            if (that.info.yL <= 1.5) {
-                              ruleResult = "true";
-                            } else {
-                              ruleResult = "false";
-                            }
-                          } else if (Number(FLOORH.value) > 4.5) {
-                            if (that.info.yL <= 2) {
-                              ruleResult = "true";
-                            } else {
-                              ruleResult = "false";
-                            }
+                        if (Number(FLOORH.value) <= 4.5) {
+                          if (that.info.yL <= 1.5) {
+                            ruleResult = "true";
+                          } else {
+                            ruleResult = "false";
+                          }
+                        } else if (Number(FLOORH.value) > 4.5) {
+                          if (that.info.yL <= 2) {
+                            ruleResult = "true";
+                          } else {
+                            ruleResult = "false";
                           }
-                        } else {
-                          ruleResult = "false";
                         }
                       }
+                      // //广告上沿高度
+                      // let ggsygd1 = Number(Z) + Number(that.info.yL) / 2;
+                      // if (FLOORH && FLOORH.value) {
+                      //   if (Number(FLOORH.value) > ggsygd1) {
+                      //     if (Number(FLOORH.value) <= 4.5) {
+                      //       if (that.info.yL <= 1.5) {
+                      //         ruleResult = "true";
+                      //       } else {
+                      //         ruleResult = "false";
+                      //       }
+                      //     } else if (Number(FLOORH.value) > 4.5) {
+                      //       if (that.info.yL <= 2) {
+                      //         ruleResult = "true";
+                      //       } else {
+                      //         ruleResult = "false";
+                      //       }
+                      //     }
+                      //   } else {
+                      //     ruleResult = "false";
+                      //   }
+                      // }
                     }
 
                     break;

File diff suppressed because it is too large
+ 0 - 0
static/data/地标.json


File diff suppressed because it is too large
+ 0 - 0
static/data/小区.json


File diff suppressed because it is too large
+ 0 - 0
static/data/楼顶流动线.json


Some files were not shown because too many files changed in this diff