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

src/pages/config/pages/mechanismManage/index.vue

@@ -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>