diff --git a/src/main/java/com/pro/info/controller/CustomerController.java b/src/main/java/com/pro/info/controller/CustomerController.java
index 12d68bc5023aa7c3c5923470f9059e990fbbfeab..d678ec5cffb64cf01c018489974322873cfab57f 100644
--- a/src/main/java/com/pro/info/controller/CustomerController.java
+++ b/src/main/java/com/pro/info/controller/CustomerController.java
@@ -3,10 +3,8 @@ package com.pro.info.controller;
 import com.github.pagehelper.PageInfo;
 import com.pro.info.entity.Customer;
 import com.pro.info.service.CustomerService;
-import com.sun.xml.internal.xsom.impl.scd.Iterators;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -21,33 +19,35 @@ public class CustomerController {
 
     /**
      * 获得客户维修页面值
+     *
      * @param page
      * @param pageSize
      * @return
      */
     @RequestMapping("customerList")
     @ResponseBody
-    public Map<String,Object> getCustomer(@RequestParam(value = "page" ,defaultValue ="1") int page,@RequestParam(value = "limit",required = false) int pageSize) {
+    public Map<String, Object> getCustomer(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", required = false) int pageSize) {
 //        System.out.println("page"+page);
 //        System.out.println("limit:---------------"+limit);
 
-        Map<String,Object> map = new HashMap<String,Object>();
-       PageInfo<Customer> customer =  customerService.getCustomer(page,pageSize);
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageInfo<Customer> customer = customerService.getCustomer(page, pageSize);
 
 
-		map.put("code", 0);
-		map.put("msg", "");
-		map.put("count", customer.getTotal());
+        map.put("code", 0);
+        map.put("msg", "");
+        map.put("count", customer.getTotal());
         map.put("data", customer.getList());
-        System.out.println("map--------------->"+map);
-       return map;
+        System.out.println("map--------------->" + map);
+        return map;
 
     }
+
     /*
     去客户维护页面
      */
-@RequestMapping("customer")
-    public String toCustomer(){
-        return "info/customerList";
-}
+    @RequestMapping("customer")
+    public String toCustomer() {
+        return "info/customer";
+    }
 }
diff --git a/src/main/java/com/pro/info/controller/StandardController.java b/src/main/java/com/pro/info/controller/StandardController.java
index 5989936c8f940fa639e1e7139d8f061f76874339..7099b9f5b810f2a07aa5521d956ea7d00a58c6fd 100644
--- a/src/main/java/com/pro/info/controller/StandardController.java
+++ b/src/main/java/com/pro/info/controller/StandardController.java
@@ -1,8 +1,84 @@
 package com.pro.info.controller;
 
+import com.github.pagehelper.PageInfo;
+import com.pro.info.entity.Customer;
+import com.pro.info.entity.Standard;
+import com.pro.info.service.StandardService;
+import com.pro.sys.entity.Result;
+import com.sun.tools.doclets.formats.html.resources.standard;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
 
 @Controller
+@RequestMapping("/info")
 public class StandardController {
+    @Autowired
+    private StandardService standardService;
+    /**
+     * 跳转到产品规格页面
+     * @return
+     */
+    @RequestMapping("standard")
+    public String toStandard(){
+        return "info/standard";
+    }
+
+    /**
+     * 产品规格数据接口
+     * 展示列表
+     * @return
+     */
+    @RequestMapping(value="standardTable", method = RequestMethod.GET)
+    @ResponseBody
+    public Map<String,Object> getStandard(@RequestParam(value = "page" ,defaultValue ="1") int page, @RequestParam(value = "limit",required = false) int pageSize
+                                          ,Standard standardIn){
+        Map<String, Object> map = new HashMap<String, Object>();
+        System.out.println("standard---con-->"+standardIn);
+        PageInfo<Standard> standard = standardService.getStandards(page, pageSize, standardIn);
+        map.put("code", 0);
+        map.put("msg", "");
+        map.put("count", standard.getTotal());
+        map.put("data", standard.getList());
+        return map;
+    }
+
+    /**
+     * 获取单条数据
+     * @param standard_id
+     * @return
+     */
+    @RequestMapping(
+            value="/standard/{standard_id}",
+            method=RequestMethod.GET
+    )
+    @ResponseBody
+    public Standard getCustomerById(@PathVariable("standard_id")  String standard_id){
+        return standardService.getStandard(standard_id);
+
+    }
+
+    /**
+     * 添加,修改
+     */
+    @RequestMapping(value = "standard", method = RequestMethod.POST)
+    @ResponseBody
+    public Result save(Standard standard){
+        return standardService.save(standard);
+    }
 
+    /**
+     * 删除
+     */
+    @RequestMapping(
+            value="standard",
+            method=RequestMethod.DELETE
+    )
+    @ResponseBody
+    public Result delete(@RequestBody  String[] standard_ids){
+        return standardService.delete(standard_ids);
+    }
 }
diff --git a/src/main/java/com/pro/info/entity/Standard.java b/src/main/java/com/pro/info/entity/Standard.java
index e39d6d4be4e73e82b8ba98882d05d81952f42097..c5c4e0c95f9aab7199f98fe13b413f77e22b1c48 100644
--- a/src/main/java/com/pro/info/entity/Standard.java
+++ b/src/main/java/com/pro/info/entity/Standard.java
@@ -2,16 +2,16 @@ package com.pro.info.entity;
 
 public class Standard {
 
-    private Integer standard_id;              //
+    private String standard_id;              //
     private String standard_name;               //
     private String standard_remark;               //
     private String standard_status;             //状态 00-未确定，22-确定，55-启用，77-禁用，99-逻辑删除
 
-    public Integer getStandard_id() {
+    public String getStandard_id() {
         return standard_id;
     }
 
-    public void setStandard_id(Integer standard_id) {
+    public void setStandard_id(String standard_id) {
         this.standard_id = standard_id;
     }
 
diff --git a/src/main/java/com/pro/info/mapper/StandardMapper.java b/src/main/java/com/pro/info/mapper/StandardMapper.java
index d12ea9fd560e5cd7d17070b85815be80df9e3e93..7b1ab7ab35ad60f8a02d7a56258a9f9409b967c1 100644
--- a/src/main/java/com/pro/info/mapper/StandardMapper.java
+++ b/src/main/java/com/pro/info/mapper/StandardMapper.java
@@ -1,8 +1,44 @@
 package com.pro.info.mapper;
 
+import com.pro.info.entity.Standard;
+import org.apache.ibatis.annotations.Param;
 import org.mybatis.spring.annotation.MapperScan;
 
+import java.util.List;
+
 @MapperScan
-public class StandardMapper {
+public interface StandardMapper {
+    /**
+     * 获得所有产品规格信息
+     * @return
+     */
+    List<Standard> getStandards(Standard standard);
+
+    /**
+     * 保存数据
+     * @param standard
+     * @return
+     */
+    int save(Standard standard);
+
+    /**
+     * 删除
+     * @param standard_ids
+     * @return
+     */
+    int delete(@Param("standard_ids") String[] standard_ids);
+
+    /**
+     * 修改
+     * @param standard
+     * @return
+     */
+    int update(Standard standard);
 
+    /**
+     * 获得单条数据
+     * @param standard_id
+     * @return
+     */
+    Standard getStandard(String standard_id);
 }
diff --git a/src/main/java/com/pro/info/service/StandardService.java b/src/main/java/com/pro/info/service/StandardService.java
index 0642e9ad8dcd28cc75ce40f4a70f817955716ebe..5aeabdbb03e356fa6dce1397b401229d6d2d1edb 100644
--- a/src/main/java/com/pro/info/service/StandardService.java
+++ b/src/main/java/com/pro/info/service/StandardService.java
@@ -1,8 +1,16 @@
 package com.pro.info.service;
 
-import org.springframework.stereotype.Service;
+import com.github.pagehelper.PageInfo;
+import com.pro.info.entity.Standard;
+import com.pro.sys.entity.Result;
 
-@Service
 public interface StandardService {
 
+    PageInfo<Standard> getStandards(int page, int pageSize, Standard standardIn);
+
+    Result save(Standard standard);
+
+    Result delete(String[] standard_ids);
+
+    Standard getStandard(String standard_id);
 }
diff --git a/src/main/java/com/pro/info/service/impl/StandardServiceImpl.java b/src/main/java/com/pro/info/service/impl/StandardServiceImpl.java
index d389745fe6d167ba7153fb391ad70a5d3a4a67f2..4103bdaf6b7a714ecc067713aeaea3211f93f077 100644
--- a/src/main/java/com/pro/info/service/impl/StandardServiceImpl.java
+++ b/src/main/java/com/pro/info/service/impl/StandardServiceImpl.java
@@ -1,7 +1,75 @@
 package com.pro.info.service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.pro.info.entity.Standard;
+import com.pro.info.mapper.StandardMapper;
 import com.pro.info.service.StandardService;
+import com.pro.sys.entity.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import java.util.UUID;
+@Service
 public class StandardServiceImpl implements StandardService {
 
+    @Autowired
+    private StandardMapper standardMapper;
+
+    /**
+     * 获得产品规格信息列表
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public PageInfo<Standard> getStandards(int page, int pageSize, Standard standardIn) {
+        PageHelper.startPage(page,pageSize);
+        return new PageInfo<Standard>(standardMapper.getStandards(standardIn));
+    }
+
+    /**
+     * 添加,修改
+     * @param standard
+     * @return
+     */
+    @Override
+    public Result save(Standard standard) {
+        if (standard.getStandard_id() != null && standard.getStandard_id() != ""){
+            if(standardMapper.update(standard) > 0){
+                return Result.successResult("修改信息成功!");
+            }
+            return Result.failResult("修改信息失败!");
+        }else{
+            standard.setStandard_id(UUID.randomUUID().toString());
+            if(standardMapper.save(standard) > 0){
+                return Result.successResult("添加信息成功!");
+            }
+            return Result.failResult("添加信息失败!");
+        }
+    }
+
+    /**
+     * 删除
+     * @param standard_ids
+     * @return
+     */
+    @Override
+    public Result delete(String[] standard_ids) {
+        if (standardMapper.delete(standard_ids) > 0){
+            return Result.successResult("信息被成功删除！");
+        }
+        return Result.failResult("信息删除失败！");
+    }
+
+    /**
+     * 获取单条数据
+     * @param standard_id
+     * @return
+     */
+    @Override
+    public Standard getStandard(String standard_id) {
+        return standardMapper.getStandard(standard_id);
+    }
+
 }
diff --git a/src/main/java/com/pro/sys/controller/LoginController.java b/src/main/java/com/pro/sys/controller/LoginController.java
index 5e04ac2565151c979d6b9876fb44ff3d7b1dafb3..aeb87964ba1c77abd46187b3871b943e50063da3 100644
--- a/src/main/java/com/pro/sys/controller/LoginController.java
+++ b/src/main/java/com/pro/sys/controller/LoginController.java
@@ -51,7 +51,6 @@ public class LoginController {
 
             System.out.println("userPer-------------->"+menuList);
             model.addAttribute("menuList",menuList);
-            model.addAttribute("message", "登录完成");
             System.out.println("登录完成");
             return "sys/home";
         } catch (Exception e) {
diff --git a/src/main/java/com/pro/sys/entity/Result.java b/src/main/java/com/pro/sys/entity/Result.java
new file mode 100644
index 0000000000000000000000000000000000000000..5db42d3c72865a618fdf91429a292cd1192f058f
--- /dev/null
+++ b/src/main/java/com/pro/sys/entity/Result.java
@@ -0,0 +1,52 @@
+package com.pro.sys.entity;
+
+public class Result {
+
+    public static Result successResult() {
+        return new Result(true,null,null);
+    }
+
+    public static Result successResult(String msg) {
+        return new Result(true,msg,null);
+    }
+
+    public static Result successResult(String msg,Object data) {
+        return new Result(true,msg,data);
+    }
+
+    public static Result failResult() {
+        return new Result(false,null,null);
+    }
+
+    public static Result failResult(String msg) {
+        return new Result(false,msg,null);
+    }
+
+    public static Result failResult(String msg,Object data) {
+        return new Result(false,msg,data);
+    }
+
+    private boolean success;
+    private String message;
+    private Object data;
+
+    private Result(boolean success, String message, Object data) {
+        super();
+        this.success = success;
+        this.message = message;
+        this.data = data;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+}
diff --git a/src/main/resources/mapper/info/StandardMapper b/src/main/resources/mapper/info/StandardMapper
deleted file mode 100644
index d33360fe5b55d33f0f996bc3395cf4adc15b2913..0000000000000000000000000000000000000000
--- a/src/main/resources/mapper/info/StandardMapper
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.pro.info.mapper.StandardMapper">
-
-
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/info/StandardMapper.xml b/src/main/resources/mapper/info/StandardMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..71b0f579ac74601e87bb090ba4eb3866fa5514f1
--- /dev/null
+++ b/src/main/resources/mapper/info/StandardMapper.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pro.info.mapper.StandardMapper">
+
+    <select id="getStandards" resultType="com.pro.info.entity.Standard" parameterType="com.pro.info.entity.Standard">
+        select * from info_standard
+        <where>
+            standard_status != '99'
+            <if test="standard_status!=null and standard_status!=''">
+                and standard_status = #{standard_status}
+            </if>
+            <if test="standard_name!=null and standard_name!=''">
+                and standard_name like concat('%',#{standard_name},'%')
+            </if>
+            <if test="standard_remark!=null and standard_remark!=''">
+                and standard_remake like concat('%',#{standard_remark},'%')
+            </if>
+        </where>
+    </select>
+
+    <select id="getStandard" resultType="com.pro.info.entity.Standard">
+        select * from info_standard where standard_id = #{standard_id}
+    </select>
+
+    <insert id="save" parameterType="com.pro.info.entity.Standard">
+        insert into info_standard (
+        standard_id,
+        standard_name,
+        standard_remark,
+        standard_status
+        ) values (
+        #{standard_id},
+        #{standard_name},
+        #{standard_remark},
+        '00'
+        )
+    </insert>
+
+    <update id="delete">
+        update info_standard set standard_status = '99'
+        <where>
+        <foreach collection="standard_ids" item="standard_id" separator="or">
+            standard_id = #{standard_id}
+        </foreach>
+        </where>
+    </update>
+
+    <update id="update" parameterType="com.pro.info.entity.Standard">
+        update info_standard
+        <set>
+            <if test="standard_status != null and standard_status != ''">
+                standard_status = #{standard_status},
+            </if>
+            <if test="standard_name != null and standard_name != ''">
+                standard_name = #{standard_name},
+            </if>
+            <if test="standard_remark != null and standard_remark != ''">
+                standard_remark = #{standard_remark},
+            </if>
+        </set>
+        where standard_id = #{standard_id}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/spring-root-shiro.xml b/src/main/resources/spring-root-shiro.xml
index 217dda5fd2336cd8d9d9668c495e02217acbb63d..ab4b1ba15e6e28027eaa1f1afe26724bb421d7ed 100644
--- a/src/main/resources/spring-root-shiro.xml
+++ b/src/main/resources/spring-root-shiro.xml
@@ -17,9 +17,11 @@
         <property name="unauthorizedUrl" value="/sys/nomodule" /> <!--当没有权限的时候，跳转到这个url-->
         <property name="filterChainDefinitions">
             <value>
+                /static/** = anon<!--放行静态资源-->
                 /sys/login = anon <!--可以不需要登录-->
                 /pro/readName = authc, perms[/readName]  <!-- perms 表示需要该权限才能访问的页面 -->
                 /pro/readData = authc, perms[/readData]
+                /logout = logout
                 /** = authc <!-- authc 表示需要认证才能访问的页面 -->
             </value>
         </property>
diff --git a/src/main/web/WEB-INF/views/info/standard.jsp b/src/main/web/WEB-INF/views/info/standard.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..2cd080199dd993a3c2a44b20576c31e0a2fa9039
--- /dev/null
+++ b/src/main/web/WEB-INF/views/info/standard.jsp
@@ -0,0 +1,612 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2018/8/6
+  Time: 11:15
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+    <link rel="stylesheet" href="../../../static/layui-2.3.0/css/layui.css" media="all">
+    <style>
+        .layui-form-label {
+            width: auto;
+        }
+    </style>
+</head>
+<body>
+
+<form class="layui-form" id="form-standard-query">
+    <div class="layui-form-item" style="margin-top: 15px;">
+
+        <div class="layui-inline">
+
+            <label class="layui-form-label">状态</label>
+            <div class="layui-input-inline">
+                <select name="standard_status" lay-verify="" lay-filter="select-standard-status">
+                    <option value="">全部</option>
+                    <option value="00">未确定</option>
+                    <option value="22">确定</option>
+                    <option value="55">启用</option>
+                    <option value="77">禁用</option>
+                </select>
+            </div>
+
+            <label class="layui-form-label">名称</label>
+            <div class="layui-input-inline" style="width: 100px;">
+                <input type="text" name="standard_name" autocomplete="off"
+                       class="layui-input">
+            </div>
+
+            <label class="layui-form-label">说明</label>
+            <div class="layui-input-inline" style="width: 100px;">
+                <input type="text" name="standard_remake" autocomplete="off"
+                       class="layui-input">
+            </div>
+
+            <button class="layui-btn" id="bn-standard-query">查询</button>
+
+        </div>
+
+    </div>
+</form>
+<div class="layui-btn-container">
+    <button type="button" class="layui-btn" id="bn-standard-add"><i class="layui-icon">&#xe608;</i> 新增</button>
+    <button type="button" class="layui-btn" id="bn-standard-cfm"><i class="layui-icon layui-icon-ok-circle"></i> 确定
+    </button>
+    <button type="button" class="layui-btn" id="bn-standard-use"><i class="layui-icon layui-icon-auz"></i> 启用</button>
+    <button type="button" class="layui-btn" id="bn-standard-unuse"><i class="layui-icon layui-icon-fonts-del"></i> 禁用
+    </button>
+    <button class="layui-btn layui-btn-danger" id="bn-standard-del-multi"><i class="layui-icon layui-icon-delete"></i>
+        删除
+    </button>
+</div>
+<table id="standard" lay-filter="standard"></table>
+<%-- 新增,修改窗口 --%>
+<div style="padding: 15px; display: none;" id="dom-win-standard-add">
+
+    <form class="layui-form" lay-filter="form-standard-add">
+
+        <input name="standard_id" hidden/>
+        <div class="layui-form-item">
+            <label class="layui-form-label">规格名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="standard_name" required lay-verify="required"
+                       placeholder="请输入规格名称" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">规格说明</label>
+            <div class="layui-input-block">
+                <input type="text" name="standard_remark" required lay-verify="required"
+                       placeholder="请输入规格说明" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="bn-standard-add">提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+
+</div>
+<script src="../../../static/layui-2.3.0/layui.js" charset="utf-8"></script>
+<script src="../../../static/js/jquery-3.3.1.min.js"></script>
+<script src="../../../static/js/sweetalert-2.1.0.min.js"></script>
+<script type="text/html" id="barDemo">
+
+    <%--laytpl 语法， d指数据，在这里指当前行数据--%>
+    {{#  if(d.standard_status == '00' ){ }}
+    <a class="layui-btn layui-btn-xs" lay-event="standard_edit"><i class="layui-icon">&#xe608;</i> 编辑</a>
+    <a class="layui-btn layui-btn-xs" lay-event="standard_cfm"><i class="layui-icon layui-icon-ok-circle"></i> 确定</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="standard_del"><i
+            class="layui-icon layui-icon-delete"></i>
+        删除</a>
+    {{#  }else if(d.standard_status == '22' || d.standard_status == '77' ){  }}
+    <a class="layui-btn layui-btn-xs" lay-event="standard_use"><i class="layui-icon layui-icon-auz"></i> 启用</a>
+    {{#  }else if(d.standard_status == '55' ){  }}
+    <a class="layui-btn layui-btn-xs" lay-event="standard_unuse"><i class="layui-icon layui-icon-fonts-del"></i> 禁用</a>
+    {{#  }  }}
+
+</script>
+<script>
+    /**
+     * 数据表格
+     */
+    layui.use(['table', 'layer', 'form', 'layer'], function () {
+        var table = layui.table;
+        var form = layui.form;
+        var layer = layui.layer;
+
+        var standardTable = table.render({
+            elem: '#standard'
+            , url: 'standardTable'
+            , page: true
+            , limit: 5
+            , limits: [3, 5, 8, 13]
+            , cols: [[
+                {
+                    type : 'checkbox'
+                }
+                , {field: 'id', title: '编号', type: 'numbers'}
+                , {field: 'standard_name', title: '名称'}
+                , {field: 'standard_remark', title: 'remark'}
+                , {
+                    field: 'standard_status', title: '状态', templet: function (d) {
+                        if (d.standard_status == '00') {
+                            return '未确定';
+                        } else if (d.standard_status == '22') {
+                            return '确定';
+                        } else if (d.standard_status == '55') {
+                            return '启用';
+                        } else if (d.standard_status == '77') {
+                            return '禁用';
+                        }
+                    }
+                }
+                , {toolbar: '#barDemo'}
+            ]]
+        });
+
+        /**
+         * 条件查询
+         */
+        $("#bn-standard-query").click(function () {
+            //将表单参数封装为json对象
+            var arr = $("#form-standard-query").serializeArray();
+            var params = {};
+
+            for (var i = 0; i < arr.length; i++) {
+                params[arr[i].name] = arr[i].value;
+            }
+            //传递查询参数重载表格（内部为ajax请求）
+            standardTable.reload({
+                where: params,
+                page: {
+                    curr: 1
+                    //重新从第 1 页开始
+                }
+            });
+            /* showBns();//重新显示按钮*/
+            return false;
+        });
+
+        //监听select选择
+        form.on('select(select-standard-status)', function (data) {
+            //console.log(data.elem); //得到select原始DOM对象
+            //console.log(data.value); //得到被选中的值
+            //console.log(data.othis); //得到美化后的DOM对象
+            $('#bn-standard-query').click();
+        });
+
+        //打开新增窗口
+        $('#bn-standard-add').click(function () {
+
+            form.val("form-standard-add", {//form-standard-add是表单的lay-filter值
+                "standard_name": "",
+                "standard_remark": ""
+            });
+
+
+            //form.val("form-standard-add", {}) ;
+            layerIdx = layer.open({
+                type: 1,
+                title: '新增规格信息',
+                area: ['800px', '540px'],
+                content: $('#dom-win-standard-add'),
+                zIndex: 100 //将层次降低，以使sweetalert能够在layer之上
+            });
+
+        });
+        //监听新增表单提交。bn-standard-add是新增表单中提交按钮的lay-filter值
+        form.on('submit(bn-standard-add)', function (data) {
+            //console.log(data.elem) //被执行事件的元素DOM对象，一般为button对象
+            //console.log(data.form) //被执行提交的form对象，一般在存在form标签时才会返回
+            console.log(data.field) //当前容器的全部表单字段，名值对形式：{name: value}
+
+            var index = layer.load(); //加载层
+
+            $.ajax({
+                url: 'standard',
+                data: data.field,
+                method: 'post',
+                dataType: 'json'
+            }).done(function (result) {
+                if (result.success) {
+                    standardTable.reload();//重载表格
+                    layer.closeAll();
+                    swal({
+                        text: result.message,
+                        icon: "success",
+                        buttons: false,
+                        timer: 1500
+                    });
+                } else {
+                    layer.close(index);
+                    swal({
+                        title: result.message,
+                        icon: "error",
+                        button: "确定"
+                    });
+                }
+            }).fail(function (xhr) {
+                layer.close(index);
+                swal({
+                    title: xhr.status,
+                    text: '请于管理员联系。',
+                    icon: "error",
+                    button: "确定"
+                });
+            });
+
+            return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
+        });
+
+
+    //监听工具条。注：tool是工具条事件名，standardTable是table原始容器的属性 lay-filter属性的值
+    table.on('tool(standard)', function (obj) {
+        var data = obj.data; //获得当前行数据
+        var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+        var tr = obj.tr; //获得当前行 tr 的DOM对象
+
+        if (layEvent === 'standard_del') { //删除
+
+            swal({
+                title: "您确实要删除该条数据吗?",
+                text: "数据一旦删除将无法恢复!",
+                icon: "warning",
+                buttons: [
+                    "取消",
+                    {text: '确认删除', closeModal: false}
+                ],
+                dangerMode: true,
+            })
+                .then((ok) => {
+                        if (ok) {
+                            var arrone = [];
+                            arrone.push(data.standard_id);
+                            $.ajax({
+                                url: 'standard',
+                                data : JSON.stringify(arrone),
+                                contentType : 'application/json;charset=UTF-8',
+                                method: 'delete',
+                                dataType: 'json'
+                            }).done(function (result) {
+                                if (result.success) {
+                                    swal({
+                                        text: result.message,
+                                        icon: "success",
+                                        buttons: false,
+                                        timer: 1500
+                                    });
+                                    standardTable.reload();
+                                } else {
+                                    swal({
+                                        title: result.message,
+                                        icon: "error",
+                                        button: "确定"
+                                    });
+                                }
+
+                            }).fail(function (xhr) {
+                                swal({
+                                    title: xhr.status,
+                                    icon: "error",
+                                    button: "确定"
+                                });
+                            });
+                        }
+
+
+                    }
+                )
+                .catch(err => {
+                    if (err) {
+                        swal("操作失败!", "请于管理员联系。", "error");
+                    } else {
+                        swal.stopLoading();//停止加载显示
+                        swal.close();//关闭提示框
+                    }
+                })
+            ;
+
+        } else if (layEvent === 'standard_edit') { //编辑
+
+            var index = layer.load(); //加载层
+
+            $.ajax({
+                url: 'standard/' + data.standard_id,
+                method: 'get',
+                dataType: 'json'
+            }).done(function (standard) {
+
+                layer.close(index);
+
+                //form-standard-upd是表单的lay-filter值
+                form.val("form-standard-add", standard);
+
+                layerIdx = layer.open({
+                    type: 1,
+                    title: '修改规格信息',
+                    area: ['800px', '540px'],
+                    content: $('#dom-win-standard-add'),
+                    zIndex: 100 //将层次降低，以使sweetalert能够在layer之上
+                });
+
+            });
+
+        } else if (layEvent === 'standard_cfm') { //确定
+
+            swal({
+                title: "您确实要确定该规格信息吗?",
+                text: "规格信息一旦确定将无法编辑!",
+                icon: "warning",
+                buttons: [
+                    "取消",
+                    {text: '确认', closeModal: false}
+                ],
+                dangerMode: true,
+            })
+                .then((ok) => {
+                        if (ok) {
+                            $.ajax({
+                                url: 'standard',
+                                method: 'post',
+                                data: {
+                                    'standard_id': data.standard_id,
+                                    'standard_status':'22'
+                                },
+                                dataType: 'json'
+                            }).done(function (result) {
+                                if (result.success) {
+                                    swal({
+                                        text: result.message,
+                                        icon: "success",
+                                        buttons: false,
+                                        timer: 1500
+                                    });
+                                    standardTable.reload();
+                                } else {
+                                    swal({
+                                        title: result.message,
+                                        icon: "error",
+                                        button: "确定"
+                                    });
+                                }
+
+                            }).fail(function (xhr) {
+                                swal({
+                                    title: xhr.status,
+                                    icon: "error",
+                                    button: "确定"
+                                });
+                            });
+                        }
+
+
+                    }
+                )
+                .catch(err => {
+                    if (err) {
+                        swal("操作失败!", "请于管理员联系。", "error");
+                    } else {
+                        swal.stopLoading();//停止加载显示
+                        swal.close();//关闭提示框
+                    }
+                });
+
+        } else if (layEvent === 'standard_use') { //启用
+
+            swal({
+                title: "您确实要启用该规格信息吗?",
+                icon: "warning",
+                buttons: [
+                    "取消",
+                    {text: '确认', closeModal: false}
+                ],
+                dangerMode: true,
+            })
+                .then((ok) => {
+                        if (ok) {
+                            $.ajax({
+                                url: 'standard',
+                                method: 'post',
+                                data: {
+                                    'standard_id': data.standard_id,
+                                    'standard_status':'55'
+                                },
+                                dataType: 'json'
+                            }).done(function (result) {
+                                if (result.success) {
+                                    swal({
+                                        text: result.message,
+                                        icon: "success",
+                                        buttons: false,
+                                        timer: 1500
+                                    });
+                                    standardTable.reload();
+                                } else {
+                                    swal({
+                                        title: result.message,
+                                        icon: "error",
+                                        button: "确定"
+                                    });
+                                }
+
+                            }).fail(function (xhr) {
+                                swal({
+                                    title: xhr.status,
+                                    icon: "error",
+                                    button: "确定"
+                                });
+                            });
+                        }
+
+
+                    }
+                )
+                .catch(err => {
+                    if (err) {
+                        swal("操作失败!", "请于管理员联系。", "error");
+                    } else {
+                        swal.stopLoading();//停止加载显示
+                        swal.close();//关闭提示框
+                    }
+                })
+            ;
+
+        } else if (layEvent === 'standard_unuse') { //禁用
+
+            swal({
+                title: "您确实要禁用该规格信息吗?",
+                icon: "warning",
+                buttons: [
+                    "取消",
+                    {text: '确认', closeModal: false}
+                ],
+                dangerMode: true,
+            })
+                .then((ok) => {
+                        if (ok) {
+                            $.ajax({
+                                url: 'standard',
+                                method: 'post',
+                                data: {
+                                    'standard_id': data.standard_id,
+                                    'standard_status':'77'
+                                },
+                                dataType: 'json'
+                            }).done(function (result) {
+                                if (result.success) {
+                                    swal({
+                                        text: result.message,
+                                        icon: "success",
+                                        buttons: false,
+                                        timer: 1500
+                                    });
+                                    standardTable.reload();
+                                } else {
+                                    swal({
+                                        title: result.message,
+                                        icon: "error",
+                                        button: "确定"
+                                    });
+                                }
+
+                            }).fail(function (xhr) {
+                                swal({
+                                    title: xhr.status,
+                                    icon: "error",
+                                    button: "确定"
+                                });
+                            });
+                        }
+
+
+                    }
+                )
+                .catch(err => {
+                    if (err) {
+                        swal("操作失败!", "请于管理员联系。", "error");
+                    } else {
+                        swal.stopLoading();//停止加载显示
+                        swal.close();//关闭提示框
+                    }
+                });
+
+        }
+
+
+    });//监听工具条结束
+        
+    //多删
+        $('#bn-standard-del-multi').click(function () {
+            var checkStatus = table.checkStatus('standard');//获得选中行
+
+            if(checkStatus.data.length==0){
+                swal({
+                    text: '您没有选择任何数据！',
+                    icon: "error",
+                    buttons:false,
+                    timer:1500
+                });
+                return;
+            }
+
+            var arr = [];
+            $.each(checkStatus.data, function() {
+                arr.push(this.standard_id);
+            });
+
+            swal({
+                title: "您确实要删除选择的数据吗?",
+                text: "数据一旦删除将无法恢复!",
+                icon: "warning",
+                buttons: [
+                    "取消",
+                    {text:'确认删除',closeModal:false}
+                ],
+                dangerMode: true,
+            })
+                .then((ok) => {
+                    if (ok) {
+
+                        $.ajax({
+                            url : 'standard',
+                            data : JSON.stringify(arr),
+                            contentType : 'application/json;charset=UTF-8',
+                            method : 'delete',
+                            dataType : 'json'
+                        }).done(function(result) {
+                            if (result.success) {
+                                swal({
+                                    text: result.message,
+                                    icon: "success",
+                                    buttons:false,
+                                    timer:1500
+                                });
+                                standardTable.reload();
+                            } else {
+                                swal({
+                                    title: result.message,
+                                    icon: "error",
+                                    button: "确定"
+                                });
+                            }
+
+                        }).fail(function(xhr) {
+                            swal({
+                                title: xhr.status,
+                                text:'请于管理员联系。',
+                                icon: "error",
+                                button: "确定"
+                            });
+                        });
+
+                    }
+
+                })
+                .catch(err => {
+                    if (err) {
+                        console.log(err);
+                        swal("操作失败!", "请于管理员联系。", "error");
+                    } else {
+                        swal.stopLoading();//停止加载显示
+                        swal.close();//关闭提示框
+                    }
+                });
+
+        });//end 多删
+
+    });
+</script>
+
+</body>
+</html>
+
diff --git a/src/main/web/WEB-INF/views/sys/home.jsp b/src/main/web/WEB-INF/views/sys/home.jsp
index 815de0125307893cc1e46906765a98b7a2a7538e..8eeb08a40ea168831bccb5f68d9dfe747285a262 100644
--- a/src/main/web/WEB-INF/views/sys/home.jsp
+++ b/src/main/web/WEB-INF/views/sys/home.jsp
@@ -6,7 +6,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>layout 后台大布局 - Layui</title>
+    <title>生产过程云管理系统</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -16,7 +16,7 @@
 
     <link rel="stylesheet" href="../../../static/layui-2.3.0/css/layui.css" media="all">
     <style>
-        .iframe{
+        iframe{
             width: 100%;
             height: 100%;
             border: none;
@@ -32,7 +32,7 @@
             <li class="layui-nav-item">
                 <a href="javascript:;">
                     <img src="http://t.cn/RCzsdCq" class="layui-nav-img">
-                    ${sessionScope.user.getU_name}
+                    ${sessionScope.user.u_name}
                 </a>
             </li>
             <li class="layui-nav-item"><a href="/logout">退了</a></li>
diff --git a/src/main/web/WEB-INF/views/sys/login.jsp b/src/main/web/WEB-INF/views/sys/login.jsp
index 2fd5e033a7723c63ac21031b65320eabf8f53967..b9de5741287d6a9da647e6b2ef368459d4a7524a 100644
--- a/src/main/web/WEB-INF/views/sys/login.jsp
+++ b/src/main/web/WEB-INF/views/sys/login.jsp
@@ -16,7 +16,7 @@
 <head>
     <title>login</title>
     <link rel="stylesheet" href="../../../static/bootstrap-4.1.1/bootstrap.min.css">
-    <link rel="stylesheet" href="../../../static/bootstrap-4.1.1/signin.css">
+    <link rel="stylesheet" href="../../../static/bootstrap-4.1.1/singin.css">
 </head>
 <body>
 <div class="container">
diff --git a/src/main/web/static/bootstrap-4.1.1/singin.css b/src/main/web/static/bootstrap-4.1.1/singin.css
new file mode 100644
index 0000000000000000000000000000000000000000..3a233496f72a1c418c792c76d8116b0f26a0f9c7
--- /dev/null
+++ b/src/main/web/static/bootstrap-4.1.1/singin.css
@@ -0,0 +1,40 @@
+body {
+    padding-top: 40px;
+    padding-bottom: 40px;
+    background-color: #eee;
+}
+
+.form-signin {
+    max-width: 330px;
+    padding: 15px;
+    margin: 0 auto;
+}
+.form-signin .form-signin-heading,
+.form-signin .checkbox {
+    margin-bottom: 10px;
+}
+.form-signin .checkbox {
+    font-weight: normal;
+}
+.form-signin .form-control {
+    position: relative;
+    height: auto;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    padding: 10px;
+    font-size: 16px;
+}
+.form-signin .form-control:focus {
+    z-index: 2;
+}
+.form-signin input[type="email"] {
+    margin-bottom: -1px;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+}
+.form-signin input[type="password"] {
+    margin-bottom: 10px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+}