JHSYS
/
AMES
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.修改系统登录自动根据用户显示对应的权限菜单 

2.修改MAC资料维护KCS001的弹窗高度640
3.修正WebApi一个Attribute冲突
PTD
Marvin 3 years ago
parent
897e5b1257
commit
226ba771f0
6 changed files with 50 additions and 238 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      AMESCoreStudio.Web/Controllers/HomeController.cs
  2. 233
      AMESCoreStudio.Web/Views/Home/Framework.cshtml
  3. 4
      AMESCoreStudio.Web/Views/KCS/KCS001.cshtml
  4. 2
      AMESCoreStudio.WebApi/Attribute/BarCodeAttribute.cs
  5. 2
      AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs
  6. 1
      AMESCoreStudio.WebApi/Models/SYS/DeptInfo.cs

46
AMESCoreStudio.Web/Controllers/HomeController.cs
View File

@ -15,11 +15,13 @@ namespace AMESCoreStudio.Web.Controllers
{ {
private readonly ILogger<HomeController> _logger; private readonly ILogger<HomeController> _logger;
public readonly IAuth _authApi; public readonly IAuth _authApi;
public readonly ISYS _sysApi;
public HomeController(ILogger<HomeController> logger, IAuth authApi) public HomeController(ILogger<HomeController> logger, IAuth authApi, ISYS sysApi)
{ {
_logger = logger; _logger = logger;
_authApi = authApi; _authApi = authApi;
_sysApi = sysApi;
} }
public IActionResult Index() public IActionResult Index()
@ -43,6 +45,48 @@ namespace AMESCoreStudio.Web.Controllers
{ {
if (int.Parse(userID.ToString()) >= 0) if (int.Parse(userID.ToString()) >= 0)
{ {
int user_id = int.Parse(userID.ToString());
var userRole = await _sysApi.GetUserRolesByUser(user_id);
int role_id = userRole[0].RoleID;
var userModule = await _sysApi.GetRoleModulesByRole(role_id, 0, 10);
var userProgram = await _sysApi.GetRoleProgramsByRole(role_id, 0, 10);
string menuData = "<ul id = 'nav' class='layui-tab-item layui-show'>";
for (int i = 0; i < userModule.Count; i++)
{
int module_id = userModule[i].ModuleID;
if (i == 0)
{
menuData = menuData + "<li class='open'>";
}
else
{
menuData = menuData + "<li>";
}
menuData = menuData + "<a class='border active'>";
menuData = menuData + "<i class='fa fa-star fa-fw' style='color:#77B272;'></i><cite style='color:#77B272;'> " + userModule[i].Module.ModuleName + " </cite><i class='fa fa-angle-up fa-fw nav_right'></i>";
menuData = menuData + "</a>";
menuData = menuData + "<ul class='sub-menu' style='display: block;'>";
for (int j = 0; j < userProgram.Count; j++)
{
if (userProgram[j].Program.ModuleID == module_id)
{
menuData = menuData + "<li class='sub-tab' hg-title='" + userProgram[j].Program.ProgramName + "' hg-nav='" + userProgram[j].Program.ProgramPath + "'>";
menuData = menuData + "<a><i class='fa fa-key fa-fw'></i><cite>" + userProgram[j].Program.ProgramName + "</cite></a>";
menuData = menuData + "</li>";
}
}
menuData = menuData + "</ul>";
menuData = menuData + "</li>";
}
menuData = menuData + "</ul>";
ViewData["MenuList"] = menuData;
return View(); return View();
} }
} }

233
AMESCoreStudio.Web/Views/Home/Framework.cshtml
View File

@ -78,238 +78,7 @@
<div class="layui-left-nav scrollBox"> <div class="layui-left-nav scrollBox">
<div id="side-nav"> <div id="side-nav">
<!-- meun_id=0；UI组件 --> <!-- meun_id=0；UI组件 -->
<ul id="nav" class="layui-tab-item layui-show"> @Html.Raw(ViewData["MenuList"])
<li class="open">
<a class="border active">
<i class="fa fa-star fa-fw" style="color:#77B272;"></i><cite style="color:#77B272;">系統管理模組</cite><i class="fa fa-angle-up fa-fw nav_right"></i>
</a>
<ul class="sub-menu" style="display: block;">
<li class="sub-tab" hg-title="系統資料維護" hg-nav="/SYS/SYS001">
<a><i class="fa fa-key fa-fw"></i><cite>系統資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="模組資料維護" hg-nav="/SYS/SYS002">
<a><i class="fa fa-key fa-fw"></i><cite>模組資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="功能資料維護" hg-nav="/SYS/SYS003">
<a><i class="fa fa-key fa-fw"></i><cite>功能資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="角色資料維護" hg-nav="/SYS/SYS004">
<a><i class="fa fa-key fa-fw"></i><cite>角色資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="角色模组維護" hg-nav="/SYS/SYS005">
<a><i class="fa fa-key fa-fw"></i><cite>角色模组維護</cite></a>
</li>
<li class="sub-tab" hg-title="角色功能維護" hg-nav="/SYS/SYS006">
<a><i class="fa fa-key fa-fw"></i><cite>角色功能維護</cite></a>
</li>
<li class="sub-tab" hg-title="部门資料維護" hg-nav="/SYS/SYS007">
<a><i class="fa fa-user-o fa-fw"></i><cite>部门資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="用户資料維護" hg-nav="/SYS/SYS008">
<a><i class="fa fa-user-o fa-fw"></i><cite>用户資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="用户角色維護" hg-nav="/SYS/SYS009">
<a><i class="fa fa-user-o fa-fw"></i><cite>用户角色維護</cite></a>
</li>
<li class="sub-tab" hg-title="使用者密碼變更" hg-nav="/SYS/SYS010">
<a><i class="fa fa-user-o fa-fw"></i><cite>使用者密碼變更</cite></a>
</li>
<li class="sub-tab" hg-title="個人密碼變更" hg-nav="/SYS/SYS011">
<a><i class="fa fa-user-o fa-fw"></i><cite>個人密碼變更</cite></a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-star fa-fw" style="color:#77B272;"></i><cite style="color:#77B272;">基本資料模組</cite><i class="fa fa-angle-up fa-fw nav_right"></i>
</a>
<ul class="sub-menu">
<li class="sub-tab" hg-title="工廠資料維護" hg-nav="/BAS/BAS001">
<a><i class="fa fa-key fa-fw"></i><cite>工廠資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="生產製程單位維護" hg-nav="/BAS/BAS002">
<a><i class="fa fa-key fa-fw"></i><cite>生產製程單位維護</cite></a>
</li>
<li class="sub-tab" hg-title="線別資料維護" hg-nav="/BAS/BAS003">
<a><i class="fa fa-key fa-fw"></i><cite>線別資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="班別資料維護" hg-nav="/BAS/BAS005">
<a><i class="fa fa-key fa-fw"></i><cite>班別資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="生產時段資料維護" hg-nav="/BAS/BAS006">
<a><i class="fa fa-key fa-fw"></i><cite>生產時段資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="站別類別維護" hg-nav="/BAS/BAS007">
<a><i class="fa fa-key fa-fw"></i><cite>站別類別維護</cite></a>
</li>
<li class="sub-tab" hg-title="站別資料維護" hg-nav="/BAS/BAS008">
<a><i class="fa fa-key fa-fw"></i><cite>站別資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="流程資料維護" hg-nav="/BAS/BAS009">
<a><i class="fa fa-key fa-fw"></i><cite>流程資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="流程站別維護" hg-nav="/BAS/BAS010">
<a><i class="fa fa-key fa-fw"></i><cite>流程站別維護</cite></a>
</li>
<li class="sub-tab" hg-title="流程規則資料維護" hg-nav="/BAS/BAS011">
<a><i class="fa fa-key fa-fw"></i><cite>流程規則資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="責任單位資料維護" hg-nav="/BAS/BAS014">
<a><i class="fa fa-key fa-fw"></i><cite>責任單位資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="郵件群組類別維護" hg-nav="/BAS/BAS015">
<a><i class="fa fa-key fa-fw"></i><cite>郵件群組類別維護</cite></a>
</li>
<li class="sub-tab" hg-title="郵件群組資料維護" hg-nav="/BAS/BAS016">
<a><i class="fa fa-key fa-fw"></i><cite>郵件群組資料維護</cite></a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-cog fa-fw" style="color:#77B272;"></i><cite style="color:#77B272;">製程資料模組</cite><i class="fa fa-angle-up fa-fw nav_right"></i>
</a>
<ul class="sub-menu">
<li class="sub-tab" hg-title="工單狀態維護" hg-nav="/PPS/PPS001">
<a><i class="fa fa-comment-o fa-fw"></i><cite>工單狀態維護</cite></a>
</li>
<li class="sub-tab" hg-title="條碼狀態維護" hg-nav="/PPS/PPS002">
<a><i class="fa fa-comment-o fa-fw"></i><cite>條碼狀態維護</cite></a>
</li>
<li class="sub-tab" hg-title="機種C/T資料維護" hg-nav="/PPS/PPS003">
<a><i class="fa fa-comment-o fa-fw"></i><cite>機種C/T資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="異常群組維護" hg-nav="/PPS/PPS005">
<a><i class="fa fa-comment-o fa-fw"></i><cite>異常群組維護</cite></a>
</li>
<li class="sub-tab" hg-title="異常類別維護" hg-nav="/PPS/PPS006">
<a><i class="fa fa-comment-o fa-fw"></i><cite>異常類別維護</cite></a>
</li>
<li class="sub-tab" hg-title="異常原因維護" hg-nav="/PPS/PPS007">
<a><i class="fa fa-comment-o fa-fw"></i><cite>異常原因維護</cite></a>
</li>
<li class="sub-tab" hg-title="不良現象群組維護" hg-nav="/PPS/PPS008">
<a><i class="fa fa-comment-o fa-fw"></i><cite>不良現象群組維護</cite></a>
</li>
<li class="sub-tab" hg-title="不良現象類別維護" hg-nav="/PPS/PPS009">
<a><i class="fa fa-comment-o fa-fw"></i><cite>不良現象類別維護</cite></a>
</li>
<li class="sub-tab" hg-title="不良現象原因維護" hg-nav="/PPS/PPS010">
<a><i class="fa fa-comment-o fa-fw"></i><cite>不良現象原因維護</cite></a>
</li>
<li class="sub-tab" hg-title="维修群組維護" hg-nav="/PPS/PPS011">
<a><i class="fa fa-comment-o fa-fw"></i><cite>维修群組維護</cite></a>
</li>
<li class="sub-tab" hg-title="维修類別維護" hg-nav="/PPS/PPS012">
<a><i class="fa fa-comment-o fa-fw"></i><cite>维修類別維護</cite></a>
</li>
<li class="sub-tab" hg-title="维修原因維護" hg-nav="/PPS/PPS013">
<a><i class="fa fa-comment-o fa-fw"></i><cite>维修原因維護</cite></a>
</li>
<li class="sub-tab" hg-title="維修方式維護" hg-nav="/PPS/PPS014">
<a><i class="fa fa-comment-o fa-fw"></i><cite>維修方式維護</cite></a>
</li>
<li class="sub-tab" hg-title="組件類別維護" hg-nav="/PPS/PPS015">
<a><i class="fa fa-comment-o fa-fw"></i><cite>組件類別維護</cite></a>
</li>
<li class="sub-tab" hg-title="問題類別維護" hg-nav="/PPS/PPS016">
<a><i class="fa fa-comment-o fa-fw"></i><cite>問題類別維護</cite></a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-cog fa-fw" style="color:#77B272;"></i><cite style="color:#77B272;">組件控管模組</cite><i class="fa fa-angle-up fa-fw nav_right"></i>
</a>
<ul class="sub-menu">
<li class="sub-tab" hg-title="MAC資料維護" hg-nav="/KCS/KCS001">
<a><i class="fa fa-comment-o fa-fw"></i><cite>MAC資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="序號-料號維護" hg-nav="/KCS/KCS002">
<a><i class="fa fa-comment-o fa-fw"></i><cite>序號-料號維護</cite></a>
</li>
<li class="sub-tab" hg-title="組件料號序號維護" hg-nav="/KCS/KCS004">
<a><i class="fa fa-comment-o fa-fw"></i><cite>組件料號序號維護</cite></a>
</li>
<li class="sub-tab" hg-title="組件類別維護" hg-nav="/KCS/KCS006">
<a><i class="fa fa-comment-o fa-fw"></i><cite>組件類別維護</cite></a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-folder-o fa-fw" style="color:#77B272;"></i><cite style="color:#77B272;">製程控管模組</cite><i class="fa fa-angle-up fa-fw nav_right"></i>
</a>
<ul class="sub-menu">
<li class="sub-tab" hg-title="工單資料查詢" hg-nav="/PCS/PCS005">
<a><i class="fa fa-comment-o fa-fw"></i><cite>工單資料查詢</cite></a>
</li>
<li class="sub-tab" hg-title="工單條碼區間設定" hg-nav="/PCS/PCS004">
<a><i class="fa fa-comment-o fa-fw"></i><cite>工單條碼區間設定</cite></a>
</li>
<li class="sub-tab" hg-title="工單開線收線作業" hg-nav="/PCS/PCS006">
<a><i class="fa fa-comment-o fa-fw"></i><cite>工單開線收線作業</cite></a>
</li>
<li class="sub-tab" hg-title="製程工單鎖定查詢" hg-nav="/PCS/PCS012">
<a><i class="fa fa-comment-o fa-fw"></i><cite>製程工單鎖定查詢</cite></a>
</li>
<li class="sub-tab" hg-title="過站作業" hg-nav="/PCS/PCS021">
<a><i class="fa fa-comment-o fa-fw"></i><cite>過站作業</cite></a>
</li>
<li class="sub-tab" hg-title="组件資料新增" hg-nav="/PCS/PCS024">
<a><i class="fa fa-comment-o fa-fw"></i><cite>组件資料新增</cite></a>
</li>
<li class="sub-tab" hg-title="组件資料置換" hg-nav="/PCS/PCS025">
<a><i class="fa fa-comment-o fa-fw"></i><cite>组件資料置換</cite></a>
</li>
<li class="sub-tab" hg-title="组件資料删除" hg-nav="/PCS/PCS026">
<a><i class="fa fa-comment-o fa-fw"></i><cite>组件資料删除</cite></a>
</li>
@*<li class="sub-tab" hg-title="組件資料批量刪除" hg-nav="/PCS/PCS027">
<a><i class="fa fa-comment-o fa-fw"></i><cite>組件資料批量刪除</cite></a>
</li>*@
<li class="sub-tab" hg-title="SOP文件查詢" hg-nav="/PCS/PCS030">
<a><i class="fa fa-comment-o fa-fw"></i><cite>SOP文件查詢</cite></a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-folder-o fa-fw" style="color:#77B272;"></i><cite style="color:#77B272;">工時控管模組</cite><i class="fa fa-angle-up fa-fw nav_right"></i>
</a>
<ul class="sub-menu">
<li class="sub-tab" hg-title="工時資料維護" hg-nav="/WHS/WHS001">
<a><i class="fa fa-comment-o fa-fw"></i><cite>工時資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="工時類別維護" hg-nav="/WHS/WHS002">
<a><i class="fa fa-comment-o fa-fw"></i><cite>工時類別維護</cite></a>
</li>
<li class="sub-tab" hg-title="標準工時維護" hg-nav="/WHS/WHS003">
<a><i class="fa fa-comment-o fa-fw"></i><cite>標準工時維護</cite></a>
</li>
<li class="sub-tab" hg-title="標準工時查詢" hg-nav="/WHS/WHS005">
<a><i class="fa fa-comment-o fa-fw"></i><cite>標準工時查詢</cite></a>
</li>
<li class="sub-tab" hg-title="每日工時資料維護" hg-nav="/WHS/WHS006">
<a><i class="fa fa-comment-o fa-fw"></i><cite>每日工時資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="援入/外資料維護" hg-nav="/WHS/WHS008">
<a><i class="fa fa-comment-o fa-fw"></i><cite>援入/外資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="異常工時資料維護" hg-nav="/WHS/WHS009">
<a><i class="fa fa-comment-o fa-fw"></i><cite>異常工時資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="重工標準工時維護" hg-nav="/WHS/WHS011">
<a><i class="fa fa-comment-o fa-fw"></i><cite>重工標準工時維護</cite></a>
</li>
<li class="sub-tab" hg-title="線上無效工時查詢" hg-nav="/WHS/WHS013">
<a><i class="fa fa-comment-o fa-fw"></i><cite>線上無效工時查詢</cite></a>
</li>
</ul>
</li>
</ul>
</div> </div>
</div> </div>

4
AMESCoreStudio.Web/Views/KCS/KCS001.cshtml
View File

@ -71,7 +71,7 @@
//通过行tool编辑，lay-event="edit" //通过行tool编辑，lay-event="edit"
function edit(obj) { function edit(obj) {
if (obj.data.class) { if (obj.data.class) {
hg.open('修改MAC資料', '/KCS/KCS001U/' + obj.data.class + ',' + obj.data.classGroup, 640, 820); hg.open('修改MAC資料', '/KCS/KCS001U/' + obj.data.class + ',' + obj.data.classGroup, 640, 640);
} }
} }
@ -104,7 +104,7 @@
layuiicon: '&#xe608;', layuiicon: '&#xe608;',
class: 'layui-btn-normal', class: 'layui-btn-normal',
handler: function () { handler: function () {
hg.open('新增MAC資料', '/KCS/KCS001C', 640, 860); hg.open('新增MAC資料', '/KCS/KCS001C', 640, 640);
} }
} }

2
AMESCoreStudio.WebApi/Attribute/BarCodeAttribute.cs
View File

@ -5,7 +5,7 @@ using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using AMESCoreStudio.WebApi.Models.AMES; using AMESCoreStudio.WebApi.Models.AMES;
namespace AMESCoreStudio.WebApi.Attribute namespace AMESCoreStudio.WebApi
{ {
public class BarCodeAttribute : ValidationAttribute public class BarCodeAttribute : ValidationAttribute
{ {

2
AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs
View File

@ -2,7 +2,7 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using AMESCoreStudio.WebApi.Attribute; using AMESCoreStudio.WebApi;
namespace AMESCoreStudio.WebApi.Models.AMES namespace AMESCoreStudio.WebApi.Models.AMES
{ {

1
AMESCoreStudio.WebApi/Models/SYS/DeptInfo.cs
View File

@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace AMESCoreStudio.WebApi.Models.SYS namespace AMESCoreStudio.WebApi.Models.SYS
{ {
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save