refactor(screen): 移除缓存过期检查逻辑并优化代码结构

- 移除了 mainScreen.vue 和 regionScreen.vue 中的缓存过期时间检查逻辑
- 简化了缓存数据的读取流程,直接返回缓存数据
- 调整了 regionScreen.vue 中风险预警详情数据的赋值缩进
- 优化了维保任务和巡检任务API调用的参数格式
- 统一了代码中的空行和缩进格式
This commit is contained in:
2025-12-30 09:01:29 +08:00
parent 7534a20556
commit d4e256eeee
2 changed files with 24 additions and 30 deletions

View File

@@ -231,15 +231,8 @@ const getCachedRegionOption = (): any[] | null => {
const cached = sessionStorage.getItem(CACHE_KEY) const cached = sessionStorage.getItem(CACHE_KEY)
if (cached) { if (cached) {
const cacheData: CacheData = JSON.parse(cached) const cacheData: CacheData = JSON.parse(cached)
const now = Date.now()
// 检查缓存是否在有效期内 // 检查缓存是否在有效期内
if (now - cacheData.timestamp < CACHE_DURATION) { return cacheData.records
console.log('使用缓存的 regionOption 数据')
return cacheData.records
} else {
console.log('缓存已过期,清除缓存')
sessionStorage.removeItem(CACHE_KEY)
}
} }
} catch (error) { } catch (error) {
console.error('读取缓存失败:', error) console.error('读取缓存失败:', error)
@@ -269,13 +262,13 @@ onMounted(async () => {
// 先检查缓存 // 先检查缓存
const cachedRecords = getCachedRegionOption() const cachedRecords = getCachedRegionOption()
let records = cachedRecords let records = cachedRecords
if (!records || records.length === 0) { if (!records || records.length === 0) {
// 缓存不存在或已过期,调用接口 // 缓存不存在或已过期,调用接口
try { try {
let result = await getTableList('park_info_list') let result = await getTableList('park_info_list')
records = result.records || [] records = result.records || []
if (records && records.length > 0) { if (records && records.length > 0) {
// 保存到缓存 // 保存到缓存
setCachedRegionOption(records) setCachedRegionOption(records)
@@ -285,7 +278,7 @@ onMounted(async () => {
records = [] records = []
} }
} }
if (records && records.length > 0) { if (records && records.length > 0) {
// 去重region字段使用Map来确保唯一性 // 去重region字段使用Map来确保唯一性
const regionMap = new Map() const regionMap = new Map()

View File

@@ -237,15 +237,8 @@ const getCachedRegionOption = (): any[] | null => {
const cached = sessionStorage.getItem(CACHE_KEY) const cached = sessionStorage.getItem(CACHE_KEY)
if (cached) { if (cached) {
const cacheData: CacheData = JSON.parse(cached) const cacheData: CacheData = JSON.parse(cached)
const now = Date.now()
// 检查缓存是否在有效期内 // 检查缓存是否在有效期内
if (now - cacheData.timestamp < CACHE_DURATION) { return cacheData.records
console.log('使用缓存的 regionOption 数据')
return cacheData.records
} else {
console.log('缓存已过期,清除缓存')
sessionStorage.removeItem(CACHE_KEY)
}
} }
} catch (error) { } catch (error) {
console.error('读取缓存失败:', error) console.error('读取缓存失败:', error)
@@ -282,13 +275,13 @@ onMounted(async () => {
// 先检查缓存 // 先检查缓存
const cachedRecords = getCachedRegionOption() const cachedRecords = getCachedRegionOption()
let records = cachedRecords let records = cachedRecords
if (!records || records.length === 0) { if (!records || records.length === 0) {
// 缓存不存在或已过期,调用接口 // 缓存不存在或已过期,调用接口
try { try {
let result = await getTableList('park_info_list') let result = await getTableList('park_info_list')
records = result.records || [] records = result.records || []
if (records && records.length > 0) { if (records && records.length > 0) {
// 保存到缓存 // 保存到缓存
setCachedRegionOption(records) setCachedRegionOption(records)
@@ -298,7 +291,7 @@ onMounted(async () => {
records = [] records = []
} }
} }
if (records && records.length > 0) { if (records && records.length > 0) {
// 根据regionCode过滤去重park_name字段 // 根据regionCode过滤去重park_name字段
const regionMap = new Map() const regionMap = new Map()
@@ -414,7 +407,7 @@ const loadDashboardData = async (): Promise<void> => {
// 获取风险预警详情数据 // 获取风险预警详情数据
getTableList('risk_alert_detail', query).then(risk_alert_detail => { getTableList('risk_alert_detail', query).then(risk_alert_detail => {
// if (risk_alert_detail.records && risk_alert_detail.records.length > 0) { // if (risk_alert_detail.records && risk_alert_detail.records.length > 0) {
dashboardData.value.alertData.details = risk_alert_detail.records || [] dashboardData.value.alertData.details = risk_alert_detail.records || []
// } // }
}).catch(error => { }).catch(error => {
console.error('获取风险预警详情数据失败:', error) console.error('获取风险预警详情数据失败:', error)
@@ -512,7 +505,7 @@ const handleHiddenDangerPannelData = (query) => {
processingCnt = totalCnt > 0 ? ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) : '0.00' processingCnt = totalCnt > 0 ? ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) : '0.00'
pendingCnt = totalCnt > 0 ? ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) : '0.00' pendingCnt = totalCnt > 0 ? ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) : '0.00'
} }
dashboardData.value.hiddenDangerData.progress = { dashboardData.value.hiddenDangerData.progress = {
overdue: overdueCnt, overdue: overdueCnt,
processed: processedCnt, processed: processedCnt,
@@ -643,13 +636,21 @@ const handleRiskTabChange = async (tab: TabType) => {
// 同时获取维保任务和巡检任务的数据 // 同时获取维保任务和巡检任务的数据
const [maintenanceResponse, inspectionResponse] = await Promise.all([ const [maintenanceResponse, inspectionResponse] = await Promise.all([
getWorkOrderStatistics({workOrderType, taskType: '维保任务', campus_id: query.campus_id}).catch(error => { getWorkOrderStatistics({
workOrderType,
taskType: '维保任务',
campus_id: query.campus_id
}).catch(error => {
console.error('获取维保任务数据失败:', error) console.error('获取维保任务数据失败:', error)
return { records: [] } return {records: []}
}), }),
getWorkOrderStatistics({workOrderType, taskType: '巡检任务', campus_id: query.campus_id}).catch(error => { getWorkOrderStatistics({
workOrderType,
taskType: '巡检任务',
campus_id: query.campus_id
}).catch(error => {
console.error('获取巡检任务数据失败:', error) console.error('获取巡检任务数据失败:', error)
return { records: [] } return {records: []}
}) })
]) ])
@@ -681,7 +682,7 @@ const handleRiskTabChange = async (tab: TabType) => {
// 将API数据转换为图表数据格式 // 将API数据转换为图表数据格式
const convertToChartData = (records: any[], taskTypeName: string): any[] => { const convertToChartData = (records: any[], taskTypeName: string): any[] => {
const charts: any[] = [] const charts: any[] = []
// 按周期分组 // 按周期分组
const cycleGroups: Record<string, any> = {} const cycleGroups: Record<string, any> = {}
records.forEach((record: any) => { records.forEach((record: any) => {
@@ -696,7 +697,7 @@ const handleRiskTabChange = async (tab: TabType) => {
cycles.forEach((cycle) => { cycles.forEach((cycle) => {
const data = cycleGroups[cycle] || {} const data = cycleGroups[cycle] || {}
const title = `${cycleMap[cycle]}检查(${taskTypeName})` const title = `${cycleMap[cycle]}检查(${taskTypeName})`
charts.push({ charts.push({
title, title,
total: Number(data.total) || 0, total: Number(data.total) || 0,