@@ -107,8 +107,8 @@
diff --git a/src/pages/modules/home/workshop.vue b/src/pages/modules/home/workshop.vue
index e5d0323..96318d4 100644
--- a/src/pages/modules/home/workshop.vue
+++ b/src/pages/modules/home/workshop.vue
@@ -70,7 +70,9 @@ export default {
{type: 'xlw', device_code: 'FJ04CDW01', coords: '539,483,556,506', coord: {x: 539, y: 483}, shape: 'rect'},
{type: 'xlw', device_code: 'FJ04CDW02', coords: '491,487,506,506', coord: {x: 491, y: 487}, shape: 'rect'},
{type: 'xlw', device_code: 'FJ04MDW01', coords: '540,571,553,580', coord: {x: 540, y: 571}, shape: 'rect'},
- {type: 'xlw', device_code: 'FJ04MDW02', coords: '489,570,504,580', coord: {x: 489, y: 570}, shape: 'rect'}
+ {type: 'xlw', device_code: 'FJ04MDW02', coords: '489,570,504,580', coord: {x: 489, y: 570}, shape: 'rect'},
+ {type: 'yao', device_code: '窑', coords: '456,270,881,335', coord: {}, shape: 'rect'},
+ {type: 'rgv', device_code: 'RGV', coords: '726,590,758,614', coord: {}, shape: 'rect'}
],
interTime: this.$store.getters.setTime,
wsTimer: null,
@@ -125,7 +127,8 @@ export default {
this.StackingPositionList = [...res.StackingPositionList]
this.SortingPositionList = [...res.SortingPositionList]
this.SortAndPalletizingList = [...res.SortAndPalletizingList]
- this.allData = [...this.PressMachineList, ...this.StackingPositionList, ...this.SortingPositionList, ...this.SortAndPalletizingList]
+ let arr = [{device_code: '窑'}, {device_code: 'RGV'}]
+ this.allData = [...this.PressMachineList, ...this.StackingPositionList, ...this.SortingPositionList, ...this.SortAndPalletizingList, ...arr]
this.pushArr(this.areaList, this.allData)
},
pushArr (arr1, arr2) {