From 46df02a8a181ecd90b8a47d0dd36401aad06a348 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 23 Jan 2024 01:04:08 +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

---
 .../machineTranslateManage.html               | 159 +++++++-----------
 1 file changed, 60 insertions(+), 99 deletions(-)

diff --git a/public/pages/property/machineTranslateManage/machineTranslateManage.html b/public/pages/property/machineTranslateManage/machineTranslateManage.html
index d109ba9f0..944e88e52 100644
--- a/public/pages/property/machineTranslateManage/machineTranslateManage.html
+++ b/public/pages/property/machineTranslateManage/machineTranslateManage.html
@@ -4,61 +4,48 @@
             <div class="ibox ">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="查询条件" namespace="machineTranslateManage"></vc:i18n></span>
+                        <vc:i18n name="查询条件" namespace="machineTranslateManage"></vc:i18n>
                     </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()">
+                            v-on:click="_moreCondition()">
                             {{machineTranslateManageInfo.moreCondition == true?'隐藏':'更多'}}
                         </button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请输入设备编码','machineTranslateManage')"
-                                       v-model="machineTranslateManageInfo.conditions.machineCode"
-                                       class=" form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-4">
+                        <div class="col-sm-2">
                             <select class="custom-select" v-model="machineTranslateManageInfo.conditions.typeCd">
                                 <option selected value="">{{vc.i18n('请选择对象类型','machineTranslateManage')}}</option>
-                                <!--<option value="8899">{{vc.i18n('业主','machineTranslateManage')}}</option>
-                                <option value="9988">{{vc.i18n('小区','machineTranslateManage')}}</option>-->
                                 <option v-for="(item,index) in machineTranslateManageInfo.typeCds" :key="index"
-                                        :value="item.statusCd">{{item.name}}
+                                    :value="item.statusCd">{{item.name}}
                                 </option>
                             </select>
                         </div>
-                        <div class="col-sm-3">
+                        <div class="col-sm-2">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请输入对象ID','machineTranslateManage')"
-                                       v-model="machineTranslateManageInfo.conditions.objId" class=" form-control">
+                                    v-model="machineTranslateManageInfo.conditions.objId" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-2">
+                            <div class="form-group">
+                                <input type="text" :placeholder="vc.i18n('请输入对象名称','machineTranslateManage')"
+                                    v-model="machineTranslateManageInfo.conditions.objName" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_queryMachineTranslateMethod()">
-                                <i class="fa fa-search"></i>
-                                <span><vc:i18n name="查询" namespace="machineTranslateManage"></vc:i18n></span>
+                                v-on:click="_queryMachineTranslateMethod()">
+                                <vc:i18n name="查询" namespace="machineTranslateManage"></vc:i18n>
                             </button>
                             <button type="button" class="btn btn-info btn-sm"
-                                    v-on:click="_resetMachineTranslateMethod()">
-                                <i class="fa fa-repeat"></i>
-                                <span><vc:i18n name="重置" namespace="machineTranslateManage"></vc:i18n></span>
+                                v-on:click="_resetMachineTranslateMethod()">
+                                <vc:i18n name="重置" namespace="machineTranslateManage"></vc:i18n>
                             </button>
                         </div>
                     </div>
-                    <div class="row" v-if="machineTranslateManageInfo.moreCondition == true">
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请输入对象名称','machineTranslateManage')"
-                                       v-model="machineTranslateManageInfo.conditions.objName" class=" form-control">
-                            </div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -68,86 +55,61 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="物联网同步" namespace="machineTranslateManage"></vc:i18n></span>
+                        <vc:i18n name="物联网同步" namespace="machineTranslateManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <!-- <button type="button" class="btn btn-primary btn-sm"
-                                v-on:click="_openAddMachineTranslateModal()">
-                            <i class="fa fa-plus"></i>
-                            添加
-                        </button> -->
+
                     </div>
                 </div>
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">
-                                <span><vc:i18n name="设备编码" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="设备名称" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="对象ID" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="对象类型" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="对象名称" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="指令" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="状态" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center" width="80px">
-                                <span><vc:i18n name="说明" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="同步时间" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="操作" namespace="machineTranslateManage"></vc:i18n></span>
-                            </th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">
+                                    <vc:i18n name="对象ID" namespace="machineTranslateManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="对象类型" namespace="machineTranslateManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="对象名称" namespace="machineTranslateManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="指令" namespace="machineTranslateManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="状态" namespace="machineTranslateManage"></vc:i18n>
+                                </th>
+                                <th class="text-center" width="80px">
+                                    <vc:i18n name="说明" namespace="machineTranslateManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="同步时间" namespace="machineTranslateManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="操作" namespace="machineTranslateManage"></vc:i18n>
+                                </th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <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.objId}}</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" v-if="machineTranslate.state != '20000'">
-                                    <button class="btn-white btn btn-xs"
+                            <tr v-for="machineTranslate in machineTranslateManageInfo.machineTranslates">
+                                <td class="text-center">{{machineTranslate.objId}}</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" v-if="machineTranslate.state != '20000'">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditMachineTranslateModel(machineTranslate)">
-                                        <span><vc:i18n name="重新同步" namespace="machineTranslateManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                                <!-- <div class="btn-group">
-                                 <button class="btn-white btn btn-xs"
-                                         v-on:click="_openDeleteMachineTranslateModel(machineTranslate)">
-                                         <span><vc:i18n name="删除" namespace="machineTranslateManage"></vc:i18n></span>
-                                 </button>
-                                </div>-->
-                            </td>
-                        </tr>
+                                            <vc:i18n name="重新同步" namespace="machineTranslateManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                </td>
+                            </tr>
                         </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="10">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
                     </table>
                     <!-- 分页 -->
                     <vc:create path="frame/pagination"></vc:create>
@@ -157,5 +119,4 @@
     </div>
     <vc:create path="property/addMachineTranslate" callBackListener="" callBackFunction=""></vc:create>
     <vc:create path="property/editMachineTranslate"></vc:create>
-    <!-- <vc:create path="property/deleteMachineTranslate"></vc:create>-->
 </div>
\ No newline at end of file