Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev

src/views/screen/mainScreen.vue

@@ -231,15 +231,8 @@ const getCachedRegionOption = (): any[] | null => {
     const cached = sessionStorage.getItem(CACHE_KEY)
     if (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) {
     console.error('读取缓存失败:', error)
@@ -269,13 +262,13 @@ onMounted(async () => {
   // 先检查缓存
   const cachedRecords = getCachedRegionOption()
   let records = cachedRecords
-  
+
   if (!records || records.length === 0) {
     // 缓存不存在或已过期，调用接口
     try {
       let result = await getTableList('park_info_list')
       records = result.records || []
-      
+
       if (records && records.length > 0) {
         // 保存到缓存
         setCachedRegionOption(records)
@@ -285,7 +278,7 @@ onMounted(async () => {
       records = []
     }
   }
-  
+
   if (records && records.length > 0) {
     // 去重region字段，使用Map来确保唯一性
     const regionMap = new Map()

src/views/screen/regionScreen.vue

@@ -237,15 +237,8 @@ const getCachedRegionOption = (): any[] | null => {
     const cached = sessionStorage.getItem(CACHE_KEY)
     if (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) {
     console.error('读取缓存失败:', error)
@@ -282,13 +275,13 @@ onMounted(async () => {
   // 先检查缓存
   const cachedRecords = getCachedRegionOption()
   let records = cachedRecords
-  
+
   if (!records || records.length === 0) {
     // 缓存不存在或已过期，调用接口
     try {
       let result = await getTableList('park_info_list')
       records = result.records || []
-      
+
       if (records && records.length > 0) {
         // 保存到缓存
         setCachedRegionOption(records)
@@ -298,7 +291,7 @@ onMounted(async () => {
       records = []
     }
   }
-  
+
   if (records && records.length > 0) {
     // 根据regionCode过滤，去重park_name字段
     const regionMap = new Map()
@@ -414,7 +407,7 @@ const loadDashboardData = async (): Promise<void> => {
     // 获取风险预警详情数据
     getTableList('risk_alert_detail', query).then(risk_alert_detail => {
       // 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 => {
       console.error('获取风险预警详情数据失败:', error)
@@ -512,7 +505,7 @@ const handleHiddenDangerPannelData = (query) => {
                 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'
               }
-              
+
               dashboardData.value.hiddenDangerData.progress = {
                 overdue: overdueCnt,
                 processed: processedCnt,
@@ -643,13 +636,21 @@ const handleRiskTabChange = async (tab: TabType) => {
 
     // 同时获取维保任务和巡检任务的数据
     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)
-        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)
-        return { records: [] }
+        return {records: []}
       })
     ])
 
@@ -681,7 +682,7 @@ const handleRiskTabChange = async (tab: TabType) => {
     // 将API数据转换为图表数据格式
     const convertToChartData = (records: any[], taskTypeName: string): any[] => {
       const charts: any[] = []
-      
+
       // 按周期分组
       const cycleGroups: Record<string, any> = {}
       records.forEach((record: any) => {
@@ -696,7 +697,7 @@ const handleRiskTabChange = async (tab: TabType) => {
       cycles.forEach((cycle) => {
         const data = cycleGroups[cycle] || {}
         const title = `${cycleMap[cycle]}检查(${taskTypeName})`
-        
+
         charts.push({
           title,
           total: Number(data.total) || 0,