From 19cd7a7bbb8510ecd581e1f85261d3833d5c12c5 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 14 Jun 2025 15:53:14 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v2.0.0/后台管理数据中心'
---
src/views/dataCenter/components/searchData.vue | 15 +++++++++++----
src/views/dataCenter/dataCenter.vue | 6 +++++-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/views/dataCenter/components/searchData.vue b/src/views/dataCenter/components/searchData.vue
index d0fe2f8..a782b06 100644
--- a/src/views/dataCenter/components/searchData.vue
+++ b/src/views/dataCenter/components/searchData.vue
@@ -254,12 +254,19 @@
};
// 清空
const handleReset = () => {
- dateRange.value = [];
- Object.keys(searchForm).forEach(key => {
- searchForm[key] = '';
- });
+ dateRange.value = timeRange;
+searchForm.jobName = ''
+searchForm.name = ''
+searchForm.areaCode = userAreaCode.value
+searchForm.endTime = endTime.format(timeFormat)
+searchForm.startTime = startTime.format(timeFormat)
+searchForm.deviceSn = ''
+searchForm.resultType = ''
+searchForm.photoType = ''
handleNodeClick({ id: userAreaCode.value });
handleSearch();
+ console.log('searchForm',searchForm);
+
};
// 下载
const downloadFun =()=>{
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index 86128c1..6087558 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -147,7 +147,7 @@
<div>拍摄时间：{{ dialogDetailList?.createTime }}</div>
<div>文件类型：{{ photoTypeMap[dialogDetailList?.photoType] }}</div>
<div>文件格式：{{ resultTypeMap[dialogDetailList?.resultType] }}</div>
- <div>照片文件大小：{{ dialogDetailList?.attachSize }}</div>
+ <div>照片文件大小：{{bytesToMB(dialogDetailList?.attachSize) }}</div>
<div>
<el-button
type="success"
@@ -217,6 +217,10 @@
import { getShowImg, getSmallImg } from '@/utils/util';
import { onMounted, watch } from 'vue';
import dayjs from 'dayjs';
+function bytesToMB(bytes, decimalPlaces = 2) {
+ if (typeof bytes !== 'number' || bytes < 0) return '无效输入';
+ return (bytes / 1048576).toFixed(decimalPlaces) + ' MB';
+}
// 视频一帧
function convertVideoUrlToThumbnail(videoUrl) {
// 检查是否是有效的视频URL
--
Gitblit v1.9.3