diff --git a/public/components/dev/addMapping/addMapping.html b/public/components/dev/addMapping/addMapping.html
index 0577a1bc6..42e6f260b 100755
--- a/public/components/dev/addMapping/addMapping.html
+++ b/public/components/dev/addMapping/addMapping.html
@@ -1,48 +1,27 @@
-<div id="addMappingModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+<div id="addMappingModel" class="modal fade"  role="dialog" aria-labelledby="exampleModalLabel"
      aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
                 <h3 class="m-t-none m-b ">
-                    <span><vc:i18n name="添加编码映射" namespace="addMapping"></vc:i18n></span>
+                    <span><vc:i18n name="添加" namespace="addMapping"></vc:i18n></span>
                 </h3>
                 <div class="ibox-content">
                     <div>
                         <div>
-                            <!--<div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="楼名称" namespace="addMapping"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="addFloorInfo.name" type="text"
-                                        :placeholder="vc.i18n('必填，请填写名称','addMapping')" class="form-control">
-                                 </div>
-                            </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                   <span><vc:i18n name="楼编号" namespace="addMapping"></vc:i18n></span>
+                                    <vc:i18n name="配置项" namespace="addMapping"></vc:i18n>
                                 </label>
                                 <div class="col-sm-10">
-                                   <input v-model="addFloorInfo.floorNum" type="email"
-                                     :placeholder="vc.i18n('必填，请填写编号','addMapping')" class="form-control">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                   <span><vc:i18n name="备注" namespace="addMapping"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                   <input v-model="addFloorInfo.remark" type="tel"
-                                      :placeholder="vc.i18n('可填，请填写备注','addMapping')" class="form-control">
-                                </div>
-                            </div>-->
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="域" namespace="addMapping"></vc:i18n></span>
-                                </label>
-                                <div class="col-sm-10">
-                                    <input v-model="addMappingInfo.domain" type="text"
-                                           :placeholder="vc.i18n('必填，请填写域','addMapping')" class="form-control">
+                                    <select class="custom-select" v-model="addMappingInfo.domain">
+                                        <option selected disabled value="">
+                                            {{vc.i18n('必填，请选择配置项','addMapping')}}
+                                        </option>
+                                        <option v-for="(item,index) in addMappingInfo.domains"
+                                                :key="index" :value="item.domain">{{item.domainName}}
+                                        </option>
+                                    </select>
                                 </div>
                             </div>
                             <div class="form-group row">
diff --git a/public/components/dev/addMapping/addMapping.js b/public/components/dev/addMapping/addMapping.js
index 7e8efefdf..b03306415 100755
--- a/public/components/dev/addMapping/addMapping.js
+++ b/public/components/dev/addMapping/addMapping.js
@@ -6,13 +6,15 @@
                 name: '',
                 key: '',
                 value: '',
-                remark: ''
+                remark: '',
+                domains:[]
             }
         },
         _initMethod: function () {
         },
         _initEvent: function () {
             vc.on('addMapping', 'openAddMappingModal', function () {
+                $that._listAddMappingDomains();
                 $('#addMappingModel').modal('show');
             });
         },
@@ -99,9 +101,29 @@
                     name: '',
                     key: '',
                     value: '',
-                    remark: ''
+                    remark: '',
+                    domains:[]
                 };
-            }
+            },
+            _listAddMappingDomains: function(_page, _rows) {
+                let param = {
+                    params: {
+                        page: 1,
+                        row: 300
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/mapping.listMappingDomain',
+                    param,
+                    function(json, res) {
+                        let _mappingDomainManageInfo = JSON.parse(json);
+                        vc.component.addMappingInfo.domains = _mappingDomainManageInfo.data;
+                    },
+                    function(errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/components/dev/editMapping/editMapping.html b/public/components/dev/editMapping/editMapping.html
index 144a1a13e..10db330b3 100755
--- a/public/components/dev/editMapping/editMapping.html
+++ b/public/components/dev/editMapping/editMapping.html
@@ -14,8 +14,14 @@
                                     <span><vc:i18n name="域" namespace="editMapping"></vc:i18n></span>
                                 </label>
                                 <div class="col-sm-10">
-                                    <input v-model="editMappingInfo.domain" type="text"
-                                           :placeholder="vc.i18n('必填，请填写域','editMapping')" class="form-control">
+                                    <select class="custom-select" v-model="editMappingInfo.domain">
+                                        <option selected disabled value="">
+                                            {{vc.i18n('必填，请选择配置项','editMapping')}}
+                                        </option>
+                                        <option v-for="(item,index) in editMappingInfo.domains"
+                                                :key="index" :value="item.domain">{{item.domainName}}
+                                        </option>
+                                    </select>
                                 </div>
                             </div>
                             <div class="form-group row">
diff --git a/public/components/dev/editMapping/editMapping.js b/public/components/dev/editMapping/editMapping.js
index 86cffed6e..c30f41376 100755
--- a/public/components/dev/editMapping/editMapping.js
+++ b/public/components/dev/editMapping/editMapping.js
@@ -7,7 +7,8 @@
                 name: '',
                 key: '',
                 value: '',
-                remark: ''
+                remark: '',
+                domains:[]
             }
         },
         _initMethod: function () {
@@ -17,6 +18,7 @@
                 vc.component.refreshEditMappingInfo();
                 $('#editMappingModel').modal('show');
                 vc.copyObject(_params, vc.component.editMappingInfo);
+                $that._listEditMappingDomains();
                 // vc.component.editMappingInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
@@ -108,9 +110,29 @@
                     name: '',
                     key: '',
                     value: '',
-                    remark: ''
+                    remark: '',
+                    domains:[]
                 }
-            }
+            },
+            _listEditMappingDomains: function(_page, _rows) {
+                let param = {
+                    params: {
+                        page: 1,
+                        row: 300
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/mapping.listMappingDomain',
+                    param,
+                    function(json, res) {
+                        let _mappingDomainManageInfo = JSON.parse(json);
+                        vc.component.editMappingInfo.domains = _mappingDomainManageInfo.data;
+                    },
+                    function(errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
         }
     });
 })(window.vc, window.vc.component);
\ No newline at end of file
diff --git a/public/components/dev/editMappingDomain/editMappingDomain.html b/public/components/dev/editMappingDomain/editMappingDomain.html
index 4b8fb0235..c507800a7 100644
--- a/public/components/dev/editMappingDomain/editMappingDomain.html
+++ b/public/components/dev/editMappingDomain/editMappingDomain.html
@@ -1,4 +1,4 @@
-<div id="editMappingDomainModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+<div id="editMappingDomainModel" class="modal fade" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -7,25 +7,25 @@
                     <div>
                         <div>
                             <div class="form-group row">
-                                <span><vc:i18n name='名称' namespace='editMappingDomain'></vc:i18n></span> </label>
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name='名称' namespace='editMappingDomain'></vc:i18n></span> </label>
                                 <div class="col-sm-10">
                                     <input v-model="editMappingDomainInfo.domainName" type="text" :placeholder="vc.i18n('必填，请填写名称','editMappingDomain')" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <span><vc:i18n name='配置项' namespace='editMappingDomain'></vc:i18n></span> </label>
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name='配置项' namespace='editMappingDomain'></vc:i18n></span> </label>
                                 <div class="col-sm-10">
                                     <input v-model="editMappingDomainInfo.domain" type="text" :placeholder="vc.i18n('必填，请填写配置项','editMappingDomain')" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <span><vc:i18n name='排序' namespace='editMappingDomain'></vc:i18n></span> </label>
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name='排序' namespace='editMappingDomain'></vc:i18n></span> </label>
                                 <div class="col-sm-10">
                                     <input v-model="editMappingDomainInfo.seq" type="number" :placeholder="vc.i18n('必填，请填写排序','editMappingDomain')" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <span><vc:i18n name='描述' namespace='editMappingDomain'></vc:i18n></span> </label>
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name='描述' namespace='editMappingDomain'></vc:i18n></span> </label>
                                 <div class="col-sm-10">
                                     <textarea v-model="editMappingDomainInfo.remark" :placeholder="vc.i18n('必填，请填写描述','editMappingDomain')" class="form-control"></textarea>
                                 </div>
diff --git a/public/pages/dev/mappingManage/mappingManage.html b/public/pages/dev/mappingManage/mappingManage.html
index 666259bda..f32f31580 100755
--- a/public/pages/dev/mappingManage/mappingManage.html
+++ b/public/pages/dev/mappingManage/mappingManage.html
@@ -2,9 +2,12 @@
     <div class="row">
         <div class="col-md-2 padding-r-0">
             <div class=" border-radius ">
-                <div class="margin-xs-r  treeview attendance-staff">
+                <div class="margin-xs-r  treeview attendance-staff" style="height: 650px;">
                     <ul class="list-group text-center border-radius">
                         <!--  -->
+                        <li class="list-group-item node-orgTree "  @click="swatchDomain()" :class="{'vc-node-selected':mappingManageInfo.conditions.domain == ''}">
+                            全部配置
+                        </li>
                         <li class="list-group-item node-orgTree " v-for="(item,index) in mappingManageInfo.mappingDomains" :key="index" @click="swatchDomain(item)" :class="{'vc-node-selected':mappingManageInfo.conditions.domain == item.domain}">
                             {{item.domainName}}({{item.domain}})
                         </li>
@@ -15,7 +18,7 @@
         <div class="col-md-10">
             <div class="row">
                 <div class="col-lg-12">
-                    <div class="ibox ">
+                    <div class="ibox " v-if="mappingManageInfo.curDomain.domain">
                         <div class="ibox-title">
                             <h5>
                                 {{mappingManageInfo.curDomain.domainName}}({{mappingManageInfo.curDomain.domain}})
diff --git a/public/pages/dev/mappingManage/mappingManage.js b/public/pages/dev/mappingManage/mappingManage.js
index c432eadfb..730042be9 100755
--- a/public/pages/dev/mappingManage/mappingManage.js
+++ b/public/pages/dev/mappingManage/mappingManage.js
@@ -108,8 +108,14 @@
                 );
             },
             swatchDomain: function(item) {
-                $that.mappingManageInfo.conditions.domain = item.domain;
-                $that.mappingManageInfo.curDomain = item;
+                if(!item){
+                    $that.mappingManageInfo.conditions.domain = '';
+                    $that.mappingManageInfo.curDomain = {};
+                }else{
+                    $that.mappingManageInfo.conditions.domain = item.domain;
+                    $that.mappingManageInfo.curDomain = item;
+                }
+               
                 vc.component._listMappings(DEFAULT_PAGE, DEFAULT_ROWS);
             }
         }