Merge branch 'dev' of http://182.92.166.109:3000/xinyilu/postdischarge-ui into dev

src/layout/index.vue

@@ -78,6 +78,9 @@ export default {
   height: 15px !important;
   background-color: #FAFAFA !important;
 }
+::v-deep .el-scrollbar__bar{
+  width: 12px !important;
+}
 
 ::v-deep .el-table {
 

src/views/components/DepartmentList.vue

@@ -291,7 +291,7 @@ export default {
 }
 
 ::-webkit-scrollbar {
-    width: 5px;
+    width: 10x;
 }
 
 ::-webkit-scrollbar-thumb {
@@ -304,8 +304,8 @@ export default {
 }
 
 .left {
-    // height: calc(100vh - 119px);
-    height: 100%;
+     height: calc(100vh - 119px);
+    // height: 100%;
     overflow: auto;
     position: relative;
     padding-right: 10px;