Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Query/clickQuery/clickQuery.vue

@@ -411,7 +411,7 @@ export default {
               e.features[u].fieldNames.forEach((fieldName, i) => {
                 if (
                   fieldName.toLowerCase().indexOf("shape") < 0 &&
-                  fieldName.toLowerCase().indexOf("sm")
+                  fieldName.toLowerCase().indexOf("sm") && e.features[u].fieldValues[i] != ''
                 ) {
                   cur.push({
                     name: fieldName,
@@ -420,18 +420,18 @@ export default {
                 }
               });
               //排序  将value值为空串的数据放到列表最后
-              cur.sort((a, b) => {
-                if (a === b) {
-                  return 0;
-                } else if (a.value == null || a.value == "") {
-                  return 1;
-                } else if (b.value == null || b.value == "") {
-                  return -1;
-                } else {
-                  // 降序
-                  return a.value < b.value ? 1 : -1;
-                }
-              });
+              // cur.sort((a, b) => {
+              //   if (a === b) {
+              //     return 0;
+              //   } else if (a.value == null || a.value == "") {
+              //     return 1;
+              //   } else if (b.value == null || b.value == "") {
+              //     return -1;
+              //   } else {
+              //     // 降序
+              //     return a.value < b.value ? 1 : -1;
+              //   }
+              // });
 
               let points = [];
               for (let y = 0; y < e.features[u].geometry.points.length; y++) {

src/views/viewer.vue

@@ -285,6 +285,8 @@ export default {
                         fillColor: Cesium.Color.fromCssColorString("#ffffff"),
                         pixelOffset: new Cesium.Cartesian2(5, -15),
                         zIndex: 3,
+                        // 设置远近裁条件
+                        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(20000, 9999999999.0),
                     },
                     billboard: {
                         // 图像地址，URI或Canvas的属性
@@ -298,7 +300,8 @@ export default {
                         // horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
                         scale: 1.0,
                         zIndex: 2,
-
+                        // 设置远近裁条件
+                        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(20000, 9999999999.0),
                         show: true
                     },
                     properties: {
@@ -318,7 +321,9 @@ export default {
                         extrudedHeight: 450,
                         outline: true,
                         // outlineColor : Cesium.Color.BLACK
-                        outlineColor: Cesium.Color.fromCssColorString('#55A1E3')
+                        outlineColor: Cesium.Color.fromCssColorString('#55A1E3'),
+                        // 设置远近裁条件
+                        distanceDisplayCondition: new Cesium.DistanceDisplayCondition(20000, 9999999999.0),
                     }
                 });