Merge branch 'master' into shibei_master

src/views/modules/communityService/dqfwzx/index.vue

@@ -189,7 +189,9 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.$store.state.inIframe ? this.clientHeight - 410 : this.clientHeight - 520;
+      return this.$store.state.inIframe
+        ? this.clientHeight - 520 - 120
+        : this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
   },
@@ -380,7 +382,7 @@ export default {
       overflow-y: auto;
 
       &.z-iframe {
-        height: calc(100vh - 100px);
+        height: calc(100vh - 210px - 120px);
       }
 
       &::-webkit-scrollbar {
@@ -450,6 +452,7 @@ export default {
           font-size: 16px;
           font-weight: bold;
           margin-bottom: 10px;
+          width: calc(100% - 70px);
         }
         .item-prop {
           display: flex;