From 214154173d55dbbab44d1c1629a68af69d33352a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 26 Dec 2020 16:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=8D=E9=80=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editMachineTranslate.html                 | 21 ++----
 .../editMachineTranslate.js                   | 75 ++-----------------
 .../simplifyOwnerAccessContol.html            |  2 +-
 .../machineTranslateManage.html               |  2 +-
 4 files changed, 16 insertions(+), 84 deletions(-)

diff --git a/public/components/property/editMachineTranslate/editMachineTranslate.html b/public/components/property/editMachineTranslate/editMachineTranslate.html
index 47162df74..cd64cce01 100644
--- a/public/components/property/editMachineTranslate/editMachineTranslate.html
+++ b/public/components/property/editMachineTranslate/editMachineTranslate.html
@@ -3,7 +3,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b ">修改同步</h3>
+                <h3 class="m-t-none m-b ">重新同步</h3>
                 <div class="ibox-content">
                     <div>
                         <div>
@@ -24,11 +24,15 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">对象类型</label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" readonly v-model="editMachineTranslateInfo.typeCd">
+                                    <select class="custom-select" readonly v-model="editMachineTranslateInfo.typeCd" disabled>
                                         <option selected disabled value="">必填，请选择对象类型</option>
                                         <option value="8899">业主</option>
                                         <option value="9988">小区</option>
-                                        <option value="4455">车辆道闸</option>
+                                        <option value="7788">钥匙信息</option>
+                                        <option value="6677">访客信息</option>
+                                        <option value="5566">员工人脸</option>
+                                        <option value="4455">车辆信息</option>
+                                        <option value="3344">设备信息</option>
                                     </select></div>
                             </div>
                             <div class="form-group row">
@@ -45,19 +49,10 @@
                                            class="form-control">
                                 </div>
                             </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">状态</label>
-                                <div class="col-sm-10">
-                                    <select class="custom-select" v-model="editMachineTranslateInfo.state">
-                                        <option selected disabled value="">必填，请选择状态</option>
-                                        <option value="10000">未同步</option>
-                                        <option value="20000">已同步</option>
-                                    </select></div>
-                            </div>
 
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button"
-                                        v-on:click="editMachineTranslate()"><i class="fa fa-check"></i>&nbsp;保存
+                                        v-on:click="editMachineTranslate()"><i class="fa fa-check"></i>&nbsp;提交
                                 </button>
                                 <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
                                         data-dismiss="modal">取消
diff --git a/public/components/property/editMachineTranslate/editMachineTranslate.js b/public/components/property/editMachineTranslate/editMachineTranslate.js
index 9c1258250..cc28dceaf 100644
--- a/public/components/property/editMachineTranslate/editMachineTranslate.js
+++ b/public/components/property/editMachineTranslate/editMachineTranslate.js
@@ -10,6 +10,7 @@
                 objName: '',
                 objId: '',
                 state: '',
+                communityId:''
 
             }
         },
@@ -29,77 +30,14 @@
                 return vc.validate.validate({
                     editMachineTranslateInfo: vc.component.editMachineTranslateInfo
                 }, {
-                    'editMachineTranslateInfo.machineCode': [
-                        {
-                            limit: "required",
-                            param: "",
-                            errInfo: "设备编码不能为空"
-                        },
-                        {
-                            limit: "maxin",
-                            param: "1,30",
-                            errInfo: "设备编码不能超过30位"
-                        },
-                    ],
-                    'editMachineTranslateInfo.machineId': [
-                        {
-                            limit: "required",
-                            param: "",
-                            errInfo: "设备ID不能为空"
-                        }],
-                    'editMachineTranslateInfo.typeCd':
-                        [
-                            {
-                                limit: "required",
-                                param: "",
-                                errInfo: "对象类型不能为空"
-                            },
-                            {
-                                limit: "num",
-                                param: "",
-                                errInfo: "对象类型格式错误"
-                            },
-                        ],
-                    'editMachineTranslateInfo.objName':
-                        [
-                            {
-                                limit: "required",
-                                param: "",
-                                errInfo: "对象名称不能为空"
-                            }],
-                    'editMachineTranslateInfo.objId':
-                        [
-                            {
-                                limit: "required",
-                                param: "",
-                                errInfo: "对象Id不能为空"
-                            },
-                            {
-                                limit: "num",
-                                param: "",
-                                errInfo: "对象Id必须为数字"
-                            },
-                        ],
-                    'editMachineTranslateInfo.state':
-                        [
-                            {
-                                limit: "required",
-                                param: "",
-                                errInfo: "状态不能为空"
-                            },
-                            {
-                                limit: "num",
-                                param: "",
-                                errInfo: "状态格式错误"
-                            },
-                        ],
                     'editMachineTranslateInfo.machineTranslateId':
                         [
                             {
                                 limit: "required",
                                 param: "",
                                 errInfo: "同步ID不能为空"
-                            }]
+                            }
+                        ]
 
                 })
                     ;
@@ -110,9 +48,8 @@
                     return;
                 }
 
-                vc.http.post(
-                    'editMachineTranslate',
-                    'update',
+                vc.http.apiPost(
+                    '/machine/resendIot',
                     JSON.stringify(vc.component.editMachineTranslateInfo),
                     {
                         emulateJSON: true
@@ -144,7 +81,7 @@
                     objName: '',
                     objId: '',
                     state: '',
-
+                    communityId:''
                 }
             }
         }
diff --git a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
index 02e52fe34..c5070d16d 100644
--- a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
+++ b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
@@ -25,7 +25,7 @@
                     <td class="text-center">{{machineTranslate.remark}}</td>
                     <td class="text-center">{{machineTranslate.updateTime}}</td>
                     <td class="text-center">
-                        <div class="btn-group">
+                        <div class="btn-group" v-if="machineTranslate.state != '20000'">
                             <button class="btn-white btn btn-xs"
                                 v-on:click="_openEditMachineTranslateModel(machineTranslate)">重新同步
                             </button>
diff --git a/public/pages/property/machineTranslateManage/machineTranslateManage.html b/public/pages/property/machineTranslateManage/machineTranslateManage.html
index 3910fdd52..d17686da8 100644
--- a/public/pages/property/machineTranslateManage/machineTranslateManage.html
+++ b/public/pages/property/machineTranslateManage/machineTranslateManage.html
@@ -93,7 +93,7 @@
                                 <td class="text-center">{{machineTranslate.remark}}</td>
                                 <td class="text-center">{{machineTranslate.updateTime}}</td>
                                 <td class="text-center">
-                                    <div class="btn-group">
+                                    <div class="btn-group" v-if="machineTranslate.state != '20000'">
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditMachineTranslateModel(machineTranslate)">重新同步
                                         </button>