Merge branch 'dev-statics' into dev

src/views/modules/shequzhili/statics/index.vue

@@ -55,7 +55,7 @@
                     size="small" :loading="exportLoading">导出</el-button>
       </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border  style="width: 100%"
-      :height="tableHeight" show-summary>
+      :height="tableHeight">
         <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
         <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column min-width="100" prop="orgName" label="所属组织" header-align="center" align="center" >
@@ -173,8 +173,8 @@ export default {
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
     tableHeight() {
-      const h = this.clientHeight - 360 + this.iframeHeigh;
-      const _h = this.clientHeight - 360;
+      const h = this.clientHeight - 330 + this.iframeHeigh;
+      const _h = this.clientHeight - 330;
       return this.$store.state.inIframe ? h : _h;
     },
   },