|
@@ -62,22 +62,22 @@
|
|
|
//获取数据
|
|
|
getData() {
|
|
|
let data, buildParams = {
|
|
|
- PageNumber: 1,
|
|
|
- PageSize: 1000,
|
|
|
- Orders: "BuildLocalName asc",
|
|
|
- Projection: [
|
|
|
- "BuildID",
|
|
|
- "BuildLocalName"
|
|
|
+ pageNumber: 1,
|
|
|
+ pageSize: 1000,
|
|
|
+ orders: "localName asc",
|
|
|
+ projection: [
|
|
|
+ "id",
|
|
|
+ "localName"
|
|
|
]
|
|
|
}, floorParams = {
|
|
|
- Orders: "FloorSequenceID desc",
|
|
|
- PageNumber: 1,
|
|
|
- PageSize: 1000,
|
|
|
- Projection: [
|
|
|
- "BuildID",
|
|
|
- "FloorID",
|
|
|
- "FloorLocalName",
|
|
|
- "FloorSequenceID"
|
|
|
+ orders: "floorSequenceId desc",
|
|
|
+ pageNumber: 1,
|
|
|
+ pageSize: 1000,
|
|
|
+ projection: [
|
|
|
+ "buildingId",
|
|
|
+ "id",
|
|
|
+ "localName",
|
|
|
+ "floorSequenceId"
|
|
|
]
|
|
|
}
|
|
|
let promise1 = new Promise((resolve, reject) => {
|
|
@@ -91,11 +91,11 @@
|
|
|
})
|
|
|
})
|
|
|
Promise.all([promise1, promise2]).then(values => {
|
|
|
- let builData = values[0].Content, floorData = values[1].Content
|
|
|
+ let builData = values[0].content, floorData = values[1].content
|
|
|
data = builData.map(build => {
|
|
|
return {
|
|
|
- value: build.BuildID,
|
|
|
- label: build.BuildLocalName
|
|
|
+ value: build.id,
|
|
|
+ label: build.localName
|
|
|
}
|
|
|
})
|
|
|
data.unshift({
|
|
@@ -107,12 +107,12 @@
|
|
|
})
|
|
|
data.forEach(build => {
|
|
|
floorData.forEach(floor => {
|
|
|
- if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName && this.type == "yes") {
|
|
|
+ if (build.value == floor.buildingId && floor.id && floor.localName && this.type == "yes") {
|
|
|
if (build.children) {
|
|
|
build.children.push({
|
|
|
- value: floor.FloorID,
|
|
|
- label: floor.FloorLocalName,
|
|
|
- FloorSequenceID: floor.FloorSequenceID
|
|
|
+ value: floor.id,
|
|
|
+ label: floor.localName,
|
|
|
+ FloorSequenceID: floor.floorSequenceId
|
|
|
})
|
|
|
} else {
|
|
|
build.children = []
|
|
@@ -123,9 +123,9 @@
|
|
|
value: 'noKnow',
|
|
|
label: "未明确楼层"
|
|
|
},{
|
|
|
- value: floor.FloorID,
|
|
|
- label: floor.FloorLocalName,
|
|
|
- FloorSequenceID: floor.FloorSequenceID
|
|
|
+ value: floor.id,
|
|
|
+ label: floor.localName,
|
|
|
+ FloorSequenceID: floor.floorSequenceId
|
|
|
})
|
|
|
}
|
|
|
}
|