diff --git a/src/components/report/deviceHeader.vue b/src/components/report/deviceHeader.vue index 64dd8a3..eda8653 100644 --- a/src/components/report/deviceHeader.vue +++ b/src/components/report/deviceHeader.vue @@ -10,7 +10,7 @@ defineProps<{ - 备ID: {{ deviceCode }} + 设备ID: {{ deviceCode }} {{ time }} diff --git a/src/components/report/item.vue b/src/components/report/item.vue index d45225d..f1426b8 100644 --- a/src/components/report/item.vue +++ b/src/components/report/item.vue @@ -2,6 +2,7 @@ import storage from '@/utils/storage' const props = defineProps<{ + id?: number title: string deviceCode: string status: string @@ -15,6 +16,7 @@ const props = defineProps<{ function goToDetail() { const key = `report_${Date.now()}` storage.set(key, { + id: props.id, title: props.title, deviceCode: props.deviceCode, status: props.status, @@ -24,8 +26,13 @@ function goToDetail() { areaCount: props.areaCount, passRate: props.passRate, }) + + const query = [`key=${key}`] + if (props.id != null) + query.push(`id=${props.id}`) + uni.navigateTo({ - url: `/pages/report/detail/index?key=${key}`, + url: `/pages/report/detail/index?${query.join('&')}`, }) } diff --git a/src/pages/report/detail/index.vue b/src/pages/report/detail/index.vue index 202a546..04fbc5d 100644 --- a/src/pages/report/detail/index.vue +++ b/src/pages/report/detail/index.vue @@ -1,4 +1,8 @@ @@ -87,4 +188,11 @@ onLoad((options) => { flex-direction: column; gap: 12px; } + +.empty-tip { + font-size: 14px; + color: #999; + text-align: center; + padding: 24px 0; +} diff --git a/src/pages/report/index.vue b/src/pages/report/index.vue index 832df5d..1393464 100644 --- a/src/pages/report/index.vue +++ b/src/pages/report/index.vue @@ -1,4 +1,8 @@