diff --git a/src/config/mork.js b/src/config/mork.js index fadd3e4..b1fd62f 100644 --- a/src/config/mork.js +++ b/src/config/mork.js @@ -1,17 +1,11 @@ // 1.1查询所有设备 export const queryAllPoints = () => { - let res = { - data: [{device_code: '10001', device_name: '车号1'}], - message: 'ok' - } + let res = [{device_code: '10001', device_name: '车号1'}] return res } // 1.2查询物料类型 export const queryMaterials = () => { - let res = { - data: [{value: '1', label: '类型一'}], - message: 'ok' - } + let res = [{value: '1', label: '类型一'}] return res } // 1.3 确认下料 @@ -30,10 +24,7 @@ export const putAction = (code, option) => { } // 1.5 查询所有就绪或者执行中任务id export const queryTaskIds = () => { - let res = { - data: [{task_id: '1'}], - message: 'ok' - } + let res = [{task_id: '1'}] return res } // 1.6 取消操作 @@ -52,10 +43,7 @@ export const forceFinish = (id) => { } // 1.8查询所有区域 export const queryAreas = () => { - let res = { - data: [{region_code: '1', region_name: 'A区', is_charge: '0', has_agv: '0'}, {region_code: '2', region_name: 'B区', is_charge: '0', has_agv: '0'}, {region_code: '3', region_name: 'C区', is_charge: '0', has_agv: '0'}, {region_code: '4', region_name: 'D区', is_charge: '0', has_agv: '0'}, {region_code: '5', region_name: 'E区', is_charge: '0', has_agv: '0'}], - message: 'ok' - } + let res = [{region_code: '1', region_name: 'A区', is_charge: '0', has_agv: '0'}, {region_code: '2', region_name: 'B区', is_charge: '0', has_agv: '0'}, {region_code: '3', region_name: 'C区', is_charge: '0', has_agv: '0'}, {region_code: '4', region_name: 'D区', is_charge: '0', has_agv: '0'}, {region_code: '5', region_name: 'E区', is_charge: '0', has_agv: '0'}] return res } // 1.9 通道释放/通道管控 diff --git a/src/images/agv_b.png b/src/images/agv_b.png new file mode 100644 index 0000000..1614cd5 Binary files /dev/null and b/src/images/agv_b.png differ diff --git a/src/images/agv_l.png b/src/images/agv_l.png new file mode 100644 index 0000000..c392624 Binary files /dev/null and b/src/images/agv_l.png differ diff --git a/src/images/agv_r.png b/src/images/agv_r.png new file mode 100644 index 0000000..7598182 Binary files /dev/null and b/src/images/agv_r.png differ diff --git a/src/pages/index.vue b/src/pages/index.vue index ff3db62..1880584 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -174,10 +174,10 @@ export default { } }, mounted () { - // this._queryAllPoints() - // this._queryMaterials() - // this._queryAreas() - // this._queryTaskIds() + this._queryAllPoints() + this._queryMaterials() + this._queryAreas() + this._queryTaskIds() }, methods: { back () { @@ -197,19 +197,19 @@ export default { }, async _queryAllPoints () { let res = await queryAllPoints() - this.options1 = [...res.data] + this.options1 = [...res] }, async _queryMaterials () { let res = await queryMaterials() - this.options2 = [...res.data] + this.options2 = [...res] }, async _queryAreas () { let res = await queryAreas() - this.options3 = [...res.data] + this.options3 = [...res] }, async _queryTaskIds () { let res = await queryTaskIds() - this.options4 = [...res.data] + this.options4 = [...res] }, async _callTask () { this.disabled1 = true