|
@@ -408,15 +408,31 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
e.features[u].fieldNames.forEach((fieldName, i) => {
|
|
|
- if (fieldName.toLowerCase().indexOf("shape") < 0) {
|
|
|
+ if (
|
|
|
+ fieldName.toLowerCase().indexOf("shape") < 0 &&
|
|
|
+ fieldName.toLowerCase().indexOf("sm")
|
|
|
+ ) {
|
|
|
cur.push({
|
|
|
name: fieldName,
|
|
|
value: e.features[u].fieldValues[i],
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
+ //排序 将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;
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
let points = [];
|
|
|
for (let y = 0; y < e.features[u].geometry.points.length; y++) {
|
|
|
let c = that.cartesianToCartographic84(
|
|
@@ -428,6 +444,7 @@ export default {
|
|
|
geoms.push(points);
|
|
|
queryData.push(cur);
|
|
|
}
|
|
|
+
|
|
|
that.queryResults[obj.id] = queryData;
|
|
|
that.queryResultsGeom[obj.id] = geoms;
|
|
|
}
|