|
@@ -95,6 +95,7 @@
|
|
|
<script>
|
|
|
import axios from "axios";
|
|
|
import { GetGDlnfo, GetXzqhTree, GetHouseInfo } from "../../../api/map";
|
|
|
+import { Getfiledslist } from "@/api/shared.js";
|
|
|
import { keys } from "lodash";
|
|
|
import { handModel, handnew, clearTranslate, keyName } from "./modelLayering";
|
|
|
import CockpitVector from "./CockpitVector.vue";
|
|
@@ -517,20 +518,30 @@ export default {
|
|
|
if (obj.serverType == "geoserver") {
|
|
|
this.getGeoserver(xy, obj);
|
|
|
} else {
|
|
|
- if (!obj.source) {
|
|
|
+ if (!obj.fwgzkj && !obj.fwmc) {
|
|
|
continue;
|
|
|
}
|
|
|
this.superQuery(xy, obj);
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ async getfieldList(zymlBsm, resetType) {
|
|
|
+ this.fieldList = [];
|
|
|
+ let res = await Getfiledslist({ zymlBsm, resetType });
|
|
|
+ return res.data;
|
|
|
+ },
|
|
|
async superQuery(xy, obj) {
|
|
|
+ console.log(
|
|
|
+ obj.source.split(","),
|
|
|
+ `${obj.fwgzkj}:${obj.fwmc}`,
|
|
|
+ obj.source.split(",") == `${obj.fwgzkj}:${obj.fwmc}`
|
|
|
+ );
|
|
|
let that = this;
|
|
|
let queryByIDParameters = {
|
|
|
getFeatureMode: "BUFFER",
|
|
|
// getFeatureMode: "SPATIAL",
|
|
|
spatialQueryMode: "INTERSECT",
|
|
|
- datasetNames: obj.source.split(","),
|
|
|
+ datasetNames: [`${obj.fwgzkj}:${obj.fwmc}`], //obj.source.split(","),
|
|
|
geometry: {
|
|
|
parts: [1],
|
|
|
points: [{ y: xy.lat, x: xy.lng }],
|
|
@@ -557,7 +568,8 @@ export default {
|
|
|
let queryData = [];
|
|
|
let geoms = [];
|
|
|
let parts = [];
|
|
|
- let parseJson = JSON.parse(obj.legend);
|
|
|
+ // let parseJson = JSON.parse(obj.legend);
|
|
|
+ let parseJson = await this.getfieldList(obj.id, false);
|
|
|
for (let u = 0; u < e.features.length; u++) {
|
|
|
let cur = [];
|
|
|
var linSAr = JSON.parse(JSON.stringify(e.features[u]));
|
|
@@ -567,13 +579,13 @@ export default {
|
|
|
if (e.features[u].fieldNames) {
|
|
|
linSAr.fieldNames.forEach((fieldName, i) => {
|
|
|
let perjson = parseJson.filter(
|
|
|
- (p) => p.fieldname.toUpperCase() == fieldName
|
|
|
+ (p) => p.filedName.toUpperCase() == fieldName
|
|
|
);
|
|
|
if (perjson.length > 0) {
|
|
|
var show = condition(perjson[0]);
|
|
|
var order = perjson[0].order || linSAr.fieldNames.length;
|
|
|
- if (fieldName != perjson[0].fieldaliasname)
|
|
|
- fieldName = perjson[0].fieldaliasname;
|
|
|
+ if (fieldName != perjson[0].filedNameZh)
|
|
|
+ fieldName = perjson[0].filedNameZh;
|
|
|
}
|
|
|
if (show) {
|
|
|
let v = linSAr.fieldValues[i];
|
|
@@ -679,7 +691,7 @@ export default {
|
|
|
scale: 1.0,
|
|
|
zIndex: 2,
|
|
|
show: true,
|
|
|
- heightReference: Cesium.HeightReference.CLAMP_TO_GROUND
|
|
|
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
|
|
|
},
|
|
|
});
|
|
|
},
|