From e895e134fce9eeaa369b20ef4bb6a4d4a10c3a01 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 19 Jul 2022 19:35: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

---
 .../addAccessControlMachine.html              | 28 ++++++++-----------
 .../addAccessControlMachine.js                |  8 +++---
 .../machineTranslateManage.html               |  4 +--
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/public/components/property/addAccessControlMachine/addAccessControlMachine.html b/public/components/property/addAccessControlMachine/addAccessControlMachine.html
index 71a6eb35b..c9e866264 100644
--- a/public/components/property/addAccessControlMachine/addAccessControlMachine.html
+++ b/public/components/property/addAccessControlMachine/addAccessControlMachine.html
@@ -8,7 +8,12 @@
                 <div class="ibox-content">
                     <div>
                         <div>
-
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="门禁名称" namespace="addAccessControlMachine"></vc:i18n></span></label>
+                                <div class="col-sm-10">
+                                    <input v-model="addAccessControlMachineInfo.machineName" type="text" :placeholder="vc.i18n('必填，请填写设备名称','addAccessControlMachine')" class="form-control">
+                                </div>
+                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="门禁编码" namespace="addAccessControlMachine"></vc:i18n></span></label>
                                 <div class="col-sm-10">
@@ -21,12 +26,7 @@
                                     <input v-model="addAccessControlMachineInfo.machineVersion" type="text" :placeholder="vc.i18n('必填，请填写版本号','addAccessControlMachine')" class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="门禁名称" namespace="addAccessControlMachine"></vc:i18n></span></label>
-                                <div class="col-sm-10">
-                                    <input v-model="addAccessControlMachineInfo.machineName" type="text" :placeholder="vc.i18n('必填，请填写设备名称','addAccessControlMachine')" class="form-control">
-                                </div>
-                            </div>
+
                             <div class="form-group row" v-if="addAccessControlMachineInfo.isShow == 'true'">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="门禁方向" namespace="addAccessControlMachine"></vc:i18n></span></label>
                                 <div class="col-sm-10">
@@ -36,32 +36,26 @@
                                         <option value="3307">{{vc.i18n('出场','addAccessControlMachine')}}</option>
                                     </select></div>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="厂家" namespace="addAccessControlMachine"></vc:i18n></span></label>
-                                <div class="col-sm-10">
-                                    <input v-model="addAccessControlMachineInfo.authCode" type="text" :placeholder="vc.i18n('必填，请填写厂家','addAccessControlMachine')" class="form-control">
-                                </div>
-                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label"><span><vc:i18n name="门禁位置" namespace="addAccessControlMachine"></vc:i18n></span></label>
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addAccessControlMachineInfo.locationTypeCd">
                                         <option selected disabled value="">{{vc.i18n('必填，请选择设备位置','addAccessControlMachine')}}</option>
-                                        <option v-for="item in addAccessControlMachineInfo.locations" :label="item.locationName"
-                                            :value="item.locationId">{{item.locationName}}
+                                        <option v-for="item in addAccessControlMachineInfo.locations" 
+                                            :value="item.locationId">{{item.locationName}}-->{{item.locationObjName}}
                                         </option>
                                     </select>
                                 </div>
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备" namespace="addAccessControlMachine"></vc:i18n></span>IP</label>
+                            <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备IP" namespace="addAccessControlMachine"></vc:i18n></span></label>
                             <div class="col-sm-10">
                                 <input v-model="addAccessControlMachineInfo.machineIp" type="text" :placeholder="vc.i18n('选填，请填写设备IP,如 192.168.1.10:8090','addAccessControlMachine')" class="form-control">
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备" namespace="addAccessControlMachine"></vc:i18n></span>MAC</label>
+                            <label class="col-sm-2 col-form-label"><span><vc:i18n name="设备MAC" namespace="addAccessControlMachine"></vc:i18n></span></label>
                             <div class="col-sm-10">
                                 <input v-model="addAccessControlMachineInfo.machineMac" type="text" :placeholder="vc.i18n('选填，请填写设备MAC','addAccessControlMachine')" class="form-control">
                             </div>
diff --git a/public/components/property/addAccessControlMachine/addAccessControlMachine.js b/public/components/property/addAccessControlMachine/addAccessControlMachine.js
index 03e46d9d9..46abf42a9 100644
--- a/public/components/property/addAccessControlMachine/addAccessControlMachine.js
+++ b/public/components/property/addAccessControlMachine/addAccessControlMachine.js
@@ -9,10 +9,10 @@
             addAccessControlMachineInfo: {
                 machineId: '',
                 machineCode: '',
-                machineVersion: '',
+                machineVersion: 'v1.0',
                 machineName: '',
                 machineTypeCd: '9999',
-                authCode: '',
+                authCode: '未知',
                 machineIp: '',
                 machineMac: '',
                 locationTypeCd: '',
@@ -156,10 +156,10 @@
                 vc.component.addAccessControlMachineInfo = {
                     machineId: '',
                     machineCode: '',
-                    machineVersion: '',
+                    machineVersion: 'v1.0',
                     machineName: '',
                     machineTypeCd: '9999',
-                    authCode: '',
+                    authCode: '未知',
                     machineIp: '',
                     machineMac: '',
                     locationTypeCd: '',
diff --git a/public/pages/property/machineTranslateManage/machineTranslateManage.html b/public/pages/property/machineTranslateManage/machineTranslateManage.html
index 6e05cb625..d0aa00954 100755
--- a/public/pages/property/machineTranslateManage/machineTranslateManage.html
+++ b/public/pages/property/machineTranslateManage/machineTranslateManage.html
@@ -53,7 +53,7 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="设备同步信息" namespace="machineTranslateManage"></vc:i18n></span>
+                        <span><vc:i18n name="物联网同步" namespace="machineTranslateManage"></vc:i18n></span>
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
                         <!-- <button type="button" class="btn btn-primary btn-sm"
@@ -136,4 +136,4 @@
     <vc:create path="property/addMachineTranslate" callBackListener="" callBackFunction=""></vc:create>
     <vc:create path="property/editMachineTranslate"></vc:create>
     <!-- <vc:create path="property/deleteMachineTranslate"></vc:create>-->
-</div>
+</div>
\ No newline at end of file