diff --git a/.env.dev b/.env.dev index 1e9a1f65..962b91c1 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-11-16 14:07:34 + # @LastEditTime: 2023-11-21 10:36:47 # @LastEditors: DY # @Description: ### @@ -19,7 +19,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48082' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' -# VUE_APP_BASE_API = 'http://192.168.1.56:48080' +# VUE_APP_BASE_API = 'http://192.168.1.56:48082' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' # 积木报表指向地址 diff --git a/public/favicon.ico b/public/favicon.ico index e3bdd359..47918ab0 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js index 38085d6a..9933c9b7 100644 --- a/src/api/base/orderManage.js +++ b/src/api/base/orderManage.js @@ -113,6 +113,15 @@ export function orderMonitor(query) { }) } +// 获取订单绑定的工单和数量信息，可传订单id列表，map索引为订单id +export function orderAssignmentList(query) { + return request({ + url: '/base/order/orderAssignmentList', + method: 'get', + params: query + }) +} + // 获得所有客户列表 export function customerList() { return request({ diff --git a/src/api/base/qualityInspectionDet.js b/src/api/base/qualityInspectionDet.js index 7253f7fa..829a9d09 100644 --- a/src/api/base/qualityInspectionDet.js +++ b/src/api/base/qualityInspectionDet.js @@ -1,3 +1,10 @@ +/* + * @Author: zhp + * @Date: 2023-10-17 09:26:38 + * @LastEditTime: 2023-11-20 15:50:08 + * @LastEditors: zhp + * @Description: + */ import request from '@/utils/request' // 创建质量检测信息基础 @@ -52,3 +59,11 @@ export function exportQualityInspectionDetExcel(query) { responseType: 'blob' }) } + +export function getQualityInspectionDetList(query) { + return request({ + url: '/base/quality-inspection-det/listAll', + method: 'get', + params: query + }) +} diff --git a/src/api/equipment/base/inspection/settings.js b/src/api/equipment/base/inspection/settings.js index 4e1fd898..306c092d 100644 --- a/src/api/equipment/base/inspection/settings.js +++ b/src/api/equipment/base/inspection/settings.js @@ -1,7 +1,7 @@ /* * @Author: Do not edit * @Date: 2023-11-08 15:56:52 - * @LastEditTime: 2023-11-13 08:52:12 + * @LastEditTime: 2023-11-20 16:38:18 * @LastEditors: DY * @Description: */ @@ -65,4 +65,12 @@ export function getcheckList(query) { method: 'get', params: query }) +} + +// 删除巡检内容 +export function deleteCheck(id) { + return request({ + url: '/base/equipment-check/delete?id=' + id, + method: 'delete' + }) } \ No newline at end of file diff --git a/src/api/equipment/base/maintain/record.js b/src/api/equipment/base/maintain/record.js index e4385ea6..89f74906 100644 --- a/src/api/equipment/base/maintain/record.js +++ b/src/api/equipment/base/maintain/record.js @@ -1,7 +1,7 @@ /* * @Author: Do not edit * @Date: 2023-11-08 15:56:52 - * @LastEditTime: 2023-11-16 20:22:12 + * @LastEditTime: 2023-11-21 10:50:55 * @LastEditors: DY * @Description: */ @@ -14,3 +14,21 @@ export function deleteEqMaintainLog(id) { method: 'delete' }) } + +// 删除设备保养计划配置 +export function deleteEqMaintainPlan(id) { + return request({ + url: '/base/equipment-maintain-plan/delete?id=' + id, + method: 'delete' + }) +} + +// 导出设备保养监控 +export function exportMaintainMonitorExcel(query) { + return request({ + url: '/base/equipment-maintain-plan/monitor-export', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/equipment/base/spare-parts/list.js b/src/api/equipment/base/spare-parts/list.js new file mode 100644 index 00000000..4408b37b --- /dev/null +++ b/src/api/equipment/base/spare-parts/list.js @@ -0,0 +1,16 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-22 13:59:17 + * @LastEditTime: 2023-11-22 13:59:45 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 删除设备备品备件 +export function deleteSparePart(id) { + return request({ + url: '/base/equipment-spare-part/delete?id=' + id, + method: 'delete' + }) +} \ No newline at end of file diff --git a/src/assets/icons/svg/order-monitoring.svg b/src/assets/icons/svg/order-monitoring.svg new file mode 100644 index 00000000..5960b5b3 --- /dev/null +++ b/src/assets/icons/svg/order-monitoring.svg @@ -0,0 +1,20 @@ + + + 编组 17 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue index ee4d8b81..9a4b5fe2 100644 --- a/src/views/OperationalOverview/AGVBoard.vue +++ b/src/views/OperationalOverview/AGVBoard.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-07-19 15:18:30 * @LastEditors: zhp - * @LastEditTime: 2023-11-15 16:04:06 + * @LastEditTime: 2023-11-22 13:58:30 * @Description: -->