admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-12 18:11:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化门禁同步显示问题

Browse Source
This commit is contained in:
java110 2020-12-25 10:20:33 +08:00
parent b99b2f152d
commit cbabcab9ad
3 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/components/property/simplifyOwnerAccessContol/simplifyOwnerAccessContol.html
View File

@ -3,22 +3,26 @@
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10"> <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
<thead> <thead>
<tr> <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> <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> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="machineTranslate in simplifyOwnerAccessContolInfo.machineTranslates"> <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.machineCode}}</td>
<td class="text-center">{{machineTranslate.machineName}}</td>
<td class="text-center">{{machineTranslate.typeCdName}}</td> <td class="text-center">{{machineTranslate.typeCdName}}</td>
<td class="text-center">{{machineTranslate.objName}}</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.stateName}}</td>
<td class="text-center">{{machineTranslate.remark}}</td>
<td class="text-center">{{machineTranslate.updateTime}}</td> <td class="text-center">{{machineTranslate.updateTime}}</td>
<td class="text-center"> <td class="text-center">
<div class="btn-group"> <div class="btn-group">

4
public/pages/property/machineManage/machineManage.html
View File

@ -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 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 v-for="(item,index) in machineManageInfo.listColumns">{{item}}</th>
<th class="text-center">时间</th> <th class="text-center">时间</th>
<th class="text-right">操作</th> <th class="text-right">操作</th>
@ -93,7 +95,9 @@
<td class="text-center">{{machine.machineTypeCdName}}</td> <td class="text-center">{{machine.machineTypeCdName}}</td>
<td class="text-center">{{machine.locationObjName}}</td> <td class="text-center">{{machine.locationObjName}}</td>
<td class="text-center">{{machine.directionName}}</td> <td class="text-center">{{machine.directionName}}</td>
<td class="text-center">{{machine.stateName}}</td> <td class="text-center">{{machine.stateName}}</td>
<td v-for="item in machine.listValues"> <td v-for="item in machine.listValues">
{{item}} {{item}}
</td> </td>

91
public/pages/property/machineTranslateManage/machineTranslateManage.html
View File

@ -1,4 +1,4 @@
<div class="animated fadeInRight ecommerce"> <div class="animated fadeInRight ecommerce">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="ibox "> <div class="ibox ">
@ -6,7 +6,7 @@
<h5>查询条件</h5> <h5>查询条件</h5>
<div class="ibox-tools" style="top:10px;"> <div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-link btn-sm" style="margin-right: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?'隐藏':'更多'}} true?'隐藏':'更多'}}
</button> </button>
</div> </div>
@ -16,8 +16,7 @@
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<input type="text" placeholder="请输入设备编码" <input type="text" placeholder="请输入设备编码"
v-model="machineTranslateManageInfo.conditions.machineCode" v-model="machineTranslateManageInfo.conditions.machineCode" class=" form-control">
class=" form-control">
</div> </div>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
@ -25,16 +24,17 @@
<option selected value="">请选择同步类型</option> <option selected value="">请选择同步类型</option>
<option value="8899">业主</option> <option value="8899">业主</option>
<option value="9988">小区</option> <option value="9988">小区</option>
</select></div> </select>
</div>
<div class="col-sm-3"> <div class="col-sm-3">
<div class="form-group"> <div class="form-group">
<input type="text" placeholder="请输入对象名称" <input type="text" placeholder="请输入对象名称"
v-model="machineTranslateManageInfo.conditions.objName" class=" form-control"> v-model="machineTranslateManageInfo.conditions.objName" class=" form-control">
</div> </div>
</div> </div>
<div class="col-sm-1"> <div class="col-sm-1">
<button type="button" class="btn btn-primary btn-sm" <button type="button" class="btn btn-primary btn-sm"
v-on:click="_queryMachineTranslateMethod()"> v-on:click="_queryMachineTranslateMethod()">
<i class="fa fa-search"></i> 查询 <i class="fa fa-search"></i> 查询
</button> </button>
</div> </div>
@ -43,7 +43,7 @@
<div class="col-sm-4" v-if="machineTranslateManageInfo.moreCondition == true"> <div class="col-sm-4" v-if="machineTranslateManageInfo.moreCondition == true">
<div class="form-group"> <div class="form-group">
<input type="text" placeholder="请输入对象ID" <input type="text" placeholder="请输入对象ID"
v-model="machineTranslateManageInfo.conditions.objId" class=" form-control"> v-model="machineTranslateManageInfo.conditions.objId" class=" form-control">
</div> </div>
</div> </div>
</div> </div>
@ -68,51 +68,51 @@
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<table class="footable table table-stripped toggle-arrow-tiny" <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
data-page-size="15"
>
<thead> <thead>
<tr> <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">对象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>
</tr> <th class="text-center">操作</th>
</tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="machineTranslate in machineTranslateManageInfo.machineTranslates"> <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.machineCode}}</td> <td class="text-center">{{machineTranslate.machineName}}</td>
<td class="text-center">{{machineTranslate.typeCdName}}</td> <td class="text-center">{{machineTranslate.typeCdName}}</td>
<td class="text-center">{{machineTranslate.objName}}</td> <td class="text-center">{{machineTranslate.objName}}</td>
<td class="text-center">{{machineTranslate.objId}}</td> <td class="text-center">{{machineTranslate.machineCmdName}}</td>
<td class="text-center">{{machineTranslate.stateName}}</td> <td class="text-center">{{machineTranslate.stateName}}</td>
<td class="text-center">{{machineTranslate.updateTime}}</td> <td class="text-center">{{machineTranslate.remark}}</td>
<td class="text-center"> <td class="text-center">{{machineTranslate.updateTime}}</td>
<div class="btn-group"> <td class="text-center">
<button class="btn-white btn btn-xs" <div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openEditMachineTranslateModel(machineTranslate)">重新同步 v-on:click="_openEditMachineTranslateModel(machineTranslate)">重新同步
</button> </button>
</div> </div>
<!-- <div class="btn-group"> <!-- <div class="btn-group">
<button class="btn-white btn btn-xs" <button class="btn-white btn btn-xs"
v-on:click="_openDeleteMachineTranslateModel(machineTranslate)">删除 v-on:click="_openDeleteMachineTranslateModel(machineTranslate)">删除
</button> </button>
</div>--> </div>-->
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="7"> <td colspan="7">
<ul class="pagination float-right"></ul> <ul class="pagination float-right"></ul>
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
<!-- 分页 --> <!-- 分页 -->
@ -123,11 +123,8 @@
</div> </div>
<vc:create path="property/addMachineTranslate" <vc:create path="property/addMachineTranslate" callBackListener="" callBackFunction=""></vc:create>
callBackListener=""
callBackFunction=""
></vc:create>
<vc:create path="property/editMachineTranslate"></vc:create> <vc:create path="property/editMachineTranslate"></vc:create>
<!-- <vc:create path="property/deleteMachineTranslate"></vc:create>--> <!-- <vc:create path="property/deleteMachineTranslate"></vc:create>-->
</div> </div>