社区公告

operationSupport/src/assets/css/public-style.scss

@@ -16,6 +16,9 @@ $base_fontSize: 100;
 @function rem($px) {
   @return $px / $base_fontSize * 1rem;
 }
+.mainTextColor {
+  color: $mainTextColor !important;
+}
 .greenText {
   color: $greenColor !important;
 }

operationSupport/src/views/newWorkBench/components/collectionRate.vue

@@ -152,9 +152,6 @@ export default {
     .model-content {
         height: calc(100% - #{rem(80)});
     }
-    .model-title {
-      
-    }
 }
 
 .model-title {

operationSupport/src/views/newWorkBench/components/communityAnnouncement.vue

@@ -0,0 +1,177 @@
+
+<template>
+    <div class="modelBlock">
+        <template v-if="permissionFiltering">
+            <div class="model-title">
+                <div class="model-title-text">社区公告</div>
+                <div class="buttons" @click="$router.push({ path: '/propertyManagement/inform' })">
+                    <span class="text">查看更多</span> <span class="triangle"></span>
+                </div>
+            </div>
+            <div class="model-content">
+                <div class="listInformation" v-for="(item, index) in datas" :key="index" @click="lookDetail(item)">
+                    <div class="listInformation_text">
+                        <span class="mainTextColor">【{{ item.title }}】</span>{{ item.content | filterHtml }}
+                    </div>
+                    <div class="listInformation_operation">{{ item.pubDate }}</div>
+                </div>
+                <div v-if="datas.length <= 0" class="noData">暂无数据</div>
+            </div>
+        </template>
+        <no-permission v-else tipsText="社区公告"></no-permission>
+    </div>
+</template>
+<script>
+import permissionComponent from './permissionComponent';
+export default {
+    mixins: [permissionComponent],
+    data() {
+        return {
+            defaultModel: {
+                permissUrl: 'propertyManagement/index',
+                titleName: '客户服务'
+            },
+            datas: [],
+            // 详情显示数据
+            mixins_query: {
+                communityId: ''
+            },
+            peopleData: [],
+            houseData: []
+        };
+    },
+    created() {
+        this.getData();
+        this.getOrgTreeList();
+        this.getPeopleList();
+    },
+    methods: {
+        getData() {
+            this.$http
+                .get('/sc-community/Workbench/getNoticeInfo', this.mixins_query)
+                .then(({ status, data, msg }) => {
+                    if (status == 0) {
+                        this.datas = data;
+                    }
+                })
+                .catch((err) => {});
+        },
+        clickDatail(val, resolve) {
+            this.$http.get('/sc-community/notice/find/' + val).then(({ data, status, msg }) => {
+                if (status === 0) {
+                    let treeData = JSON.parse(data.treeData);
+                    let treeDataHome = JSON.parse(treeData[0]);
+                    let treeDataPeople = JSON.parse(treeData[1]);
+                    let userType = '';
+                    if (treeDataHome.length > 0 && treeDataPeople.length > 0) {
+                        userType = 2;
+                    } else if (treeDataHome.length > 0) {
+                        userType = 0;
+                    } else {
+                        userType = 1;
+                    }
+                    resolve &&
+                        resolve({
+                            dataDetail: data,
+                            houseDataIds: treeDataHome,
+                            houseDataPeopleIds: treeDataPeople,
+                            userType: userType,
+                            filePath: JSON.parse(data.filePath),
+                            successImageLists: JSON.parse(data.themePictrue)
+                        });
+                } else {
+                    return this.$message('获取详情失败！请稍后重试');
+                }
+            });
+        },
+        lookDetail(row) {
+            new Promise((resolve) => {
+                this.clickDatail(row.id, resolve);
+            }).then(({ dataDetail, houseDataIds, houseDataPeopleIds, userType, filePath, successImageLists }) => {
+                new Promise((resolve) => {
+                    this.$store.dispatch('addPopup', {
+                        url: '/propertyManagement/common/detailView.vue',
+                        width: '1080px',
+                        height: '750px',
+                        props: {
+                            dataDetail: dataDetail,
+                            successImageLists: successImageLists,
+                            filePath: filePath,
+                            houseData: this.houseData,
+                            peopleData: this.peopleData,
+                            houseDataIds: houseDataIds,
+                            houseDataPeopleIds: houseDataPeopleIds,
+                            userType: userType,
+                            showrightPhone: true,
+                            callback: resolve
+                        },
+                        title: dataDetail.type == 0 ? '物业通知详情' : '社区活动详情',
+                        showCancelButton: true,
+                        showConfirmButton: true
+                    });
+                }).then(() => {
+                    this.getData();
+                });
+            });
+        },
+        // 获取房间
+        getOrgTreeList() {
+            this.$http.get('/sc-community/assets/tree/community/find').then(({ status, data, msg }) => {
+                if (status === 0 && data) {
+                    this.houseData = data;
+                }
+            });
+        },
+        // 获取人员
+        getPeopleList() {
+            // this.PeopleNames = [];
+            this.$http.get('/sc-user-center/user/findUserList').then(({ status, data, msg }) => {
+                if (status == 0 && data) {
+                    this.peopleData = data;
+                }
+            });
+        }
+    }
+};
+</script>
+<style scoped lang="scss">
+@import './style.scss';
+.noData {
+    text-align: center;
+    line-height: rem(100);
+}
+.modelBlock {
+    .model-content {
+        display: block;
+        font-size: 14px;
+        .flex {
+            display: flex;
+        }
+        .listInformation {
+            cursor: pointer;
+            display: flex;
+            justify-content: space-between;
+            margin-top: rem(10);
+            .listInformation_img {
+                width: rem(46);
+                height: rem(46);
+                margin-right: rem(20);
+            }
+            .listInformation_text {
+                display: flex;
+                opacity: 0.7;
+                width: calc(100% - 250px);
+                max-width: 500px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+            .listInformation_operation {
+                width: 150px;
+                opacity: 0.5;
+                text-align: end;
+            }
+        }
+    }
+}
+</style>

operationSupport/src/views/newWorkBench/components/index.js

@@ -1,18 +1,18 @@
-// map中间地图data_id:1,
-// complaintsSuggestions投诉建议类型分布data_id:1,  OK
-// commonFunctions常用功能data_id:1,
-// satisfaction 服务满意度趋势 data_id:1 OK
-// discount设备告警趋势data_id:1,OK
-// rentalAndSaleRate房屋租售率data_id:1, OK
-// collectionRate 收款率分析 data_id:1 OK
-// householdGender住户性别占比data_id:1, OK
-// householdIdentity住户身份占比data_id:1, OK
-// equipmentStatistics设备设施统计data_id:1,
-// ownerApproval 业主审批 data_id:1
-// pendingComplaints 待处理投诉 data_id:1
-// complaintsAndSuggestions投诉建议数量趋势data_id:1,  OK
-
-
+// map中间地图
+// complaintsSuggestions投诉建议类型分布
+// commonFunctions常用功能
+// satisfaction 服务满意度趋势
+// discount设备告警趋势
+// rentalAndSaleRate房屋租售率
+// collectionRate 收款率分析
+// householdGender住户性别占比
+// householdIdentity住户身份占比
+// equipmentStatistics设备设施统计
+// ownerApproval 业主审批
+// pendingComplaints 待处理投诉
+// complaintsAndSuggestions投诉建议数量趋势
+// patrolDuration 巡更人员任务执行时长
+// communityAnnouncement
 
 import maps from '@views/newWorkBench/components/map.vue';
 import complaintsSuggestions from '@views/newWorkBench/components/complaintsSuggestions.vue';
@@ -28,6 +28,10 @@ import ownerApproval from '@views/newWorkBench/components/ownerApproval.vue';
 import pendingComplaints from '@views/newWorkBench/components/pendingComplaints.vue';
 import complaintsAndSuggestions from '@views/newWorkBench/components/complaintsAndSuggestions.vue';
 
+import patrolDuration from '@views/newWorkBench/components/patrolDuration.vue';
+
+import communityAnnouncement from '@views/newWorkBench/components/communityAnnouncement.vue';
+
 
 export default {
   components: {
@@ -45,6 +49,9 @@ export default {
     ownerApproval,
     pendingComplaints,
     complaintsAndSuggestions,
+
+    patrolDuration,
+    communityAnnouncement
   },
   data() {
     return {
@@ -62,7 +69,9 @@ export default {
         10: 'equipmentStatistics',
         11: "ownerApproval",
         12: "pendingComplaints",
-        13: "complaintsAndSuggestions"
+        13: "complaintsAndSuggestions",
+        14: 'patrolDuration',
+        15: 'communityAnnouncement'
       }
     }
   },

operationSupport/src/views/newWorkBench/components/patrolDuration.vue

@@ -0,0 +1,83 @@
+<template>
+    <div class="modelBlock">
+        <template v-if="permissionFiltering">
+            <div class="model-title">
+                <div class="model-title-text">巡更人员任务执行时长</div>
+                <div class="model-title-right">
+                    <el-date-picker
+                        value-format="yyyy-MM"
+                        v-model="date"
+                        type="month"
+                        placeholder="选择年"
+                        class="saveColumn-select"
+                        @change="changeTime"
+                        :clearable="false"
+                    >
+                    </el-date-picker>
+                </div>
+            </div>
+            <div class="model-content">
+                <zz-echart :option="clientOptions" class="chart"></zz-echart>
+            </div>
+        </template>
+        <no-permission v-else tipsText="巡更人员任务执行时长"></no-permission>
+    </div>
+</template>
+<script>
+import { columnOptionsChart } from './indexOptionChart';
+import permissionComponent from './permissionComponent';
+let dataArr = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+export default {
+    mixins: [permissionComponent],
+    data() {
+        return {
+            defaultModel: {
+                permissUrl: '19',
+                titleName: '安保巡更'
+            },
+            mixins_query: {
+                communityId: '',
+                date: '',
+            },
+            date: '',
+            clientOptions: columnOptionsChart('(分)', [], [{ data: dataArr, name: '任务时长' }], [], 10)
+        };
+    },
+    methods: {
+        getData() {
+            this.$http.get('/sc-community/statisticPatrolPersonnelDuration', this.mixins_query).then(({ data, msg, status }) => {
+                if (status == 0 && !!data) {
+                    let timeDay = [],
+                        datas = [];
+                    data.map((item) => {
+                        timeDay.push(item.date);
+                        datas.push(item.data);
+                    });
+                    this.clientOptions = columnOptionsChart('(分)', timeDay, [{ data: datas, name: '任务时长' }], [], 10);
+                }
+            });
+        },
+        changeTime(v) {
+            this.mixins_query.date = v;
+            this.getData();
+        }
+    },
+    created() {
+        this.date = this.$moment().format('YYYY-MM');
+        this.mixins_query.date = this.$moment().format('YYYY-MM');
+        this.getData();
+    }
+};
+</script>
+<style scoped lang="scss">
+@import './style.scss';
+.model-title {
+    .model-title-right {
+        .saveColumn-select {
+            &:not(:first-child) {
+                margin-left: rem(20);
+            }
+        }
+    }
+}
+</style>

operationSupport/src/views/newWorkBench/template/leftAssembly.vue

@@ -179,6 +179,20 @@ export default {
                     type: 9,
                     imgPng: require('@assets/img/formulation/img_zhexiantu@2x.png'),
                     imgIcon: require('@assets/img/formulation/tag_2x@2x.png')
+                },
+                {
+                    data_id: 14,
+                    title: '巡更人员任务执行时长',
+                    type: 8,
+                    imgPng: require('@assets/img/formulation/img_zhuzhuangtu@2x.png'),
+                    imgIcon: require('@assets/img/formulation/tag_2x@2x.png')
+                },
+                {
+                    data_id: 15,
+                    title: '社区公告',
+                    type: 9,
+                    imgPng: require('@assets/img/formulation/img_liebiao@2x.png'),
+                    imgIcon: require('@assets/img/formulation/tag_2x@2x.png')
                 }
             ],
             componentsValue: 0

operationSupport/src/views/patrolManagement/popups/scheduling.vue

@@ -314,9 +314,6 @@ export default {
             td.prev {
                 pointer-events: none;
             }
-            td.current {
-                // pointer-events: none;
-            }
         }
         .el-calendar-day {
             height: 110px;

operationSupport/src/views/payService/propertyFee/index.vue

@@ -336,7 +336,7 @@ export default {
             this.mixins_search();
         },
         exportExcel() {
-            this.__exportExcel('/sc-charge/charge/report/export/excel', this.mixins_query);
+            this.__exportExcel('/sc-charge/charge/bill/export/excel', this.mixins_query);
         },
         typeTimeTransition(start, end) {
             let text = '';

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

@@ -0,0 +1,53 @@
+<template>
+    <previe-inform
+        :dataDetail="dataDetail"
+        :filePath="filePath"
+        :successImageLists="successImageLists"
+        :houseData="houseData"
+        :peopleData="peopleData"
+        :houseDataIds="houseDataIds"
+        :houseDataPeopleIds="houseDataPeopleIds"
+        :showrightPhone="showrightPhone"
+        :userType="userType"
+    ></previe-inform>
+</template>
+<script>
+import previeInform from './previeInform';
+export default {
+    components: { previeInform },
+    props: ['params'],
+    data() {
+        return {};
+    },
+    computed: {
+        dataDetail() {
+            return this.params.dataDetail;
+        },
+        filePath() {
+            return this.params.filePath;
+        },
+        successImageLists() {
+            return this.params.successImageLists;
+        },
+        houseData() {
+            return this.params.houseData;
+        },
+        peopleData() {
+            return this.params.peopleData;
+        },
+        houseDataIds() {
+            return this.params.houseDataIds;
+        },
+        houseDataPeopleIds() {
+            return this.params.houseDataPeopleIds;
+        },
+        showrightPhone() {
+            return this.params.showrightPhone;
+        },
+        userType() {
+            return this.params.userType;
+        }
+    },
+    created() {}
+};
+</script>

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

@@ -1,8 +1,5 @@
 <template>
-    <div class="prev" v-if="dataDetail">
-        <!-- <div class="dialog-header" v-show="showrightPhone">
-            <div class="dialogTitle">{{ dataDetail.type == 0 ? '物业通知' : '社区活动' }}详情</div>
-        </div> -->
+    <div class="prev">
         <!-- 详情左侧部分 -->
         <div class="detail-left">
             <div class="prev-text" style="margin-top: 0">
@@ -13,70 +10,55 @@
                     <div class="files-text">发布对象:</div>
                     <div v-if="userType == 2">
                         <div class="prev-obj-right">
-                            <div class="prev-obj-text">社区住户/{{ '指定房间' }}/{{ houseDataNames }}</div>
+                            <div class="prev-obj-text">社区住户/{{ '指定房间' }}/{{ houseDataNames.join(',') }}</div>
                             <div @click="clickDetailHouse()" class="click-prev">{{ showTreeHouse ? '关闭详情' : '查看详情' }}</div>
                         </div>
                         <div class="prev-obj-right">
-                            <div class="prev-obj-text">
-                                社区员工/{{ '指定员工' }}/{{ !!peopleData[0] ? peopleData[0].value : '' }}/
-                                {{ houseDataNamesPeople }}
-                            </div>
+                            <div class="prev-obj-text">社区员工/{{ '指定员工' }}/{{ houseDataNamesPeople.join(',') }}</div>
                             <div @click="clickDetailPeople()" class="click-prev">{{ showTreePeople ? '关闭详情' : '查看详情' }}</div>
                         </div>
                     </div>
                     <div class="prev-obj-right" v-else>
-                        <div class="prev-obj-text" v-if="userType == 0">社区住户/{{ '指定房间' }}/{{ houseDataNames }}</div>
-                        <div class="prev-obj-text" v-else>社区员工/{{ '指定员工' }}/{{ houseDataNamesPeople }}</div>
+                        <div class="prev-obj-text" v-if="userType == 0">社区住户/{{ '指定房间' }}/{{ houseDataNames.join(',') }}</div>
+                        <div class="prev-obj-text" v-else>社区员工/{{ '指定员工' }}/{{ houseDataNamesPeople.join(',') }}</div>
                         <div @click="clickDetail()" class="click-prev">{{ showTree ? '关闭详情' : '查看详情' }}</div>
                     </div>
                 </div>
-                <div v-if="showTree">
-                    <div>
-                        <!-- 社区住户 -->
-                        <div class="prev-detail-right" v-if="(userType == 0 || userType == 2) && showTreeHouse">
-                            <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 v-show="showTree">
+                    <!-- 社区住户 -->
+                    <div class="prev-detail-right" v-show="(userType == 0 || userType == 2) && showTreeHouse">
+                        <div class="containerScrollbar">
+                            <el-tree
+                                class="filter-tree"
+                                ref="filterHouse"
+                                node-key="value"
+                                show-checkbox
+                                :data="houseData"
+                                :props="defaultProps"
+                                :default-checked-keys="houseDataIds"
+                                :default-expand-all="true"
+                                :filter-node-method="filterNodeHouse"
+                            >
+                            </el-tree>
                         </div>
-                        <!-- 社区人员 -->
-                        <div
-                            :class="{ 'prev-detail-right': true, 'prev-detail-right-two': userType == 2 }"
-                            v-if="(userType == 1 || userType == 2) && showTreePeople"
-                        >
-                            <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
+                        :class="{ 'prev-detail-right': true, 'prev-detail-right-two': userType == 2 }"
+                        v-show="(userType == 1 || userType == 2) && showTreePeople"
+                    >
+                        <div class="containerScrollbar">
+                            <el-tree
+                                class="filter-tree"
+                                ref="filterPeople"
+                                node-key="id"
+                                :data="peopleData"
+                                :props="defaultPropsPeople"
+                                :default-checked-keys="houseDataPeopleIds"
+                                :default-expand-all="true"
+                                :filter-node-method="filterNode"
+                            >
+                            </el-tree>
                         </div>
                     </div>
                 </div>
@@ -122,9 +104,7 @@
             <div class="prev-text html-content">
                 <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>
-                    <!-- </div> -->
                 </GeminiScrollbar>
             </div>
         </div>
@@ -148,7 +128,6 @@
                             <div>
                                 <div class="dialog-urgency" v-if="dataDetail.urgentFlag">紧急</div>
                             </div>
-                            <!-- ruleForm.exigencyOr -->
                         </div>
                         <div class="dialog-right-time">{{ dataDetail.pubDate }}</div>
                         <div></div>
@@ -177,9 +156,9 @@
 export default {
     name: 'previeInform',
     props: {
-        houseDataNamesPeople: '',
         showrightPhone: false,
-        houseDataNames: '',
+        houseDataPeopleIds: [],
+        houseDataIds: [],
         userType: '',
         dataDetail: {
             type: Object,
@@ -206,11 +185,6 @@ export default {
             default: () => []
         }
     },
-    watch: {
-        dataDetail(val) {
-            this.showTree = false;
-        }
-    },
     computed: {},
     data() {
         return {
@@ -227,7 +201,9 @@ export default {
             defaultPropsPeople: {
                 children: 'children',
                 label: 'value'
-            }
+            },
+            houseDataNames: [],
+            houseDataNamesPeople: []
         };
     },
     created() {},
@@ -238,14 +214,6 @@ export default {
             this.showTreeHouse = false;
             this.showTreePeople = false;
         },
-        // 关闭节点事件
-        closeTree(e) {
-            console.log('e', e);
-            // 这里不知道什么原因
-            // if (e.type == 'community') {
-            //     this.showTree = false;
-            // }
-        },
         // 点击显示发布对象详情
         clickDetail(val) {
             this.showTree = !this.showTree;
@@ -269,12 +237,25 @@ export default {
             }
 
             this.showTreePeople = !this.showTreePeople;
-            // this.showTreeHouse = false;
         },
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.label.indexOf(value) !== -1;
+        filterNodeHouse(value, data, node) {
+            if (node.checked || (node.indeterminate && data.type == 'room')) {
+                this.houseDataNames.push(data.name);
+            }
+            return node.checked || node.indeterminate;
+        },
+        filterNode(value, data, node) {
+            if (node.checked || (node.indeterminate && data.children == null)) {
+                this.houseDataNamesPeople.push(data.label);
+            }
+            return node.checked || node.indeterminate;
         }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$refs.filterHouse.filter();
+            this.$refs.filterPeople.filter();
+        });
     }
 };
 </script>
@@ -284,7 +265,6 @@ export default {
 .prev {
     width: 100%;
     display: flex;
-    position: relative;
 
     // 弹框自定义滚动条
     .my-scroll-bar-right {
@@ -470,9 +450,9 @@ export default {
             .prev-detail-right {
                 position: absolute;
                 top: 24px;
-                left: 11%;
+                left: 75px;
                 background: #fff;
-                width: 559px;
+                width: calc(100% - 120px);
                 height: 55vh;
                 z-index: 99;
                 box-shadow: 0px 2px 10px 0px #e6ebf4;
@@ -561,4 +541,30 @@ export default {
         }
     }
 }
+
+/deep/ .el-checkbox {
+    display: none;
+}
+.containerScrollbar {
+    height: 100%;
+    overflow-y: auto;
+    overflow-x: hidden;
+    &::-webkit-scrollbar {
+        z-index: 11;
+        width: 5px;
+    }
+    &::-webkit-scrollbar-track,
+    &::-webkit-scrollbar-corner {
+        background: transparent;
+    }
+    &::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        width: 5px;
+        background: #e0e1e3;
+    }
+    &::-webkit-scrollbar-track-piece {
+        background: transparent;
+        width: 5px;
+    }
+}
 </style>

operationSupport/src/views/propertyManagement/inform.vue

@@ -47,38 +47,6 @@
                     </template>
                 </zz-table>
             </div>
-            <!-- 添加弹框 -->
-            <div class="dialog-info">
-                <el-dialog
-                    :visible.sync="centerDialogVisible"
-                    @close="handleDialogClose"
-                    width="1086px"
-                    :close-on-press-escape="false"
-                    :close-on-click-modal="false"
-                >
-                    <div class="dialog">
-                        <div class="dialog-header">
-                            <i class="el-dialog__close el-icon el-icon-close" @click="centerDialogVisible = false"></i>
-                            <div class="dialogTitle">{{ rowDetail.type == 0 ? '物业通知' : '社区活动' }}详情</div>
-                        </div>
-
-                        <div class="dialog-contents">
-                            <previe-inform
-                                :dataDetail="rowDetail"
-                                :filePath="filePath"
-                                :successImageLists="successImageLists"
-                                :houseData="houseData"
-                                :peopleData="peopleData"
-                                :houseDataNames="houseDataNames"
-                                :houseDataNamesPeople="houseDataNamesPeople"
-                                :userType="userType"
-                                :showrightPhone="true"
-                                ref="previeInform"
-                            ></previe-inform>
-                        </div>
-                    </div>
-                </el-dialog>
-            </div>
         </div>
     </div>
 </template>
@@ -171,34 +139,16 @@ export default {
                     slot: 'opt'
                 }
             ],
-            mixins_post: 'post',
-            // 显隐弹框
-            centerDialogVisible: false,
-            // 获取的房间信息
-            houseData: [],
-            houseDataNames: '',
-            houseDataNamesPeople: '',
-            peopleData: [],
-            userType: '',
-            // 选中的房间
-            selectDataHouseTreeData: {
-                checkData: [],
-                userID: [],
-                userList: []
-            },
-            houseNames: [],
-            PeopleNames: []
+            mixins_post: 'post'
         };
     },
     created() {
-        // if (!!this.$route.params.showPop) {
-        //     this.add();
-        // }
         this.getCommunityList();
         this.mixins_dataUrl = '/sc-community/notice/page';
         this.mixins_query = {};
         this.mixins_search();
         this.getOrgTreeList();
+        this.getPeopleList();
     },
     mounted() {},
     methods: {
@@ -221,10 +171,6 @@ export default {
         },
         /**查询按钮*/
         searchInfo() {
-            let detaH = this.$moment(new Date()).format('HH');
-            let detaM = this.$moment(new Date()).format('mm');
-            let detaS = this.$moment(new Date()).format('ss');
-            // let d = detaH + ':' + detaM + ':' + detaS;
             let d = '00:00:00';
             let dEnd = '23:59:59';
             if (this.searchTime && this.searchTime.length) {
@@ -250,176 +196,60 @@ export default {
                 });
             });
         },
-        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.treeDataPeople.includes(Number(item.id))) {
-                arr.splice(index, 1);
-                arr.map((item) => {
-                    this.filterArrPeople(arr, item, index);
-                });
-            }
-        },
-        filterPeopleName(array) {
-            var that = this;
-            array.map((item) => {
-                if (item.children) {
-                    that.filterPeopleName(item.children);
-                } else if (item.children == null) {
-                    that.PeopleNames.push(item.value);
+
+        getOrgTreeList() {
+            this.$http.get('/sc-community/assets/tree/community/find').then(({ status, data, msg }) => {
+                if (status === 0 && data) {
+                    this.houseData = data;
                 }
             });
         },
         // 获取人员
         getPeopleList() {
-            this.PeopleNames = [];
             this.$http.get('/sc-user-center/user/findUserList').then(({ status, data, msg }) => {
-                if (status === 0) {
-                    this.filterPeople(data);
-                    this.filterPeopleName(data);
-                    this.clearTreeChildrenPeople(data);
+                if (status == 0 && data) {
                     this.peopleData = data;
-                    this.houseDataNamesPeople = this.PeopleNames.toString();
-                } else {
-                    this.$message(error, res.msg);
-                }
-            });
-        },
-        dimension(arr) {
-            arr.map((item, index) => {
-                if (item.children) {
-                    if (item.children.length > 0) {
-                        this.dimension(item.children);
-                    }
-                } else if (item.type == 'room') {
-                    this.filterArr(arr, item, index);
-                }
-            });
-        },
-        clearTreeChildren(arr) {
-            arr.map((item, index) => {
-                if (!!item.children && item.children.length > 0) {
-                    this.clearTreeChildren(item.children);
-                } else {
-                    if (!!item.children) {
-                        arr.splice(index, 1);
-                    }
-                }
-            });
-        },
-        clearTreeChildrenPeople(arr) {
-            arr.map((item, index) => {
-                if (!!item.children && item.children.length > 0) {
-                    this.clearTreeChildrenPeople(item.children);
-                } else {
-                    if (!!item.children && item.children.length == 0) {
-                        this.clearTreeChildrenPeopleArr(arr, index);
-                    }
-                }
-            });
-        },
-        clearTreeChildrenPeopleArr(arr, index) {
-            arr.splice(index, 1);
-            arr.map((item, indexs) => {
-                if (!!item.children && item.children.length == 0) {
-                    this.clearTreeChildrenPeopleArr(arr, indexs);
-                }
-            });
-        },
-        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) {
-                        var arr = data.filter((item) => {
-                            return item.id == this.rowDetail.communityId;
-                        });
-
-                        if (arr.length > 0) {
-                            this.dimension(arr);
-                            this.clearTreeChildren(arr);
-                            this.houseData = arr;
-                            this.filterName(this.houseData);
-                            this.houseDataNames = this.houseNames.toString();
-                        }
-                    }
-                });
-        },
-
         /** 查看详情*/
         clickDatail(row) {
-            this.showDetail = false;
-            // 弹框关闭事件
-            // this.rowDetail = [];
-            this.$http.get('/sc-community/notice/find/' + row.id).then((res) => {
-                if (res.status === 0) {
-                    // console.log('查看详情res.data.treeData', res.data.treeData);
-                    this.rowDetail = res.data;
-                    let treeData = JSON.parse(res.data.treeData);
-                    this.rowDetail.treeData = JSON.parse(treeData[0]);
-                    this.rowDetail.treeDataPeople = JSON.parse(treeData[1]);
+            this.$http.get('/sc-community/notice/find/' + row.id).then(({ data, status, msg }) => {
+                if (status == 0) {
+                    let treeData = JSON.parse(data.treeData);
+                    let treeDataHome = JSON.parse(treeData[0]);
+                    let treeDataPeople = JSON.parse(treeData[1]);
                     let userType = '';
-                    let arr1 = this.rowDetail.treeData;
-                    let arr2 = this.rowDetail.treeDataPeople;
-                    if (arr1.length > 0 && arr2.length > 0) {
+                    if (treeDataHome.length > 0 && treeDataPeople.length > 0) {
                         userType = 2;
-                    } else if (arr1.length > 0) {
+                    } else if (treeDataHome.length > 0) {
                         userType = 0;
                     } else {
                         userType = 1;
                     }
-                    this.userType = userType;
-                    // console.log('查看详情this.userType', this.rowDetail.treeData);
-                    // console.log('查看详情this.rowDetail.treeData', this.rowDetail.treeData);
-                    // console.log('查看详情this.rowDetail.treeDataPeople', this.rowDetail.treeDataPeople);
-                    // this.rowDetail.newName = this.houseNames.toString();
-                    if (userType == 0) {
-                        this.getOrgTreeList();
-                    } else if (userType == 1) {
-                        this.getPeopleList();
-                    } else {
-                        this.getOrgTreeList();
-                        this.getPeopleList();
-                    }
-                    // let fileArr = row.filePath.split(',');
-                    // this.filePath = fileArr.slice(0, fileArr.length - 1);
-                    this.filePath = JSON.parse(res.data.filePath);
-                    this.successImageLists = JSON.parse(res.data.themePictrue);
-                    this.contentHtml = res.data.content;
-                    this.centerDialogVisible = true;
-                    // this.showDetail = false;
-                    if (!!this.$refs.previeInform) {
-                        this.$refs.previeInform.closeDialog();
-                    }
+                    new Promise((resolve) => {
+                        this.$store.dispatch('addPopup', {
+                            url: '/propertyManagement/common/detailView.vue',
+                            width: '1080px',
+                            height: '750px',
+                            props: {
+                                dataDetail: data,
+                                successImageLists: JSON.parse(data.themePictrue),
+                                filePath: JSON.parse(data.filePath),
+                                houseData: this.houseData,
+                                peopleData: this.peopleData,
+                                houseDataIds: treeDataHome,
+                                houseDataPeopleIds: treeDataPeople,
+                                userType: userType,
+                                showrightPhone: true,
+                                callback: resolve
+                            },
+                            title: data.type == 0 ? '物业通知详情' : '社区活动详情',
+                            showCancelButton: true,
+                            showConfirmButton: true
+                        });
+                    }).then(() => {});
                 } else {
                     return this.$message.error('获取详情失败！请稍后重试');
                 }