|
@@ -1,30 +1,39 @@
|
|
|
import { floorQuery, buildingQuery } from '@/api/scan/request'
|
|
|
|
|
|
-const buildFloorData = {
|
|
|
- data: []
|
|
|
-}
|
|
|
+const buildFloor = {
|
|
|
+ getData: function (buildFloorData) {
|
|
|
+ let data, buildParams = {
|
|
|
+ PageNumber: 1,
|
|
|
+ PageSize: 500,
|
|
|
+ Projection: [
|
|
|
+ "BuildID",
|
|
|
+ "BuildLocalName"
|
|
|
+ ]
|
|
|
+ }, floorParams = {
|
|
|
+ Orders: "FloorSequenceID desc",
|
|
|
+ PageNumber: 1,
|
|
|
+ PageSize: 500,
|
|
|
+ Projection: [
|
|
|
+ "BuildID",
|
|
|
+ "FloorID",
|
|
|
+ "FloorLocalName",
|
|
|
+ "FloorSequenceID"
|
|
|
+ ]
|
|
|
+ }
|
|
|
|
|
|
-function getData () {
|
|
|
- let data, buildParams = {
|
|
|
- PageNumber: 1,
|
|
|
- PageSize: 500,
|
|
|
- Projection: [
|
|
|
- "BuildID",
|
|
|
- "BuildLocalName"
|
|
|
- ]
|
|
|
- }, floorParams = {
|
|
|
- Orders: "FloorSequenceID desc",
|
|
|
- PageNumber: 1,
|
|
|
- PageSize: 500,
|
|
|
- Projection: [
|
|
|
- "BuildID",
|
|
|
- "FloorID",
|
|
|
- "FloorLocalName",
|
|
|
- "FloorSequenceID"
|
|
|
- ]
|
|
|
- }
|
|
|
- buildingQuery(buildParams, res => {
|
|
|
- let builData = res.Content
|
|
|
+ let promise1 = new Promise((resolve, reject) => {
|
|
|
+ buildingQuery(buildParams, res => {
|
|
|
+ resolve(res)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ let promise2 = new Promise((resolve, reject) => {
|
|
|
+ floorQuery(floorParams, res => {
|
|
|
+ resolve(res)
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+ return Promise.all([promise1, promise2]).then(function(values) {
|
|
|
+ let builData = values[0].Content, floorData = values[1].Content
|
|
|
data = builData.map(build => {
|
|
|
return {
|
|
|
value: build.BuildID,
|
|
@@ -35,45 +44,90 @@ function getData () {
|
|
|
value: "",
|
|
|
label: "未明确建筑的设备"
|
|
|
})
|
|
|
- floorQuery(floorParams, res => {
|
|
|
- let floorData = res.Content
|
|
|
- data.forEach(build => {
|
|
|
- floorData.forEach(floor => {
|
|
|
- if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName) {
|
|
|
- if (build.children) {
|
|
|
- build.children.push({
|
|
|
- value: floor.FloorID,
|
|
|
- label: floor.FloorLocalName
|
|
|
- })
|
|
|
- } else {
|
|
|
- build.children = []
|
|
|
- build.children.push({
|
|
|
- value: "",
|
|
|
- label: "未明确楼层的设备"
|
|
|
- })
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
- data.forEach(item => {
|
|
|
- if (item.children && item.children.length) {
|
|
|
- item.children.forEach(child => {
|
|
|
- buildFloorData.data.push({
|
|
|
- Code: item.value + "-" + child.value,
|
|
|
- Name: item.label + "-" + child.label
|
|
|
- })
|
|
|
- })
|
|
|
- } else {
|
|
|
- buildFloorData.data.push({
|
|
|
- Code: item.value,
|
|
|
- Name: item.label
|
|
|
- })
|
|
|
+ data.forEach(build => {
|
|
|
+ floorData.forEach(floor => {
|
|
|
+ if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName) {
|
|
|
+ if (build.children) {
|
|
|
+ build.children.push({
|
|
|
+ value: floor.FloorID,
|
|
|
+ label: floor.FloorLocalName
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ build.children = []
|
|
|
+ build.children.push({
|
|
|
+ value: "",
|
|
|
+ label: "未明确楼层的设备"
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
+ })
|
|
|
+ })
|
|
|
+ data.forEach(item => {
|
|
|
+ if (item.children && item.children.length) {
|
|
|
+ item.children.forEach(child => {
|
|
|
+ buildFloorData.push({
|
|
|
+ Code: item.value + "-" + child.value,
|
|
|
+ Name: item.label + "-" + child.label
|
|
|
+ })
|
|
|
})
|
|
|
+ } else {
|
|
|
+ buildFloorData.push({
|
|
|
+ Code: item.value,
|
|
|
+ Name: item.label
|
|
|
+ })
|
|
|
+ }
|
|
|
})
|
|
|
- })
|
|
|
+ })
|
|
|
+ // buildingQuery(buildParams, res => {
|
|
|
+ // let builData = res.Content
|
|
|
+ // data = builData.map(build => {
|
|
|
+ // return {
|
|
|
+ // value: build.BuildID,
|
|
|
+ // label: build.BuildLocalName
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // data.unshift({
|
|
|
+ // value: "",
|
|
|
+ // label: "未明确建筑的设备"
|
|
|
+ // })
|
|
|
+ // floorQuery(floorParams, res => {
|
|
|
+ // let floorData = res.Content
|
|
|
+ // data.forEach(build => {
|
|
|
+ // floorData.forEach(floor => {
|
|
|
+ // if (build.value == floor.BuildID && floor.FloorID && floor.FloorLocalName) {
|
|
|
+ // if (build.children) {
|
|
|
+ // build.children.push({
|
|
|
+ // value: floor.FloorID,
|
|
|
+ // label: floor.FloorLocalName
|
|
|
+ // })
|
|
|
+ // } else {
|
|
|
+ // build.children = []
|
|
|
+ // build.children.push({
|
|
|
+ // value: "",
|
|
|
+ // label: "未明确楼层的设备"
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // data.forEach(item => {
|
|
|
+ // if (item.children && item.children.length) {
|
|
|
+ // item.children.forEach(child => {
|
|
|
+ // buildFloorData.push({
|
|
|
+ // Code: item.value + "-" + child.value,
|
|
|
+ // Name: item.label + "-" + child.label
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // } else {
|
|
|
+ // buildFloorData.push({
|
|
|
+ // Code: item.value,
|
|
|
+ // Name: item.label
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
-getData()
|
|
|
-
|
|
|
-export default buildFloorData
|
|
|
+export default buildFloor
|