diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/blue.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/blue.css index 22aaf042a..1a523dc77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/blue.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/blue.css @@ -2,7 +2,7 @@ html,body{ background: #EBF6FF; } body.active .header { - background-image: url(../../../images/DragSSO/DragSSO/headBg2.jpg); + background-image: url(../../images/DragSSO/headBg2.jpg); } .header{ background-image:url('../../images/DragSSO/headBg.jpg'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js index 2d2e04b43..712f454ab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/main.js @@ -19,6 +19,21 @@ $(document).ready(function () { $('.skinBox').removeClass('active'); }).on('click', '.headSearch', function () { $('body').addClass('active'); + }).on('click', '.headSearchImg', function () { + if ($('body').hasClass('active')) { + var keyword = $('#headSearchInput').val(); + if ($.trim(keyword) != "") { + $.each($('.search').find('.searchLi'), function (i, item) { + if ($(item).children('.searchLiTxt').html().indexOf(keyword) != -1) { + $(item).show(); + } else { + $(item).hide(); + } + }); + } else { + $('.search').find('.searchLi').show(); + } + } }).on('click', '.searchTopList li', function () { if ($(this).hasClass('active')) return; $(this).addClass('active').siblings().removeClass('active'); @@ -31,6 +46,13 @@ $(document).ready(function () { } e.stopPropagation(); $('body').removeClass('active'); + //清空搜索 + if ($.trim($('#headSearchInput').val()) != "") { + setTimeout(function () { + $('#headSearchInput').val(''); + $('.search').find('.searchLi').show(); + }, 50); + } }).on('click', '.signOut', function () { //退出登录 //ajax退出操作 layer.msg('退出中...', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index e716d4cad..e6dd2a1b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -17,6 +17,7 @@ using Learun.Cache.Base; using Learun.Cache.Factory; using Newtonsoft.Json; using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Application.TwoDevelopment.PersonnelManagement; namespace Learun.Application.Web.Controllers { @@ -53,6 +54,8 @@ namespace Learun.Application.Web.Controllers private StuScoreNotPassIBLL stuScoreNotPassIBLL = new StuScoreNotPassBLL(); private Sys_QRCodeInLoginIBLL sys_QRCodeInLoginIBLL = new Sys_QRCodeInLoginBLL(); private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL(); + private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL(); + private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL(); #region 统一身份认证2.0 /// @@ -1072,16 +1075,81 @@ namespace Learun.Application.Web.Controllers ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); if (fod != null) { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + modulelist.Add(fod); } } ViewBag.OffenusedAll = modulelist; - ViewBag.OffenusedJiao = modulelist.Where(x => x.F_FullName.Contains("教")); - ViewBag.OffenusedGuan = modulelist.Where(x => x.F_FullName.Contains("管理")); - ViewBag.Offenused = modulelist.Except(modulelist.Where(x => x.F_FullName.Contains("教") || x.F_FullName.Contains("管理"))).Take(6); - ViewBag.OffenusedJiaoStr = JsonConvert.SerializeObject(ViewBag.OffenusedJiao); - ViewBag.OffenusedGuanStr = JsonConvert.SerializeObject(ViewBag.OffenusedGuan); - ViewBag.OffenusedStr = JsonConvert.SerializeObject(ViewBag.Offenused); + + var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity() + { + F_ParentId = x.Key, + ParentName = x.FirstOrDefault().ParentName, + ChildrenList = x.Select(y => new ModuleEntity() + { + F_ModuleId = y.F_ModuleId, + F_FullName = y.F_FullName + }).ToList() + }).ToList(); + ViewBag.OffenusedGroup = mm; + ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup); //查找服务 List searchmodulelist = new List(); foreach (var item in moduledata) @@ -1109,6 +1177,9 @@ namespace Learun.Application.Web.Controllers //教室 var classRoomData = classroomInfoIBLL.GetAllList(); ViewBag.ClassRoomTotalNum = classRoomData.Count(); + //课程 + var lessonData = lessonInfoIBLL.GetAllList(); + ViewBag.LessonTotalNum = lessonData.Count(); //专业总览 //专业学生 var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new @@ -1131,6 +1202,36 @@ namespace Learun.Application.Web.Controllers ViewBag.AllCount = allCount; ViewBag.FlowType = flowType; ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //校园一卡通余额 + ViewBag.StuSaveRecordTotalNum = 0; + var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + if (stuSaveRecordList.Any()) + { + ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + } + //红湖付款码余额 + ViewBag.StuConsumptionTotalNum = 0; + var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + if (stuConsumptionList.Any()) + { + ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + } + //常用链接 + var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); + var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() + { + FTName = x.Key, + PFunctionList = x.Select(y => new Perm_FunctionEntity() + { + FId = y.FId, + FTId = y.FTId, + FName = y.FName, + UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid + UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid + }).Take(8).ToList() + }); + ViewBag.FunctionList = ff; + ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList); return View(); @@ -1295,16 +1396,90 @@ namespace Learun.Application.Web.Controllers ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); if (fod != null) { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + modulelist.Add(fod); } } ViewBag.OffenusedAll = modulelist; + + var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity() + { + F_ParentId = x.Key, + ParentName = x.FirstOrDefault().ParentName, + ChildrenList = x.Select(y => new ModuleEntity() + { + F_ModuleId = y.F_ModuleId, + F_FullName = y.F_FullName + }).ToList() + }).ToList(); + ViewBag.OffenusedGroup = mm; + ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup); + //todo: + //删begin ViewBag.OffenusedJiao = modulelist.Where(x => x.F_FullName.Contains("教")); ViewBag.OffenusedGuan = modulelist.Where(x => x.F_FullName.Contains("管理")); ViewBag.Offenused = modulelist.Except(modulelist.Where(x => x.F_FullName.Contains("教") || x.F_FullName.Contains("管理"))).Take(6); ViewBag.OffenusedJiaoStr = JsonConvert.SerializeObject(ViewBag.OffenusedJiao); ViewBag.OffenusedGuanStr = JsonConvert.SerializeObject(ViewBag.OffenusedGuan); ViewBag.OffenusedStr = JsonConvert.SerializeObject(ViewBag.Offenused); + //删end //查找服务 List searchmodulelist = new List(); foreach (var item in moduledata) @@ -1332,6 +1507,9 @@ namespace Learun.Application.Web.Controllers //教室 var classRoomData = classroomInfoIBLL.GetAllList(); ViewBag.ClassRoomTotalNum = classRoomData.Count(); + //课程 + var lessonData = lessonInfoIBLL.GetAllList(); + ViewBag.LessonTotalNum = lessonData.Count(); //专业总览 //专业学生 var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new @@ -1354,6 +1532,36 @@ namespace Learun.Application.Web.Controllers ViewBag.AllCount = allCount; ViewBag.FlowType = flowType; ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //校园一卡通余额 + ViewBag.StuSaveRecordTotalNum = 0; + var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + if (stuSaveRecordList.Any()) + { + ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + } + //红湖付款码余额 + ViewBag.StuConsumptionTotalNum = 0; + var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + if (stuConsumptionList.Any()) + { + ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + } + //常用链接 + var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); + var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() + { + FTName = x.Key, + PFunctionList = x.Select(y => new Perm_FunctionEntity() + { + FId = y.FId, + FTId = y.FTId, + FName = y.FName, + UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid + UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid + }).Take(8).ToList() + }); + ViewBag.FunctionList = ff; + ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList); return View(); @@ -1466,6 +1674,88 @@ namespace Learun.Application.Web.Controllers name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName }); ViewBag.StuScoreByMajorStr = JsonConvert.SerializeObject(stuScoreByMajor); + //常用服务 + List modulelist = new List(); + List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList(); + var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId)); + foreach (var oitem in offenused) + { + ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); + if (fod != null) + { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + + modulelist.Add(fod); + } + } + ViewBag.OffenusedAll = modulelist; + //查找服务 + List searchmodulelist = new List(); + foreach (var item in moduledata) + { + if (moduleIBLL.GetColumnList(item.F_ModuleId).Any()) + { + item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1); + searchmodulelist.Add(item); + } + } + ViewBag.SearchModule = searchmodulelist; return View(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml index d3bceecfe..ec20f137f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml @@ -31,14 +31,14 @@ +'
' +'校园一卡通余额' + '' - + '
￥' + (Math.random() *100).toFixed(2) + '
' + + '
￥@ViewBag.StuSaveRecordTotalNum
' +'' +'
' +'
' +'
' +'红湖付款码余额' +'
' - + '
￥' + (Math.random() * 100).toFixed(2)+'
' + + '
￥@ViewBag.StuConsumptionTotalNum
' +'
' +'
' +'
' @@ -230,46 +230,36 @@ }; //常用链接 var card5Fun = function (ind) { + var listStr = "@ViewBag.FunctionListStr"; + var list = JSON.parse(listStr.replace(/"/g, "\"")); + var html = '
' - +'
' - +'
' - +'常用链接' - +'' - +'
' - +'
' - +'
' - +'
    ' - +'
  • ' - +'
    ' - +'系统直通' - +'4' - +'
    • ' - +'
  • ' - +'
    ' - +'系统链接' - +'
    • ' - +'
  • ' - +'
    ' - +'网站链接' - +'
    • ' - +'
' - +'
' - +'
' - +'
' - +'教务管理系统' - +'学生管理系统' - +'人事管理系统' - +'财务管理系统' - +'
' - +'
' - + '资产管理系统' - + '宿舍管理系统' - +'
' - +'
' - + '教科研系统' - + '后勤管理系统' - +'
' - +'
' + + '
' + + '
' + + '常用链接' + + '' + + '
' + + '
' + + '
' + + '
    '; + for (var i = 0; i < list.length; i++) { + html += '
  • ' + + '
    ' + + '' + list[i].FTName+'' + + ''+list[i].PFunctionList.length+'' + + '
    • '; + } + html += '
' + + '
' + + '
'; + for (var i = 0; i < list.length; i++) { + html += '
'; + for (var j = 0; j < list[i].PFunctionList.length; j++) { + html += '' + list[i].PFunctionList[j].FName+''; + } + html+= '
'; + } + html+='
' +'
' +'
' +'
' @@ -278,12 +268,8 @@ }; //常用服务 var card6Fun = function (ind) { - var listStr = "@ViewBag.OffenusedStr"; + var listStr = "@ViewBag.OffenusedGroupStr"; var list = JSON.parse(listStr.replace(/"/g, "\"")); - var listStr2 = "@ViewBag.OffenusedJiaoStr"; - var list2 = JSON.parse(listStr2.replace(/"/g, "\"")); - var listStr3 = "@ViewBag.OffenusedGuanStr"; - var list3 = JSON.parse(listStr3.replace(/"/g, "\"")); var html = '
' + '
' @@ -293,109 +279,40 @@ + '
' + '
' + '
' - + '
    ' - + '
  • ' - + '
    ' - + '校级服务' - + '' + list.length + '' - + '
    • ' - + '
  • ' - + '
    ' - + '人事微服务' - + '' + list2.length + '' - + '
    • ' - + '
  • ' - + '
    ' - + '教育微服务' - + '' + list3.length + '' - + '
    • ' - + '
  • ' - + '
    ' - + '公共微服务' - + '0' - + '
    • ' - + '
  • ' - + '
    ' - + '研究生微服务' - + '0' - + '
    • ' - + '
  • ' - + '
    ' - + '科研微服务' - + '0' - + '
    • ' - + '
  • ' - + '
    ' - + '教科研微服务' - + '0' - + '
    • ' - + '
' - + '
' - + '
' - + '
' - + '
'; - if (list.length > 0) { - for (var i = 0; i < list.length; i++) { - html += '
' - + '' - + '' - + '' + list[i].F_FullName+'' - + '' - + '
'; - } - } else { - html += noHtml; + + '
    '; + for (var i = 0; i < list.length; i++) { + html += '
  • ' + + '
    ' + + '' + list[i].ParentName+'' + + '' + list[i].ChildrenList.length + '' + + '
    • '; } - html += '
' + html += '' + '
' - + '
' - + '
'; - if (list2.length > 0) { - for (var i = 0; i < list2.length; i++) { - html += '
' - + '' - + '' - + '' + list2[i].F_FullName + '' - + '' - + '
'; - } - } else { - html += noHtml; - } - html += '
' - + '
' - + '
' - + '
'; - if (list3.length > 0) { - for (var i = 0; i < list3.length; i++) { - html += '
' - + '' - + '' - + '' + list3[i].F_FullName + '' - + '' - + '
'; + + '
'; + for (var i = 0; i < list.length; i++) { + html+= '
' + + '
'; + if (list[i].ChildrenList.length > 0) { + for (var j = 0; j < list[i].ChildrenList.length; j++) { + html += '
' + + '' + + '' + + '' + list[i].ChildrenList[j].F_FullName + '' + + '' + + '
'; + } + } else { + html += noHtml; } - } else { - html += noHtml; + html += '
' + + '
'; } - html+= '
' - + '
' - + '
'; - html += noHtml; - html+= '
' - + '
'; - html += noHtml; - html+= '
' - + '
'; - html += noHtml; - html+= '
' - + '
'; - html += noHtml; + html+='
' +'
' +'
' +'
' - +'
' ; return html; }; @@ -446,9 +363,9 @@ +'
' +'
' +'' - +'在用实验室' + +'课程总数' +'
' - +'
'+parseInt(Math.random()*((@ViewBag.ClassRoomTotalNum)/5))+'
' + +'
@ViewBag.LessonTotalNum
' +'
' +'
' +'
' @@ -1015,18 +932,18 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml index 192a508c4..87baa7a98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml @@ -57,11 +57,17 @@
最近使用
@@ -84,64 +90,109 @@
-
- A-D (1) -
-
-
-
-
班级课表
- - 班级课表 - - - - - - 大学直通车 - - - - - - - - 38人收藏 - - - + @{ + var searchModule = ViewBag.SearchModule as List; + +
+ A-D (@searchModule.Where(x => "abcd".Contains(x.FirstLetter)).Count())
-
-
- E-H (0) -
-
-
-
- I-L (0) -
-
-
-
- M-P (0) -
-
-
-
- Q-T (0) -
-
-
-
- U-X (0) -
-
-
-
- Y-Z (0) -
-
-
+
+ @{ + foreach (var item in searchModule.Where(x => "abcd".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+
+
@item.F_FullName
+
+ } + } +
+
+ E-H (@searchModule.Where(x => "efgh".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "efgh".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+
+
@item.F_FullName
+
+ } + } +
+
+ I-L (@searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+
+
@item.F_FullName
+
+ } + } +
+
+ M-P (@searchModule.Where(x => "mnop".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "mnop".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+
+
@item.F_FullName
+
+ } + } +
+
+ Q-T (@searchModule.Where(x => "qrst".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "qrst".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+
+
@item.F_FullName
+
+ } + } +
+
+ U-X (@searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+
+
@item.F_FullName
+
+ } + } +
+
+ Y-Z (@searchModule.Where(x => "yz".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "yz".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+
+
@item.F_FullName
+
+ } + } +
+ } +
@@ -185,18 +236,18 @@ @@ -373,9 +424,9 @@
- 在用实验室 + 课程总数
-
+
@ViewBag.LessonTotalNum
@@ -608,9 +659,7 @@ $("#flowList").html(html); }) $("#flowTypeList").find(".itemName").eq(0).trigger("click"); - - //校园总览-在用实验室 - $("#shiyanshiTotalNum").html(randomFun((@ViewBag.ClassRoomTotalNum) / 5, 0)); + //学生总览 var StuInfoOfManRate = parseInt((@ViewBag.StuInfoTotalNumOfMan) / (@ViewBag.StuInfoTotalNum) * 100); //男比例 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml index 69c0a8478..a342b472b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml @@ -32,21 +32,21 @@ +'
' +'校园一卡通余额' + '' - + '
￥' + (Math.random() *100).toFixed(2) + '
' + + '
￥@ViewBag.StuSaveRecordTotalNum
' +'' +'
' +'
' +'
' +'红湖付款码余额' +'
' - + '
￥' + (Math.random() * 100).toFixed(2)+'
' + + '
￥@ViewBag.StuConsumptionTotalNum
' +'
' +'
' +'
' +'
' +'图书馆借阅(未还) ' + '
' - + '
' + parseInt(Math.random() * 100) + '
' + + '
0
' +'
' +'
' +'
' @@ -60,14 +60,14 @@ +'
' +'智慧教育在线学习时长' +'
' - + '
' + (Math.random() * 50).toFixed(2)+'
' + + '
0
' +'
' +'
' +'
' +'
' +'办公业务往来人员' +'
' - + '
' + parseInt(Math.random() * 100)+'
' + + '
0
' +'
' +'
' +'
' @@ -81,7 +81,7 @@ +'
' +'累计在线时长' +'
' - + '
' + (Math.random() * 100).toFixed(2)+'
' + + '
0
' +'
' +'' +'' @@ -231,46 +231,36 @@ }; //常用链接 var card5Fun = function (ind) { + var listStr = "@ViewBag.FunctionListStr"; + var list = JSON.parse(listStr.replace(/"/g, "\"")); + var html = '
' - +'
' - +'
' - +'常用链接' - +'' - +'
' - +'
' - +'
' - +'
    ' - +'
  • ' - +'
    ' - +'系统直通' - +'4' - +'
    • ' - +'
  • ' - +'
    ' - +'系统链接' - +'
    • ' - +'
  • ' - +'
    ' - +'网站链接' - +'
    • ' - +'
' - +'
' - +'
' - +'
' - +'教务管理系统' - +'学生管理系统' - +'人事管理系统' - +'财务管理系统' - +'
' - +'
' - + '资产管理系统' - + '宿舍管理系统' - +'
' - +'
' - + '教科研系统' - + '后勤管理系统' - +'
' - +'
' + + '
' + + '
' + + '常用链接' + + '' + + '
' + + '
' + + '
' + + '
    '; + for (var i = 0; i < list.length; i++) { + html += '
  • ' + + '
    ' + + '' + list[i].FTName+'' + + '' + list[i].PFunctionList.length+'' + + '
    • '; + } + html += '
' + + '
' + + '
'; + for (var i = 0; i < list.length; i++) { + html += '
'; + for (var j = 0; j < list[i].PFunctionList.length; j++) { + html += '' + list[i].PFunctionList[j].FName+''; + } + html+= '
'; + } + html+='
' +'
' +'
' +'
' @@ -279,12 +269,8 @@ }; //常用服务 var card6Fun = function (ind) { - var listStr = "@ViewBag.OffenusedStr"; + var listStr = "@ViewBag.OffenusedGroupStr"; var list = JSON.parse(listStr.replace(/"/g, "\"")); - var listStr2 = "@ViewBag.OffenusedJiaoStr"; - var list2 = JSON.parse(listStr2.replace(/"/g, "\"")); - var listStr3 = "@ViewBag.OffenusedGuanStr"; - var list3 = JSON.parse(listStr3.replace(/"/g, "\"")); var html = '
' + '
' @@ -294,109 +280,40 @@ + '
' + '
' + '
' - + '
    ' - + '
  • ' - + '
    ' - + '校级服务' - + '' + list.length + '' - + '
    • ' - + '
  • ' - + '
    ' - + '人事微服务' - + '' + list2.length + '' - + '
    • ' - + '
  • ' - + '
    ' - + '教育微服务' - + '' + list3.length + '' - + '
    • ' - + '
  • ' - + '
    ' - + '公共微服务' - + '0' - + '
    • ' - + '
  • ' - + '
    ' - + '研究生微服务' - + '0' - + '
    • ' - + '
  • ' - + '
    ' - + '科研微服务' - + '0' - + '
    • ' - + '
  • ' - + '
    ' - + '教科研微服务' - + '0' - + '
    • ' - + '
' - + '
' - + '
' - + '
' - + '
'; - if (list.length > 0) { - for (var i = 0; i < list.length; i++) { - html += '
' - + '' - + '' - + '' + list[i].F_FullName+'' - + '' - + '
'; - } - } else { - html += noHtml; + + '
    '; + for (var i = 0; i < list.length; i++) { + html += '
  • ' + + '
    ' + + '' + list[i].ParentName+'' + + '' + list[i].ChildrenList.length + '' + + '
    • '; } - html += '
' + html += '' + '
' - + '
' - + '
'; - if (list2.length > 0) { - for (var i = 0; i < list2.length; i++) { - html += '
' - + '' - + '' - + '' + list2[i].F_FullName + '' - + '' - + '
'; - } - } else { - html += noHtml; - } - html += '
' - + '
' - + '
' - + '
'; - if (list3.length > 0) { - for (var i = 0; i < list3.length; i++) { - html += '
' - + '' - + '' - + '' + list3[i].F_FullName + '' - + '' - + '
'; + + '
'; + for (var i = 0; i < list.length; i++) { + html+= '
' + + '
'; + if (list[i].ChildrenList.length > 0) { + for (var j = 0; j < list[i].ChildrenList.length; j++) { + html += '
' + + '' + + '' + + '' + list[i].ChildrenList[j].F_FullName + '' + + '' + + '
'; + } + } else { + html += noHtml; } - } else { - html += noHtml; + html += '
' + + '
'; } - html+= '
' - + '
' - + '
'; - html += noHtml; - html+= '
' - + '
'; - html += noHtml; - html+= '
' - + '
'; - html += noHtml; - html+= '
' - + '
'; - html += noHtml; + html+='
' +'
' +'
' +'
' - +'
' ; return html; }; @@ -447,9 +364,9 @@ +'
' +'
' +'' - +'在用实验室' + +'课程总数' +'
' - +'
'+parseInt(Math.random()*((@ViewBag.ClassRoomTotalNum)/5))+'
' + +'
@ViewBag.LessonTotalNum
' +'
' +'
' +'
' @@ -459,32 +376,43 @@ }; //宣传报道 var card8Fun = function (ind) { + var listStr = "@ViewBag.NewsListOfxuanchuanStr"; + var list = JSON.parse(listStr.replace(/"/g, "\"")); var html = '
' - +'
' - +'
' - +'宣传报道' - +'' - +'
' - +'
' - +'' - +'
' + + '
' + + '
' + + '宣传报道' + + '' + + '
' + + '
'; + if (list.length > 0) { + html += ''; + } else { + html += noHtml; + } + html+='
' +'
' +'
' ; @@ -591,22 +519,23 @@ }; //智慧教育 var card11Fun = function (ind) { + var listStr = "@ViewBag.NewsListOfzhihuiStr"; + var list = JSON.parse(listStr.replace(/"/g, "\"")); var html = '
' + '
' + '
' + '智慧教育' - + '' - + '
' - + '
' - + '教务管理系统' - + '学生管理系统' - + '人事管理系统' - + '财务管理系统' - + '资产管理系统' - + '宿舍管理系统' - + '教科研系统' - + '后勤管理系统' + + '' + '
' + + '
'; + if (list.length > 0) { + for (var i = 0; i < list.length; i++) { + html += '' + list[i].F_FullHead+''; + } + } else { + html += noHtml; + } + html+= '
' + '
' + '
' ; @@ -614,32 +543,37 @@ }; //专题推荐 var card12Fun = function (ind) { + var listStr = "@ViewBag.NewsListOfzhuantiStr"; + var list = JSON.parse(listStr.replace(/"/g, "\"")); var html = '
' - +'
' - +'
' - +'专题推荐' - +'' - +'
' - +'
' - +'' - +'' - +'
不忘初心牢记使命
' - +'' - +'
' - +'
' - +'' - +'' - +'
三进两联一交友
' - +'' - +'
' - +'
' - +'' - +'' - +'
三进两联一交友
' - +'' - +'
' - +'
' - +'
' + + '
' + + '
' + + '专题推荐' + + '' + + '
' + + '
'; + if (list.length > 0) { + for (var i = 0; i < list.length; i++) { + if (i == 0) { + html += '' + + '' + + '
' + list[i].F_FullHead +'
' + + '' + + '
'; + } else { + html += '
' + + '' + + '' + + '
' + list[i].F_FullHead +'
' + + '' + + '
'; + } + } + html+= '
'; + } else { + html += noHtml; + } + html+='
' +'
' +'
' ; @@ -999,18 +933,18 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml index 594cb49bf..59ea5871e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml @@ -51,7 +51,7 @@
数字化智慧校园
- +
历史
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs index 068560f29..8c1613285 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs @@ -1,5 +1,6 @@ using Learun.Util; using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; namespace Learun.Application.Base.SystemModule @@ -181,6 +182,17 @@ namespace Learun.Application.Base.SystemModule ///
[NotMapped] public string FirstLetter { get; set; } + /// + /// 父级名称 + /// + [NotMapped] + public string ParentName { get; set; } + /// + /// 子级列表 + /// + [NotMapped] + public List ChildrenList { get; set; } + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs index 1769a4bef..24c628acc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs @@ -91,6 +91,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetListByAccount(string account) + { + try + { + return stuConsumptionService.GetListByAccount(account); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs index b71e6624f..4eb290c34 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs @@ -34,6 +34,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// StuConsumptionEntity GetStuConsumptionEntity(string keyValue); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetListByAccount(string account); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs index 30b050362..8f72f202d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs @@ -211,6 +211,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetListByAccount(string account) + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => x.OUTID == account); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs index 604923806..e65f43c53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs @@ -1,5 +1,6 @@ using Learun.Util; using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; namespace Learun.Application.TwoDevelopment.Permission @@ -99,6 +100,11 @@ namespace Learun.Application.TwoDevelopment.Permission [NotMapped] public string UPId { get; set; } + /// + /// 子项列表 + /// + [NotMapped] + public List PFunctionList { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs index 8c5caa85b..061ffd3b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs @@ -66,6 +66,31 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetListByAccount(string account) + { + try + { + return stuSaverecordService.GetListByAccount(account); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs index 1b63d65a7..d147c1ae1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs @@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// StuSaveRecordEntity GetStuSaveRecordEntity(string keyValue); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetListByAccount(string account); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs index f04947c48..f1913aa6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs @@ -132,6 +132,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetListByAccount(string account) + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => x.OUTID == account); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据