diff --git a/wms-vue/dist.rar b/wms-vue/dist.rar
new file mode 100644
index 0000000..e527850
Binary files /dev/null and b/wms-vue/dist.rar differ
diff --git a/wms-vue/src/components/Aside.vue b/wms-vue/src/components/Aside.vue
index c130b97..c6656e7 100644
--- a/wms-vue/src/components/Aside.vue
+++ b/wms-vue/src/components/Aside.vue
@@ -25,7 +25,33 @@ export default {
   name: "Aside",
   data(){
     return{
+      ruleForm: {
+        userNo: '',
+        passWord: '',
+      }
+    }
+  },
+  mounted() {
+    this.login()
+  },
+  methods: {
+    login() {
+      this.ruleForm.userNo="admin"
+      this.ruleForm.passWord="123"
 
+      this.$axios.post(this.$httpUrl + '/user/login', this.ruleForm).then(res => res.data)
+          .then(res => {
+            if (res.code == 200) {
+              //存储
+              sessionStorage.setItem("user", JSON.stringify(res.data.user))
+              console.log(res.data.menu)
+              this.$store.commit("setMenu",res.data.menu)
+              //跳转页面
+              this.$router.push('/index')
+            } else {
+              this.$message.error(res.msg);
+            }
+          })
     }
   },
   computed:{
diff --git a/wms-vue/src/components/Index.vue b/wms-vue/src/components/Index.vue
index 339343e..878d74d 100644
--- a/wms-vue/src/components/Index.vue
+++ b/wms-vue/src/components/Index.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-container style="height: 100%; border: 1px solid #eee">
-    <el-aside :width="aside_width" style="background-color: rgb(238, 241, 246);margin-left: -1px;">
+  <el-container style="height: 100%;">
+    <el-aside :width="aside_width"  style="background-color: rgb(238, 241, 246);margin-left: -1px;">
       <Aside :isCollapse="isCollapse"></Aside>
     </el-aside>
 
@@ -9,7 +9,7 @@
         <Header @doCollapse="doCollapse" :icon="icon"></Header>
       </el-header>
 
-      <el-main style="height: 100%">
+      <el-main >
 <!--        <Main></Main>-->
        <router-view/>
       </el-main>
diff --git a/wms-vue/src/components/duochaxun/Rukuzhengli.vue b/wms-vue/src/components/duochaxun/Rukuzhengli.vue
index 83ce78e..7a5df6c 100644
--- a/wms-vue/src/components/duochaxun/Rukuzhengli.vue
+++ b/wms-vue/src/components/duochaxun/Rukuzhengli.vue
@@ -398,7 +398,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="pageNum"
-        :page-sizes="[10, 50, 150, 200]"
+        :page-sizes="[ 50, 100, 200,500]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
@@ -444,7 +444,7 @@ export default {
       value1: '',
       value2: '',
       tableData: [],
-      pageSize: 10,
+      pageSize: 50,
       pageNum: 1,
       total: 3,
       param: {
@@ -471,7 +471,7 @@ export default {
     this.PlantS();
     this.LOC();
     this.$nextTick(() => {
-      this.MaxHeight = window.innerHeight - 220 +"px";
+      this.MaxHeight = window.innerHeight - 240 +"px";
     })
   },
   methods: {
diff --git a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
index 62f5dd7..a4b085b 100644
--- a/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
+++ b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue
@@ -460,7 +460,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="pageNum"
-        :page-sizes="[10, 50, 150, 200]"
+        :page-sizes="[ 50, 100, 200,500]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
@@ -528,7 +528,7 @@ export default {
         }]
       },
       tableData: [],
-      pageSize: 10,
+      pageSize: 50,
       pageNum: 1,
       total: 3,
       param: {
@@ -604,7 +604,7 @@ export default {
     this.Loc();
     this.z_Name();
     this.$nextTick(() => {
-      this.MaxHeight = window.innerHeight - 220 +"px";
+      this.MaxHeight = window.innerHeight - 240 +"px";
     })
 
   },
diff --git a/wms-vue/src/main.js b/wms-vue/src/main.js
index 9d5408a..d99c0e0 100644
--- a/wms-vue/src/main.js
+++ b/wms-vue/src/main.js
@@ -8,8 +8,9 @@ import VueRouter from "vue-router";
 import router from "@/router/router";
 import store from "@/store/store";
 Vue.prototype.$axios=axios;
-// Vue.prototype.$httpUrl='http://192.168.56.147:8081';
-Vue.prototype.$httpUrl='http://127.0.0.1:8081';
+//Vue.prototype.$httpUrl='http://127.0.0.1:8081';
+//Vue.prototype.$httpUrl='http://192.68.2.88:8081';
+Vue.prototype.$httpUrl='http://127.0.0.1:8083';
 Vue.config.productionTip = false;
 Vue.use(VueRouter)
 Vue.use(ElementUI,{size:'small'});
diff --git a/wms-vue/src/router/router.js b/wms-vue/src/router/router.js
index 017e8a3..262ca4f 100644
--- a/wms-vue/src/router/router.js
+++ b/wms-vue/src/router/router.js
@@ -22,7 +22,7 @@ const routes=[
                 meta:{
                     title:'首页'
                 },
-                component: () => import('../components/Login')
+                component: () => import('../components/duochaxun/Zhengliqingdan')
             },
             {
                 path:'/Zhengliqingdan',
diff --git a/wms/pom.xml b/wms/pom.xml
index 325dad6..413a2b0 100644
--- a/wms/pom.xml
+++ b/wms/pom.xml
@@ -88,13 +88,13 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <!-- 跳过单元测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <excludes>
-                        <exclude>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </exclude>
-                    </excludes>
+                    <skipTests>true</skipTests>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/wms/src/main/resources/application.yml b/wms/src/main/resources/application.yml
index 43262ba..f38795d 100644
--- a/wms/src/main/resources/application.yml
+++ b/wms/src/main/resources/application.yml
@@ -1,5 +1,14 @@
 server:
-  port: 8081
+  port: 8083
+#    url: jdbc:sqlserver://47.100.54.81:1433;DatabaseName=zwwms
+#    driver-class-name:  com.microsoft.sqlserver.jdbc.SQLServerDriver
+#    username: super
+#    password: 1K4QfD%ESd1fe@VJ
+
+#    url: jdbc:sqlserver://10.1.96.106:1433;DatabaseName=LD_WMSDB
+#    driver-class-name:  com.microsoft.sqlserver.jdbc.SQLServerDriver
+#    username: wmsdb
+#    password: AmecDDbb32A
 
 spring:
   datasource:
@@ -7,8 +16,10 @@ spring:
     driver-class-name:  com.microsoft.sqlserver.jdbc.SQLServerDriver
     username: super
     password: 1K4QfD%ESd1fe@VJ
+
     hikari:
       connection-timeout: 60000
+
       validation-timeout: 3000
       idle-timeout: 60000
       login-timeout: 5
@@ -16,3 +27,4 @@ spring:
       maximum-pool-size: 10
       minimum-idle: 10
       read-only: false
+