From 2d56707f78deab9a7cc11cfb2f0fa8e2b4a2e458 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 6 Feb 2024 00:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ownerDetailAccessControl.html             | 14 +++-------
 .../ownerDetailAccessControlRecord.html       | 26 +++++++++----------
 .../ownerDetailAccessControlRecord.js         |  4 +--
 3 files changed, 18 insertions(+), 26 deletions(-)

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 @@
         <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
             <thead>
                 <tr>
-                    <th class="text-center">
-                        <vc:i18n name="设备编码" namespace="ownerDetailAccessControl"></vc:i18n>
-                    </th>
-                    <th class="text-center">
-                        <vc:i18n name="设备名称" namespace="ownerDetailAccessControl"></vc:i18n>
-                    </th>
                     <th class="text-center">
                         <vc:i18n name="对象类型" namespace="ownerDetailAccessControl"></vc:i18n>
                     </th>
@@ -37,21 +31,19 @@
             </thead>
             <tbody>
                 <tr v-for="machineTranslate in ownerDetailAccessControlInfo.machineTranslates">
-                    <td class="text-center">{{machineTranslate.machineCode}}</td>
-                    <td class="text-center">{{machineTranslate.machineName}}</td>
                     <td class="text-center">{{machineTranslate.typeCdName}}</td>
                     <td class="text-center">{{machineTranslate.objName}}</td>
                     <td class="text-center">{{machineTranslate.machineCmdName}}</td>
                     <td class="text-center">{{machineTranslate.stateName}}</td>
-                    <td class="text-center">{{machineTranslate.remark}}</td>
+                    <td class="text-center">
+                        <div class="hc-td">{{machineTranslate.remark}}</div>
+                    </td>
                     <td class="text-center">{{machineTranslate.updateTime}}</td>
                     <td class="text-center">
                         <div class="btn-group" v-if="machineTranslate.state != '20000'">
                             <button class="btn-white btn btn-xs"
                                 v-on:click="_openEditMachineTranslateModel(machineTranslate)">
-                                <span>
                                     <vc:i18n name="重新同步" namespace="ownerDetailAccessControl"></vc:i18n>
-                                </span>
                             </button>
                         </div>
                     </td>
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 @@
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="accessControlInout in ownerDetailAccessControlRecordInfo.accessControlInouts">
+                <tr v-for="inout in ownerDetailAccessControlRecordInfo.inouts">
                     <td class="text-center" style="white-space: nowrap;">
-                        <img style="width: 60px; height: 60px;" class="border-radius" v-if="accessControlInout.facePath" v-bind:src="accessControlInout.facePath" v-on:click="_viewOwnerFace(accessControlInout.facePath)" />
+                        <img style="width: 60px; height: 60px;" class="border-radius" v-if="inout.facePath" v-bind:src="inout.facePath" v-on:click="_viewOwnerFace(inout.facePath)" />
                         <img style="width: 60px; height: 60px;" class="border-radius" v-else src="/img/noPhoto.jpg" />
                     </td>
-                    <td class="text-center">{{accessControlInout.inoutId}}</td>
-                    <td class="text-center">{{accessControlInout.machineName}}</td>
-                    <td class="text-center">{{accessControlInout.machineCode}}</td>
-                    <td class="text-center">{{accessControlInout.name}}</td>
-                    <td class="text-center">{{accessControlInout.openTypeCd == '1000'?'人脸':'其他'}}</td>
-                    <td class="text-center">{{accessControlInout.tel || '-'}}</td>
-                    <td class="text-center">{{accessControlInout.idCard || '-'}}</td>
-                    <td class="text-center">{{accessControlInout.similar}}</td>
-                    <td class="text-center">{{accessControlInout.state == 'C'?'开门成功':'开门失败'}}</td>
-                    <td class="text-center">{{accessControlInout.createTime}}</td>
+                    <td class="text-center">{{inout.inoutId}}</td>
+                    <td class="text-center">{{inout.machineName}}</td>
+                    <td class="text-center">{{inout.machineCode}}</td>
+                    <td class="text-center">{{inout.name}}</td>
+                    <td class="text-center">{{inout.openTypeCd == '1000'?'人脸':'其他'}}</td>
+                    <td class="text-center">{{inout.tel || '-'}}</td>
+                    <td class="text-center">{{inout.idCard || '-'}}</td>
+                    <td class="text-center">{{inout.similar}}</td>
+                    <td class="text-center">{{inout.state == 'C'?'开门成功':'开门失败'}}</td>
+                    <td class="text-center">{{inout.createTime}}</td>
                 </tr>
             </tbody>
         </table>
@@ -69,7 +69,7 @@
 
             </div>
             <div class="col-sm-8">
-                <vc:create namespace="ownerDetailAccessControl" path="frame/paginationPlus"></vc:create>
+                <vc:create namespace="ownerDetailAccessControlRecord" path="frame/paginationPlus"></vc:create>
             </div>
         </div>
     </div>
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,