戴艳蓉 3 years ago
parent
commit
892b8f9ab4

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.5872cf8d.css


BIN
dist/static/css/app.9397f897.css.gz → dist/static/css/app.5872cf8d.css.gz


BIN
dist/static/css/chunk-1106a83a.2a895c1e.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-91c9c9d0.dc50f156.css


BIN
dist/static/css/chunk-91c9c9d0.dc50f156.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-bbbb50ca.21826ebc.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-d25520c0.d57effec.css


BIN
dist/static/css/chunk-d25520c0.d57effec.css.gz


BIN
dist/static/js/app.39968fee.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.73087ce0.js


BIN
dist/static/js/app.73087ce0.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-1106a83a.48e6938f.js


BIN
dist/static/js/chunk-1106a83a.48e6938f.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-91c9c9d0.f4595fd5.js


BIN
dist/static/js/chunk-91c9c9d0.f4595fd5.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-bbbb50ca.234136ca.js


BIN
dist/static/js/chunk-bbbb50ca.234136ca.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-d25520c0.22f9f095.js


BIN
dist/static/js/chunk-d25520c0.22f9f095.js.gz


+ 13 - 5
src/assets/css/common.scss

@@ -74,13 +74,21 @@ html,
 body {
   height: 100%;
   width: 100%;
-  background-color: #fff;
-  // position: relative;
-  // z-index:1;
-  // position: fixed;
+  position: relative;
   padding:0;
   margin: 0;
-  // overflow: hidden;
+  min-height: 100%;
+}
+html{
+  display: block;
+  head{
+    display: none;
+    padding:0;
+    margin: 0;
+  }
+  body{
+    display: inline-block;
+  }
 }
 
 .fillcontain {

+ 5 - 2
src/assets/css/index.scss

@@ -10,8 +10,11 @@
   background-color: #fff;
   position: relative;
   width: 100%;
-  height: 100%;
-  overflow: hidden;
+  min-height: 100%;
+  display: inline-block;
+  box-sizing: border-box;
+
+  // overflow: hidden;
 }
 .box-home {
   width: 1196px;

+ 11 - 23
src/layout/components/AppMain.vue

@@ -23,42 +23,30 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// @import "~@/styles/mixin.scss";
-// @import "~@/styles/sidebar.scss";
-@import "~@/styles/variables.scss";
-@import "~@/styles/mixin.scss";
-@import "~@/styles/transition.scss";
-@import "~@/styles/element-ui.scss";
-@import "~@/styles/sidebar.scss";
-@import "~@/styles/btn.scss";
 .app-main {
-  min-height: 100%;
+  /* 50= navbar  50  */
+  min-height: calc(100% - 0px);
   width: 100%;
-  height: 100%;
   position: relative;
-  padding: 50px 0 0 0;
-  overflow-y: scroll;
-  min-width: 1200px;
-  @include scrollBar();
+  // overflow: hidden;
+  background: #fff;
+
   box-sizing: border-box;
+  // background: #f0f4fd;
 }
 
 .fixed-header + .app-main {
-  min-height: 100%;
-  width: 100%;
-  height: 100%;
   padding: 50px 0 0 0;
-  box-sizing: border-box;
 }
 
 .hasTagsView {
   .app-main {
-    // min-height: calc(100vh - 50px);
-    min-height: 100%;
-    width: 100%;
-    height: 100%;
+    /* 84 = navbar + tags-view = 50 + 34 */
+    min-height: 100vh;
+  }
+
+  .fixed-header + .app-main {
     padding: 50px 0 0 0;
-    box-sizing: border-box;
   }
 }
 </style>

+ 3 - 4
src/layout/index.vue

@@ -64,16 +64,15 @@ export default {
 <style lang="scss" scoped>
 @import "~@/styles/mixin.scss";
 @import "~@/styles/variables.scss";
-
 .app-wrapper {
+  min-width: 1200px;
   @include clearfix;
+  position: relative;
   height: 100%;
   width: 100%;
-  min-width: 1200px;
-  position: relative;
 
   &.mobile.openSidebar {
-    // position: fixed;
+    position: fixed;
     top: 0;
   }
 }

+ 4 - 2
src/views/purchaseIn/workbench/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="workbench pagePadding" style="padding-top: 24px">
+  <div class="workbench">
     <div
       class="workbench-main"
       v-loading="loading"
@@ -275,9 +275,10 @@ export default {
 .workbench {
   position: relative;
   width: 100%;
-  height: 100%;
+  height: calc(100vh - 50px);
   box-sizing: border-box;
   background: #f0f2f5;
+  padding: 16px;
   .workbench-main {
     position: relative;
     width: 100%;
@@ -286,6 +287,7 @@ export default {
     ul {
       width: 100%;
       height: 100%;
+      overflow-y: hidden;
       box-sizing: border-box;
       li {
         position: relative;

+ 0 - 1
src/views/serviceParam/supplier/detail.vue

@@ -189,7 +189,6 @@ export default {
   width: 100%;
   box-sizing: border-box;
   .supplierDetail-main {
-    overflow-y: scroll;
     position: relative;
     padding: 10px;
     height: 100%;

Some files were not shown because too many files changed in this diff