Merge branch 'master' into shibei_master

3 years ago · fb892918b6
1 changed files with 2 additions and 2 deletions
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@ -190,7 +190,7 @@ export default {
  computed: {
    maxTableHeight() {
      return this.$store.state.inIframe
-        ? this.clientHeight - 520 - 120
+        ? this.clientHeight - 520 + 120
        : this.clientHeight - 520;
    },
    ...mapGetters(["clientHeight"]),
@ -382,7 +382,7 @@ export default {
      overflow-y: auto;
      &.z-iframe {
-        height: calc(100vh - 210px - 120px);
+        height: calc(100vh - 210px + 120px);
      }
      &::-webkit-scrollbar {