diff --git a/package.json b/package.json index 5252f77..cbc53c6 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "@vue/test-utils": "1.0.0-beta.29", "autoprefixer": "^9.5.1", "babel-core": "7.0.0-bridge.0", - "babel-eslint": "10.0.1", + "babel-eslint": "8.2.2", "babel-jest": "23.6.0", "chalk": "2.4.2", "chokidar": "2.1.5", diff --git a/src/lang/i18n.js b/src/lang/i18n.js index 554b0ab..f31d83c 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', 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 c4bea1b..5772b01 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -400,6 +400,45 @@ export const constantRoutes = [ 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, 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 @@ + + + + + + E10 + + + OEE + + + MTTR + + + MCBF + + + + + + + {{ 'btn.search' | i18nFilter }} + + + + + + + + + + + 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 @@ + + + + + + E10 + + + OEE + + + MTTR + + + MCBF + + + + + + + {{ 'btn.search' | i18nFilter }} + + + + + + + + + + + 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 @@ + + + + + + E10 + + + OEE + + + MTTR + + + MCBF + + + + + + + {{ 'btn.search' | i18nFilter }} + + + + + + + + + + + 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 @@ + + + + + + E10 + + + OEE + + + MTTR + + + MCBF + + + + + + + {{ 'btn.search' | i18nFilter }} + + + + + + + + + + + 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 @@ + + + + + + 年 + 季度 + 月 + 周 + 天 + + + + + + + +