Merge remote-tracking branch 'origin/master'

src/locales/en.ts

@@ -946,7 +946,8 @@ export default {
     nameHolder:'Please enter plan name',
     mileage:'Mileage',
     runTime:'RunTime',
-    date:'Date'
+    date:'Date',
+    currentDate:'Current Date'
   },
   mainPlan:{
     basicMaintenanceRecords:'BasicMaintenanceRecords',

src/locales/ru.ts

@@ -930,7 +930,8 @@ export default {
     nameHolder:'请输入计划名称',
     mileage:'运行里程',
     runTime:'运行时间',
-    date:'自然日期'
+    date:'自然日期',
+    currentDate:'当前日期'
   },
   mainPlan:{
     basicMaintenanceRecords:'基础保养记录',

src/locales/zh-CN.ts

@@ -941,7 +941,8 @@ export default {
     nameHolder:'请输入计划名称',
     mileage:'运行里程',
     runTime:'运行时间',
-    date:'自然日期'
+    date:'自然日期',
+    currentDate:'当前日期'
   },
   mainPlan:{
     basicMaintenanceRecords:'基础保养记录',

src/views/pms/iotmainworkorder/DeviceAlarmBomList.vue

@@ -78,7 +78,7 @@
           <el-table-column v-if="showNaturalDateColumns" label="保养日期"
                            align="center"
                            :width="columnWidths.dateGroup">
-            <el-table-column :label="t('mainPlan.lastMaintenanceOperationTime')" align="center" prop="lastNaturalDate"
+            <el-table-column :label="t('mainPlan.lastMaintenanceNaturalDate')" align="center" prop="lastNaturalDate"
                              :width="columnWidths.lastNaturalDate">
               <template #default="scope">
                 <el-date-picker