diff --git a/src/views/demo/resourcemanagement/aiinstance/ShowInfoDrawer.vue b/src/views/demo/resourcemanagement/aiinstance/ShowInfoDrawer.vue index 36715c9..927ecb9 100644 --- a/src/views/demo/resourcemanagement/aiinstance/ShowInfoDrawer.vue +++ b/src/views/demo/resourcemanagement/aiinstance/ShowInfoDrawer.vue @@ -11,7 +11,7 @@
- +
实例名称
公路-隔离栏破损识别
@@ -60,6 +60,8 @@ diff --git a/src/views/demo/system/mediaLibrary/path/pathImageInfo.vue b/src/views/demo/system/mediaLibrary/path/pathImageInfo.vue index 1de6edb..52227f8 100644 --- a/src/views/demo/system/mediaLibrary/path/pathImageInfo.vue +++ b/src/views/demo/system/mediaLibrary/path/pathImageInfo.vue @@ -24,34 +24,40 @@
+    - {{ - '  ' + - dayjs(props.nowShowImageData.createTime).format('YYYY-MM-DD HH:mm:ss (UTCZ)') + - '   ' - }} + {{ dayjs(props.nowShowImageData.createTime).format('YYYY-MM-DD HH:mm:ss (UTCZ)') }} +     {{ - props.nowShowImageData.siz - ? (props.nowShowImageData.size / 1024 / 1024).toFixed(2) + 'M' + '   ' - : imageSize + '   ' + props.nowShowImageData.size + ? props.nowShowImageData.size > 1024 * 1024 + ? parseFloat((props.nowShowImageData.size / (1024 * 1024)).toFixed(2)) + 'MB' + : props.nowShowImageData.size > 1024 + ? parseFloat((props.nowShowImageData.size / 1024).toFixed(2)) + 'KB' + : parseFloat(props.nowShowImageData.size) + 'B' + : imageSize }} +     {{ props.nowShowImageData.width + ' x ' + props.nowShowImageData.height }}
- {{ props.nowShowImageData.lat + '° E' + '    ' }} + {{ props.nowShowImageData.lat + '° E' }} +      - {{ props.nowShowImageData.lng + '° N' + '    ' }} + {{ props.nowShowImageData.lng + '° N' }} +      - {{ '拍摄高度' + props.nowShowImageData.relativeAltitude + 'm     ' }} + {{ '拍摄高度' + props.nowShowImageData.relativeAltitude + 'm' }} +     
@@ -865,8 +871,15 @@ const contentLength = response.headers.get('Content-Length'); if (contentLength) { const sizeInBytes = parseInt(contentLength, 10); - const sizeInMB = (sizeInBytes / (1024 * 1024)).toFixed(2); - imageSize.value = parseFloat(sizeInMB) + 'M'; + if (sizeInBytes > 1024 * 1024) { + imageSize.value = (sizeInBytes / (1024 * 1024)).toFixed(2) + 'MB'; + } else if (sizeInBytes > 1024) { + imageSize.value = (sizeInBytes / 1024).toFixed(2) + 'KB'; + } else if (sizeInBytes > 0) { + imageSize.value = sizeInBytes + 'B'; + } else { + imageSize.value = '--'; + } } else { imageSize.value = '--'; } diff --git a/src/views/demo/system/mediaLibrary/path/pathLeftMenu.vue b/src/views/demo/system/mediaLibrary/path/pathLeftMenu.vue index cc7ea6a..4cc3dc1 100644 --- a/src/views/demo/system/mediaLibrary/path/pathLeftMenu.vue +++ b/src/views/demo/system/mediaLibrary/path/pathLeftMenu.vue @@ -192,24 +192,20 @@ const imageTypeSelect = ref([]); const imageOptions: any = ref([ { - value: '广角照片', - label: '广角照片', - }, - { - value: '变焦照片', - label: '变焦照片', + value: 1, + label: '可见光照片', }, { - value: '红外照片', + value: 2, label: '红外照片', }, { - value: '全景图', - label: '全景图', + value: 3, + label: '变焦照片', }, { - value: '码流截图', - label: '码流截图', + value: 4, + label: '广角照片', }, ]); // 按照媒体名称搜索 @@ -223,11 +219,9 @@ }); } // 图片类型 - // if (tagSelect.value.length > 0) { - // imageTypeSelect.value.forEach((imagetype) => { - // filterImageData = filterImageData.filter((item) => item.fileTags.includes(imagetype)); - // }); - // } + if (imageTypeSelect.value.length > 0) { + filterImageData = filterImageData.filter((item) => imageTypeSelect.value.includes(item.type)); + } // 按照媒体名称搜索 if (searchValue.value) { filterImageData = filterImageData.filter((item) => item.name.includes(searchValue.value)); diff --git a/src/views/demo/system/mediaLibrary/preview/previewImageInformation.vue b/src/views/demo/system/mediaLibrary/preview/previewImageInformation.vue index a926eee..3f7b728 100644 --- a/src/views/demo/system/mediaLibrary/preview/previewImageInformation.vue +++ b/src/views/demo/system/mediaLibrary/preview/previewImageInformation.vue @@ -21,7 +21,7 @@ 照片类型 - {{ props.nowPreviewRecord.imgtype || '--' }} + {{ getImageType(props.nowPreviewRecord.type) || '--' }} 任务名称 @@ -50,7 +50,11 @@ {{ props.nowPreviewRecord.size - ? (props.nowPreviewRecord.size / 1024 / 1024).toFixed(2) + 'M' + ? props.nowPreviewRecord.size > 1024 * 1024 + ? parseFloat((props.nowPreviewRecord.size / (1024 * 1024)).toFixed(2)) + 'MB' + : props.nowPreviewRecord.size > 1024 + ? parseFloat((props.nowPreviewRecord.size / 1024).toFixed(2)) + 'KB' + : parseFloat(props.nowPreviewRecord.size) + 'B' : imageSize }} @@ -266,6 +270,26 @@ editName.value = props.nowPreviewRecord.name.split('.').slice(0, -1).join('.'); } + // 图片类型 + function getImageType(type) { + let imageType = ''; + switch (type) { + case 1: + imageType = '可见光照片'; + break; + case 2: + imageType = '红外照片'; + break; + case 3: + imageType = '变焦照片'; + break; + case 4: + imageType = '广角照片'; + break; + } + return imageType; + } + // 标签-------------------------------- const addFileTagsFlag = ref(false); const newFileTagsName = ref(''); @@ -382,8 +406,15 @@ const contentLength = response.headers.get('Content-Length'); if (contentLength) { const sizeInBytes = parseInt(contentLength, 10); - const sizeInMB = (sizeInBytes / (1024 * 1024)).toFixed(2); - imageSize.value = parseFloat(sizeInMB) + 'M'; + if (sizeInBytes > 1024 * 1024) { + imageSize.value = (sizeInBytes / (1024 * 1024)).toFixed(2) + 'MB'; + } else if (sizeInBytes > 1024) { + imageSize.value = (sizeInBytes / 1024).toFixed(2) + 'KB'; + } else if (sizeInBytes > 0) { + imageSize.value = sizeInBytes + 'B'; + } else { + imageSize.value = '--'; + } } else { imageSize.value = '--'; }