diff --git a/package-lock.json b/package-lock.json index d3b32cb..0a7cd1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11053,6 +11053,11 @@ "minimist": "^1.2.5" } }, + "moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" + }, "mousetrap": { "version": "1.6.5", "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz", diff --git a/package.json b/package.json index 5b308a2..6cdead5 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "element-ui": "^2.15.7", "js-cookie": "^2.2.1", "lodash": "^4.17.19", + "moment": "^2.29.4", "qs": "^6.9.4", "quill": "^1.3.7", "sass": "^1.26.5", diff --git a/public/index.html b/public/index.html index 8ac36ad..98d46f8 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-08-22 14:57:50 * @LastEditors: zwq - * @LastEditTime: 2023-06-20 16:49:12 + * @LastEditTime: 2023-06-27 15:48:06 * @Description: --> diff --git a/src/filters/basic-filter.js b/src/filters/basic-filter.js index fefc16a..1878894 100644 --- a/src/filters/basic-filter.js +++ b/src/filters/basic-filter.js @@ -7,6 +7,7 @@ * @Description: */ import i18n from "@/i18n"; +import moment from 'moment' const table = { status: { @@ -33,6 +34,14 @@ const table = { } } +export function timeFormatter(timeObj) { + if (timeObj) { + return moment(timeObj).format('YYYY-MM-DD HH:mm:ss') + } else { + return '-' + } +} + export default function(dictTable) { return function(val) { return table?.[dictTable]?.[val] diff --git a/src/i18n/en.js b/src/i18n/en.js index 26a4b50..df4d29c 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -16,24 +16,33 @@ t.add = 'add' t.delete = 'delete' t.edit = 'edit' t.detail = 'detail' +t.change = 'change status' t.deleteBatch = 'deleteBatch' t.update = 'update' t.query = 'query' +t.register = 'register' t.export = 'export' t.handle = 'handle' t.confirm = 'confirm' t.cancel = 'cancel' +t.save = 'save' t.clear = 'clear' t.logout = 'logout' t.manage = 'manage' t.createDate = 'createDate' t.keyword = 'keyword:' t.choose = 'choose' +t.close = 'close' +t.submit = 'submit' +t.billing = 'billing' +t.index = 'index' t.placeholder = {} -t.placeholder.name = 'Please enter name' -t.placeholder.code = 'Please enter code' -t.placeholder.sampleSize = 'Please enter sample size' +t.placeholder.first = "Please enter " +t.placeholder.second = "Please select " +t.placeholder.name = 'Please enter name ' +t.placeholder.code = 'Please enter code ' +t.placeholder.sampleSize = 'Please enter sample size ' t.prompt = {} t.prompt.title = 'Tips' diff --git a/src/i18n/eng/basicData.js b/src/i18n/eng/basicData.js index 6bfab6c..f83a555 100644 --- a/src/i18n/eng/basicData.js +++ b/src/i18n/eng/basicData.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-02-28 14:21:52 * @LastEditors: zwq - * @LastEditTime: 2023-02-28 14:24:19 + * @LastEditTime: 2023-06-27 09:56:26 * @Description: */ @@ -10,18 +10,94 @@ export default { name: 'name', code: 'code', type: 'type', + procedureType: 'procedure type', address: 'address', descs: 'description', status: 'status', site: 'site', machine: 'machine', + machineList: 'machine list', + bindMachine: 'bind machine', + bindMachineList: 'bind machine list', specs: 'specs', drawing: 'drawing', productType: 'product type', inspectionStandard: 'standard', inspectionStage: 'stage', + productName: 'product name', platformGroup: 'site grouping', measureType: 'measure type', sampleSize: 'sample size', createTime: 'create time', + basicInfo: 'basic info', + processFlow: 'process flow', + productFeatures: 'product features', + features: 'features', + featuresInfo: 'features Info', + controlFeatures: 'control features', + back: 'back', + next: 'next', + featuresType: 'features type', + defectLevel: 'defect level', + measureTool: 'measure tool', + analyzeGraphics: 'analyze graphics', + sampleRate: 'sample rate', + sampleQuantity: 'sample quantity', + unit: 'unit', + decimalPlaces: 'decimal places', + controlMatrix: 'control matrix', + propertyList: 'property list', + proDesc: 'This product is not configured with product features or processes, and process control features cannot be assigned temporarily', + history: 'history', + twoTip: 'Select a process and add it to the table', + processName: 'process name', + processCode: 'process code', + tableMode: 'table mode', + graphicsMode: 'graphics mode', + parentType: 'parent type', + toolTip: 'difference parameter', + unitType: 'unit type', + meanControlChart: 'mean control chart', + controlLimitFactor: 'control limit factor', + centerlineFactor: 'centerline factor', + standardDeviationControlChart: 'standard deviation control chart', + rangeControlChart: 'range control chart', + monitoringGraphOne: 'monitoring graph One', + inspectionTime: 'inspection time', + startTime: 'start time', + endTime: 'end time', + inspectionSite: 'inspection site', + inspectionType: 'inspection type', + product: 'product', + procedure: 'procedure', + batch: 'batch', + inspectionNum: 'inspectionNum', + orderNumber: 'order Num', + grouping: 'grouping', + Year: 'Year', + Month: 'Month', + Day: 'Day', + rawData: 'raw data', + configurationAnalysisPlan: 'analysis plan', + noData: 'No Data', + meanValue: 'mean value', + rangeValue: 'range value', + StdDeviation: 'Std. Deviation', + singleValue: 'single value', + movingRangeValue: 'moving range value', + AddSampleGroup: 'Add sample group', + recordQuantity: 'record quantity', + MaxValue: 'Max', + miniValue: 'Mini', + meanValue: 'Mean', + inspectionResults: 'inspection results', + defectValue: 'defect value', + inspectionInfo: 'inspection Info', + billingTime: 'billing time', + groupSample: 'group sample', + poorValue: 'poor value', + classes: 'classes', + producer: 'producer', + inspector: 'inspector', + selectAnalysisPlan: 'select Analysis Plan', } diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 19a41df..58a9039 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -13,22 +13,30 @@ t.add = '新增' t.delete = '删除' t.edit = '编辑' t.detail = '详情' +t.change = '改变状态' t.deleteBatch = '删除' t.update = '修改' t.query = '查询' +t.register = '登记' t.export = '导出' t.handle = '操作' t.confirm = '确定' t.cancel = '取消' +t.save = '保存' t.clear = '清除' t.logout = '退出' t.manage = '处理' t.createDate = '创建时间' t.keyword = '关键字：' t.choose = '请选择' +t.close = '关闭' +t.submit = '提交' +t.billing = '开单' - +t.index = '序号' t.placeholder = {} +t.placeholder.first = "请输入" +t.placeholder.second = "请选择" t.placeholder.name = '请输入名称' t.placeholder.code = '请输入编码' t.placeholder.sampleSize = '请输入样本大小' diff --git a/src/i18n/zh/basicData.js b/src/i18n/zh/basicData.js index 285b1db..4fa1615 100644 --- a/src/i18n/zh/basicData.js +++ b/src/i18n/zh/basicData.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-02-28 14:21:52 * @LastEditors: zwq - * @LastEditTime: 2023-06-21 13:56:25 + * @LastEditTime: 2023-06-27 10:17:20 * @Description: */ @@ -10,18 +10,94 @@ export default { name: '名称', code: '编码', type: '类型', + procedureType: '工序类型', address: '联系地址', descs: '描述', status: '状态', site: '站点', machine: '机台', + machineList: '总机台列表', + bindMachine: '绑定机台', + bindMachineList: '绑定机台列表', specs: '规格', drawing: '图纸', productType: '产品类型', inspectionStandard: '检验标准', inspectionStage: '检验阶段', + productName: '产品名称', platformGroup: '站点分组', measureType: '测量类型', sampleSize: '样本大小', createTime: '添加时间', + basicInfo: '基础信息', + processFlow: '工艺流程', + productFeatures: '产品特性', + features: '特性', + featuresInfo: '特性信息', + controlFeatures: '控制特性', + back: '上一步', + next: '下一步', + featuresType: '特性类型', + defectLevel: '缺陷等级', + measureTool: '量具', + analyzeGraphics: '分析图形', + sampleRate: '抽样频率', + sampleQuantity: '抽样频率', + unit: '单位', + decimalPlaces: '小数位数', + controlMatrix: '控制矩阵', + propertyList: '特性列表', + proDesc: '该产品没有配置产品特性或工序，暂时不能分配过程控制特性', + history: '历史记录', + twoTip: '选择工序,新增到表格', + processName: '工序名称', + processCode: '工序编码', + tableMode: '表格模式', + graphicsMode: '图形模式', + parentType: '父类型', + toolTip: '台差参数', + unitType: '单位分类', + meanControlChart: '均值管制图', + controlLimitFactor: '控制限系数', + centerlineFactor: '中线系数', + standardDeviationControlChart: '标准差管制图', + rangeControlChart: '极差管制图', + monitoringGraphOne: '监控图形一', + inspectionTime: '检验时间', + startTime: '开始日期', + endTime: '结束日期', + inspectionSite: '检验站点', + inspectionType: '检验类型', + product: '产品', + procedure: '工序', + batch: '批次号', + inspectionNum: '检验单号', + orderNumber: '订单号', + grouping: '分组', + Year: '年', + Month: '月', + Day: '日', + rawData: '原始数据', + configurationAnalysisPlan: '配置分析方案', + noData: '无数据', + meanValue: '均值数值', + rangeValue: '极差数值', + StdDeviation: '标准差数值', + singleValue: '单值数值', + movingRangeValue: '移动极差数值', + AddSampleGroup: '添加样本组', + recordQuantity: '记录数量', + MaxValue: '最大值', + miniValue: '最小值', + meanValue: '均值', + inspectionResults: '检验结果', + defectValue: '缺陷数量', + inspectionInfo: '检验信息', + billingTime: '开单时间', + groupSample: '分组样本数', + poorValue: '不良数量', + classes: '班次', + producer: '生产人', + inspector: '检验人', + selectAnalysisPlan: '选择分析判读方案', } diff --git a/src/views/process-inspection/Counting/CGraph.vue b/src/views/process-inspection/Counting/CGraph.vue index 850dc5b..7f9fedf 100644 --- a/src/views/process-inspection/Counting/CGraph.vue +++ b/src/views/process-inspection/Counting/CGraph.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-09-15 10:22:53 * @LastEditors: zwq - * @LastEditTime: 2023-01-09 14:20:16 + * @LastEditTime: 2023-06-27 14:50:51 * @Description: C图 --> diff --git a/src/views/process-inspection/Counting/NPGraph.vue b/src/views/process-inspection/Counting/NPGraph.vue index 4592478..daee590 100644 --- a/src/views/process-inspection/Counting/NPGraph.vue +++ b/src/views/process-inspection/Counting/NPGraph.vue @@ -34,7 +34,7 @@ - + diff --git a/src/views/process-inspection/Counting/PGraph.vue b/src/views/process-inspection/Counting/PGraph.vue index bd8bb74..52223d9 100644 --- a/src/views/process-inspection/Counting/PGraph.vue +++ b/src/views/process-inspection/Counting/PGraph.vue @@ -34,7 +34,7 @@ - + diff --git a/src/views/process-inspection/Counting/UGraph.vue b/src/views/process-inspection/Counting/UGraph.vue index 67a2103..281d18b 100644 --- a/src/views/process-inspection/Counting/UGraph.vue +++ b/src/views/process-inspection/Counting/UGraph.vue @@ -34,7 +34,7 @@ - + diff --git a/src/views/process-inspection/Metrological/XMRGraph.vue b/src/views/process-inspection/Metrological/XMRGraph.vue index 2eaffcc..8bd294a 100644 --- a/src/views/process-inspection/Metrological/XMRGraph.vue +++ b/src/views/process-inspection/Metrological/XMRGraph.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2022-09-15 10:23:42 * @LastEditors: zwq - * @LastEditTime: 2023-01-09 14:26:17 + * @LastEditTime: 2023-06-27 14:57:36 * @Description: 单值-移动极差 控制图 -->