浏览代码

Merge remote-tracking branch 'origin/master'

lxb 1 年之前
父节点
当前提交
97c071a003

+ 2 - 1
newFeatures.cmd

@@ -1,4 +1,5 @@
 新增功能
 1、自动生成编码规则,根据填入的code,去serial_number表中找规则
 2、新增菜单页面是否创建新的页面出来
-3、统一的审批接口:post:/admin/common/bSalesOrder/apply/${id}/2   2 表示想要改变的状态
+3、统一的审批接口:post:/admin/common/bSalesOrder/apply/${id}/2   2 表示想要改变的状态
+4、图标在 materialdesignicons.min.css

+ 1 - 1
src/main/resources/static/admin/choose_enterprise.html

@@ -71,7 +71,7 @@
   <div class="lyear-login">
     <div class="login-center"  style="padding:15px;">
       <div class="login-header text-center">
-        <img src="images/logo.png" style="height:40px;line-height:40px;" /><span style="font-size:1.2em;line-height:40px;">低代码管理系统</span>
+        <img src="" style="height:40px;line-height:40px;" /><span style="font-size:1.2em;line-height:40px;">兴胜机械数字管理系统</span>
       </div>
       <form action="#!" method="post" id="form">
         <div class="choose-enterprise">选择企业</div>

+ 13 - 7
src/main/resources/static/admin/index.html

@@ -3,10 +3,10 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-<title>IMCS管理系统</title>
-<link rel="icon" href="images/logo.png" type="image/png">
-<meta name="keywords" content="IMCS管理系统">
-<meta name="description" content="IMCS管理系统">
+<title>兴胜机械数字管理系统</title>
+<link rel="icon" href="" type="image/png">
+<meta name="keywords" content="兴胜机械数字管理系统">
+<meta name="description" content="兴胜机械数字管理系统">
 <meta name="author" content="yinqi">
 <link href="css/bootstrap.min.css" rel="stylesheet">
 <link href="css/materialdesignicons.min.css" rel="stylesheet">
@@ -19,6 +19,11 @@
     //     window.location.href="/admin/mobile.html?t="+new Date().getTime();
     // }
 </script>
+  <style>
+    #menus li:last-child {
+      margin-bottom: 30px;
+    }
+  </style>
 </head>
 
 <body >
@@ -29,8 +34,8 @@
 
       <!-- logo -->
       <div id="logo" class="sidebar-header">
-        <a href="index.html"><img src="images/logo.png" style="height:40px;" /><span
-                style="font-size:1.2em;line-height:40px;">IMCS管控系统</span></a>
+        <a href="index.html"><img src="" style="height:40px;" /><span
+                style="font-size:1.2em;line-height:40px;">兴胜机械数字管理系统</span></a>
       </div>
       <div class="lyear-layout-sidebar-scroll">
 
@@ -59,7 +64,8 @@
           </ul>
         </nav>
       </div>
-
+      <div class="sidebar-header">
+      </div>
     </aside>
     <!--End 左侧导航-->
 

+ 7 - 7
src/main/resources/static/admin/lyear_pages_login.html

@@ -10,10 +10,10 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-<title>登录页面 - 管控系统</title>
+<title>登录页面 - 兴胜机械数字管理系统</title>
 <link rel="icon" href="images/logo.png" type="image/png">
-<meta name="keywords" content="管控系统">
-<meta name="description" content="管控系统">
+<meta name="keywords" content="兴胜机械数字管理系统">
+<meta name="description" content="兴胜机械数字管理系统">
 <meta name="author" content="yinqi">
 <link href="css/bootstrap.min.css" rel="stylesheet">
 <link href="css/materialdesignicons.min.css" rel="stylesheet">
@@ -73,16 +73,16 @@
   <div class="lyear-login" >
     <div class="login-center" style="padding:15px;">
       <div class="login-header text-center">
-        <img src="images/logo.png" style="height:40px;line-height:40px;" /><span
-              style="font-size:1.2em;line-height:40px;">登录管控系统</span>
+        <img src="" style="height:40px;line-height:40px;" /><span
+              style="font-size:1.2em;line-height:40px;">登录兴胜机械数字管理系统</span>
       </div>
       <form action="#!" method="post">
         <div class="form-group has-feedback feedback-left">
-          <input type="text" placeholder="体验版账号admin" class="form-control" name="username" id="username" />
+          <input type="text" placeholder="账号" class="form-control" name="username" id="username" />
           <span class="mdi mdi-account form-control-feedback" aria-hidden="true"></span>
         </div>
         <div class="form-group has-feedback feedback-left">
-          <input type="password" placeholder="体验版密码1" class="form-control" id="password" name="password" />
+          <input type="password" placeholder="密码" class="form-control" id="password" name="password" />
           <span class="mdi mdi-lock form-control-feedback" aria-hidden="true"></span>
         </div>
         <div class="form-group has-feedback feedback-left row" style="margin-bottom:5px;">