合并冲突掉的代码

spring

2025-09-02 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b

 src/views/productionManagement/safetyMonitoring/index.vue

@@ -295,7 +295,7 @@
         emergencyRecords: [
            {
               id: 'EM001',
               time: '2024-01-15 14:35:12',
               time: '2025-01-15 14:35:12',
               location: '储罐T-003',
               type: '甲烷超标',
               status: 'resolved',
@@ -303,7 +303,7 @@
            },
            {
               id: 'EM002',
               time: '2024-01-15 14:35:15',
               time: '2025-01-15 14:35:15',
               location: '压缩机C-002',
               type: '硫化氢超标',
               status: 'processing',