diff --git a/public/components/owner/ownerDetailAccessControl/ownerDetailAccessControl.html b/public/components/owner/ownerDetailAccessControl/ownerDetailAccessControl.html index 3f3a1b158..cf72b14bd 100644 --- a/public/components/owner/ownerDetailAccessControl/ownerDetailAccessControl.html +++ b/public/components/owner/ownerDetailAccessControl/ownerDetailAccessControl.html @@ -6,12 +6,6 @@ - - @@ -37,21 +31,19 @@ - - - + diff --git a/public/components/owner/ownerDetailAccessControlRecord/ownerDetailAccessControlRecord.html b/public/components/owner/ownerDetailAccessControlRecord/ownerDetailAccessControlRecord.html index 0861b9b11..e33d11b71 100644 --- a/public/components/owner/ownerDetailAccessControlRecord/ownerDetailAccessControlRecord.html +++ b/public/components/owner/ownerDetailAccessControlRecord/ownerDetailAccessControlRecord.html @@ -45,21 +45,21 @@ - + - - - - - - - - - - + + + + + + + + + +
- - - -
{{machineTranslate.machineCode}}{{machineTranslate.machineName}} {{machineTranslate.typeCdName}} {{machineTranslate.objName}} {{machineTranslate.machineCmdName}} {{machineTranslate.stateName}}{{machineTranslate.remark}} +
{{machineTranslate.remark}}
+
{{machineTranslate.updateTime}}
- + {{accessControlInout.inoutId}}{{accessControlInout.machineName}}{{accessControlInout.machineCode}}{{accessControlInout.name}}{{accessControlInout.openTypeCd == '1000'?'人脸':'其他'}}{{accessControlInout.tel || '-'}}{{accessControlInout.idCard || '-'}}{{accessControlInout.similar}}{{accessControlInout.state == 'C'?'开门成功':'开门失败'}}{{accessControlInout.createTime}}{{inout.inoutId}}{{inout.machineName}}{{inout.machineCode}}{{inout.name}}{{inout.openTypeCd == '1000'?'人脸':'其他'}}{{inout.tel || '-'}}{{inout.idCard || '-'}}{{inout.similar}}{{inout.state == 'C'?'开门成功':'开门失败'}}{{inout.createTime}}
@@ -69,7 +69,7 @@
- +
diff --git a/public/components/owner/ownerDetailAccessControlRecord/ownerDetailAccessControlRecord.js b/public/components/owner/ownerDetailAccessControlRecord/ownerDetailAccessControlRecord.js index e16529af3..11af7d061 100644 --- a/public/components/owner/ownerDetailAccessControlRecord/ownerDetailAccessControlRecord.js +++ b/public/components/owner/ownerDetailAccessControlRecord/ownerDetailAccessControlRecord.js @@ -7,7 +7,7 @@ vc.extends({ data: { ownerDetailAccessControlRecordInfo: { - accessControlInouts: [], + inouts: [], ownerId: '', link: '', } @@ -42,7 +42,7 @@ param, function (json) { let _roomInfo = JSON.parse(json); - $that.ownerDetailAccessControlRecordInfo.accessControlInouts = _roomInfo.data; + $that.ownerDetailAccessControlRecordInfo.inouts = _roomInfo.data; vc.emit('ownerDetailAccessControlRecord', 'paginationPlus', 'init', { total: _roomInfo.records, dataCount: _roomInfo.total,