Merge remote-tracking branch 'origin/master'

src/locales/en-US.js

@@ -20,6 +20,12 @@ export default {
     work: 'Manage',
     mine: 'Mine'
   },
+  work:{
+    mold: '模具',
+    equipmentMaintenance: 'Equipment Maintenance',
+    keypart: '关键件',
+    spare: '备件',
+  },
   nav: {
     home: 'Home',
     mine: 'Profile',
@@ -515,7 +521,7 @@ export default {
     creatorName: 'Creator',
     createTime: 'Created At',
     updateTime: 'Updated At',
-    searchPlaceholder: 'Enter task name',
+    searchPlaceholder: 'Enter task name/device code/device name',
     empty: 'No equipment inspection tasks',
     createTicketSuccess: 'Work order created successfully',
     createTicketFail: 'Work order creation failed',
@@ -543,7 +549,7 @@ export default {
     jobResultOk: 'Pass',
     jobResultNg: 'Fail',
     taskTime: 'Job Time',
-    searchPlaceholder: 'Enter task no.',
+    searchPlaceholder: 'Enter task no/device code/device name',
     empty: 'No equipment inspection records',
     progressTitle: 'Progress',
     inspectionMethod: 'Inspection Method',
@@ -850,7 +856,7 @@ export default {
     confirmDeleteContent: 'Confirm delete category [{name}]?'
   },
   equipmentLedger: {
-    moduleName: 'Equipment Ledger',
+    moduleName: 'Equipment Ledger11',
     subTitle: 'Equipment ledger management',
     detailTitle: 'Equipment Detail',
     basicInfo: 'Basic Info',
@@ -955,7 +961,7 @@ export default {
     autoCode: 'Auto Generate',
     deviceLabel: 'Equipment',
     reportTimeLabel: 'Report Time',
-    searchPlaceholder: 'Enter order no. or equipment code',
+    searchPlaceholder: 'Enter order no/device code/device name',
     empty: 'No repair records',
     statusPending: 'Pending Repair',
     statusPassed: 'Passed',

src/locales/index.js

@@ -130,6 +130,7 @@ const literalMap = {
   '模具点检': 'moldCheck.moduleName',
   '点检详情': 'moldCheck.detailTitle',
   '新增点检': 'moldCheck.addTitle',
+  '设备运维': 'work.equipmentMaintenance',
   '模具保养': 'moldMaintain.moduleName',
   '保养详情': 'moldMaintain.detailTitle',
   '新增保养': 'moldMaintain.addTitle',

src/locales/zh-CN.js

@@ -20,6 +20,12 @@ export default {
     work: '管理',
     mine: '我的'
   },
+  work:{
+    mold: '模具',
+    equipmentMaintenance: '设备运维',
+    keypart: '关键件',
+    spare: '备件',
+  },
   nav: {
     home: '首页',
     mine: '个人中心',
@@ -515,7 +521,7 @@ export default {
     creatorName: '创建人',
     createTime: '创建时间',
     updateTime: '更新时间',
-    searchPlaceholder: '请输入任务名称',
+    searchPlaceholder: '请输入任务名称/设备编码/设备名称',
     empty: '暂无设备点检任务数据',
     createTicketSuccess: '工单创建成功',
     createTicketFail: '工单创建失败',
@@ -543,7 +549,7 @@ export default {
     jobResultOk: '通过',
     jobResultNg: '不通过',
     taskTime: '作业时间',
-    searchPlaceholder: '请输入任务编号',
+    searchPlaceholder: '请输入任务编号/设备编码/设备名称',
     empty: '暂无设备点检记录数据',
     progressTitle: '执行进度',
     inspectionMethod: '检验方式',
@@ -958,7 +964,7 @@ export default {
     autoCode: '自动生成',
     deviceLabel: '设备',
     reportTimeLabel: '报修时间',
-    searchPlaceholder: '请输入单号或设备编码',
+    searchPlaceholder: '请输入单号/设备编码/设备名称',
     empty: '暂无维修记录',
     statusPending: '待维修',
     statusPassed: '通过',