修改工作台跳转详情页

operationSupport/src/views/propertyManagement/common/previeInform.vue

@@ -1,62 +1,87 @@
 <template>
     <div class="prev" v-if="dataDetail">
-        <div>
+        <!-- <div class="dialog-header" v-show="showrightPhone">
+            <div class="dialogTitle">{{ dataDetail.type == 0 ? '物业通知' : '社区活动' }}详情</div>
+        </div> -->
+        <!-- 详情左侧部分 -->
+        <div class="detail-left">
             <div class="prev-text" style="margin-top: 0">
                 <span>所属社区: </span><span class="text-right">{{ dataDetail.communityName }}</span>
             </div>
             <div class="prev-text detail">
                 <div class="prev-obj">
-                    发布对象: <span class="prev-obj-text">{{ houseDataNames }}</span>
+                    <div class="files-text">发布对象:</div>
+                    <div class="prev-obj-right">
+                        <div class="prev-obj-text" v-if="dataDetail.userType == 0">
+                            社区住户/{{ '指定房间' }}/
+                            <!-- <span v-for="(item, index) in houseDataNames" :key="index">{{ item }}</span> -->
+                            <!-- {{ houseData[0].name }}-{{ houseData[0].children.name }}- -->
+                            {{ houseDataNames }}
+                        </div>
+                        <div class="prev-obj-text" v-else>社区员工/{{ '指定房间' }}/{{ peopleData[0].value }}/{{ houseDataNames }}</div>
+                        <div @click="clickDetail()" class="click-prev">{{ showTree ? '关闭详情' : '查看详情' }}</div>
+                    </div>
                 </div>
                 <div v-if="showTree">
                     <div>
-                        <div class="detail-right" v-if="dataDetail.userType == 0">
-                            <el-tree
-                                class="filter-tree"
-                                ref="filterHouse"
-                                node-key="id"
-                                :data="houseData"
-                                :props="defaultProps"
-                                :default-expand-all="true"
-                                :filter-node-method="filterNode"
-                                @node-collapse="closeTree"
-                            >
-                                <span class="custom-tree-node" slot-scope="{ node, data }">
-                                    <span v-if="data.children == null || data.children.length > 0">{{ data.name }}</span>
-                                </span>
-                            </el-tree>
+                        <!-- 社区住户 -->
+                        <div class="prev-detail-right" v-if="dataDetail.userType == 0">
+                            <GeminiScrollbar class="prev-my-scroll-bar" :autoshow="true">
+                                <el-tree
+                                    class="filter-tree"
+                                    ref="filterHouse"
+                                    node-key="id"
+                                    :data="houseData"
+                                    :props="defaultProps"
+                                    :default-expand-all="true"
+                                    :filter-node-method="filterNode"
+                                    @node-collapse="closeTree"
+                                >
+                                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                                        <span v-if="data.children == null || data.children.length > 0">
+                                            <span class="circle"></span>
+                                            {{ data.name }}</span
+                                        >
+                                    </span>
+                                </el-tree>
+                            </GeminiScrollbar>
                         </div>
-                        <div class="detail-right" v-else>
-                            <el-tree
-                                class="filter-tree"
-                                ref="filterHouse"
-                                node-key="id"
-                                :data="peopleData"
-                                :props="defaultPropsPeople"
-                                :default-expand-all="true"
-                                :filter-node-method="filterNode"
-                                @node-collapse="closeTree"
-                            >
-                                <span class="custom-tree-node" slot-scope="{ node, data }">
-                                    <span v-if="data.children == null || data.children.length > 0">{{ data.label }}</span>
-                                </span>
-                            </el-tree>
+                        <!-- 社区人员 -->
+                        <div class="prev-detail-right" v-else>
+                            <GeminiScrollbar class="prev-my-scroll-bar" :autoshow="true">
+                                <el-tree
+                                    class="filter-tree"
+                                    ref="filterHouse"
+                                    node-key="id"
+                                    :data="peopleData"
+                                    :props="defaultPropsPeople"
+                                    :default-expand-all="true"
+                                    :filter-node-method="filterNode"
+                                    @node-collapse="closeTree"
+                                >
+                                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                                        <span v-if="data.children == null || data.children.length > 0">
+                                            <span class="circle"></span>{{ data.label }}</span
+                                        >
+                                    </span>
+                                </el-tree>
+                            </GeminiScrollbar>
                         </div>
                     </div>
                 </div>
-                <div @click="clickDetail()" class="click-prev">{{ showTree ? '关闭详情' : '查看详情' }}</div>
             </div>
             <div class="prev-text">
-                <span>通知类型: </span
+                <span class="files-text">通知类型: </span
                 ><span class="text-right">{{ dataDetail.type == 0 ? '物业通知' : dataDetail.type == 1 ? '社区活动' : '其他' }}</span>
             </div>
             <div class="prev-text">
-                <span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 标题:</span><span class="text-right">{{ dataDetail.title }}</span>
+                <span class="files-text"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 标题:</span
+                ><span class="text-right">{{ dataDetail.title }}</span>
             </div>
             <div class="prev-text">
-                <span>是否紧急:</span><span class="text-right">{{ dataDetail.urgentFlag ? '是' : '否' }}</span>
+                <span class="files-text">是否紧急:</span><span class="text-right">{{ dataDetail.urgentFlag ? '是' : '否' }}</span>
             </div>
-            <div class="prev-text image-content" v-if="dataDetail.type">
+            <div class="prev-text image-content" v-if="dataDetail.type == 1">
                 <div class="image-text">主题图片:</div>
                 <div class="right-image" v-if="successImageLists.length > 0">
                     <el-image
@@ -66,24 +91,20 @@
                         :src="item.url"
                         :preview-src-list="[item.url]"
                     ></el-image>
-                    <!-- <img v-for="(item, index) of successImageLists" :key="index" :src="item.url" alt="" /> -->
-                    <!-- <img src="https://a.storyblok.com/f/88751/1734x1092/c3cde09986/storyblok-editor-1.jpg/m/900x0/" alt="" /> -->
-                    <!-- <img src="https://a.storyblok.com/f/88751/1734x1092/c3cde09986/storyblok-editor-1.jpg/m/900x0/" alt="" /> -->
-                    <!-- <img src="https://a.storyblok.com/f/88751/1734x1092/c3cde09986/storyblok-editor-1.jpg/m/900x0/" alt="" /> -->
                 </div>
                 <div class="prev-text-none" v-else>暂无图片</div>
             </div>
             <div class="prev-text files">
-                <div>文件上传:</div>
+                <div class="files-text">文件上传:</div>
                 <div v-if="filePath.length > 0" class="files-content">
                     <div v-for="(item, index) of filePath" :key="index" class="prev-text-file">
                         <div class="prev-text-right"><i class="el-icon-paperclip"></i> {{ item.name }}</div>
                     </div>
                 </div>
-                <div class="prev-text-none" v-else style="margin-left: 25px">暂无文件</div>
+                <div class="prev-text-none" v-else>暂无文件</div>
             </div>
             <div class="prev-text html-content">
-                <div class="html-left">通知内容:</div>
+                <div class="files-text" style="margin-right: 25px">通知内容:</div>
                 <GeminiScrollbar class="my-scroll-bar" :autoshow="true">
                     <!-- <div class="html-right"> -->
                     <div v-html="dataDetail.content"></div>
@@ -91,12 +112,56 @@
                 </GeminiScrollbar>
             </div>
         </div>
+        <!-- 右侧手机部分 -->
+        <div class="detail-right" v-show="showrightPhone">
+            <div class="dialog-right">
+                <div class="dialog-right-top">
+                    <img src="../../../assets/img/phoneHeader.png" alt="" />
+                </div>
+                <div class="dialog-right-header">
+                    <i class="el-icon-arrow-left"></i>
+                    <div>{{ dataDetail.type == 0 ? '物业通知' : '社区活动' }}</div>
+                </div>
+                <div class="center-padding"></div>
+                <GeminiScrollbar class="my-scroll-bar-right" :autoshow="true">
+                    <div class="dialog-right-content">
+                        <div class="dialog-title">
+                            <div class="dialog-titles">
+                                {{ dataDetail.title }}
+                            </div>
+                            <div>
+                                <div class="dialog-urgency" v-if="dataDetail.urgentFlag">紧急</div>
+                            </div>
+                            <!-- ruleForm.exigencyOr -->
+                        </div>
+                        <div class="dialog-right-time">{{ dataDetail.pubDate }}</div>
+                        <div></div>
+                        <div class="content">
+                            <div class="content-text">
+                                <div v-html="dataDetail.content" id="content" />
+                            </div>
+                            <div class="content-inform"></div>
+                            <div v-if="filePath.length > 0">
+                                <div class="file-name" v-for="(item, index) of filePath" :key="index">
+                                    <span class="file-name-left"><i class="el-icon-paperclip"></i> </span>
+                                    <span class="file-name-right">
+                                        {{ item.name }}
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+                        <div></div>
+                    </div>
+                </GeminiScrollbar>
+            </div>
+        </div>
     </div>
 </template>
 <script>
 export default {
     name: 'previeInform',
     props: {
+        showrightPhone: false,
         houseDataNames: '',
         dataDetail: {
             type: Object,
@@ -169,119 +234,279 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import '../style.scss';
+
 .prev {
     width: 100%;
-    .prev-text {
-        width: 100%;
-        font-size: 12px;
-        color: #424656;
-        margin: 34px 20px;
-        .text-right {
-            margin-left: 25px;
+    display: flex;
+    position: relative;
+
+    // 弹框自定义滚动条
+    .my-scroll-bar-right {
+        height: 438px;
+        /deep/ .gm-scrollbar.-horizontal .thumb {
+            height: 0;
         }
     }
-    .prev-obj {
-        max-width: 60%;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        span {
-            margin-left: 25px;
-        }
-        .prev-obj-text {
+    .el-tree {
+        .circle {
+            display: block;
         }
-    }
-    .detail {
-        display: flex;
-        position: relative;
-        .detail-right {
-            position: absolute;
-            top: -5px;
-            right: 4%;
-            background: #eee;
+        /deep/ .el-tree-node__expand-icon.is-leaf {
+            width: 4px;
+            height: 4px;
+            border-radius: 50%;
+            background: #7a7d88;
+            margin: 6px;
+            padding: 0px;
         }
-        .click-prev {
-            color: #0eaeff;
-            cursor: pointer;
-            margin-left: 5px;
+        .el-tree-node:focus > .el-tree-node__content {
+            background: #fff;
         }
     }
-    .files {
-        display: flex;
-    }
-    .prev-text-none {
-        font-size: 12px;
+    // 右侧部分
+    .detail-right {
+        .dialog-right {
+            width: 283px;
+            height: 570px;
+            border-radius: 24px;
+            border: 1px solid #e0e1e3;
+            margin: 20px 40px 70px;
+            background-color: #fafcff;
+            .dialog-right-top {
+                text-align: center;
+                background: white;
+                border-top-right-radius: 28px;
+                border-top-left-radius: 28px;
+                border-bottom: none;
+                padding: 4px;
+                img {
+                    background: white;
+                    width: 100%;
+                    width: 234px;
+                    height: 8px;
+                    text-align: center;
+                }
+            }
+            .dialog-right-header {
+                width: 100%;
+                padding: 24px 14px;
+                background: white;
+                :first-child {
+                    float: left;
+                    line-height: 20px;
+                }
+                :last-child {
+                    font-weight: bold;
+                    text-align: center;
+                }
+            }
+            .center-padding {
+                padding: 5px 0;
+            }
+
+            .dialog-right-content {
+                background: white;
+                padding: 11px;
+                .dialog-title {
+                    display: flex;
+                    .dialog-titles {
+                        font-size: 14px;
+                        color: #424656;
+                    }
+                    .dialog-urgency {
+                        border-radius: 15px;
+                        width: 36px;
+                        height: 15px;
+                        line-height: 15px;
+                        background-image: linear-gradient(to right, #f65b5b, #ffa3a3);
+                        font-size: 12px;
+                        -webkit-transform-origin-x: 0;
+                        -webkit-transform: scale(0.8);
+                        margin-left: 2px;
+                        margin-top: 2px;
+                        color: white;
+                        text-align: center;
+                    }
+                }
+                .dialog-right-time {
+                    font-size: 10px;
+                    -webkit-transform-origin-x: 0;
+                    -webkit-transform: scale(0.9);
+                    color: #9ba6af;
+                    padding: 3px 0;
+                }
+                .dialog-right-time + div {
+                    width: 100%;
+                    border-bottom: 1px solid #eeeeee;
+                    margin-bottom: 10px;
+                }
+                .content {
+                    width: 110%;
+                    font-size: 10px;
+                    color: #e0e1e3;
+                    background-color: #fff;
+                    -webkit-transform-origin-x: 0;
+                    -webkit-transform: scale(0.92);
+                    .content-text {
+                        width: 100%;
+                        color: #686b78;
+                        background-color: #fff;
+                        /deep/ img {
+                            // width: 100%;
+                            max-width: 100%;
+                            max-height: 750px;
+                        }
+                    }
+                    .content-inform {
+                        width: 100%;
+                        text-align: center;
+                        margin: 50px;
+                        :first-child {
+                            color: #373b49;
+                        }
+                    }
+                    .file-name {
+                        margin: 5px;
+                        border-radius: 24px;
+                        width: 90%;
+                        background: #fafcff;
+                        .file-name-left {
+                            color: #0eaeff;
+                            font-size: 14px;
+                        }
+                        .file-name-right {
+                            color: #424656;
+                        }
+                    }
+                }
+            }
+        }
     }
-    .image-content {
+    // 左侧部分
+    .detail-left {
         width: 100%;
-        display: flex;
-        .image-text {
-            width: 12%;
+        padding: 27px 20px 40px 24px;
+        .prev-text {
+            width: 100%;
+            font-size: 12px;
+            color: #424656;
+            margin: 34px 20px;
+            .text-right {
+                margin-left: 25px;
+                min-width: 60px;
+            }
+        }
+        .prev-obj {
+            width: 100%;
             display: flex;
-            flex-direction: column;
-            justify-content: center;
+            .prev-obj-right {
+                display: flex;
+                .prev-obj-text {
+                    max-width: 495px;
+                    margin-left: 25px;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
+                .click-prev {
+                    color: #0eaeff;
+                    cursor: pointer;
+                    margin-left: 5px;
+                }
+            }
         }
-        .right-image {
-            max-height: 120px;
+        .detail {
             display: flex;
-            :last-child {
-                margin-right: 0;
+            position: relative;
+
+            .prev-detail-right {
+                position: absolute;
+                top: 24px;
+                left: 11%;
+                background: #fff;
+                width: 559px;
+                height: 55vh;
+                z-index: 99;
+                box-shadow: 0px 2px 10px 0px #e6ebf4;
+                // border-radius: 4px;
+                // .prev-my-scroll-bar {
+                // }
             }
-            .images {
-                display: block;
-                float: left;
-                width: 180px;
-                height: 100px;
-                border: 1px solid #ccc;
-                border-radius: 4px;
-                min-width: 100px;
-                margin-right: 10px;
+        }
+        .files {
+            display: flex;
+            .files-text {
+                min-width: 60px;
             }
         }
-    }
-    .files-content {
-        min-width: 150px;
-        display: flex;
-        .prev-text-file {
-            background: #f8fcff;
-            border-radius: 4px;
-            font-size: 14px;
-            margin-left: 25px;
-            padding: 2px 8px;
-            .prev-text-right {
-                overflow: hidden;
-                white-space: nowrap;
-                -o-text-overflow: ellipsis; //浏览器兼容
-                text-overflow: ellipsis;
+        .prev-text-none {
+            margin-left: 20px;
+            font-size: 12px;
+        }
+        .image-content {
+            width: 100%;
+            display: flex;
+            .image-text {
+                min-width: 60px;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+            }
+            .right-image {
+                max-height: 120px;
+                display: flex;
+                margin-left: 15px;
+                :last-child {
+                    margin-right: 0;
+                }
+                .images {
+                    display: block;
+                    float: left;
+                    width: 180px;
+                    height: 100px;
+                    border: 1px solid #ccc;
+                    border-radius: 4px;
+                    min-width: 100px;
+                    margin-right: 10px;
+                }
             }
         }
-    }
-    .html-content {
-        display: flex;
-        width: 100%;
-        max-height: 200px;
-        .html-left {
-            margin-right: 5%;
+        .files-content {
+            min-width: 150px;
+            display: flex;
+            .prev-text-file {
+                background: #f8fcff;
+                border-radius: 4px;
+                font-size: 14px;
+                margin-left: 25px;
+                padding: 2px 8px;
+                .prev-text-right {
+                    overflow: hidden;
+                    white-space: nowrap;
+                    -o-text-overflow: ellipsis; //浏览器兼容
+                    text-overflow: ellipsis;
+                }
+            }
         }
-    }
-    // 弹框自定义滚动条
-    .my-scroll-bar {
-        width: 86%;
-        height: 200px;
-        max-height: 218px;
-        /deep/ .gm-scrollbar.-horizontal .thumb {
-            height: 0;
+        .html-content {
+            display: flex;
+            width: 100%;
+            max-height: 200px;
+        }
+        // 弹框自定义滚动条
+        .my-scroll-bar {
+            width: 86%;
+            height: 200px;
+            max-height: 218px;
+            /deep/ .gm-scrollbar.-horizontal .thumb {
+                height: 0;
+            }
+        }
+        /deep/ .wscnph {
+            max-width: 200px;
+            max-height: 200px;
         }
-    }
-    /deep/ .wscnph {
-        max-width: 200px;
-        max-height: 200px;
-    }
-    .el-tree {
-        background: #fff;
-        padding: 0 20px;
-        height: 50vh;
-        overflow: auto;
     }
 }
 </style>

operationSupport/src/views/propertyManagement/inform.vue

@@ -56,7 +56,7 @@
                                 <span style="color: #ff7f7f"> *</span>
                                 为必填项)
                             </div>
-                            <div class="dialogTitle" v-else>物业通知发布</div>
+                            <div class="dialogTitle" v-else>{{ rowDetail.type == 0 ? '物业通知' : '社区活动' }}详情</div>
                         </div>
 
                         <div class="dialog-contents">
@@ -661,11 +661,11 @@ export default {
             } else {
                 this.showUploadImage = false;
             }
-            // this.rowDetail = '';
-            // this.showDetail = true;
-            // this.centerDialogVisible = true;
-            // this.$refs.upImages.clearImageList('');
-            // this.$refs.endit.setContent('');
+            this.rowDetail = '';
+            this.showDetail = true;
+            this.centerDialogVisible = true;
+            this.$refs.upImages.clearImageList('');
+            this.$refs.endit.setContent('');
 
             console.log('发布活动类型', val);
         },
@@ -764,8 +764,7 @@ export default {
                             title: this.ruleForm.title,
                             type: this.ruleForm.informType,
                             urgentFlag: this.ruleForm.exigencyOr == '是' ? 1 : 0,
-                            userType:
-                                this.ruleForm.issueRoom.radioStaff == '全部员工' || this.ruleForm.issueRoom.radioStaff == '指定员工' ? 1 : 0
+                            userType: this.ruleForm.issueRoom.checkAll ? 0 : 1
                         };
                         this.$http.post('/sc-community-web/notice/add', query).then((res) => {
                             if (res.status === 0) {
@@ -916,7 +915,6 @@ export default {
                 .get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })
                 .then(({ status, data, msg }) => {
                     if (status === 0 && data) {
-                        console.log('houseData=1', this.houseData);
                         var arr = data.filter((item) => {
                             return item.id == this.rowDetail.communityId;
                         });
@@ -924,9 +922,6 @@ export default {
                         this.dimension(this.houseData);
                         this.filterName(this.houseData);
                         let h = [...new Set(this.houseNames)];
-                        console.log('====================================');
-                        console.log('houseNames', this.houseData);
-                        console.log('====================================');
                         this.houseDataNames = this.houseNames.toString();
                     }
                 });
@@ -952,8 +947,6 @@ export default {
                     this.contentHtml = res.data.content;
                     this.centerDialogVisible = true;
                     this.showDetail = false;
-                    console.log('查看详情', res);
-                    console.log('查看详情', res.data.noticeUserVoList[0].userType);
                 } else {
                     return this.$message('获取详情失败！请稍后重试');
                 }
@@ -964,4 +957,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import './style.scss';
+/deep/ .html-left {
+    width: 16%;
+}
 </style>

operationSupport/src/views/propertyManagement/style.scss

@@ -326,7 +326,7 @@ $fontSizeSmall: 14px;
     }
 }
 
-// 通知公公告样式
+// 通知公告样式
 .inform {
     /deep/ .cell.el-tooltip p {
         overflow: hidden;
@@ -355,8 +355,9 @@ $fontSizeSmall: 14px;
                 }
                 .dialogTitle {
                     position: absolute;
-                    top: 10px;
+                    top: 13px;
                     left: 24px;
+                    font-size: 14px;
                 }
             }
             .dialog-contents {
@@ -368,7 +369,7 @@ $fontSizeSmall: 14px;
                 }
                 .dialog-left {
                     width: 65%;
-                    padding: 27px 20px 40px 24px;
+                    padding: 0px 20px 40px 24px;
                     .dialog-select {
                         width: 100%;
                         /deep/ .el-select > .el-input {

operationSupport/src/views/workbench/index.vue

@@ -165,7 +165,7 @@
                     <div @click="goPath('/propertyManagement/inform')">查看更多&nbsp;></div>
                 </div>
                 <ul v-if="informData.length > 0">
-                    <li v-for="(item, index) in informData" :key="index" @click="goPathBack('/propertyManagement/inform', true, item.id)">
+                    <li v-for="(item, index) in informData" :key="index" @click="clickDatail(item.id)">
                         <div class="footer-content">
                             <div>[{{ item.title }}]</div>
                             <div>{{ item.content | filterHtml }}</div>
@@ -196,19 +196,48 @@
             </div>
         </div>
         <!-- 底部结束部分 -->
+        <!-- 详情显示 -->
+        <div class="dialog-info">
+            <el-dialog
+                :visible.sync="showRight"
+                width="1086px"
+                :title="rowDetail.type == 0 ? '物业通知详情' : '社区活动详情'"
+                :close-on-press-escape="true"
+                :close-on-click-modal="true"
+            >
+                <previe-inform
+                    :dataDetail="rowDetail"
+                    :filePath="filePath"
+                    :successImageLists="successImageLists"
+                    :houseData="houseData"
+                    :peopleData="peopleData"
+                    :houseDataNames="houseDataNames"
+                    ref="filterHouse"
+                    :showrightPhone="showrightPhone"
+                ></previe-inform>
+            </el-dialog>
+        </div>
     </div>
 </template>
 <script>
+import previeInform from '../propertyManagement/common/previeInform';
+
 export default {
+    components: { previeInform },
     data() {
         return {
             houseData: [],
             warnData: [],
             informData: [],
-            pendData: []
+            pendData: [],
+            // 详情显示数据
+            rowDetail: [],
+            showrightPhone: false,
+            showRight: false,
+            PeopleNames: '',
+            houseDataNames: ''
         };
     },
-
     created() {
         this.getHouseData();
         this.getWarnData();
@@ -217,6 +246,132 @@ export default {
     },
 
     methods: {
+        /** 查看通知公告详情*/
+        clickDatail(val) {
+            // this.rowDetail = [];
+            this.$http.get('/sc-community-web/notice/find/' + val).then((res) => {
+                if (res.status === 0) {
+                    this.rowDetail = res.data;
+                    this.rowDetail.treeData = JSON.parse(res.data.treeData);
+                    // this.rowDetail.newName = this.houseNames.toString();
+                    if (res.data.userType == 0) {
+                        this.getOrgTreeList();
+                    } else {
+                        this.getPeopleList();
+                    }
+                    this.filePath = JSON.parse(res.data.filePath);
+                    this.successImageLists = JSON.parse(res.data.themePictrue);
+
+                    this.showRight = true;
+                    this.showrightPhone = true;
+                } else {
+                    return this.$message('获取详情失败！请稍后重试');
+                }
+            });
+        },
+        filterPeople(arr) {
+            arr.map((item, index) => {
+                if (item.children && item.children.length > 0) {
+                    this.filterPeople(item.children);
+                } else if (item.children == null) {
+                    this.filterArrPeople(arr, item, index);
+                }
+            });
+        },
+        filterArrPeople(arr, item, index) {
+            if (!this.rowDetail.treeData.includes(Number(item.id))) {
+                arr.splice(index, 1);
+                arr.map((item) => {
+                    this.filterArrPeople(arr, item, index);
+                });
+            }
+        },
+        filterPeopleName(array) {
+            console.log('====================================');
+            console.log(' filterPeopleName(array', array);
+            console.log('====================================');
+            var that = this;
+            // array.map((item) => {
+            //     if (item.children && item.children.length > 0) {
+            //         that.filterName(item.children);
+            //         that.houseNames.push(item.name);
+            //     } else if (item.type == 'room') {
+            //         that.houseNames.push(item.name);
+            //     }
+            // });
+            array.map((item) => {
+                if (item.children) {
+                    that.filterPeopleName(item.children);
+                } else if (item.children == null) {
+                    that.PeopleNames.push(item.value);
+                }
+            });
+        },
+        // 获取人员
+        getPeopleList() {
+            this.PeopleNames = [];
+            this.$http.get('/sc-user-center/user/findUserList').then(({ status, data, msg }) => {
+                if (status === 0) {
+                    this.peopleData = data;
+                    this.filterPeople(this.peopleData);
+                    this.filterPeopleName(this.peopleData);
+                    this.houseDataNames = this.PeopleNames.toString();
+                } else {
+                    this.$message(warning, '获取人员失败,请稍后重试');
+                }
+            });
+        },
+        dimension(arr) {
+            arr.map((item, index) => {
+                if (item.children) {
+                    this.dimension(item.children);
+                } else if (item.type == 'room') {
+                    this.filterArr(arr, item, index);
+                }
+            });
+        },
+        filterArr(arr, item, index) {
+            if (!this.rowDetail.treeData.includes(Number(item.value))) {
+                arr.splice(index, 1);
+                arr.map((item) => {
+                    this.filterArr(arr, item, index);
+                });
+            }
+        },
+        filterName(array) {
+            var that = this;
+            array.map((item) => {
+                if (item.children && item.children.length > 0) {
+                    that.houseNames.push(item.name);
+                    that.filterName(item.children);
+                } else if (item.type == 'room') {
+                    that.houseNames.push(item.name);
+                }
+            });
+        },
+
+        // 获取房间
+        getOrgTreeList() {
+            this.houseNames = [];
+            this.$http
+                .get('/sc-community/assets/tree/community/find', { buildingType: this.buildingType })
+                .then(({ status, data, msg }) => {
+                    if (status === 0 && data) {
+                        console.log('houseData=1', this.houseData);
+                        var arr = data.filter((item) => {
+                            return item.id == this.rowDetail.communityId;
+                        });
+                        this.houseData = arr;
+                        this.dimension(this.houseData);
+                        this.filterName(this.houseData);
+                        let h = [...new Set(this.houseNames)];
+                        console.log('====================================');
+                        console.log('houseNames', this.houseData);
+                        console.log('====================================');
+                        this.houseDataNames = this.houseNames.toString();
+                    }
+                });
+        },
         // 打开新页  跳转的路径
         goPath(path, showDialog, id) {
             this.$router.push({ path, query: { showDialog: showDialog, id: id } });
@@ -281,4 +436,13 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import './style.scss';
+/deep/ .el-dialog__body {
+    padding: 0;
+}
+.el-dialog__header {
+    background-color: #f8fcff;
+}
+/deep/ .detail .prev-detail-right {
+    left: 11% !important;
+}
 </style>