From 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:29:23 +0800
Subject: [PATCH] 合并冲突掉的代码
---
src/views/productionManagement/safetyMonitoring/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/productionManagement/safetyMonitoring/index.vue b/src/views/productionManagement/safetyMonitoring/index.vue
index 8416914..12922e7 100644
--- a/src/views/productionManagement/safetyMonitoring/index.vue
+++ b/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: '鍘嬬缉鏈篊-002',
type: '纭寲姘㈣秴鏍�',
status: 'processing',
--
Gitblit v1.9.3