|
@@ -71,7 +71,7 @@
|
|
|
<script>
|
|
|
import {mapGetters} from "vuex";
|
|
|
import tools from "@/utils/scan/tools";
|
|
|
- import {deleteZone, getDataDictionary, queryZone} from '@/api/scan/request';
|
|
|
+ import {deleteZone, getDataDictionary, zoneQuery} from '@/api/scan/request';
|
|
|
|
|
|
import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable';
|
|
|
import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable';
|
|
@@ -195,10 +195,8 @@
|
|
|
},
|
|
|
type: this.params.zone
|
|
|
}, params2 = {
|
|
|
- data: {
|
|
|
- Filters: `RoomID='${this.params.RoomID}'`
|
|
|
- },
|
|
|
- zone: this.params.zone
|
|
|
+ Filters: `RoomID='${this.params.RoomID}'`,
|
|
|
+ ZoneType: this.params.zone
|
|
|
};
|
|
|
let promise1 = new Promise((resolve, reject) => {
|
|
|
getDataDictionary(params1, res => {
|
|
@@ -206,13 +204,14 @@
|
|
|
})
|
|
|
})
|
|
|
let promise2 = new Promise((resolve, reject) => {
|
|
|
- queryZone(params2, res => {
|
|
|
+ zoneQuery(params2, res => {
|
|
|
resolve(res)
|
|
|
})
|
|
|
})
|
|
|
Promise.all([promise1, promise2]).then(values => {
|
|
|
this.pointData = values[0].Content;
|
|
|
this.exampleData = values[1].Content[0];
|
|
|
+ debugger
|
|
|
let obj = this.deepCopy(values[1].Content[0]);
|
|
|
obj = tools.flattenKeys(obj);
|
|
|
this.instance = obj;
|