Merge remote-tracking branch 'origin/master'

src/locales/en.ts

@@ -999,6 +999,7 @@ export default {
     stanHolder:'Please enter inspections standards',
     isException:'IsException',
     exceptionDes:'ExceptionDes',
+    inspectTime:'InspectionTime',
     createName:'creator'
   },
   route:{

src/locales/zh-CN.ts

@@ -994,6 +994,7 @@ export default {
     stanHolder:'请输入巡检标准',
     isException:'是否异常',
     exceptionDes:'异常描述',
+    inspectTime:'巡检时间',
     createName:'创建人'
   },
   route:{

src/views/pms/inspect/plan/RouteInspectItemDrawer.vue

@@ -33,10 +33,11 @@
               >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span style="font-weight: bold">{{ t('inspect.InspectionStandards') }}：</span
               ><span style="font-size: 14px">{{ element.standard }}</span><br/>
               <div v-if="element.ifNormal!=undefined">
-                <span style="font-weight: bold;color: #2bb673">{{ t('inspect.isException') }}：</span><span style="font-size: 14px">{{ element.ifNormal?"是":"否" }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <span style="font-weight: bold;color: #2bb673">{{ t('inspect.isException') }}：</span><span style="font-size: 14px">{{ element.ifNormal?"正常":"异常" }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 <span style="font-weight: bold;color: #2bb673">{{ t('inspect.exceptionDes') }}：</span
               ><span style="font-size: 14px">{{ element.description }}</span><br/>
                 <span style="font-weight: bold;color: #2bb673" v-if="element.picUrl">{{ t('deviceForm.picture') }}：<span style="font-size: 14px;vertical-align: middle"><Icon style="color: deepskyblue" icon="ep:view" @click="openWeb(element.picUrl)" /></span></span>
+                <span style="font-weight: bold;color: #2bb673">{{ t('inspect.inspectTime') }}：</span><span style="font-size: 14px">{{element.updateTime? dayjs(element.updateTime).format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''}}</span>
               </div>
             </div>
           </div>
@@ -48,6 +49,7 @@
 <script setup lang="ts">
 import { defineEmits, defineOptions, ref } from 'vue'
 import draggable from 'vuedraggable'
+import dayjs from 'dayjs'
 const { t } = useI18n() // 国际化
 const drawerVisible = ref<boolean>(false)
 const emit = defineEmits(['update:modelValue', 'add'])