点标注更新高程时忽略自身

src/Obj/Base/BillboardObject/index.js

@@ -2391,7 +2391,7 @@ class BillboardObject extends Base {
       10000000000000
     )
 
-    let objectsToExclude = []
+    let objectsToExclude = [this.entity]
     for (let [key, value] of this.sdk.entityMap) {
       if (value.type === 'RadarScanStereoscopic' && value.entity) {
         objectsToExclude.push(value.entity)

src/Obj/Base/GeoJson/index.js

@@ -96,17 +96,13 @@ class GeoJson extends Base {
     })
     let json = await rsp.json()
     this.geojson = json
-    // this.sdk.addIncetance(this.options.id, this)
-    return GeoJson.addDataToGlobe(this, json.features)
-  }
 
-  /*geojosn暂时只用线的形式*/
+    /*geojosn暂时只用线的形式*/
-  static addDataToGlobe(that) {
     const geoJsonDataSource = new Cesium.GeoJsonDataSource();
-    let geojson = that.deepCopyObj(that.geojson)
+    let geojson = this.deepCopyObj(this.geojson)
     for (let i = 0; i < geojson.features.length; i++) {
       if (!geojson.features[i].id) {
-        geojson.features[i].id = that.options.id + '_' + i
+        geojson.features[i].id = this.options.id + '_' + i
       }
     }
     // console.log(geojson)
@@ -114,13 +110,13 @@ class GeoJson extends Base {
       clampToGround: true,
     });
     return promise.then(datasource => {
-      that.entity = datasource
+      this.entity = datasource
       datasource.entities.values.forEach(enetity => {
         // console.log(enetity)
-        let color = Cesium.Color.fromCssColorString(that.options.color)
+        let color = Cesium.Color.fromCssColorString(this.options.color)
         let colorPolygon = color.withAlpha(0.2)
-        enetity.show = that.options.show
+        enetity.show = this.options.show
-        that.sdk.viewer.entities.add(enetity)
+        this.sdk.viewer.entities.add(enetity)
         if (enetity.billboard) {
           enetity.billboard.heightReference = Cesium.HeightReference.CLAMP_TO_GROUND
           enetity.point = new Cesium.PointGraphics({
@@ -134,26 +130,26 @@ class GeoJson extends Base {
 
         if (enetity.polyline) {
           enetity.polyline.material = color
-          enetity.polyline.zIndex = that.sdk._entityZIndex
+          enetity.polyline.zIndex = this.sdk._entityZIndex
-          that.sdk._entityZIndex++
+          this.sdk._entityZIndex++
         }
 
         if (enetity.polygon) {
           enetity.polygon.perPositionHeight = false
           enetity.polygon.material = colorPolygon
-          enetity.polygon.zIndex = that.sdk._entityZIndex
+          enetity.polygon.zIndex = this.sdk._entityZIndex
 
           enetity.polyline = new Cesium.PolylineGraphics({
             positions: enetity.polygon.hierarchy._value.positions,
             width: 1,
             clampToGround: true,
             material: color,
-            zIndex: that.sdk._entityZIndex
+            zIndex: this.sdk._entityZIndex
           })
-          that.sdk._entityZIndex++
+          this.sdk._entityZIndex++
         }
       })
-      that.loading = false
+      this.loading = false
     })
   }
 

static/custom/css/index.css

@@ -288,6 +288,10 @@
   padding: 0px 24px;
 }
 
+.YJ-custom-base-dialog>.content .el-tabs .el-tabs__header {
+  margin-bottom: 0;
+}
+
 .YJ-custom-base-dialog>.content .div-item {
   /* border-top: 1px solid rgba(204, 204, 204, 0.2); */
   padding: 12px 0;
@@ -338,7 +342,7 @@
 
 .YJ-custom-base-dialog>.content input,
 .YJ-custom-base-dialog>.content textarea {
-  font-size: 16px;
+  font-size: 14px;
   background-color: rgba(0, 0, 0, 0.5);
   border: 1px solid rgba(var(--color-base1), 0.5);
   border-radius: 5px;
@@ -2531,8 +2535,8 @@
 .YJ-custom-base-dialog.polygon>.content .attribute-content-vr .table .tr .td:nth-child(3),
 .YJ-custom-base-dialog.polygon>.content .attribute-content-rtmp .table .tr .th:nth-child(3),
 .YJ-custom-base-dialog.polygon>.content .attribute-content-rtmp .table .tr .td:nth-child(3) {
-  flex: 0 0 165px;
+  flex: 0 0 175px;
-  width: 165px;
+  width: 175px;
   justify-content: center;
 }
 
@@ -2615,8 +2619,8 @@
 .YJ-custom-base-dialog.assemble>.content .attribute-content-vr .table .tr .td:nth-child(3),
 .YJ-custom-base-dialog.assemble>.content .attribute-content-rtmp .table .tr .th:nth-child(3),
 .YJ-custom-base-dialog.assemble>.content .attribute-content-rtmp .table .tr .td:nth-child(3) {
-  flex: 0 0 165px;
+  flex: 0 0 175px;
-  width: 165px;
+  width: 175px;
   justify-content: center;
 }
 
@@ -2675,8 +2679,8 @@
 .YJ-custom-base-dialog.pincerArrow>.content .attribute-content-vr .table .tr .td:nth-child(3),
 .YJ-custom-base-dialog.pincerArrow>.content .attribute-content-rtmp .table .tr .th:nth-child(3),
 .YJ-custom-base-dialog.pincerArrow>.content .attribute-content-rtmp .table .tr .td:nth-child(3) {
-  flex: 0 0 165px;
+  flex: 0 0 175px;
-  width: 165px;
+  width: 175px;
   justify-content: center;
 }
 
@@ -2758,7 +2762,7 @@
 
 /* 折线 */
 .YJ-custom-base-dialog.polyline>.content {
-  width: 580px;
+  width: 600px;
 }
 
 .YJ-custom-base-dialog.polyline>.content>div #dashTextureDom {
@@ -3793,7 +3797,7 @@
 .yj-custom-icon {
   display: inline-block;
   width: 22px;
-  height: 10px;
+  height: 18px;
   margin-right: 5px;
 }