Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
This commit is contained in:
commit
0499c2c439
@ -1,7 +1,7 @@
|
|||||||
<main id="js-page-content" role="main" class="page-content">
|
<main id="js-page-content" role="main" class="page-content">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-12 col-xl-12">
|
<div class="col-sm-12 col-xl-12">
|
||||||
<h1 class="p-2 mb-0">帳號與權限管理</h1>
|
<h1 class="p-2 mb-0">帳號管理</h1>
|
||||||
<div class="row mt-5">
|
<div class="row mt-5">
|
||||||
<ul class="nav nav-tabs w-100" role="tablist">
|
<ul class="nav nav-tabs w-100" role="tablist">
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
|
@ -2681,7 +2681,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
|
|||||||
</div>`;
|
</div>`;
|
||||||
|
|
||||||
$.each(res.data, function (i, v) {
|
$.each(res.data, function (i, v) {
|
||||||
if (v.authCode == 'FL1') {
|
if (v.authCode == 'PF1') {
|
||||||
strHtml += `<div class="btn-group mx-4" >
|
strHtml += `<div class="btn-group mx-4" >
|
||||||
<a href="javascript:;" class="dropdown-toggle no-arrow text-center" data-toggle="dropdown"
|
<a href="javascript:;" class="dropdown-toggle no-arrow text-center" data-toggle="dropdown"
|
||||||
aria-haspopup="true" aria-expanded="false">
|
aria-haspopup="true" aria-expanded="false">
|
||||||
@ -2695,7 +2695,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
|
|||||||
hasMonitor = true;
|
hasMonitor = true;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
let icon = v.authCode == 'FL2' ? 'fa-chart-pie' : v.authCode == 'FL3' ? 'fa-chart-area' : v.authCode == 'FL4' ? 'fa-bell' : v.authCode == 'FL5' ? 'fa-server' : v.authCode == 'FL6' ? 'fa-image' : v.authCode == 'FL7' ? 'fa-user' : '';
|
let icon = v.authCode == 'PF2' ? 'fa-chart-pie' : v.authCode == 'PF3' ? 'fa-chart-area' : v.authCode == 'PF4' ? 'fa-bell' : v.authCode == 'PF5' ? 'fa-server' : v.authCode == 'PF6' ? 'fa-image' : v.authCode == 'PF7' ? 'fa-user' : '';
|
||||||
strHtml += `<div class="btn-group mx-4">
|
strHtml += `<div class="btn-group mx-4">
|
||||||
<a href="javascript:;" name="topFunBtn" class="dropdown-toggle no-arrow text-center"
|
<a href="javascript:;" name="topFunBtn" class="dropdown-toggle no-arrow text-center"
|
||||||
data-page="${v.showView}">
|
data-page="${v.showView}">
|
||||||
|
@ -683,7 +683,7 @@ namespace FrontendWebApi.ApiControllers
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var sqlString = $@"select * from auth_page where AuthCode like 'FL%' order by AuthCode";
|
var sqlString = $@"select * from auth_page where AuthCode like 'PF%' order by AuthCode";
|
||||||
authPage = await backendRepository.GetAllAsync<AuthPage>(sqlString);
|
authPage = await backendRepository.GetAllAsync<AuthPage>(sqlString);
|
||||||
apiResult.Code = "0000";
|
apiResult.Code = "0000";
|
||||||
apiResult.Data = authPage;
|
apiResult.Data = authPage;
|
||||||
|
@ -140,7 +140,7 @@ namespace FrontendWebApi.ApiControllers
|
|||||||
var sqlString = $@"select ap.* from auth_page ap
|
var sqlString = $@"select ap.* from auth_page ap
|
||||||
join role_auth ra on ap.AuthCode = ra.AuthCode
|
join role_auth ra on ap.AuthCode = ra.AuthCode
|
||||||
join userinfo ui on ra.role_guid = ui.role_guid
|
join userinfo ui on ra.role_guid = ui.role_guid
|
||||||
where ap.AuthCode like 'FL%' and ui.userinfo_guid = @userinfo_guid
|
where ap.AuthCode like 'PF%' and ui.userinfo_guid = @userinfo_guid
|
||||||
order by ap.AuthCode";
|
order by ap.AuthCode";
|
||||||
authPage = await backendRepository.GetAllAsync<AuthPage>(sqlString, new { @userinfo_guid = myUser.userinfo_guid });
|
authPage = await backendRepository.GetAllAsync<AuthPage>(sqlString, new { @userinfo_guid = myUser.userinfo_guid });
|
||||||
apiResult.Code = "0000";
|
apiResult.Code = "0000";
|
||||||
|
Loading…
Reference in New Issue
Block a user