diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart index e043b762..74395fbf 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart @@ -72,7 +72,8 @@ class DoorLockLogDataItem { this.videoUrl, this.headUrl, this.userid, - this.keyboardPwd}); + this.keyboardPwd, + this.recordStr}); DoorLockLogDataItem.fromJson(Map json) { recordId = json['recordId']; @@ -87,6 +88,7 @@ class DoorLockLogDataItem { headUrl = json['headUrl']; userid = json['userid']; keyboardPwd = json['keyboardPwd']; + recordStr = json['recordStr']; } int? recordId; int? lockId; @@ -100,6 +102,7 @@ class DoorLockLogDataItem { String? headUrl; String? userid; String? keyboardPwd; + String? recordStr; Map toJson() { final Map data = {}; @@ -115,6 +118,7 @@ class DoorLockLogDataItem { data['headUrl'] = headUrl; data['userid'] = userid; data['keyboardPwd'] = keyboardPwd; + data['recordStr'] = recordStr; return data; } } diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart index 63c87ed3..7c076e8e 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart @@ -281,7 +281,8 @@ class _DoorLockLogPageState extends State with RouteAware { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - '$formattedTime ${timelineData.username!.isNotEmpty ? "${timelineData.username}操作" : ""}${timelineData.recordTypeName}', + // '$formattedTime ${timelineData.username!.isNotEmpty ? "${timelineData.username}操作" : ""}${timelineData.recordTypeName}', + timelineData.recordStr ?? '', textAlign: TextAlign.left, style: TextStyle( color: Colors.black,