Browse Source

Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

002201 1 year ago
parent
commit
a03a8ff48d
2 changed files with 4 additions and 3 deletions
  1. 3 3
      src/assets/styles/sidebar.scss
  2. 1 0
      src/components/super-table/index.vue

+ 3 - 3
src/assets/styles/sidebar.scss

@@ -3,7 +3,7 @@
   .main-container {
     min-height: 100%;
     transition: margin-left .28s;
-    // margin-left: $base-sidebar-width;
+    margin-left: $base-sidebar-width;
     margin-left: 0;
     position: relative;
   }
@@ -114,8 +114,8 @@
     }
 
     .main-container {
-      // margin-left: 54px;
-      margin-left: 0;
+      margin-left: 54px;
+      // margin-left: 0;
     }
 
     .submenu-title-noDropdown {

+ 1 - 0
src/components/super-table/index.vue

@@ -391,6 +391,7 @@ export default {
           </slot>
         </template>
       </el-table-column>
+      <slot ></slot>
     </el-table>
     <div
       style="