工作台

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

@@ -76,7 +76,8 @@ export default {
             mixins_query: {
                 communityId: '',
                 chargeType: '',
-                date: ''
+                startTime: '',
+                endTime: ''
             },
             date: '',
             amountType: [
@@ -135,12 +136,14 @@ export default {
             });
         },
         changeTime(v) {
-            this.mixins_query.date = v + '-01';
+            this.mixins_query.startTime = v;
+            this.mixins_query.endTime = v;
             this.getData();
         }
     },
     created() {
-        this.mixins_query.date = this.$moment().format('YYYY-MM') + '-01';
+        this.mixins_query.startTime = this.$moment().format('YYYY-MM');
+        this.mixins_query.endTime = this.$moment().format('YYYY-MM');
         this.date = this.$moment().format('YYYY-MM');
         this.getData();
     }

operationSupport/src/views/newWorkBench/components/communityManagement/overallCommunity.vue

@@ -62,23 +62,26 @@ export default {
                     fontObj: 'residentTotal',
                     path: '/ownerManagement/index'
                 }
-            ]
+            ],
+            mixins_query: {
+                communityId: ''
+            }
         };
     },
     methods: {
         // 获取房屋信息
-        getHouseData() {
-            this.$http.get('/sc-community/Workbench/totalHouseInfo').then((res) => {
-                if (res.status == 0) {
-                    this.houseData = res.data;
+        getData() {
+            this.$http.get('/sc-community/Workbench/totalHouseInfo', this.mixins_query).then(({ data, msg, status }) => {
+                if (status == 0) {
+                    this.houseData = data;
                 } else {
-                    this.$message.warning('获取房屋信息失败');
+                    this.$message.error(msg);
                 }
             });
         }
     },
     created() {
-        this.getHouseData();
+        this.getData();
     }
 };
 </script>

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

@@ -8,7 +8,9 @@
     </div>
 </template>
 <script>
+import permissionComponent from './permissionComponent';
 export default {
+    mixins: [permissionComponent],
     data() {
         return {
             map: '',
@@ -19,11 +21,35 @@ export default {
             polygons: [],
             addressName: '', //地址查询名称
             poisArray: [],
-            loadding: true
+            loadding: true,
+            mixins_query: {
+                communityId: ''
+            }
         };
     },
     mounted() {},
-    computed: {},
+    computed: {
+        poisArrays() {
+            let arrs = [];
+            this.poisArray.map((item) => {
+                if (!!this.mixins_query.communityId) {
+                    if (item.id == this.mixins_query.communityId) {
+                        arrs = [item];
+                    }
+                } else {
+                    arrs = this.poisArray;
+                }
+            });
+            return arrs;
+        }
+    },
+    watch: {
+        //全局社区接口调用
+        'mixins_query.communityId'(val) {
+            this.map.clearMap();
+            this.mapMak();
+        }
+    },
     methods: {
         init() {
             this.map = new AMap.Map('mapInit', {
@@ -45,8 +71,8 @@ export default {
             });
         },
         mapMak() {
-            if (this.poisArray.length > 0) {
-                this.poisArray.map((item) => {
+            if (this.poisArrays.length > 0) {
+                this.poisArrays.map((item) => {
                     this.addIcon(item);
                 });
             }

operationSupport/src/views/newWorkBench/index.vue

@@ -20,6 +20,8 @@
         <model-one v-if="isShowModel == 1" :ref="model + '_model'"></model-one>
         <model-two v-if="isShowModel == 2" :ref="model + '_model'"></model-two>
         <model-three v-if="isShowModel == 3" :ref="model + '_model'"></model-three>
+        <model-four v-if="isShowModel == 4" :ref="model + '_model'"></model-four>
+        <model-five v-if="isShowModel == 5" :ref="model + '_model'"></model-five>
     </div>
 </template>