From 5d24960b3350d6047f9eee7a0cdc0d4d0ea0c9ed Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 24 Jan 2024 12:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simplifyOwnerAccessContol.html            | 10 +-
 .../simplifyOwnerTransactionCar.html          | 92 +++++++++----------
 .../simplifyAcceptance.html                   |  4 +-
 3 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
index 96f622281..36b0065ae 100644
--- a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
+++ b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
@@ -3,12 +3,7 @@
         <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
             <thead>
             <tr>
-                <th class="text-center">
-                    <vc:i18n name="设备编码" namespace="simplifyOwnerAccessContol"></vc:i18n>
-                </th>
-                <th class="text-center">
-                    <vc:i18n name="设备名称" namespace="simplifyOwnerAccessContol"></vc:i18n>
-                </th>
+               
                 <th class="text-center">
                     <vc:i18n name="对象类型" namespace="simplifyOwnerAccessContol"></vc:i18n>
                 </th>
@@ -34,8 +29,7 @@
             </thead>
             <tbody>
             <tr v-for="machineTranslate in simplifyOwnerAccessContolInfo.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>
diff --git a/public/components/property/simplifyOwnerTransactionCar/simplifyOwnerTransactionCar.html b/public/components/property/simplifyOwnerTransactionCar/simplifyOwnerTransactionCar.html
index 4f18147b5..bdb47a910 100644
--- a/public/components/property/simplifyOwnerTransactionCar/simplifyOwnerTransactionCar.html
+++ b/public/components/property/simplifyOwnerTransactionCar/simplifyOwnerTransactionCar.html
@@ -2,7 +2,7 @@
     <div class="row margin-top">
         <div class="col-lg-2 text-left">
             <select class="custom-select" v-model="simplifyOwnerTransactionCarInfo.carId"
-                    @change="changeTransactionCar()">
+                @change="changeTransactionCar()">
                 <option v-for="(item,index) in simplifyOwnerTransactionCarInfo.ownerCars" :value="item.carId">
                     {{item.carNum}}
                 </option>
@@ -13,55 +13,51 @@
     <div>
         <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
             <thead>
-            <tr>
-                <th class="text-center">
-                    <span><vc:i18n name="同步" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>ID
-                </th>
-                <th class="text-center">
-                    <span><vc:i18n name="设备编码" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                </th>
-                <th class="text-center">
-                    <span><vc:i18n name="对象类型" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                </th>
-                <th class="text-center">
-                    <span><vc:i18n name="对象名称" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                </th>
-                <th class="text-center">
-                    <span><vc:i18n name="指令" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                </th>
-                <th class="text-center">
-                    <span><vc:i18n name="状态" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                </th>
-                <th class="text-center" width="80px">
-                    <span><vc:i18n name="说明" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                </th>
-                <th class="text-center">
-                    <span><vc:i18n name="同步时间" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                </th>
-                <th class="text-center">
-                    <span><vc:i18n name="操作" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                </th>
-            </tr>
+                <tr>
+                    <th class="text-center">
+                        <vc:i18n name="同步ID" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="对象类型" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="对象名称" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="指令" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="状态" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                    </th>
+                    <th class="text-center" width="80px">
+                        <vc:i18n name="说明" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="同步时间" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                    </th>
+                    <th class="text-center">
+                        <vc:i18n name="操作" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                    </th>
+                </tr>
             </thead>
             <tbody>
-            <tr v-for="machineTranslate in simplifyOwnerTransactionCarInfo.machineTranslates">
-                <td class="text-center">{{machineTranslate.machineTranslateId}}</td>
-                <td class="text-center">{{machineTranslate.machineCode}}</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">{{machineTranslate.updateTime}}</td>
-                <td class="text-center">
-                    <div class="btn-group">
-                        <button class="btn-white btn btn-xs"
+                <tr v-for="machineTranslate in simplifyOwnerTransactionCarInfo.machineTranslates">
+                    <td class="text-center">{{machineTranslate.machineTranslateId}}</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">{{machineTranslate.updateTime}}</td>
+                    <td class="text-center">
+                        <div class="btn-group">
+                            <button class="btn-white btn btn-xs"
                                 v-on:click="_openEditCarTranslateModel(machineTranslate)">
-                            <span><vc:i18n name="重新同步" namespace="simplifyOwnerTransactionCar"></vc:i18n></span>
-                        </button>
-                    </div>
-                </td>
-            </tr>
+                                <vc:i18n name="重新同步" namespace="simplifyOwnerTransactionCar"></vc:i18n>
+                            </button>
+                        </div>
+                    </td>
+                </tr>
             </tbody>
             <tr>
                 <td colspan="9">
@@ -75,4 +71,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
index d6b19b450..50bd29ba7 100644
--- a/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
+++ b/public/pages/property/simplifyAcceptance/simplifyAcceptance.html
@@ -307,14 +307,14 @@
                     <a class="nav-link"
                        v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 'simplifyOwnerAccessContol'}"
                        v-on:click="changeTab('simplifyOwnerAccessContol')">
-                        <vc:i18n name="设备同步" namespace="simplifyAcceptance"></vc:i18n>
+                        <vc:i18n name="业主同步" namespace="simplifyAcceptance"></vc:i18n>
                     </a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link"
                        v-bind:class="{active:simplifyAcceptanceInfo._currentTab == 'simplifyOwnerTransactionCar'}"
                        v-on:click="changeTab('simplifyOwnerTransactionCar')">
-                        <vc:i18n name="道闸同步" namespace="simplifyAcceptance"></vc:i18n>
+                        <vc:i18n name="车辆同步" namespace="simplifyAcceptance"></vc:i18n>
                     </a>
                 </li>
                 <li class="nav-item" v-if="vc.hasPrivilege('502020092373407363')">