From cbabcab9ad89c5cd3e49fdb48347241efa281def Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 25 Dec 2020 10:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=A8=E7=A6=81=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simplifyOwnerAccessContol.html            |  8 +-
 .../property/machineManage/machineManage.html |  4 +
 .../machineTranslateManage.html               | 91 +++++++++----------
 3 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
index 8aef01059..02e52fe34 100644
--- a/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
+++ b/public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
@@ -3,22 +3,26 @@
         <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
             <thead>
                 <tr>
-                    <th class="text-center">同步ID</th>
                     <th class="text-center">设备编码</th>
+                    <th class="text-center">设备名称</th>
                     <th class="text-center">对象类型</th>
                     <th class="text-center">对象名称</th>
+                    <th class="text-center">指令</th>
                     <th class="text-center">状态</th>
+                    <th class="text-center">说明</th>
                     <th class="text-center">同步时间</th>
                     <th class="text-center">操作</th>
                 </tr>
             </thead>
             <tbody>
                 <tr v-for="machineTranslate in simplifyOwnerAccessContolInfo.machineTranslates">
-                    <td class="text-center">{{machineTranslate.machineTranslateId}}</td>
                     <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">{{machineTranslate.updateTime}}</td>
                     <td class="text-center">
                         <div class="btn-group">
diff --git a/public/pages/property/machineManage/machineManage.html b/public/pages/property/machineManage/machineManage.html
index f2b7aa596..9e51b5ada 100644
--- a/public/pages/property/machineManage/machineManage.html
+++ b/public/pages/property/machineManage/machineManage.html
@@ -79,7 +79,9 @@
                                 <th class="text-center">设备类型</th>
                                 <th class="text-center">设备位置</th>
                                 <th class="text-center">方向</th>
+                               
                                 <th class="text-center">状态</th>
+                               
                                 <th v-for="(item,index) in machineManageInfo.listColumns">{{item}}</th>
                                 <th class="text-center">时间</th>
                                 <th class="text-right">操作</th>
@@ -93,7 +95,9 @@
                                 <td class="text-center">{{machine.machineTypeCdName}}</td>
                                 <td class="text-center">{{machine.locationObjName}}</td>
                                 <td class="text-center">{{machine.directionName}}</td>
+                                
                                 <td class="text-center">{{machine.stateName}}</td>
+                                
                                 <td v-for="item in machine.listValues">
                                     {{item}}
                                 </td>
diff --git a/public/pages/property/machineTranslateManage/machineTranslateManage.html b/public/pages/property/machineTranslateManage/machineTranslateManage.html
index 5564a5261..3910fdd52 100644
--- a/public/pages/property/machineTranslateManage/machineTranslateManage.html
+++ b/public/pages/property/machineTranslateManage/machineTranslateManage.html
@@ -1,4 +1,4 @@
-<div  class="animated fadeInRight ecommerce">
+<div class="animated fadeInRight ecommerce">
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox ">
@@ -6,7 +6,7 @@
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                v-on:click="_moreCondition()">{{machineTranslateManageInfo.moreCondition ==
+                            v-on:click="_moreCondition()">{{machineTranslateManageInfo.moreCondition ==
                             true?'隐藏':'更多'}}
                         </button>
                     </div>
@@ -16,8 +16,7 @@
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <input type="text" placeholder="请输入设备编码"
-                                       v-model="machineTranslateManageInfo.conditions.machineCode"
-                                       class=" form-control">
+                                    v-model="machineTranslateManageInfo.conditions.machineCode" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-4">
@@ -25,16 +24,17 @@
                                 <option selected value="">请选择同步类型</option>
                                 <option value="8899">业主</option>
                                 <option value="9988">小区</option>
-                            </select></div>
+                            </select>
+                        </div>
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="请输入对象名称"
-                                       v-model="machineTranslateManageInfo.conditions.objName" class=" form-control">
+                                    v-model="machineTranslateManageInfo.conditions.objName" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_queryMachineTranslateMethod()">
+                                v-on:click="_queryMachineTranslateMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
                         </div>
@@ -43,7 +43,7 @@
                         <div class="col-sm-4" v-if="machineTranslateManageInfo.moreCondition == true">
                             <div class="form-group">
                                 <input type="text" placeholder="请输入对象ID"
-                                       v-model="machineTranslateManageInfo.conditions.objId" class=" form-control">
+                                    v-model="machineTranslateManageInfo.conditions.objId" class=" form-control">
                             </div>
                         </div>
                     </div>
@@ -68,51 +68,51 @@
                 </div>
                 <div class="ibox-content">
 
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">同步ID</th>
-                            <th class="text-center">设备编码</th>
-                            <th class="text-center">对象类型</th>
-                            <th class="text-center">对象名称</th>
-                            <th class="text-center">对象Id</th>
-                            <th class="text-center">状态</th>
-                            <th class="text-center">同步时间</th>
-                            <th class="text-center">操作</th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">设备编码</th>
+                                <th class="text-center">设备名称</th>
+                                <th class="text-center">对象类型</th>
+                                <th class="text-center">对象名称</th>
+                                <th class="text-center">指令</th>
+                                <th class="text-center">状态</th>
+                                <th class="text-center">说明</th>
+                                <th class="text-center">同步时间</th>
+                                <th class="text-center">操作</th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="machineTranslate in machineTranslateManageInfo.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.objId}}</td>
-                            <td class="text-center">{{machineTranslate.stateName}}</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 machineTranslateManageInfo.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">{{machineTranslate.updateTime}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditMachineTranslateModel(machineTranslate)">重新同步
-                                    </button>
-                                </div>
-                                <!-- <div class="btn-group">
+                                        </button>
+                                    </div>
+                                    <!-- <div class="btn-group">
                                      <button class="btn-white btn btn-xs"
                                              v-on:click="_openDeleteMachineTranslateModel(machineTranslate)">删除
                                      </button>
                                  </div>-->
-                            </td>
+                                </td>
 
-                        </tr>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
@@ -123,11 +123,8 @@
     </div>
 
 
-    <vc:create path="property/addMachineTranslate"
-               callBackListener=""
-               callBackFunction=""
-    ></vc:create>
+    <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