Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev

src/views/modules/base/community/buildTable.vue

@@ -409,10 +409,13 @@ export default {
 
 
     handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
     },
     handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+      this.pageNo = val
+      this.loadTable()
     },
 
     // 开启加载动画

src/views/modules/base/community/community.vue

@@ -95,7 +95,7 @@ export default {
   },
   computed: {
     rowHeight () {
-      return (this.clientHeight - 200) + 'px'
+      return (this.clientHeight - 180) + 'px'
     },
     ...mapGetters(['clientHeight'])
   },
@@ -209,13 +209,6 @@ export default {
 
     },
 
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-    },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
-    },
-
     filterNode (value, data) {
       if (!value) return true;
       return data.label.indexOf(value) !== -1;
@@ -256,11 +249,13 @@ export default {
   margin-top: 20px;
 }
 
-.el-row {
+.row {
-  /* margin-bottom: 20px; */
+  padding: 10px;
-  display: flex;
+}
-  flex-wrap: wrap;
+</style>
-  margin-top: 10px;
+
-  margin-right: 50px;
+<style>
+.aui-content > .el-tabs > .el-tabs__content {
+  padding: 0px;
 }
 </style>

src/views/modules/base/community/communityTable.vue

@@ -417,10 +417,13 @@ export default {
     },
 
     handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
     },
     handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+      this.pageNo = val
+      this.loadTable()
     },
 
     // 开启加载动画

src/views/modules/base/community/roomTable.vue

@@ -422,10 +422,13 @@ export default {
     },
 
     handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
     },
     handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+      this.pageNo = val
+      this.loadTable()
     },
 
     // 开启加载动画

src/views/modules/workSys/mapConfig.vue

@@ -717,7 +717,7 @@ const vueGis = {
 export default vueGis;
 </script>
 
-<style >
+<style scoped>
 .div_search {
   z-index: 9999;
   position: absolute;