wenjy
/
aucma-scada-management-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 异常处理

Browse Source
master
wenjy 3 years ago
parent d38cd81bb6
commit 9ee7212f0a
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File

8
ruoyi-admin/src/main/resources/templates/index.html
Unescape Escape View File

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
<title>仓库管理系统</title>
<title>SCADA管理系统</title>
<!-- 避免IE使用兼容模式 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
@ -26,7 +26,7 @@
</div>
<a th:href="@{/index}">
<li class="logo hidden-xs">
<span class="logo-lg">仓库管理系统</span>
<span class="logo-lg">SCADA管理系统</span>
</li>
</a>
<div class="sidebar-collapse">
@ -118,6 +118,10 @@
</li>
</ul>
</li>-->
<li>
<a th:href="@{logout}">
<i class="fa fa-sign-out"></i> 退出登录</a>
</li>
</ul>
</nav>
</div>

10
ruoyi-admin/src/main/resources/templates/login.html
Unescape Escape View File

@ -3,8 +3,8 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>登录仓库管理系统</title>
<meta name="description" content="仓库系统后台管理框架">
<title>登录SCADA管理系统</title>
<meta name="description" content="SCADA后台管理框架">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
<link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
@ -99,10 +99,10 @@
</div>
<div class="col-sm-6" >
<form id="signupForm" autocomplete="off">
<p class="m-t-md" style="font-size: 30px" align="center">仓库管理系统</p>
<p class="m-t-md" style="font-size: 30px" align="center">SCADA管理系统</p>
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" />
<input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123" />
<input type="text" name="username" class="form-control uname" placeholder="用户名" />
<input type="password" name="password" class="form-control pword" placeholder="密码" />
<div class="row m-t" th:if="${captchaEnabled==true}">
<!--<div class="col-xs-6">
<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />

2
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
Unescape Escape View File

@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int">
select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
select count(1) from sys_user_wms where dept_id = #{deptId} and del_flag = '0'
</select>
<select id="selectDeptCount" parameterType="SysDept" resultType="int">

2
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
Unescape Escape View File

@ -34,7 +34,7 @@
from sys_menu_wms m
left join sys_role_menu_wms rm on m.menu_id = rm.menu_id
left join sys_user_role_wms ur on rm.role_id = ur.role_id
LEFT JOIN sys_role_wms_wms ro on ur.role_id = ro.role_id
LEFT JOIN sys_role_wms ro on ur.role_id = ro.role_id
where ur.user_id = #{userId} and m.menu_type in ('M', 'C') and m.visible = 0 AND ro.status = 0
order by m.parent_id, m.order_num
</select>

Write Preview
Loading…
Cancel
Save