diff --git a/public/pages/property/parkingAreaManage/parkingAreaManage.html b/public/pages/property/parkingAreaManage/parkingAreaManage.html
index 60c07e9f7..5194b5422 100644
--- a/public/pages/property/parkingAreaManage/parkingAreaManage.html
+++ b/public/pages/property/parkingAreaManage/parkingAreaManage.html
@@ -4,7 +4,7 @@
             <div class="ibox ">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="查询条件" namespace="parkingAreaManage"></vc:i18n></span>
+                        <vc:i18n name="查询条件" namespace="parkingAreaManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;"></div>
                 </div>
@@ -13,13 +13,13 @@
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请输入停车场ID','parkingAreaManage')"
-                                       v-model.trim="parkingAreaManageInfo.conditions.paId" class=" form-control">
+                                    v-model.trim="parkingAreaManageInfo.conditions.paId" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请输入停车场编号','parkingAreaManage')"
-                                       v-model.trim="parkingAreaManageInfo.conditions.num" class=" form-control">
+                                    v-model.trim="parkingAreaManageInfo.conditions.num" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-3">
@@ -31,14 +31,12 @@
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryParkingAreaMethod()"
-                                    style="margin-top: 5px;">
-                                <i class="fa fa-search"></i>
-                                <span><vc:i18n name="查询" namespace="parkingAreaManage"></vc:i18n></span>
+                                style="margin-top: 5px;">
+                                <vc:i18n name="查询" namespace="parkingAreaManage"></vc:i18n>
                             </button>
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_resetParkingAreaMethod()"
-                                    style="margin-top: 5px;">
-                                <i class="fa fa-repeat"></i>
-                                <span><vc:i18n name="重置" namespace="parkingAreaManage"></vc:i18n></span>
+                                style="margin-top: 5px;">
+                                <vc:i18n name="重置" namespace="parkingAreaManage"></vc:i18n>
                             </button>
                         </div>
                     </div>
@@ -51,93 +49,87 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="停车场信息" namespace="parkingAreaManage"></vc:i18n></span>
+                        <vc:i18n name="停车场信息" namespace="parkingAreaManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddParkingAreaModal()"
-                                v-if="vc.hasPrivilege('502022100147030003')">
-                            <i class="fa fa-plus"></i>
-                            <span><vc:i18n name="添加" namespace="parkingAreaManage"></vc:i18n></span>
+                            v-if="vc.hasPrivilege('502022100147030003')">
+                            <vc:i18n name="添加" namespace="parkingAreaManage"></vc:i18n>
                         </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="停车场ID" namespace="parkingAreaManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="停车场编号" namespace="parkingAreaManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="停车场类型" namespace="parkingAreaManage"></vc:i18n></span>
-                            </th>
-                            <th v-for="(item,index) in parkingAreaManageInfo.listColumns" class="text-center">
-                                {{item.specName}}
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="备注" namespace="parkingAreaManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="创建时间" namespace="parkingAreaManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="操作" namespace="parkingAreaManage"></vc:i18n></span>
-                            </th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">
+                                    <vc:i18n name="停车场ID" namespace="parkingAreaManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="停车场编号" namespace="parkingAreaManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="停车场类型" namespace="parkingAreaManage"></vc:i18n>
+                                </th>
+                                <th v-for="(item,index) in parkingAreaManageInfo.listColumns" class="text-center">
+                                    {{item.specName}}
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="备注" namespace="parkingAreaManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="创建时间" namespace="parkingAreaManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="操作" namespace="parkingAreaManage"></vc:i18n>
+                                </th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="parkingArea in parkingAreaManageInfo.parkingAreas">
-                            <td class="text-center">{{parkingArea.paId}}</td>
-                            <td class="text-center">{{parkingArea.num}}</td>
-                            <td class="text-center" v-if="parkingArea.typeCd=='1001'">
-                                {{vc.i18n('地上停车场','parkingAreaManage')}}
-                            </td>
-                            <td class="text-center" v-else>
-                                {{vc.i18n('地下停车场','parkingAreaManage')}}
-                            </td>
-                            <td v-for="item in parkingArea.listValues" class="text-center">
-                                {{item}}
-                            </td>
-                            <td class="text-center">
-                                {{parkingArea.remark}}
-                            </td>
-                            <td class="text-center">{{parkingArea.createTime}}</td>
-                            <td class="text-center">
-                                <div class="btn-group" v-if="vc.hasPrivilege('502022100103010004')">
-                                    <button class="btn-white btn btn-xs"
+                            <tr v-for="parkingArea in parkingAreaManageInfo.parkingAreas">
+                                <td class="text-center">{{parkingArea.paId}}</td>
+                                <td class="text-center">{{parkingArea.num}}</td>
+                                <td class="text-center" v-if="parkingArea.typeCd=='1001'">
+                                    {{vc.i18n('地上停车场','parkingAreaManage')}}
+                                </td>
+                                <td class="text-center" v-else>
+                                    {{vc.i18n('地下停车场','parkingAreaManage')}}
+                                </td>
+                                <td v-for="item in parkingArea.listValues" class="text-center">
+                                    {{item}}
+                                </td>
+                                <td class="text-center">
+                                    {{parkingArea.remark}}
+                                </td>
+                                <td class="text-center">{{parkingArea.createTime}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group" v-if="vc.hasPrivilege('502022100103010004')">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditParkingAreaModel(parkingArea)">
-                                        <span><vc:i18n name="修改" namespace="parkingAreaManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                                <div class="btn-group" v-if="vc.hasPrivilege('502022100117490005')">
-                                    <button class="btn-white btn btn-xs"
+                                            <vc:i18n name="修改" namespace="parkingAreaManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                    <div class="btn-group" v-if="vc.hasPrivilege('502022100117490005')">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openDeleteParkingAreaModel(parkingArea)">
-                                        <span><vc:i18n name="删除" namespace="parkingAreaManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                                <!--<div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openParkingAreaText(parkingArea)">
-                                        <span><vc:i18n name="问候语" namespace="parkingAreaManage"></vc:i18n></span>
-                                    </button>
-                                </div>-->
-                                <div class="btn-group" v-if="vc.hasPrivilege('502022100112510006')">
-                                    <button class="btn-white btn btn-xs"
+                                            <vc:i18n name="删除" namespace="parkingAreaManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                    <div class="btn-group" v-if="vc.hasPrivilege('502022100112510006')">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openParkingAreaTotalControl(parkingArea)">
-                                        <span><vc:i18n name="控制台" namespace="parkingAreaManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                            </td>
-                        </tr>
+                                            <vc:i18n name="控制台" namespace="parkingAreaManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                </td>
+                            </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>
                     <!-- 分页 -->
diff --git a/public/pages/property/parkingAreaManage/parkingAreaManage.js b/public/pages/property/parkingAreaManage/parkingAreaManage.js
index c3bd69b36..e42794e31 100644
--- a/public/pages/property/parkingAreaManage/parkingAreaManage.js
+++ b/public/pages/property/parkingAreaManage/parkingAreaManage.js
@@ -136,7 +136,31 @@
                 vc.jumpToPage('/#/pages/property/parkingAreaText?paId=' + _parkingArea.paId)
             },
             _openParkingAreaTotalControl: function (_parkingArea) {
-                vc.jumpToPage('/#/pages/property/parkingAreaTotalControl?paId=' + _parkingArea.paId);
+
+                //获取用户名
+                let param = {
+                    params:{
+                        targetUrl: encodeURIComponent('/#/pages/car/parkingAreaTotalControl?paId=' + _parkingArea.paId),
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/iot.getIotToken',
+                    param,
+                    function (json, res) {
+                        let _json = JSON.parse(json);
+                        if (_json.code != 0) {
+                            vc.toast(_json.msg);
+                            return;
+                        }
+                        let _url = _json.data.url;
+                        window.open(_url);
+                    },
+                    function () {
+                        console.log('请求失败处理');
+                    }
+                );
+
+                //vc.jumpToPage('/#/pages/property/parkingAreaTotalControl?paId=' + _parkingArea.paId);
             }
         }
     });