diff --git a/src/config/getData2.js b/src/config/getData2.js index c7cbcb2..5bffab2 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -24,7 +24,7 @@ export const updatePass = (Rfold, Rfnew) => post2('api/pda/updatePass', { export const queryArea = () => post2('api/hand/queryDevice', {}) // export const queryArea = () => { // let res = { -// result: [{region_code: '1', region_name: 'A1', deviceArr: [{device_code: '1', device_name: 'A2', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A3', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A4', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A5', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}]}, {region_code: '2', region_name: 'A6'}, {region_code: '3', region_name: 'A7'}, {region_code: '11', region_name: 'A8'}, {region_code: '12', region_name: 'A9'}, {region_code: '13', region_name: 'A10'}, {region_code: '21', region_name: 'A11'}, {region_code: '22', region_name: 'JLDFJLLJ', deviceArr: [{device_code: '1', device_name: 'A2', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A3', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A4', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}, {device_code: '1', device_name: 'A5', input_material: '1', status: '0'}, {device_code: '2', device_name: 'fffdf', status: '1'}, {device_code: '3', device_name: 'dffsfg', status: '2'}]}] +// result: {regionja: [{region_code: '1', region_name: 'A1', deviceArr: [{device_code: '1', device_name: 'AA1', input_material: '1', status: '0'}, {device_code: '2', device_name: 'AA2', status: '1'}, {device_code: '3', device_name: 'AA3', status: '2'}]}]} // } // return res // } @@ -42,7 +42,7 @@ export const queryPointByArea = (code) => post2('api/hand/queryPointByArea', { export const queryMaterial = () => post2('api/hand/queryMaterial', {}) // 1.4点位状态绑定 export const bindpoint = (code, mtype, type, status) => post2('api/hand/bindpoint', { - device_code: code, + device_codes: code, material_type: mtype, type: type, status: status diff --git a/src/pages/project/CallManage.vue b/src/pages/project/CallManage.vue index be73db3..d38e35c 100644 --- a/src/pages/project/CallManage.vue +++ b/src/pages/project/CallManage.vue @@ -66,7 +66,8 @@ export default { areaArr: [], disabled1: false, scodeArr: [], - scodenameArr: [] + scodenameArr: [], + scodeoArr: [] } }, mounted () { @@ -88,12 +89,21 @@ export default { this.areaArr = [...res.result.regionja] }, setInfo (e) { - this.scodeArr.push(e.device_code) - this.scodenameArr.push(e.device_name) + let arr = this.scodeoArr.filter(el => { return e.device_code === el.device_code }) + if (this.scodeoArr.length === 0) { + this.scodeoArr.push({device_code: e.device_code}) + this.scodeArr.push(e.device_code) + this.scodenameArr.push(e.device_name) + } else if (this.scodeoArr.length > 0 && arr.length === 0) { + this.scodeoArr.push({device_code: e.device_code}) + this.scodeArr.push(e.device_code) + this.scodenameArr.push(e.device_name) + } }, /** 清空点位选择 */ cancle () { this.scodeArr = [] + this.scodeoArr = [] this.scodenameArr = [] this.disabled1 = false }, diff --git a/src/pages/project/Home.vue b/src/pages/project/Home.vue index 76665c2..98fd799 100644 --- a/src/pages/project/Home.vue +++ b/src/pages/project/Home.vue @@ -11,7 +11,7 @@
+