Browse Source

Web Updated

1.增加网页皮肤设定功能,修改以下相关文件
1.1.修改Views\Home\Framework.cshtml
1.2.修改Views\_ViewStart.cshtml
1.3.修改Views\Shared\_Layout.cshtml,删除Views\Shared\_Layout2.cshtml
1.4.修改lib\admin\admin.js
1.5.修改lib\admin\admin.css
1.6.修改config\skin.json
PTD
BB.Wang 4 years ago
parent
commit
2e5008cc1b
  1. 31
      AMESCoreStudio.Web/Code/Properties/launchSettings.json
  2. 16
      AMESCoreStudio.Web/UpdateList.txt
  3. 36
      AMESCoreStudio.Web/Views/Home/Framework.cshtml
  4. 4
      AMESCoreStudio.Web/Views/Home/Index.cshtml
  5. 7
      AMESCoreStudio.Web/Views/Login/Index.cshtml
  6. 20
      AMESCoreStudio.Web/Views/Shared/_Layout.cshtml
  7. 2
      AMESCoreStudio.Web/Views/_ViewStart.cshtml
  8. BIN
      AMESCoreStudio.Web/wwwroot/images/ames_logo.png
  9. BIN
      AMESCoreStudio.Web/wwwroot/images/welcome1.png
  10. 2
      AMESCoreStudio.Web/wwwroot/lib/admin/admin.css
  11. 12
      AMESCoreStudio.Web/wwwroot/lib/admin/admin.js

31
AMESCoreStudio.Web/Code/Properties/launchSettings.json

@ -0,0 +1,31 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:5821",
"sslPort": 0
}
},
"$schema": "http://json.schemastore.org/launchsettings.json",
"profiles": {
"IIS Express": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "amesapi/index.html",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://localhost:5821"
},
"AMESCoreStudio.WebApi": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "api/bulletins",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5001;http://localhost:5000"
}
}
}

16
AMESCoreStudio.Web/UpdateList.txt

@ -1,16 +1,26 @@
 
2021-09-18 Updated by Marvin 2021-09-23 Web Updated by Marvin
******************************************************************************
1.增加网页皮肤设定功能,修改以下相关文件
1.1.修改Views\Home\Framework.cshtml
1.2.修改Views\_ViewStart.cshtml
1.3.修改Views\Shared\_Layout.cshtml,删除Views\Shared\_Layout2.cshtml
1.4.修改lib\admin\admin.js
1.5.修改lib\admin\admin.css
1.6.修改config\skin.json
2021-09-18 Web Updated by Marvin
****************************************************************************** ******************************************************************************
1.新增角色模組維護頁面SYS005(支持批量刪除) 1.新增角色模組維護頁面SYS005(支持批量刪除)
2.新增角色功能維護頁面SYS006(支持批量刪除) 2.新增角色功能維護頁面SYS006(支持批量刪除)
3.新增用戶角色維護頁面SYS009(支持批量刪除) 3.新增用戶角色維護頁面SYS009(支持批量刪除)
2021-09-16 Updated by Marvin 2021-09-16 Web Updated by Marvin
****************************************************************************** ******************************************************************************
1.移除测试范例相关文件 1.移除测试范例相关文件
2.修改SYS模组相关Models的引用来源 2.修改SYS模组相关Models的引用来源
2021-09-01 Updated by Marvin 2021-09-01 Web Updated by Marvin
****************************************************************************** ******************************************************************************
1.修改admin.css,調整左上方LOGO區域大小與菜單對齊.layui-layout-admin .layui-header .logo a 1.修改admin.css,調整左上方LOGO區域大小與菜單對齊.layui-layout-admin .layui-header .logo a
2.修改admin.css,調整菜單點選右邊內容區域菜單顯示大小.layui-page-content .layui-tab-title 2.修改admin.css,調整菜單點選右邊內容區域菜單顯示大小.layui-page-content .layui-tab-title

36
AMESCoreStudio.Web/Views/Home/Framework.cshtml

@ -2,7 +2,7 @@
ViewData["Title"] = "AMES 1.0.0"; ViewData["Title"] = "AMES 1.0.0";
} }
<!DOCTYPE html> <!doctype html>
<html> <html>
@ -28,7 +28,7 @@
<![endif]--> <![endif]-->
</head> </head>
<body class="layui-layout-body" style="display: none;"> <body class="layui-layout-body" >
<div class="layui-layout layui-layout-admin"> <div class="layui-layout layui-layout-admin">
<!-- 顶部 --> <!-- 顶部 -->
<div class="layui-header" align="left"> <div class="layui-header" align="left">
@ -111,12 +111,6 @@
<li class="sub-tab" hg-title="用户角色維護" hg-nav="/SYS/SYS009"> <li class="sub-tab" hg-title="用户角色維護" hg-nav="/SYS/SYS009">
<a><i class="fa fa-user-o fa-fw"></i><cite>用户角色維護</cite></a> <a><i class="fa fa-user-o fa-fw"></i><cite>用户角色維護</cite></a>
</li> </li>
<li class="sub-tab" hg-title="pcb" hg-nav="/PCS/PCS001C">
<a><i class="fa fa-user-o fa-fw"></i><cite>PCB001C</cite></a>
</li>
<li class="sub-tab" hg-title="pcb" hg-nav="/PCS/PCS001A">
<a><i class="fa fa-user-o fa-fw"></i><cite>PCB001A</cite></a>
</li>
</ul> </ul>
</li> </li>
</ul> </ul>
@ -156,23 +150,40 @@
</div> </div>
</div> </div>
</div>
<!--皮肤配置--> <!--皮肤配置-->
<div class="hg-config" style="display: none;"> <div class="hg-config" style="display: none;">
<div class="layui-fluid"> <div class="layui-fluid">
<div class="layui-row"> <div class="layui-row">
<br />
<div class="layui-col-md12"> <div class="layui-col-md12">
<fieldset class="layui-elem-field layui-field-title"><legend>主题</legend></fieldset> <fieldset class="layui-elem-field"><legend>主题</legend></fieldset>
<div class="layui-col-md12"> <div class="layui-col-md12">
<ul class="skin"> <ul class="skin">
</ul> </ul>
</div> </div>
</div> </div>
<br />
<div class="layui-col-md12">
<fieldset class="layui-elem-field"><legend>字号</legend></fieldset>
<div class="layui-col-md12">
<form class="layui-form layui-form-pane" action="">
<div class="layui-form-item" pane="">
<div class="layui-input-line">
<input type="radio" name="fontsize" value="lg" title="大号">
<input type="radio" name="fontsize" value="md" title="默认">
<input type="radio" name="fontsize" value="sm" title="小号">
<input type="radio" name="fontsize" value="xs" title="超小">
</div> </div>
</div> </div>
<script type="text/javascript" src="./lib/layui/lay/modules/form.js"></script> </form>
</div> </div>
</div> </div>
</div>
</div>
<script type="text/javascript" src="~/lib/layui/lay/modules/form.js"></script>
</div>
<script> <script>
//注意:element未作封装处理,使用layui.use引用 //注意:element未作封装处理,使用layui.use引用
@ -190,7 +201,8 @@
hg.msghide('清除服务器缓存成功.'); hg.msghide('清除服务器缓存成功.');
}, 2000); }, 2000);
}) })
}</script> }
</script>
<script type="text/javascript" src="~/lib/admin/jquery-1.9.1.min.js"></script> <script type="text/javascript" src="~/lib/admin/jquery-1.9.1.min.js"></script>
<script type="text/javascript" src="~/lib/Scrollbar/jquery.scrollBar.js"></script> <script type="text/javascript" src="~/lib/Scrollbar/jquery.scrollBar.js"></script>
<!-- 请求进度条插件 --> <!-- 请求进度条插件 -->

4
AMESCoreStudio.Web/Views/Home/Index.cshtml

@ -15,8 +15,8 @@
</head> </head>
<body> <body>
<div style="text-align:center; background:#fff;width:100%;height:100%;overflow:hidden"> <div style="text-align:center; background:#fff;width:100%;height:100%;overflow:hidden">
<div style="margin-top:16%;"> <div>
<img src="~/images/welcome.png" /> <img src="~/images/welcome.png" style="max-width: 100%; height: auto; width: auto; width: auto;" />
</div> </div>
</div> </div>
</body> </body>

7
AMESCoreStudio.Web/Views/Login/Index.cshtml

@ -46,13 +46,14 @@
<span style="color:firebrick;word-break: break-all;">@Html.ValidationSummary()</span> <span style="color:firebrick;word-break: break-all;">@Html.ValidationSummary()</span>
</div> </div>
</div> </div>
<div class="login-left"><img src="~/images/mes_logo.png" style="width:607px;height:445px;" asp-append-version="true" /></div> <div class="login-left"><img src="~/images/ames_logo.png" style="max-width: 100%; height: auto; width: auto; width: auto;" asp-append-version="true" /></div>
</div>
<div class="footer "> <div class="footer ">
<div class=" layui-row" style="width:980px; margin:0 auto;"> <div class=" layui-row" style="width:90%; margin:0 auto;">
<div class="layui-col-md6"><a href="#" style=" color: #fff;"></a></div> <div class="layui-col-md6"><a href="#" style=" color: #fff;"></a></div>
</div> </div>
</div> </div>
</div>
</form> </form>
<script>$(function () { <script>$(function () {
layui.use('form', function () { layui.use('form', function () {

20
AMESCoreStudio.Web/Views/Shared/_Layout.cshtml

@ -9,7 +9,25 @@
</head> </head>
<body> <body>
<header> <header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container">
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">AMESCoreStudio.Web</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
<ul class="navbar-nav flex-grow-1">
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</li>
</ul>
</div>
</div>
</nav>
</header> </header>
<div class="container" style="max-width:100%;padding-left:0px;padding-right:0px"> <div class="container" style="max-width:100%;padding-left:0px;padding-right:0px">
<main role="main" class="pb-3"> <main role="main" class="pb-3">

2
AMESCoreStudio.Web/Views/_ViewStart.cshtml

@ -1,3 +1,3 @@
@{ @{
Layout = "_Layout"; Layout = null;
} }

BIN
AMESCoreStudio.Web/wwwroot/images/ames_logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

BIN
AMESCoreStudio.Web/wwwroot/images/welcome1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

2
AMESCoreStudio.Web/wwwroot/lib/admin/admin.css

@ -100,7 +100,7 @@ body{width: 100%;min-height: 100%;}
.layui-floor .layui-elem-quote {margin-bottom: 10px;margin-right: 20px;padding: 15px;line-height: 17px;border-left: 5px solid #d6d6d6;} .layui-floor .layui-elem-quote {margin-bottom: 10px;margin-right: 20px;padding: 15px;line-height: 17px;border-left: 5px solid #d6d6d6;}
/* 皮肤设置 */ /* 皮肤设置 */
#hgconfig .layui-elem-field legend {margin-left: 20px;padding: 0 10px;font-size: 14px;font-weight: 500;text-align: center;} #hgconfig .layui-elem-field legend {margin-left: 0px;padding: 0 20px;font-size: 14px;font-weight: 500;text-align: center;}
#hgconfig ul li {position: relative;display: inline-block;vertical-align: top;width: 100px; height: 50px;margin: 0 10px; margin-bottom: 16px;cursor: pointer;font-size: 12px; #hgconfig ul li {position: relative;display: inline-block;vertical-align: top;width: 100px; height: 50px;margin: 0 10px; margin-bottom: 16px;cursor: pointer;font-size: 12px;
} }

12
AMESCoreStudio.Web/wwwroot/lib/admin/admin.js

@ -1177,7 +1177,7 @@ layui.use(['layer', 'element', 'form', 'jquery'], function () {
skinConfig: function (m) { skinConfig: function (m) {
var clientHeight = (document.documentElement.clientHeight) - 55; var clientHeight = (document.documentElement.clientHeight) - 55;
var html = $('.hg-config'); var html = $('.hg-config');
$.getJSON('config/skin.json', function (res) { $.getJSON('../config/skin.json', function (res) {
if (res && res.data) { if (res && res.data) {
var ul = document.createElement("ul"); var ul = document.createElement("ul");
var config = events.getSkinConfig(); var config = events.getSkinConfig();
@ -1201,6 +1201,7 @@ layui.use(['layer', 'element', 'form', 'jquery'], function () {
ul.appendChild(li); ul.appendChild(li);
}); });
html.find('ul.skin').html(ul.children); html.find('ul.skin').html(ul.children);
} }
}); });
@ -1217,7 +1218,7 @@ layui.use(['layer', 'element', 'form', 'jquery'], function () {
shade: 0.2, shade: 0.2,
anim: 2, //动画 anim: 2, //动画
resize: false, //禁止拉伸 resize: false, //禁止拉伸
scrollbar: true, //滚动条 scrollbar: false, //滚动条
move: false, //禁止拖拽 move: false, //禁止拖拽
shadeClose: false, //点击遮罩关闭 shadeClose: false, //点击遮罩关闭
id: 'hgconfig', id: 'hgconfig',
@ -1255,7 +1256,9 @@ layui.use(['layer', 'element', 'form', 'jquery'], function () {
//获取皮肤设置 //获取皮肤设置
getSkinConfig: function () { getSkinConfig: function () {
var hg_skin = localStorage.getItem('hg_skin') || 0; var hg_skin = localStorage.getItem('hg_skin') || 0;
//alert(hg_skin);
var hg_fontsize = localStorage.getItem('hg_fontsize') || 'md'; var hg_fontsize = localStorage.getItem('hg_fontsize') || 'md';
//alert(hg_fontsize);
return { return {
hg_skin: hg_skin, hg_fontsize: hg_fontsize hg_skin: hg_skin, hg_fontsize: hg_fontsize
}; };
@ -1272,9 +1275,11 @@ layui.use(['layer', 'element', 'form', 'jquery'], function () {
var config = m || events.getSkinConfig(); var config = m || events.getSkinConfig();
var hg_skin = config.hg_skin; var hg_skin = config.hg_skin;
var hg_fontsize = config.hg_fontsize; var hg_fontsize = config.hg_fontsize;
//alert(hg_skin);
//alert(hg_fontsize);
$('head').find('style#skinConfig').remove(); $('head').find('style#skinConfig').remove();
if (hg_skin) { if (hg_skin) {
$.getJSON('config/skin.json', function (res) { $.getJSON('../config/skin.json', function (res) {
if (res && res.data) { if (res && res.data) {
var style = document.createElement("style"); var style = document.createElement("style");
style.id = 'skinConfig'; style.id = 'skinConfig';
@ -1293,6 +1298,7 @@ layui.use(['layer', 'element', 'form', 'jquery'], function () {
} }
document.head.appendChild(style); document.head.appendChild(style);
$('.layui-layout-body').show(); $('.layui-layout-body').show();
//alert(style.outerHTML);
} }
}); });
} }

Loading…
Cancel
Save