diff --git a/api/agv/agv.js b/api/agv/agv.js new file mode 100644 index 0000000..b031259 --- /dev/null +++ b/api/agv/agv.js @@ -0,0 +1,67 @@ +import request from '@/utils/request' + +/** + * 1.获取工单列表 + * @param {查询条件} query + */ +export function getWorkorderList(query) { + return request({ + url: '/mes/wm/agv/get_workorder_list', + method: 'get', + params: query, + }) +} + +/** + * 2.获取当前工单下的所有AGV小车任务 + * @param query + */ +export function GetTask(query) { + return request({ + url: '/mes/wm/agv/GetTask', + method: 'get', + params: query, + }) +} + +/** + * 3.新增AGV小车任务 + * @param FkWorkorderId 区域编号 + * @param sort: 1, + * @param goStartPoint: '', //上料起点 + * @param goEndPoint: '', //上料终点 + * @param number: 0, //上料数量 + * @param backStartPoint: '', //返程起点 + * @param backEndPoint: '', //返程终点 + */ +export function addTask(data) { + return request({ + url: '/mes/wm/agv/add_task', + method: 'post', + data, + }) +} + +/** + * 3.删除AGV小车任务 + * @param taskId 任务id + */ +export function deleteTask(data) { + return request({ + url: '/mes/wm/agv/deleteTask', + method: 'get', + params: data, + }) +} +/** + * 6 获取agv 起点和终点下拉列表 + * @param Area 区域编号 + * @param Type 类型(0: 起点,1:终点) + */ +export function getAgvPosition(query) { + return request({ + url: '/mes/wm/agv/get_agv_position', + method: 'get', + params: query, + }) +} \ No newline at end of file diff --git a/pages.json b/pages.json index 82d7ed5..6d01e68 100644 --- a/pages.json +++ b/pages.json @@ -106,6 +106,22 @@ "navigationBarTitleText" : "出料", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/agv/agv-order/agv-order", + "style" : + { + "navigationBarTitleText" : "AGV任务", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/agv/agv-order/agv-order-add", + "style" : + { + "navigationBarTitleText" : "创建AGV任务", + "enablePullDownRefresh" : false + } } ] diff --git a/pages/agv/agv-in/agv-in.vue b/pages/agv/agv-in/agv-in.vue index b70ce01..8617bbd 100644 --- a/pages/agv/agv-in/agv-in.vue +++ b/pages/agv/agv-in/agv-in.vue @@ -1,18 +1,21 @@ @@ -67,8 +103,8 @@ .scroll-view-box { width: 94%; margin: 0 auto; - margin-top: 30px; - height: 450px; + margin-top: 5px; + height: 460px; padding: 10px; background-color: rgba(179, 179, 179, 0.7); border-radius: 5px; diff --git a/pages/agv/agv-order/agv-order-add.vue b/pages/agv/agv-order/agv-order-add.vue new file mode 100644 index 0000000..aea8aa4 --- /dev/null +++ b/pages/agv/agv-order/agv-order-add.vue @@ -0,0 +1,286 @@ + + + + + \ No newline at end of file diff --git a/pages/agv/agv-order/agv-order.vue b/pages/agv/agv-order/agv-order.vue new file mode 100644 index 0000000..6c9656c --- /dev/null +++ b/pages/agv/agv-order/agv-order.vue @@ -0,0 +1,221 @@ + + + + + \ No newline at end of file diff --git a/pages/agv/components/createAgvOrder/index.vue b/pages/agv/components/createAgvOrder/index.vue new file mode 100644 index 0000000..02409e3 --- /dev/null +++ b/pages/agv/components/createAgvOrder/index.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/pages/agv/components/dateCheck/index.vue b/pages/agv/components/dateCheck/index.vue index 018961c..143fe0c 100644 --- a/pages/agv/components/dateCheck/index.vue +++ b/pages/agv/components/dateCheck/index.vue @@ -1,24 +1,30 @@ \ No newline at end of file