pms 保养计划 明细 页面优化

src/api/pms/iotmaintenancebom/index.ts

@@ -12,15 +12,16 @@ export interface IotMaintenanceBomVO {
   naturalDateRule: number   // 保养规则-自然日期(0启用 1停用)
   runningTimeRule: number   // 保养规则-运行时间(0启用 1停用)
   lastRunningTime: number // 上次保养运行时长(小时)
-  nextRunningTime: number // 下次保养运行时长(小时)
-  timePeriod: number // 时间周期(小时)
-  kilometerCycle: number // 公里数周期(千米)
-  naturalDatePeriod: number // 自然日周期(天)
+  nextRunningTime: number // 下次保养运行时长(小时) 运行时长周期
+  timePeriod: number // 时间周期(小时) 距离下次保养运行时长
+  kilometerCycle: number // 公里数周期(千米) 距离下次保养公里数
+  naturalDatePeriod: number // 自然日周期(天) 下次保养自然日期
   timePeriodLead: number  // 运行时长周期提前量 H
   lastRunningKilometers: number // 上次保养运行公里数(千米)
   nextRunningKilometers: number // 下次保养运行公里数(千米)
   kiloCycleLead: number // 公里数周期-提前量 km
   lastNaturalDate: Date // 上次保养自然日期(天)
+  tempLastNaturalDate: Date // 上次保养自然日期(天) 临时变量
   nextNaturalDate: number // 下次保养自然日期(天)
   naturalDatePeriodLead: number // 自然日周期-提前量(天)
   bomNodeId: number // bom节点id
@@ -58,6 +59,20 @@ export interface IotMaintenanceBomVO {
     totalRunTime: number;
     totalMileage: number;
   }>;
+  // 上次保养时间 不同于自然日保养规则下的 上次保养自然日期
+  lastMaintenanceDate: Date
+  // 下次保养公里数
+  nextMaintenanceKm: number
+  // 剩余保养公里数
+  remainKm: number
+  // 下次保养运行时长
+  nextMaintenanceH: number
+  // 剩余保养运行时长
+  remainH: number
+  // 下次保养日期
+  nextMaintenanceDate: Date
+  // 自然日期保养 剩余天数
+  remainDay: number
 }
 
 // PMS 保养计划明细BOM API

src/locales/en.ts

@@ -953,6 +953,7 @@ export default {
     lastMaintenanceMileage:'LastMaintenanceMileage(KM)',
     lastMaintenanceOperationTime:'LastMOTime(H)',
     lastMaintenanceNaturalDate:'LastMaintenanceNaturalDate',
+    lastMaintenanceDate: 'LastMaintenanceTime',
     operatingMileageRuleConfiguration:'OperatingMileageRuleConfig',
     operatingMileageCycle:'OperatingMileageCycle(KM)',
     OperatingMileageCycle_lead:'OMC_Lead(KM)',
@@ -975,6 +976,11 @@ export default {
     nextMaintTime:'NextMaintTime(H)',
     nextMaintKil:'NextMaintKil(KM)',
     nextMaintDate:'NextMaintDate',
+    nextMaintenanceKm:'NextMaintKil(KM)',
+    nextMaintenanceH:'NextMaintTime(H)',
+    remainKm: 'Remaining Mileage(KM)',
+    remainH: 'Remaining Duration(H)',
+    remainDay: 'Remaining Day',
     completed: 'Completed',
     delayed: 'Delayed',
     maintaining: 'Maintaining',

src/locales/ru.ts

@@ -932,8 +932,9 @@ export default {
   mainPlan:{
     basicMaintenanceRecords:'基础保养记录',
     lastMaintenanceMileage:'上次保养里程数(KM)',
-    lastMaintenanceOperationTime:'上次保养运行时间(H)',
+    lastMaintenanceOperationTime:'上次保养时长(H)',
     lastMaintenanceNaturalDate:'上次保养自然日期',
+    lastMaintenanceDate: '上次保养时间',
     operatingMileageRuleConfiguration:'运行里程规则配置',
     operatingMileageCycle:'运行里程周期(KM)',
     OperatingMileageCycle_lead:'运行里程周期-提前量(KM)',
@@ -956,6 +957,11 @@ export default {
     nextMaintTime:'距离下次保养运行时长(H)',
     nextMaintKil:'距离下次保养公里数(KM)',
     nextMaintDate:'下次保养自然日期',
+    nextMaintenanceKm:'下次保养公里数(KM)',
+    nextMaintenanceH:'下次保养时长(H)',
+    remainKm: '剩余公里数(KM)',
+    remainH: '剩余时长(H)',
+    remainDay: '剩余天数',
     completed: '完成',
     delayed: '延时',
     maintaining: '保养中',

src/locales/zh-CN.ts

@@ -502,7 +502,7 @@ export default {
   operationFillForm:{
     team:'所属队伍',
     sumTime:'累计运行时间(H)',
-    sumKil:'累计运行公里数(Km)',
+    sumKil:'累计运行公里数(KM)',
     confirm:'确定',
     cancel:'取消',
     alert:'以下数值取自PLC，如有不符请修改',
@@ -947,8 +947,9 @@ export default {
   mainPlan:{
     basicMaintenanceRecords:'基础保养记录',
     lastMaintenanceMileage:'上次保养里程数(KM)',
-    lastMaintenanceOperationTime:'上次保养运行时间(H)',
-    lastMaintenanceNaturalDate:'上次保养自然日期',
+    lastMaintenanceOperationTime:'上次保养时长(H)',
+    lastMaintenanceNaturalDate:'上次保养日期',
+    lastMaintenanceDate: '上次保养时间',
     operatingMileageRuleConfiguration:'运行里程规则配置',
     operatingMileageCycle:'运行里程周期(KM)',
     OperatingMileageCycle_lead:'运行里程周期-提前量(KM)',
@@ -970,7 +971,12 @@ export default {
     MaintItems:'保养项',
     nextMaintTime:'距离下次保养运行时长(H)',
     nextMaintKil:'距离下次保养公里数(KM)',
-    nextMaintDate:'下次保养自然日期',
+    nextMaintDate:'下次保养日期',
+    nextMaintenanceKm:'下次保养公里数(KM)',
+    nextMaintenanceH:'下次保养时长(H)',
+    remainKm: '剩余公里数(KM)',
+    remainH: '剩余时长(H)',
+    remainDay: '剩余天数(D)',
     completed: '完成',
     delayed: '延时',
     maintaining: '保养中',