Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/assets/styles/element-ui.scss

@@ -90,8 +90,8 @@
 }
 
 .tree-container{
-  min-height: calc(100vh - 180px);;
-  max-height: 850px;
+  height: calc(100vh - 180px);;
+  -max-height: 850px;
   overflow: auto;
 }
 

src/views/system/user/index.vue

@@ -21,7 +21,6 @@
             size="small"
             :inline="true"
             v-show="showSearch"
-            label-width="68px"
           >
             <el-form-item label="账号" prop="username">
               <el-input
@@ -157,7 +156,6 @@
             <right-toolbar
               :showSearch.sync="showSearch"
               @queryTable="getList"
-              :columns="columns"
             ></right-toolbar>
           </el-row>
         </div>