|
@@ -63,7 +63,7 @@
|
|
<script>
|
|
<script>
|
|
import { mapGetters } from "vuex";
|
|
import { mapGetters } from "vuex";
|
|
import tools from "@/utils/scan/tools";
|
|
import tools from "@/utils/scan/tools";
|
|
-import { zoneDelete, zoneQuery, BeatchQueryParam } from '@/api/scan/request';
|
|
|
|
|
|
+import { BeatchQueryParam, zoneDelete, zoneQuery } from '@/api/scan/request';
|
|
import { getDataDictionary } from "@/api/dict";
|
|
import { getDataDictionary } from "@/api/dict";
|
|
|
|
|
|
import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable';
|
|
import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable';
|
|
@@ -246,8 +246,17 @@ export default {
|
|
res.data.length && res.data.map(child => {
|
|
res.data.length && res.data.map(child => {
|
|
this.pointData.map(head => {
|
|
this.pointData.map(head => {
|
|
if (head.code == child.infoCode) {
|
|
if (head.code == child.infoCode) {
|
|
|
|
+ if (head.dataSource) {
|
|
|
|
+ head.dataSource.forEach(i => {
|
|
|
|
+ if (i.code == child.data) {
|
|
|
|
+ this.$set(head, 'data', i.name)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ } else {
|
|
|
|
+ this.$set(head, 'data', child.data)
|
|
|
|
+ }
|
|
this.$set(head, 'svalue', child.infoValue)
|
|
this.$set(head, 'svalue', child.infoValue)
|
|
- this.$set(head, 'data', child.data)
|
|
|
|
|
|
+ // this.$set(head, 'data', child.data)
|
|
this.$set(head, 'receivetime', child.time)
|
|
this.$set(head, 'receivetime', child.time)
|
|
this.$set(head, 'error', child.error)
|
|
this.$set(head, 'error', child.error)
|
|
}
|
|
}
|