diff --git a/public/components/community/aRoomDetailOwner/aRoomDetailOwner.js b/public/components/community/aRoomDetailOwner/aRoomDetailOwner.js
index 2bfa9c932..a86bce794 100644
--- a/public/components/community/aRoomDetailOwner/aRoomDetailOwner.js
+++ b/public/components/community/aRoomDetailOwner/aRoomDetailOwner.js
@@ -67,7 +67,7 @@
                 });
             },
             _toARoomDetailOwnerDetail:function(_owner){
-                window.open('/#/pages/owner/ownerDetail?ownerId='+_owner.ownerId);
+                window.open('/#/pages/owner/adminOwnerDetail?ownerId='+_owner.ownerId);
             }
         }
     });
diff --git a/public/pages/car/adminCar/adminCar.js b/public/pages/car/adminCar/adminCar.js
index ee83389b5..cbcdff330 100644
--- a/public/pages/car/adminCar/adminCar.js
+++ b/public/pages/car/adminCar/adminCar.js
@@ -21,6 +21,7 @@
                     ownerTel:'',
                     carNum: '',
                     carNumLike: '',
+                    carTypeCd:'1001',
                 }
             }
         },
diff --git a/public/pages/community/adminRoom/adminRoom.html b/public/pages/community/adminRoom/adminRoom.html
index bdcf46fd4..328a727ef 100644
--- a/public/pages/community/adminRoom/adminRoom.html
+++ b/public/pages/community/adminRoom/adminRoom.html
@@ -160,7 +160,7 @@
                                     <td class="text-center hand" v-if="room.ownerName">
                                         <div class="hc-td">
                                             <a target="_blank"
-                                                :href="'/#/pagessss/owner/ownerDetail?ownerId='+room.ownerId">
+                                                :href="'/#/pages/owner/adminOwnerDetail?ownerId='+room.ownerId">
                                                 {{room.ownerName}}({{room.link}})
                                             </a>
                                         </div>
diff --git a/public/pages/property/equipmentAccount/equipmentAccount.html b/public/pages/property/equipmentAccount/equipmentAccount.html
index 57fa4447c..599d3f18c 100644
--- a/public/pages/property/equipmentAccount/equipmentAccount.html
+++ b/public/pages/property/equipmentAccount/equipmentAccount.html
@@ -1,15 +1,9 @@
 <div>
     <div class="bg-white padding-sm">
         <button type="button" class="btn btn-primary btn-sm margin-left-sm"
-                v-on:click="_openAddEquipmentAccountModal()">
+            v-on:click="_openAddEquipmentAccountModal()">
             <i class="fa fa-plus"></i>添加设备
         </button>
-        <!-- <button type="button" class="btn btn-white btn-sm margin-left-sm" v-on:click="_openImportEquipment()">
-            导入
-        </button>
-        <button type="button" class="btn btn-white btn-sm margin-left-sm" v-on:click="_exportEquipmentAccount()">
-            导出
-        </button> -->
         <button type="button" class="btn btn-primary btn-sm margin-left-sm" v-on:click="_printEquipmentAccounts()">
             <i class="fa fa-print"></i>批量打印
         </button>
@@ -21,202 +15,179 @@
             </div>
         </div>
         <div class="col-md-10 margin-top-xs">
-            <div class="row">
-                <div class="col-lg-12">
-                    <div class="ibox ">
-                        <div class="ibox-title">
-                            <h5>
-                                <span><vc:i18n name="查询条件"></vc:i18n></span>
-                            </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()">
-                                    {{equipmentAccountManageInfo.moreCondition == true?'隐藏':'更多'}}
-                                </button>
+
+            <div class="ibox ">
+                <div class="ibox-title">
+                    <h5>
+                        <vc:i18n name="查询条件"></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()">
+                            {{equipmentAccountManageInfo.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('请选择设备名称','equipmentAccountManage')"
+                                    v-model.trim="equipmentAccountManageInfo.conditions.machineName"
+                                    class=" form-control">
                             </div>
                         </div>
-                        <div class="ibox-content">
-                            <div class="row">
-                                <div class="col-sm-3">
-                                    <div class="form-group">
-                                        <input type="text" :placeholder="vc.i18n('请选择设备名称','equipmentAccountManage')"
-                                               v-model.trim="equipmentAccountManageInfo.conditions.machineName"
-                                               class=" form-control">
-                                    </div>
-                                </div>
-                                <div class="col-sm-4">
-                                    <div class="form-group">
-                                        <input type="text" :placeholder="vc.i18n('请选择设备编码','equipmentAccountManage')"
-                                               v-model.trim="equipmentAccountManageInfo.conditions.machineCode"
-                                               class=" form-control">
-                                    </div>
-                                </div>
-                                <div class="col-sm-3">
-                                    <select class="custom-select" v-model="equipmentAccountManageInfo.conditions.state">
-                                        <option selected value="">{{vc.i18n('请选择状态','feeConfigManage')}}</option>
-                                        <option v-for="(item,index) in equipmentAccountManageInfo.useStatus"
-                                                :key="index" v-bind:value="item.statusCd">{{item.name}}
-                                        </option>
-                                    </select>
-                                </div>
-                                <div class="col-sm-2">
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                            v-on:click="_queryEquipmentAccountMethod()">
-                                        <i class="fa fa-search"></i> <span>
-                                            <vc:i18n name="查询"></vc:i18n>
-                                        </span>
-                                    </button>
-                                    <button type="button" class="btn btn-primary btn-sm"
-                                            v-on:click="_resetEquipmentAccountMethod()">
-                                        <i class="fa fa-repeat"></i> <span>
-                                            <vc:i18n name="重置"></vc:i18n>
-                                        </span>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="row" v-show="equipmentAccountManageInfo.moreCondition == true">
-                                <div class="col-sm-3">
-                                    <select class="custom-select"
-                                            v-model="equipmentAccountManageInfo.conditions.importanceLevel">
-                                        <option selected disabled value="">请选择重要等级</option>
-                                        <option v-for="(item,index) in equipmentAccountManageInfo.importanceLevels"
-                                                :key="index" :value="item.statusCd">{{item.name}}
-                                        </option>
-                                    </select>
-                                </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" :placeholder="vc.i18n('请选择设备编码','equipmentAccountManage')"
+                                    v-model.trim="equipmentAccountManageInfo.conditions.machineCode"
+                                    class=" form-control">
                             </div>
                         </div>
+                        <div class="col-sm-3">
+                            <select class="custom-select" v-model="equipmentAccountManageInfo.conditions.state">
+                                <option selected value="">{{vc.i18n('请选择状态','feeConfigManage')}}</option>
+                                <option v-for="(item,index) in equipmentAccountManageInfo.useStatus" :key="index"
+                                    v-bind:value="item.statusCd">{{item.name}}
+                                </option>
+                            </select>
+                        </div>
+                        <div class="col-sm-2">
+                            <button type="button" class="btn btn-primary btn-sm"
+                                v-on:click="_queryEquipmentAccountMethod()">
+                                    <vc:i18n name="查询"></vc:i18n>
+                            </button>
+                            <button type="button" class="btn btn-primary btn-sm"
+                                v-on:click="_resetEquipmentAccountMethod()">
+                                    <vc:i18n name="重置"></vc:i18n>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="row" v-show="equipmentAccountManageInfo.moreCondition == true">
+                        <div class="col-sm-3">
+                            <select class="custom-select"
+                                v-model="equipmentAccountManageInfo.conditions.importanceLevel">
+                                <option selected disabled value="">请选择重要等级</option>
+                                <option v-for="(item,index) in equipmentAccountManageInfo.importanceLevels" :key="index"
+                                    :value="item.statusCd">{{item.name}}
+                                </option>
+                            </select>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-lg-12">
-                    <div class="ibox">
-                        <div class="ibox-content border-radius">
-                            <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
-                                <thead>
-                                <tr>
-                                    <th class="text-center">
-                                        <input id="check1" type="checkbox" class="i-checks"
-                                               @click="checkAllEqu($event)">
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='设备名称' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='设备编码' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='设备品牌' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='设备型号' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='位置详情' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span>
-                                            <vc:i18n name='首次启用时间' namespace='equipmentAccountManage'></vc:i18n>
-                                        </span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span>
-                                            <vc:i18n name='保修截止日期' namespace='equipmentAccountManage'></vc:i18n>
-                                        </span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='使用年限' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='重要等级' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='使用状态' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='采购价格' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='资产净值' namespace='equipmentAccountManage'></vc:i18n></span>
-                                    </th>
-                                    <th class="text-center">
-                                        <span><vc:i18n name='操作'></vc:i18n></span>
-                                    </th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <tr v-for="equipmentAccount in equipmentAccountManageInfo.equipmentAccounts">
-                                    <td class="text-center">
-                                        <input type="checkbox" class="i-checks checkItem" @click="isCheckAll($event)"
-                                               v-bind:value="equipmentAccount.machineId"
-                                               v-model="equipmentAccountManageInfo.machineIds">
-                                    </td>
-                                    <td class="text-center">{{equipmentAccount.machineName}}</td>
-                                    <td class="text-center">{{equipmentAccount.machineCode}}</td>
-                                    <td class="text-center">{{equipmentAccount.brand}}</td>
-                                    <td class="text-center">{{equipmentAccount.model}}</td>
-                                    <td class="text-center">{{equipmentAccount.locationDetail}}</td>
-                                    <td class="text-center">{{equipmentAccount.firstEnableTime}}</td>
-                                    <td class="text-center">{{equipmentAccount.warrantyDeadline}}</td>
-                                    <td class="text-center">{{equipmentAccount.usefulLife}}</td>
-                                    <td class="text-center">{{equipmentAccount.levelName}}</td>
-                                    <td class="text-center">{{equipmentAccount.stateName}}</td>
-                                    <td class="text-center">{{equipmentAccount.purchasePrice}}</td>
-                                    <td class="text-center">{{equipmentAccount.netWorth}}</td>
-                                    <td class="text-center">
-                                        <div class="btn-group">
-                                            <button class="btn-white btn btn-xs"
-                                                    @click="_printEquipmentAccount(equipmentAccount)">
-                                                <span><vc:i18n name='打印'></vc:i18n></span>
-                                            </button>
-                                        </div>
-                                        <div class="btn-group">
-                                            <button class="btn-white btn btn-xs"
-                                                    v-on:click="_openEquipmentAccountDetail(equipmentAccount)">
-                                                <span><vc:i18n name='详情'></vc:i18n></span>
-                                            </button>
-                                        </div>
-                                        <div class="btn-group">
-                                            <button class="btn-white btn btn-xs"
-                                                    v-on:click="_openEditEquipmentAccountModel(equipmentAccount)">
-                                                <span><vc:i18n name='修改'></vc:i18n></span>
-                                            </button>
-                                            <!-- <button class="btn-white btn btn-xs"
+            <div class="ibox">
+                <div class="ibox-content border-radius">
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                        <thead>
+                            <tr>
+                                <th class="text-center">
+                                    <input id="check1" type="checkbox" class="i-checks" @click="checkAllEqu($event)">
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='设备名称' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='设备编码' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='设备品牌' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='设备型号' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='位置详情' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='首次启用时间' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='保修截止日期' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='使用年限' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='重要等级' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='使用状态' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='采购价格' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='资产净值' namespace='equipmentAccountManage'></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                        <vc:i18n name='操作'></vc:i18n>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-for="equipmentAccount in equipmentAccountManageInfo.equipmentAccounts">
+                                <td class="text-center">
+                                    <input type="checkbox" class="i-checks checkItem" @click="isCheckAll($event)"
+                                        v-bind:value="equipmentAccount.machineId"
+                                        v-model="equipmentAccountManageInfo.machineIds">
+                                </td>
+                                <td class="text-center">{{equipmentAccount.machineName}}</td>
+                                <td class="text-center">{{equipmentAccount.machineCode}}</td>
+                                <td class="text-center">{{equipmentAccount.brand}}</td>
+                                <td class="text-center">{{equipmentAccount.model}}</td>
+                                <td class="text-center">{{equipmentAccount.locationDetail}}</td>
+                                <td class="text-center">{{equipmentAccount.firstEnableTime}}</td>
+                                <td class="text-center">{{equipmentAccount.warrantyDeadline}}</td>
+                                <td class="text-center">{{equipmentAccount.usefulLife}}</td>
+                                <td class="text-center">{{equipmentAccount.levelName}}</td>
+                                <td class="text-center">{{equipmentAccount.stateName}}</td>
+                                <td class="text-center">{{equipmentAccount.purchasePrice}}</td>
+                                <td class="text-center">{{equipmentAccount.netWorth}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
+                                            @click="_printEquipmentAccount(equipmentAccount)">
+                                                <vc:i18n name='打印'></vc:i18n>
+                                        </button>
+                                    </div>
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEquipmentAccountDetail(equipmentAccount)">
+                                                <vc:i18n name='详情'></vc:i18n>
+                                        </button>
+                                    </div>
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEditEquipmentAccountModel(equipmentAccount)">
+                                                <vc:i18n name='修改'></vc:i18n>
+                                        </button>
+                                        <!-- <button class="btn-white btn btn-xs"
                                                 v-on:click="_openChangeStateEquipmentModel(equipmentAccount)">
                                                 <span><vc:i18n name='状态改变'></vc:i18n></span>
                                                 </button> -->
-                                            <!-- <button class="btn-white btn btn-xs"
+                                        <!-- <button class="btn-white btn btn-xs"
                                                 v-on:click="_openMoveEquipmentModel(equipmentAccount)">
                                                 <span><vc:i18n name='移动'></vc:i18n></span>
                                                 </button> -->
-                                        </div>
-                                        <div class="btn-group">
-                                            <button class="btn-white btn btn-xs"
-                                                    v-on:click="_openDeleteEquipmentAccountModel(equipmentAccount)">
-                                                <span><vc:i18n name='删除'></vc:i18n></span>
-                                            </button>
-                                        </div>
-                                    </td>
-                                </tr>
-                                </tbody>
-                                <tfoot>
-                                <tr>
-                                    <td colspan="14">
-                                        <ul class="pagination float-right"></ul>
-                                    </td>
-                                </tr>
-                                </tfoot>
-                            </table>
-                            <!-- 分页 -->
-                            <div class="row margin-top-xs">
-                                <div class="col-sm-7">
-                                    <div>设备状态 分为：使用中，停用中 等状态</div>
-                                </div>
-                                <div class="col-sm-5 float-right">
-                                    <vc:create path="frame/pagination"></vc:create>
-                                </div>
-                            </div>
+                                    </div>
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeleteEquipmentAccountModel(equipmentAccount)">
+                                                <vc:i18n name='删除'></vc:i18n>
+                                        </button>
+                                    </div>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <!-- 分页 -->
+                    <div class="row margin-top-xs">
+                        <div class="col-sm-7">
+                            <div>设备状态 分为：使用中，停用中 等状态</div>
+                        </div>
+                        <div class="col-sm-5 float-right">
+                            <vc:create path="frame/pagination"></vc:create>
                         </div>
                     </div>
                 </div>
diff --git a/public/user.html b/public/user.html
index 3874886ad..b69e6a628 100644
--- a/public/user.html
+++ b/public/user.html
@@ -29,7 +29,7 @@
                 <a href="#" target="_blank" class="java110-logo"></a>
             </div>
             <fieldset class="layui-elem-field layui-field-title">
-                <legend class="text-white" style="margin-left: 0px;">
+                <legend class="text-white" >
                     <span class="java110-sub-system-name"></span>
                 </legend>
             </fieldset>