diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue index e54b536..6f7233e 100644 --- a/lms/nladmin-ui/src/views/wms/produceScreen/index.vue +++ b/lms/nladmin-ui/src/views/wms/produceScreen/index.vue @@ -326,9 +326,9 @@ export default { this.buttonName = name if (type === 1) { crudProduceScreen.regionList().then(res => { - this.machineData = [...res] + this.machineData = [...res.content] this.show = true - this.options2 = [...res] + this.options2 = [...res.content] }) } else if (type === 2 && name in this.pointState) { crudProduceScreen.regionOrder(this.pointState[name]).then(res => { diff --git a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js index b4cc2e8..aebc4d8 100644 --- a/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js +++ b/lms/nladmin-ui/src/views/wms/produceScreen/produceScreen.js @@ -8,25 +8,27 @@ export function regionList() { }) } // export function regionList() { -// const res = [ -// { value: '111-02', label: 'TP5000冲床加工' }, -// { value: '111 03', label: '警平' }, -// { value: '111-04', label: '激光切闻' }, -// { value: '111-05', label: '复合机' }, -// { value: '111-06', label: 'Amada 801冲床' }, -// { value: '111-07', label: 'TruBend 7038' }, -// { value: '111-08', label: 'TruBend 5170' }, -// { value: '111 09', label: 'TruBend Cell 7000' }, -// { value: '111-10', label: 'LAG Robot Bending Cell' }, -// { value: '111-12', label: '气保焊' }, -// { value: '111-13', label: '姆柱焊、点焊' }, -// { value: '111-14', label: '林肯焊接机器人' }, -// { value: '111-15', label: '铜冲机' }, -// { value: '111-16', label: '铜弯机' }, -// { value: '111-22', label: '钳床' }, -// { value: '111-23', label: '压铆机' }, -// { value: '111-24', label: '斯图加特焊接机器人' } -// ] +// const res = { +// content: [ +// { value: '111-02', label: 'TP5000冲床加工' }, +// { value: '111 03', label: '警平' }, +// { value: '111-04', label: '激光切闻' }, +// { value: '111-05', label: '复合机' }, +// { value: '111-06', label: 'Amada 801冲床' }, +// { value: '111-07', label: 'TruBend 7038' }, +// { value: '111-08', label: 'TruBend 5170' }, +// { value: '111 09', label: 'TruBend Cell 7000' }, +// { value: '111-10', label: 'LAG Robot Bending Cell' }, +// { value: '111-12', label: '气保焊' }, +// { value: '111-13', label: '姆柱焊、点焊' }, +// { value: '111-14', label: '林肯焊接机器人' }, +// { value: '111-15', label: '铜冲机' }, +// { value: '111-16', label: '铜弯机' }, +// { value: '111-22', label: '钳床' }, +// { value: '111-23', label: '压铆机' }, +// { value: '111-24', label: '斯图加特焊接机器人' } +// ] +// } // return new Promise((resolve, reject) => { // resolve(res) // })