项目初始化

datax-ui/src/layout/index.vue

@@ -59,8 +59,7 @@ export default {
   .app-wrapper {
     @include clearfix;
     position: relative;
-    // height: 100%;
-    height: $contentHeight;
+    height: 100%;
     width: 100%;
     &.mobile.openSidebar{
       position: fixed;

datax-ui/src/styles/index.scss

@@ -6,7 +6,6 @@
 @import './topbar.scss';
 
 body {
-  height: $contentHeight;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
@@ -18,12 +17,11 @@ label {
 }
 
 html {
-  height: 100%;
   box-sizing: border-box;
 }
 
 #app {
-  height: calc(100vh);
+  height: 100%;
 }
 
 *,

datax-ui/src/utils/request.js

@@ -6,7 +6,7 @@ import router from '@/router'
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API,
-  timeout: 5000
+  timeout: 10000
 })
 
 let loadingInstance

datax-ui/src/views/lock/index.vue

@@ -25,6 +25,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
+
 export default {
   name: 'Lock',
   data() {
@@ -69,7 +70,7 @@ export default {
 
 <style lang="scss" scoped>
 .lock-container {
-  height: 100%;
+  height: calc(100vh);
   display: flex;
   align-items: center;
   justify-content: center;

datax-ui/src/views/login/index.vue

@@ -86,30 +86,31 @@ export default {
 
 <style lang="scss" scoped>
 .login-container {
+  height: calc(100vh);
+  width: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 100%;
   background-size: cover;
-}
-.title-container {
-  margin: 0 auto 30px auto;
-  text-align: center;
-  color: #707070;
-}
-.login-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 385px;
-  padding: 25px 25px 5px 25px;
-  .el-input {
-    height: 38px;
-    input {
+  .title-container {
+    margin: 0 auto 30px auto;
+    text-align: center;
+    color: #707070;
+  }
+  .login-form {
+    border-radius: 6px;
+    background: #ffffff;
+    width: 385px;
+    padding: 25px 25px 5px 25px;
+    .el-input {
       height: 38px;
+      input {
+        height: 38px;
+      }
+    }
+    .input-icon{
+      height: 39px;width: 14px;margin-left: 2px;
     }
-  }
-  .input-icon{
-    height: 39px;width: 14px;margin-left: 2px;
   }
 }
 </style>