Merge remote-tracking branch 'origin/develop' into develop

2021-09-24 14:43:07 +08:00
parent ced7e8f0e2 6dce1e13bb
commit 4b68312815
1 changed files with 22 additions and 15 deletions
@@ -394,6 +394,11 @@ export default {
 }
 </style>
 <style lang="less" scoped>
+#mechanism-manage{
+  height: 100%;
+  .content {
+    height: calc(~'100% - 105px - 56px')
+  }
  /deep/.el-select__tags {
    overflow-x: hidden;
  }
@@ -411,5 +416,7 @@ export default {
  .add-form-item {
    display: flex;
  }
+}
+

 </style>