diff --git a/src/api/art-manage/art.js b/src/api/art-manage/art.js index 7b7a53d..2db8fae 100644 --- a/src/api/art-manage/art.js +++ b/src/api/art-manage/art.js @@ -94,7 +94,7 @@ export function listAllEquipmentRecipe(data) { // 保存某个工艺下的所有节点 export function addProcessFlows(data) { return request({ - url: 'process/process-flow-equipment/add', + url: '/api/process/process-flow-equipment/add', method: 'post', data }) diff --git a/src/api/basicData/EquipmentScrapGrade.js b/src/api/basicData/EquipmentScrapGrade.js index 5005c61..48d4bb3 100644 --- a/src/api/basicData/EquipmentScrapGrade.js +++ b/src/api/basicData/EquipmentScrapGrade.js @@ -2,14 +2,14 @@ * @Author: zwq * @Date: 2020-12-29 16:00:14 * @LastEditors: zwq - * @LastEditTime: 2021-07-06 11:10:22 + * @LastEditTime: 2022-03-03 13:46:55 * @Description: */ import request from '@/utils/request' export function EquipmentScrapGradeList(data) { // 获取废片等级列表 return request({ - url: '/basic/equipment-scraps-grade/pageForEquipmentGrade', + url: '/api/wms/equipment-scraps-grade/pageForEquipmentGrade', method: 'post', data }) @@ -17,7 +17,7 @@ export function EquipmentScrapGradeList(data) { // 获取废片等级列表 export function EquipmentScrapGradeDetail(id) { // 获取废片等级单条数据 return request({ - url: '/basic/equipment-scraps-grade/get', + url: '/api/wms/equipment-scraps-grade/get', method: 'post', data: { id } }) @@ -25,7 +25,7 @@ export function EquipmentScrapGradeDetail(id) { // 获取废片等级单条数 export function EquipmentScrapGradeUpdate(data) { // 更新废片等级单条数据 return request({ - url: '/basic/equipment-scraps-grade/update', + url: '/api/wms/equipment-scraps-grade/update', method: 'post', data }) @@ -33,7 +33,7 @@ export function EquipmentScrapGradeUpdate(data) { // 更新废片等级单条数 export function EquipmentScrapGradeAdd(data) { // 新增废片等级单条数据 return request({ - url: '/basic/equipment-scraps-grade/add', + url: '/api/wms/equipment-scraps-grade/add', method: 'post', data }) @@ -41,7 +41,7 @@ export function EquipmentScrapGradeAdd(data) { // 新增废片等级单条数据 export function EquipmentScrapGradeDelete(id) { // 删除废片等级单条数据 return request({ - url: '/basic/equipment-scraps-grade/delete', + url: '/api/wms/equipment-scraps-grade/delete', method: 'post', data: { id } }) diff --git a/src/api/basicData/GroupModule/staff.js b/src/api/basicData/GroupModule/staff.js index aeccfd4..979f553 100644 --- a/src/api/basicData/GroupModule/staff.js +++ b/src/api/basicData/GroupModule/staff.js @@ -1,8 +1,8 @@ /* * @Author: zwq * @Date: 2020-12-29 16:00:14 - * @LastEditors: gtz - * @LastEditTime: 2021-04-17 16:04:51 + * @LastEditors: zwq + * @LastEditTime: 2022-03-03 15:10:05 * @Description: */ import request from '@/utils/request' @@ -56,7 +56,7 @@ export function staffDelete(id) { // 删除员工单条数据 export function workerList(data) { // 添加组员列表 return request({ - url: '/basic/team-det/workerList', + url: '/api/wms/team-det/workerList', method: 'post', data }) @@ -64,7 +64,7 @@ export function workerList(data) { // 添加组员列表 export function getRoleList() { return request({ - url: '/basic/platform-dict/selectPlatformDictDataListByPage', + url: '/api/wms/platform-dict/selectPlatformDictDataListByPage', method: 'post', data: { dictTypeId: '1383318968677273601', diff --git a/src/api/basicData/Scrap/ScrapInfo.js b/src/api/basicData/Scrap/ScrapInfo.js index 6942d0b..fb1eb93 100644 --- a/src/api/basicData/Scrap/ScrapInfo.js +++ b/src/api/basicData/Scrap/ScrapInfo.js @@ -2,14 +2,14 @@ * @Author: zwq * @Date: 2020-12-29 16:00:14 * @LastEditors: zwq - * @LastEditTime: 2021-03-10 14:25:18 + * @LastEditTime: 2022-03-03 13:46:40 * @Description: */ import request from '@/utils/request' export function scrapInfoList(data) { // 获取报废信息列表 return request({ - url: '/basic/scrap-information/page', + url: '/api/wms/scrap-information/page', method: 'post', data }) @@ -20,7 +20,7 @@ export function scrapInfoDetail(id) { // 获取报废信息单条数据 'id': id } return request({ - url: '/basic/scrap-information/get', + url: '/api/wms/scrap-information/get', method: 'post', data }) @@ -28,7 +28,7 @@ export function scrapInfoDetail(id) { // 获取报废信息单条数据 export function scrapInfoUpdate(data) { // 更新报废信息单条数据 return request({ - url: '/basic/scrap-information/update', + url: '/api/wms/scrap-information/update', method: 'post', data }) @@ -36,7 +36,7 @@ export function scrapInfoUpdate(data) { // 更新报废信息单条数据 export function scrapInfoAdd(data) { // 新增报废信息单条数据 return request({ - url: '/basic/scrap-information/add', + url: '/api/wms/scrap-information/add', method: 'post', data }) @@ -44,14 +44,14 @@ export function scrapInfoAdd(data) { // 新增报废信息单条数据 export function scrapInfoCode() { // 获取报废信息code return request({ - url: '/basic/scrap-information/get-code', + url: '/api/wms/scrap-information/get-code', method: 'post' }) } export function scrapInfoDelete(id) { // 删除报废信息单条数据 return request({ - url: '/basic/scrap-information/delete', + url: '/api/wms/scrap-information/delete', method: 'post', data: { id } }) diff --git a/src/api/basicData/Scrap/ScrapType.js b/src/api/basicData/Scrap/ScrapType.js index 5a69925..4684208 100644 --- a/src/api/basicData/Scrap/ScrapType.js +++ b/src/api/basicData/Scrap/ScrapType.js @@ -2,14 +2,14 @@ * @Author: zwq * @Date: 2020-12-29 16:00:14 * @LastEditors: zwq - * @LastEditTime: 2021-03-10 14:25:59 + * @LastEditTime: 2022-03-03 13:46:46 * @Description: */ import request from '@/utils/request' export function scrapTypeList(data) { // 获取报废类型列表 return request({ - url: '/basic/scrap-type-information/page', + url: '/api/wms/scrap-type-information/page', method: 'post', data }) @@ -20,7 +20,7 @@ export function scrapTypeDetail(id) { // 获取报废类型单条数据 'id': id } return request({ - url: '/basic/scrap-type-information/get', + url: '/api/wms/scrap-type-information/get', method: 'post', data }) @@ -28,7 +28,7 @@ export function scrapTypeDetail(id) { // 获取报废类型单条数据 export function scrapTypeUpdate(data) { // 更新报废类型单条数据 return request({ - url: '/basic/scrap-type-information/update', + url: '/api/wms/scrap-type-information/update', method: 'post', data }) @@ -36,7 +36,7 @@ export function scrapTypeUpdate(data) { // 更新报废类型单条数据 export function scrapTypeAdd(data) { // 新增报废类型单条数据 return request({ - url: '/basic/scrap-type-information/add', + url: '/api/wms/scrap-type-information/add', method: 'post', data }) @@ -44,14 +44,14 @@ export function scrapTypeAdd(data) { // 新增报废类型单条数据 export function scrapTypeCode() { // 获取报废类型code return request({ - url: '/basic/scrap-type-information/get-code', + url: '/api/wms/scrap-type-information/get-code', method: 'post' }) } export function scrapTypeDelete(id) { // 删除报废类型单条数据 return request({ - url: '/basic/scrap-type-information/delete', + url: '/api/wms/scrap-type-information/delete', method: 'post', data: { id } }) diff --git a/src/api/basicData/StateConfig.js b/src/api/basicData/StateConfig.js index f7208da..6e7980a 100644 --- a/src/api/basicData/StateConfig.js +++ b/src/api/basicData/StateConfig.js @@ -2,14 +2,14 @@ * @Author: zwq * @Date: 2020-12-29 16:00:14 * @LastEditors: zwq - * @LastEditTime: 2021-01-13 16:11:45 + * @LastEditTime: 2022-03-03 16:10:54 * @Description: */ import request from '@/utils/request' export function StateConfigList(data) { // 获取状态列表 return request({ - url: '/basic/configure-display/page', + url: '/api/wms/configure-display/page', method: 'post', data }) diff --git a/src/api/basicData/dataDictionary.js b/src/api/basicData/dataDictionary.js index 99540ee..dc0a5c8 100644 --- a/src/api/basicData/dataDictionary.js +++ b/src/api/basicData/dataDictionary.js @@ -1,15 +1,15 @@ /* * @Author: zwq * @Date: 2020-12-29 16:00:14 - * @LastEditors: Please set LastEditors - * @LastEditTime: 2021-05-19 15:57:56 + * @LastEditors: zwq + * @LastEditTime: 2022-03-03 15:10:16 * @Description: */ import request from '@/utils/request' export function dataDictionaryDataList(data) { // 获取字典类型列表 return request({ - url: '/basic/platform-dict/selectPlatformDictDataListByPage', + url: '/api/wms/platform-dict/selectPlatformDictDataListByPage', method: 'post', data }) @@ -17,7 +17,7 @@ export function dataDictionaryDataList(data) { // 获取字典类型列表 export function dataDictionaryDataDetail(id) { // 获取字典类型单条数据 return request({ - url: '/basic/platform-dict/selectPlatformDictDataById', + url: '/api/wms/platform-dict/selectPlatformDictDataById', method: 'post', data: { id } }) @@ -25,7 +25,7 @@ export function dataDictionaryDataDetail(id) { // 获取字典类型单条数据 export function dataDictionaryDataUpdate(data) { // 更新字典类型单条数据 return request({ - url: '/basic/platform-dict/updatePlatformDictData', + url: '/api/wms/platform-dict/updatePlatformDictData', method: 'post', data }) @@ -33,7 +33,7 @@ export function dataDictionaryDataUpdate(data) { // 更新字典类型单条数 export function dataDictionaryDataAdd(data) { // 新增字典类型单条数据 return request({ - url: '/basic/platform-dict/savePlatformDictData', + url: '/api/wms/platform-dict/savePlatformDictData', method: 'post', data }) @@ -41,7 +41,7 @@ export function dataDictionaryDataAdd(data) { // 新增字典类型单条数据 export function dataDictionaryDataDelete(id) { // 删除字典类型单条数据 return request({ - url: '/basic/platform-dict/deletePlatformDictData', + url: '/api/wms/platform-dict/deletePlatformDictData', method: 'post', data: { id } }) diff --git a/src/api/basicData/dataDictionaryType.js b/src/api/basicData/dataDictionaryType.js index 614c1fc..07c7d07 100644 --- a/src/api/basicData/dataDictionaryType.js +++ b/src/api/basicData/dataDictionaryType.js @@ -2,14 +2,14 @@ * @Author: zwq * @Date: 2020-12-29 16:00:14 * @LastEditors: zwq - * @LastEditTime: 2021-04-16 12:51:29 + * @LastEditTime: 2022-03-03 15:29:30 * @Description: */ import request from '@/utils/request' export function dataDictionaryTypeList(data) { // 获取字典类型列表 return request({ - url: '/basic/platform-dict/selectPlatformDictTypeListByPage', + url: '/api/wms/platform-dict/selectPlatformDictTypeListByPage', method: 'post', data }) @@ -17,7 +17,7 @@ export function dataDictionaryTypeList(data) { // 获取字典类型列表 export function dataDictionaryTypeDetail(id) { // 获取字典类型单条数据 return request({ - url: '/basic/platform-dict/selectDictTypeById', + url: '/api/wms/platform-dict/selectDictTypeById', method: 'post', data: { id } }) @@ -25,7 +25,7 @@ export function dataDictionaryTypeDetail(id) { // 获取字典类型单条数据 export function dataDictionaryTypeUpdate(data) { // 更新字典类型单条数据 return request({ - url: '/basic/platform-dict/updatePlatformDictType', + url: '/api/wms/platform-dict/updatePlatformDictType', method: 'post', data }) @@ -33,7 +33,7 @@ export function dataDictionaryTypeUpdate(data) { // 更新字典类型单条数 export function dataDictionaryTypeAdd(data) { // 新增字典类型单条数据 return request({ - url: '/basic/platform-dict/savePlatformDictType', + url: '/api/wms/platform-dict/savePlatformDictType', method: 'post', data }) @@ -41,7 +41,7 @@ export function dataDictionaryTypeAdd(data) { // 新增字典类型单条数据 export function dataDictionaryTypeDelete(id) { // 删除字典类型单条数据 return request({ - url: '/basic/platform-dict/deletePlatformDictType', + url: '/api/wms/platform-dict/deletePlatformDictType', method: 'post', data: { id } }) diff --git a/src/api/equipment/maintain.js b/src/api/equipment/maintain.js index 30a8a7a..061d865 100644 --- a/src/api/equipment/maintain.js +++ b/src/api/equipment/maintain.js @@ -1,7 +1,7 @@ /* * @Date: 2021-01-15 17:42:07 - * @LastEditors: Please set LastEditors - * @LastEditTime: 2021-07-12 10:31:01 + * @LastEditors: zwq + * @LastEditTime: 2022-03-03 13:52:50 * @FilePath: \basic-admin\src\api\equipment\maintain.js * @Description: 保养计划 & 保养记录 接口定义 */ @@ -109,7 +109,7 @@ export function getMaintainLog(data) { // 获取设备列表 export function getEqList(data) { return request({ - url: '/basic/equipment/page', + url: '/api/wms/equipment/page', method: 'post', data }) diff --git a/src/api/material-manage/material.js b/src/api/material-manage/material.js index 20a6a39..4eff68c 100644 --- a/src/api/material-manage/material.js +++ b/src/api/material-manage/material.js @@ -1,15 +1,22 @@ +/* + * @Author: zwq + * @Date: 2021-09-18 16:09:07 + * @LastEditors: zwq + * @LastEditTime: 2022-03-03 09:52:41 + * @Description: + */ import request from '@/utils/request' export function list(data) { return request({ - url: 'material/material-date/materialList', + url: 'api/process/process-flow-equipment/equipmentList', method: 'post', data }) } export function listEquipment(data) { return request({ - url: 'material/equipment-material-replace/equipmentList', + url: 'api/process/process-flow-equipment/equipmentList', method: 'post', data }) diff --git a/src/api/orderManage/workOrder/workOrder.js b/src/api/orderManage/workOrder/workOrder.js index 340a188..23a91d3 100644 --- a/src/api/orderManage/workOrder/workOrder.js +++ b/src/api/orderManage/workOrder/workOrder.js @@ -1,15 +1,15 @@ /* * @Author: zwq * @Date: 2020-12-29 16:00:14 - * @LastEditors: Please set LastEditors - * @LastEditTime: 2021-07-20 10:30:39 + * @LastEditors: zwq + * @LastEditTime: 2022-03-03 13:57:00 * @Description: */ import request from '@/utils/request' export function workOrderList(data) { // 获取工单列表 return request({ - url: '/order/work-order/page', + url: '/api/order/work-order/page', method: 'post', data }) @@ -20,7 +20,7 @@ export function workOrderDetail(id) { // 获取工单单条数据 'id': id } return request({ - url: '/order/work-order/get', + url: '/api/order/work-order/get', method: 'post', data }) @@ -28,7 +28,7 @@ export function workOrderDetail(id) { // 获取工单单条数据 export function workOrderUpdate(data) { // 更新工单单条数据 return request({ - url: '/order/work-order/update', + url: '/api/order/work-order/update', method: 'post', data }) @@ -36,7 +36,7 @@ export function workOrderUpdate(data) { // 更新工单单条数据 export function workOrderAdd(data) { // 新增工单单条数据 return request({ - url: '/order/work-order/add', + url: '/api/order/work-order/add', method: 'post', data }) @@ -44,14 +44,14 @@ export function workOrderAdd(data) { // 新增工单单条数据 export function workOrderCode() { // 获取工单code return request({ - url: '/order/work-order/get-code', + url: '/api/order/work-order/get-code', method: 'post' }) } export function workOrderDelete(id) { // 删除工单单条数据 return request({ - url: '/order/work-order/delete', + url: '/api/order/work-order/delete', method: 'post', data: { id } }) @@ -59,7 +59,7 @@ export function workOrderDelete(id) { // 删除工单单条数据 export function workOrderIssueList(data) { // 获取工单下发列表 return request({ - url: '/order/wo-sync/page', + url: '/api/order/wo-sync/page', method: 'post', data }) @@ -67,7 +67,7 @@ export function workOrderIssueList(data) { // 获取工单下发列表 export function packagingBoxList(data) { // 获取包装基板列表 return request({ - url: '/order/wo-packaging-box-substrate/page', + url: '/api/order/wo-packaging-box-substrate/page', method: 'post', data }) @@ -75,7 +75,7 @@ export function packagingBoxList(data) { // 获取包装基板列表 export function packagingList(data) { // 获取包装标签列表 return request({ - url: '/order/wo-packaging-box/page', + url: '/api/order/wo-packaging-box/page', method: 'post', data }) @@ -86,7 +86,7 @@ export function packagingDetail(id) { // 获取包装标签详情 'id': id } return request({ - url: '/order/wo-packaging-box/get', + url: '/api/order/wo-packaging-box/get', method: 'post', data }) @@ -94,7 +94,7 @@ export function packagingDetail(id) { // 获取包装标签详情 export function syncAdd(data) { // 新增下发工单单条数据 return request({ - url: '/order/wo-sync/add', + url: '/api/order/wo-sync/add', method: 'post', data }) @@ -102,7 +102,7 @@ export function syncAdd(data) { // 新增下发工单单条数据 export function packagingInventoryList(data) { // 获取包装清单列表 return request({ - url: '/order/wo-packaging-box/page-for-inventory', + url: '/api/order/wo-packaging-box/page-for-inventory', method: 'post', data }) @@ -110,7 +110,7 @@ export function packagingInventoryList(data) { // 获取包装清单列表 export function updateForStatus(data) { // 激活 return request({ - url: '/order/work-order/updateForStatus', + url: '/api/order/work-order/updateForStatus', method: 'post', data }) diff --git a/src/api/quality-manage/scrap.js b/src/api/quality-manage/scrap.js index 95becf4..b7d0349 100644 --- a/src/api/quality-manage/scrap.js +++ b/src/api/quality-manage/scrap.js @@ -1,7 +1,7 @@ /* * @Date: 2021-03-15 10:27:40 - * @LastEditors: Please set LastEditors - * @LastEditTime: 2021-07-09 14:35:26 + * @LastEditors: zwq + * @LastEditTime: 2022-03-03 15:40:29 * @FilePath: \basic-admin\src\api\quality-manage\scrap.js * @Description: */ @@ -9,7 +9,7 @@ import request from '@/utils/request' export function getScrapList(data) { return request({ - url: '/quality/scrap/page', + url: '/api/wms/scrap/page', method: 'post', data }) @@ -17,7 +17,7 @@ export function getScrapList(data) { export function delScrapInfo(data) { return request({ - url: '/quality/scrap/delete', + url: '/api/wms/scrap/delete', method: 'post', data }) @@ -25,7 +25,7 @@ export function delScrapInfo(data) { export function editScrapInfo(data) { return request({ - url: '/quality/scrap/update', + url: '/api/wms/scrap/update', method: 'post', data }) @@ -33,14 +33,14 @@ export function editScrapInfo(data) { export function addScrapInfo(data) { return request({ - url: '/quality/scrap/create', + url: '/api/wms/scrap/create', method: 'post', data }) } export function getScrapInfo(data) { return request({ - url: '/quality/scrap/findById', + url: '/api/wms/scrap/findById', method: 'post', data }) @@ -49,7 +49,7 @@ export function getScrapInfo(data) { // 废品报废 原因 export function getscrapReason(data) { return request({ - url: '/basic/scrap-information/get', + url: '/api/wms/scrap-information/get', method: 'post', data }) @@ -58,7 +58,7 @@ export function getscrapReason(data) { // 根据设备id查询肺片等级 export function getScrap(id) { return request({ - url: '/basic/equipment-scraps-grade/getScrapsGradeByEquipmentId', + url: '/api/wms/equipment-scraps-grade/getScrapsGradeByEquipmentId', method: 'post', data: { id } }) diff --git a/src/api/quality-manage/scrapCategoryStatistics.js b/src/api/quality-manage/scrapCategoryStatistics.js index 1cc78f4..6e7728f 100644 --- a/src/api/quality-manage/scrapCategoryStatistics.js +++ b/src/api/quality-manage/scrapCategoryStatistics.js @@ -1,7 +1,7 @@ /* * @Date: 2021-03-15 10:27:40 - * @LastEditors: Please set LastEditors - * @LastEditTime: 2021-07-09 14:35:26 + * @LastEditors: zwq + * @LastEditTime: 2022-03-03 15:40:35 * @FilePath: \basic-admin\src\api\quality-manage\scrap.js * @Description: */ @@ -9,7 +9,7 @@ import request from '@/utils/request' export function getList(data) { return request({ - url: '/quality/scrap/findReportByEquipmentId', + url: '/api/wms/scrap/findReportByEquipmentId', method: 'post', data }) @@ -18,7 +18,7 @@ export function getList(data) { // 废品报废 原因 export function getscrapReason(data) { return request({ - url: '/basic/scrap-information/get', + url: '/api/wms/scrap-information/get', method: 'post', data }) diff --git a/src/lang/i18n.js b/src/lang/i18n.js index 7a304d3..f3416b2 100644 --- a/src/lang/i18n.js +++ b/src/lang/i18n.js @@ -280,6 +280,10 @@ export default { equipment: { zh: '设备管理', en: 'Equipment Manager', + EquipmentUtilizationRate: { + zh: '设备稼动率', + en: 'EQ OEE' + }, EquipmentVisualization: { zh: '设备可视化', en: 'Equipment Visualization', @@ -972,6 +976,18 @@ export default { zh: '质量检测计划', en: 'Quality Detect Plan' }, + scrapManagement: { + zh: '废片管理', + en: 'Scrap management', + gradeInfo: { + zh: '等级信息', + en: 'Grade Info' + }, + scrapInfo: { + zh: '废片信息', + en: 'Scrap Info' + } + }, knowledge: { zh: '维护保养知识库', en: 'Maintain the knowledge base' diff --git a/src/lang/i18n/en/module/equipmentManager.js b/src/lang/i18n/en/module/equipmentManager.js index 1534c49..0426ea1 100644 --- a/src/lang/i18n/en/module/equipmentManager.js +++ b/src/lang/i18n/en/module/equipmentManager.js @@ -1,7 +1,7 @@ /* * @Date: 2021-03-05 10:04:30 - * @LastEditors: Please set LastEditors - * @LastEditTime: 2021-07-23 09:13:56 + * @LastEditors: DY + * @LastEditTime: 2022-03-03 16:31:23 * @FilePath: \basic-admin\src\lang\i18n\en\module\equipmentManager.js * @Description: */ @@ -19,6 +19,68 @@ export default { Water: 'Water', Gas: 'Gas' }, + monitoringInfo: { + allCycles: 'Total cycle Times', + badTimes: 'Failure Times', + time: 'Time', + MCBF: 'MCBF', + previousStatus: 'State Before', + runTime: 'UpTime (hours)', + produceTime: 'Production time (hours)', + productiveCount: 'Actual Capacity', + timeRate: 'Time Start Rate', + performanceRate: 'Performance Start Rate', + oee: 'OEE', + E10StartTime: 'E10 StartTime', + E10endTime: 'E10 EndTime', + laterE10Status: 'Changed E10 State', + duration: 'Duration', + goodsNumbers: 'OK Quantity', + noOkNumbers: 'NOK Quantity', + onceOkCount: 'OK Quantity Of Fist Process ', + reworkOkCount: 'OK Quantity Of Rework ', + GetTimePeriod: 'Time Period', + ProductionTimePeriod: 'Production Time Period', + MaintenanceTimes: 'Maintenance Times', + RunningTime: 'Running Time', + E10status: 'E10 State', + number: 'Quantity Produced Of Current day', + yieId: 'Daily yield', + bom: 'Daily Consumption Of Materials,', + controlState: 'Control State', + equipmentName: 'EQ Name', + e10Code: 'E10 State', + materialName: 'MaterialName', + port: 'Loading Port', + productCount: 'Product Quantity', + spec: 'Spec', + materialNo: 'MaterialNo', + upTime: 'Loading Time', + upCount: 'Loading Amount', + useCount: 'Used Amount', + unit: 'Unit', + eventName: 'EventName', + paramName: 'ParamName', + paramValue: 'ParamValue', + standardFormat: 'StandardFormat', + paramFormat: 'ParamFormat', + receiveTime: 'ReceivedTime', + recipe: 'EQ Recipe', + controlStatus: 'Control State', + traceDataState: 'Trace Data OpenState', + controlStateUpdateTime: 'Control State UpdateTime', + e10UpdateTime: 'E10 Update Time', + StateFlg: 'StateFlag', + EnableSpooling: 'EnableSpooling', + maxspooltransmit: 'MaxSpoolTransmit', + spoolingstate: 'SpoolingState', + spoolingcountactual: 'SpoolingCountActual', + SpoolingCountTotal: 'SpoolingCountTotal', + F1F3Succ: 'F1F3 Request Success', + F2F13Succ: 'F2F13 Request Success', + baseChart: 'Processed Substrates Quantity', + monitorChart: 'EQ Running Time' + }, sparepart: { 'sparepart': 'Sparepart', 'code': 'Sparepart number', diff --git a/src/lang/i18n/zh/module/equipmentManager.js b/src/lang/i18n/zh/module/equipmentManager.js index 0b207b2..c3469ae 100644 --- a/src/lang/i18n/zh/module/equipmentManager.js +++ b/src/lang/i18n/zh/module/equipmentManager.js @@ -1,7 +1,7 @@ /* * @Date: 2021-03-05 10:04:37 - * @LastEditors: Please set LastEditors - * @LastEditTime: 2021-07-23 09:13:20 + * @LastEditors: DY + * @LastEditTime: 2022-03-03 16:31:16 * @FilePath: \basic-admin\src\lang\i18n\zh\module\equipmentManager.js * @Description: */ @@ -19,6 +19,68 @@ export default { 'Water': '水', 'Gas': '气' }, + monitoringInfo: { + allCycles: '总循环次数', + badTimes: '故障次数', + time: '时间', + MCBF: 'MCBF', + previousStatus: '转换前状态', + runTime: '开机时长(时)', + produceTime: '生产时长(时)', + productiveCount: '实际产能', + timeRate: '时间开动率', + performanceRate: '性能开动率', + oee: '综合效率OEE', + E10StartTime: 'E10开始时间', + E10endTime: 'E10结束时间', + laterE10Status: '变化后E10状态', + duration: '持续时间', + goodsNumbers: '良品数量', + noOkNumbers: '不良品数量', + onceOkCount: '一次加工良品数量', + reworkOkCount: '重工良品数量', + GetTimePeriod: '获取时间段', + ProductionTimePeriod: '生产时间段', + MaintenanceTimes: '维护次数', + RunningTime: '运行时长', + E10status: 'E10状态', + number: '当日生产的数量', + yieId: '当日良率', + bom: '当日消耗物料', + controlState: '控制状态', + equipmentName: '设备名称', + e10Code: 'E10状态名称', + port: '上料位置', + recipe: '设备配方', + materialName: '物料名称', + productCount: '加工数量', + spec: '物料规格', + materialNo: '物料批次号', + upTime: '上料时间', + upCount: '上料数量', + useCount: '使用数量', + unit: '单位', + eventName: '事件名称', + paramName: '参数名称', + receiveTime: '获取参数时间', + paramValue: '获取参数值', + standardFormat: '标准参数模式', + paramFormat: '获取参数格式', + controlStatus: '设备控制状态', + traceDataState: 'Trace Data 开启状态', + controlStateUpdateTime: '控制状态更新时间', + e10UpdateTime: 'E10更新时间', + StateFlg: 'StateFlg', + EnableSpooling: 'EnableSpooling', + maxspooltransmit: 'maxspooltransmit', + spoolingstate: 'spoolingstate', + spoolingcountactual: 'spoolingcountactual', + SpoolingCountTotal: 'SpoolingCountTotal', + F1F3Succ: 'F1F3请求成功', + F2F13Succ: 'F2F13请求成功', + baseChart: '设备加工基板数量', + monitorChart: '设备运行时长' + }, sparepart: { 'sparepart': '备品备件', 'code': '备件编号', diff --git a/src/router/index.js b/src/router/index.js index e4110eb..51753db 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -208,6 +208,24 @@ export const constantRoutes = [ meta: { title: routerTitle.basicData.materials.materialType?.[language] || routerTitle.basicData.materials.materialType.en, icon: 'form', affix: true, required: true, requireToken: true } } ] + }, + { + path: '/dataDictionary', + component: () => import('@/views/basicData/index'), + name: 'dataDictionary', + meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true }, + children: [{ + path: 'dataDictionary', + component: () => import('@/views/basicData/dataDictionary'), + name: 'dataDictionary', + meta: { title: routerTitle.basicData.dataDictionaryType?.[language] || routerTitle.basicData.dataDictionaryType.en, icon: 'form', affix: true, required: true, requireToken: true } + }, { + path: 'dataDictionaryData', + component: () => import('@/views/basicData/components/dataDictionaryData'), + hidden: true, + name: 'dataDictionaryData', + meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true } + }] } ] }, @@ -361,104 +379,131 @@ export const constantRoutes = [ component: Layout, redirect: '/quality', name: 'qualityManage', - hidden: true, meta: { title: routerTitle.quality?.[language] || routerTitle.quality.en, icon: 'form', iconPart: 'qualityManage', affix: true, required: true, requireToken: true }, children: [ - { - path: 'scrap', - component: () => import('@/views/QualityManager/scrap'), - name: 'scrapManage', - meta: { title: routerTitle.quality.scrap?.[language] || routerTitle.quality.scrap.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true } - }, - { - path: 'scrapcategorystatistics', - component: () => import('@/views/QualityManager/scrap/scrapCategoryStatistics'), - name: 'scrapCategoryStatistics', - meta: { title: routerTitle.quality.scrapcategorystatistics?.[language] || routerTitle.quality.scrapcategorystatistics.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true } - }, { path: 'plan', - component: () => import('@/views/QualityManager/plan'), + component: () => import('@/views/QualityManager/QCPplan'), name: 'PlanManage', meta: { title: routerTitle.quality.plan?.[language] || routerTitle.quality.plan.en, icon: 'form', affix: true } - }, { - path: 'planparam', - component: () => import('@/views/QualityManager/plan/subpage/detail'), - name: 'PlanParamManage', - hidden: true, - meta: { title: routerTitle.quality.planform?.[language] || routerTitle.quality.planform.en, icon: 'form', affix: true } - }, { - path: 'issue', - component: () => import('@/views/QualityManager/plan/issuedplan'), - name: 'PlanIssuedManage', - meta: { title: routerTitle.quality.issuedplan?.[language] || routerTitle.quality.issuedplan.en, icon: 'form', affix: true } }, { path: '/offlineDetec', component: () => import('@/views/basicData/index'), name: 'offlineDetec', - meta: { title: routerTitle.quality.offlineDetec?.[language] || routerTitle.quality.offlineDetec.en, icon: 'form', affix: true, required: true, requireToken: true }, + meta: { title: routerTitle.quality.scrapManagement?.[language] || routerTitle.quality.scrapManagement.en, icon: 'form', affix: true, required: true, requireToken: true }, children: [ { - path: 'detecParam', - component: () => - import('@/views/QualityManager/offlineDetec/detecParam'), - name: 'detecParam', - hidden: true, - meta: { title: routerTitle.quality.offlineDetec.detecParam?.[language] || routerTitle.quality.offlineDetec.detecParam.detecParam.en, icon: 'form', affix: true, required: true, requireToken: true } + path: 'ScrapInfo', + component: () => import('@/views/basicData/Scrap/ScrapInfo'), + name: 'ScrapInfo', + meta: { title: routerTitle.basicData.scrap.scrapInfo?.[language] || routerTitle.basicData.scrap.scrapInfo.en, icon: 'form', affix: true, required: true, requireToken: true } }, { - path: 'detecParamAdd', - component: () => - import('@/views/QualityManager/offlineDetec/components/detecParam-add'), - name: 'detecParamAdd', - hidden: true, - meta: { title: routerTitle.quality.offlineDetec.detecParam?.[language] || routerTitle.quality.offlineDetec.detecParam.detecParam.en, icon: 'form', affix: true, required: true, requireToken: true } + path: 'ScrapType', + component: () => import('@/views/basicData/Scrap/ScrapType'), + name: 'ScrapType', + meta: { title: routerTitle.basicData.scrap.scrapType?.[language] || routerTitle.basicData.scrap.scrapType.en, icon: 'form', affix: true, required: true, requireToken: true } }, { - path: 'equipmentDetectParam', - component: () => - import('@/views/basicData/Equipment/equipmentDetectParam'), - name: 'equipmentDetectParam', - hidden: true, - meta: { title: routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam?.[language] || routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam.en, icon: 'form', affix: true, required: true, requireToken: true } + path: 'EquipmentScrapGrade', + component: () => import('@/views/basicData/EquipmentScrapGrade'), + name: 'EquipmentScrapGrade', + meta: { title: routerTitle.basicData.EquipmentScrapGrade?.[language] || routerTitle.basicData.EquipmentScrapGrade.en, icon: 'form', affix: true, required: true, requireToken: true } }, { - path: 'equipmentDetectParamAdd', - component: () => - import('@/views/basicData/Equipment/components/equipmentDetectParam-add'), - name: 'equipmentDetectParamAdd', - meta: { title: routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam?.[language] || routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam.en, icon: 'form', affix: true, required: true, requireToken: true } - }, - { - path: 'detecRegistration', - component: () => - import('@/views/QualityManager/offlineDetec/detecRegistration'), - name: 'detecRegistration', - meta: { title: routerTitle.quality.offlineDetec.detecRegistration?.[language] || routerTitle.quality.offlineDetec.detecRegistration.en, icon: 'form', affix: true, required: true, requireToken: true } + path: 'scrap', + component: () => import('@/views/QualityManager/scrap'), + name: 'scrapManage', + meta: { title: routerTitle.quality.scrap?.[language] || routerTitle.quality.scrap.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true } } ] - }, - { - path: '/spc', - component: () => import('@/views/spc/index'), - name: 'spcManage', - meta: { title: routerTitle.spc?.[language] || routerTitle.spc.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, openUrl: 'http://58.210.206.230:8000/thirdLogin?username=ZJCadmin&password=123456' } - }, - { - path: 'knowledge', - component: () => import('@/views/QualityManager/base/knowledge'), - name: 'knowledge', - meta: { title: routerTitle.quality.knowledge?.[language] || routerTitle.quality.knowledge.en, icon: 'form', iconPart: 'formwhite', affix: true } } ] }, + { + path: '/form', + component: Layout, + redirect: '/form', + name: 'formManage', + meta: { title: routerTitle.form?.[language] || routerTitle.form.en, icon: 'form', iconPart: 'formManage', affix: true, required: true, requireToken: true, unuse: false }, + children: [{ + path: 'report', + component: () => import('@/views/report-manage/ReportSortChoise'), + name: 'Report', + meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true } + }, + { + path: 'report-sort-list', + component: () => import('@/views/report-manage/Report'), + name: 'ReportSortList', + hidden: true, + meta: { title: routerTitle.form.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true } + }, + { + path: 'report-view', + component: () => import('@/views/report-manage/ReportView'), + name: 'ReportDesign', + meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true }, + hidden: true + }, + { + path: 'report-design', + component: () => import('@/views/report-manage/ReportDesign'), + name: 'ReportDesign', + meta: { title: routerTitle.form.reportDesign?.[language] || routerTitle.form.reportDesign.en, icon: 'form', affix: true, required: true, requireToken: true } + }, + { + path: 'report-sort', + component: () => import('@/views/report-manage/ReportSort/index'), + name: 'ReportSort', + meta: { title: routerTitle.form.reportSort?.[language] || routerTitle.form.reportSort.en, icon: 'form', affix: true, required: true, requireToken: true } + }] + }, + { + path: '/equipment', + component: Layout, + redirect: '/equipment', + name: 'equipmentManage', + meta: { title: routerTitle.equipment?.[language] || routerTitle.equipment.en, icon: 'form', iconPart: 'equipmentManage', affix: true, required: true, requireToken: true, unuse: false }, + children: [{ + path: 'equipmentUtilizationRate', + component: () => import('@/views/basicData/index'), + name: 'EquipmentUtilizationRate', + meta: { title: routerTitle.equipment.EquipmentUtilizationRate?.[language] || routerTitle.equipment.EquipmentUtilizationRate.en, icon: 'form', affix: true, required: true, requireToken: true }, + children: [ + { + path: 'e10', + component: () => import('@/views/EquipmentManager/equipmentUtilizationRate/E10'), + name: 'E10', + meta: { title: 'E10' } + }, + { + path: 'oee', + component: () => import('@/views/EquipmentManager/equipmentUtilizationRate/OEE'), + name: 'OEE', + meta: { title: 'OEE' } + }, + { + path: 'mttr', + component: () => import('@/views/EquipmentManager/equipmentUtilizationRate/MTTR'), + name: 'MTTR', + meta: { title: 'MTTR' } + }, + { + path: 'mcbf', + component: () => import('@/views/EquipmentManager/equipmentUtilizationRate/MCBF'), + name: 'MCBF', + meta: { title: 'MCBF' } + } + ] + }] + }, { path: '/basic', component: Layout, redirect: '/user/manager', name: 'ArticleManager', - hidden: true, meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true }, children: [ { diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/E10.vue b/src/views/EquipmentManager/equipmentUtilizationRate/E10.vue new file mode 100644 index 0000000..5130638 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/E10.vue @@ -0,0 +1,152 @@ + + + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue b/src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue new file mode 100644 index 0000000..8686c54 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue @@ -0,0 +1,151 @@ + + + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue b/src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue new file mode 100644 index 0000000..1efd9d3 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue @@ -0,0 +1,151 @@ + + + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue b/src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue new file mode 100644 index 0000000..268d40c --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue @@ -0,0 +1,151 @@ + + + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/E10Table.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/E10Table.vue new file mode 100644 index 0000000..b74fabe --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/E10Table.vue @@ -0,0 +1,134 @@ + + + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/McbfTable.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/McbfTable.vue new file mode 100644 index 0000000..a947d20 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/McbfTable.vue @@ -0,0 +1,94 @@ + + + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/MttrTable.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/MttrTable.vue new file mode 100644 index 0000000..62af13a --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/MttrTable.vue @@ -0,0 +1,132 @@ + + + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/OeeTable.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/OeeTable.vue new file mode 100644 index 0000000..b9797c8 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/OeeTable.vue @@ -0,0 +1,100 @@ + + + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/e10-chart.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/e10-chart.vue new file mode 100644 index 0000000..a7b9caf --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/e10-chart.vue @@ -0,0 +1,212 @@ + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/e10Detail-chart.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/e10Detail-chart.vue new file mode 100644 index 0000000..a9bd22c --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/e10Detail-chart.vue @@ -0,0 +1,253 @@ + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/mcbf-chart.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/mcbf-chart.vue new file mode 100644 index 0000000..39eb57c --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/mcbf-chart.vue @@ -0,0 +1,137 @@ + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/mcbfDetail-chart.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/mcbfDetail-chart.vue new file mode 100644 index 0000000..fd40e67 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/mcbfDetail-chart.vue @@ -0,0 +1,185 @@ + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/mttr-chart.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/mttr-chart.vue new file mode 100644 index 0000000..9ed5638 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/mttr-chart.vue @@ -0,0 +1,133 @@ + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/mttrDetail-chart.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/mttrDetail-chart.vue new file mode 100644 index 0000000..07a7532 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/mttrDetail-chart.vue @@ -0,0 +1,165 @@ + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/oee-chart.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/oee-chart.vue new file mode 100644 index 0000000..625e5e7 --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/oee-chart.vue @@ -0,0 +1,137 @@ + + + + diff --git a/src/views/EquipmentManager/equipmentUtilizationRate/components/oeeDetail-chart.vue b/src/views/EquipmentManager/equipmentUtilizationRate/components/oeeDetail-chart.vue new file mode 100644 index 0000000..84bac2c --- /dev/null +++ b/src/views/EquipmentManager/equipmentUtilizationRate/components/oeeDetail-chart.vue @@ -0,0 +1,258 @@ + + + + diff --git a/src/views/QualityManager/QCPplan.vue b/src/views/QualityManager/QCPplan.vue new file mode 100644 index 0000000..6ff30ee --- /dev/null +++ b/src/views/QualityManager/QCPplan.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/art/process/process-chart.vue b/src/views/art/process/process-chart.vue index 770e0b3..d6d8d8a 100644 --- a/src/views/art/process/process-chart.vue +++ b/src/views/art/process/process-chart.vue @@ -13,11 +13,11 @@ {{ i.equipmentId ? equipmentObj[i.equipmentId] : $t('module.art.eqName') }} - +