diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index2.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index2.css index 8a859f1b1..34afc40a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index2.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/css/DragSSO/index2.css @@ -1,6 +1,6 @@ -.inSec2TabBox { +/*.inSec2TabBox { width: 33.333333%; -} +}*/ .in2Sec3Row { padding: 0 24px 30px; overflow: hidden; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index2.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index2.js index 2ef5cf17c..301eccb83 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index2.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index2.js @@ -21,37 +21,58 @@ $(window).load(function() { $(".headModeList li").eq(1).addClass("active"); $(".headModeList li").eq(2).removeClass("active"); $(".headModeTxt").find('span').html($(".headModeList li").eq(1).find('a').html()); - - //右侧菜单显示隐藏 - $('.index_sec2').on('click', '.inSecLeftCon', function() { - var ind = $(this).index(); - var parents = $(this).parents('.index_sec2'); - if(ind == 3){ - parents.find('.inSec2TabBox').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con') - }else{ - parents.find('.inSec2TabBox').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Llist li').removeClass('active').eq(ind).addClass('active').end().end().find('.inSec3WorkBox').css('display', 'none').eq(ind).fadeIn(); - } - - parents.addClass('active') - $('.indexSec3Box').css('paddingRight', '445px') - }).on('click', '.aRight', function() { - var parents = $(this).parents('.index_sec2'); - parents.removeClass('active'); - $('.indexSec3Box').css('paddingRight', '0') - }) - //右侧tab切换 - $('.inSec2Tab').on('click', '.inSec2TabBox', function() { - var ind = $(this).index(); - $(this).addClass('active').siblings().removeClass('active'); - $('.indexSec2Box .inSec2Con').removeClass('active').eq(ind).addClass('active'); - }) + + //右侧菜单显示隐藏 + $('.index_sec2').on('click', '.inSecLeftCon', function () { + var ind = $(this).index(); + var parents = $(this).parents('.index_sec2'); + if (ind == 3) { + parents.find('.inSec2TabBox').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(1).addClass('active').end().end().find('.inSec2Con') + } else { + parents.find('.inSec2TabBox').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Con').removeClass('active').eq(0).addClass('active').end().end().find('.inSec2Llist li').removeClass('active').eq(ind).addClass('active').end().end().find('.inSec3WorkBox').css('display', 'none').eq(ind).fadeIn(); + } + + parents.addClass('active') + $('.indexSec3Box').css('paddingRight', '445px') + }).on('click', '.aRight', function () { + var parents = $(this).parents('.index_sec2'); + parents.removeClass('active'); + $('.indexSec3Box').css('paddingRight', '0') + }) + //右侧tab切换 + $('.inSec2Tab').on('click', '.inSec2TabBox', function () { + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active'); + $('.indexSec2Box .inSec2Con').removeClass('active').eq(ind).addClass('active'); + }) //办公事项 $('.inSec3Con').on('click', '.workList li', function() { if ($(this).hasClass('active')) return; var ind = $(this).index(); $(this).addClass('active').siblings().removeClass('active').parents('.inSec3Con').find('.inSec3WorkBox').css( 'display', 'none').eq(ind).fadeIn(); - }) + }) + + //任务 + $('.inSec2Con').on('click', '.inSec2Llist li', function () { + if ($(this).hasClass('active')) return; + var ind = $(this).index(); + $(this).addClass('active').siblings().removeClass('active').parents('.inSec2Con').find('.inSec3WorkBox').css( + 'display', 'none').eq(ind).fadeIn(); + }).on('click', '.indexSec2Li i', function (e) { + //消息移除 + //阻止默认浏览器动作(W3C) + if (e && e.preventDefault) { + e.preventDefault(); + } else { //IE中阻止函数器默认动作的方式 + window.e.returnValue = false; + } + e.stopPropagation(); + var parents = $(this).parents('.indexSec2Li'); + parents.animate({ opacity: 0.2, left: '80%' }, 300, function () { + parents.remove() + }) + }) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js index a7d46d77d..9b515ed22 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index3.js @@ -6,7 +6,7 @@ $(window).load(function () { $(".headModeTxt").find('span').html($(".headModeList li").eq(2).find('a').html()); //学生到课率预警 - var toClassNum = 20; + var toClassNum = $("#StuInfoOfDaoKe").html(); var toClassBl = $('.toClassBl') if (toClassNum < 60) { toClassBl.addClass('green').height(toClassNum + '%') @@ -235,7 +235,7 @@ function majorEchart() { // 学生逃课预警 function skipEchart() { // 基于准备好的dom，初始化echarts实例 - var myChart8 = echarts.init(document.getElementById('skipClass')); + var myChart8 = echarts.init(document.getElementById('skipClass')); option = { tooltip: { @@ -289,7 +289,7 @@ function skipEchart() { } }, data: [{ - value: 5, + value: 0, name: '', label: { textStyle: { 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 cefa58f67..08265cdd2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -57,6 +57,8 @@ namespace Learun.Application.Web.Controllers private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL(); private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL(); private SSO_Drag_CollectManageIBLL sSO_Drag_CollectManageIBLL = new SSO_Drag_CollectManageBLL(); + private OpenLessonPlanIBLL openLessonPlanIBLL = new OpenLessonPlanBLL(); + private StuAttendanceIBLL stuAttendanceIBLL = new StuAttendanceBLL(); #region 统一身份认证2.0 /// @@ -1162,6 +1164,10 @@ namespace Learun.Application.Web.Controllers } } ViewBag.SearchModule = searchmodulelist; + //数据看板 + //累计登录次数 + var logData = LogBLL.GetList("{\"F_OperateUserId\":\"" + userInfo.userId + "\",\"F_OperateTypeId\":\"1\"}"); + ViewBag.LoginTotalNum = logData.Count(); //校园总览 //专业 var majorData = cdMajorIBLL.GetAllList(); @@ -1499,6 +1505,10 @@ namespace Learun.Application.Web.Controllers } } ViewBag.SearchModule = searchmodulelist; + //数据看板 + //累计登录次数 + var logData = LogBLL.GetList("{\"F_OperateUserId\":\"" + userInfo.userId + "\",\"F_OperateTypeId\":\"1\"}"); + ViewBag.LoginTotalNum = logData.Count(); //校园总览 //专业 var majorData = cdMajorIBLL.GetAllList(); @@ -1640,18 +1650,34 @@ namespace Learun.Application.Web.Controllers ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); //流程 var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); - var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList().OrderBy(x => x.F_Id); + var flowListOfCollect = sSO_Drag_CollectManageIBLL.GetList("{\"UserId\":\"" + userInfo.userId + "\",\"ModelCode\":\"three\"}").OrderBy(x => x.SchemeInfoId); + foreach (var item in flowList) + { + item.IsCollect = false; + if (flowListOfCollect.Where(x => x.SchemeInfoId == item.F_Id).Any()) + { + item.IsCollect = true; + } + } var allCount = 0; + var allCountOfCollect = 0; foreach (var flow in flowType) { - var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + var count = flowList.Count(a => a.F_Category == flow.F_ItemValue); flow.FlowCount = count; allCount += count; + var countOfCollect = flowListOfCollect.Count(x => x.F_Category == flow.F_ItemValue); + flow.FlowCountOfCollect = countOfCollect; + allCountOfCollect += countOfCollect; } ViewBag.AllCount = allCount; ViewBag.FlowType = flowType; ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //流程-收藏 + ViewBag.AllCountOfCollect = allCountOfCollect; + ViewBag.FlowListOfCollect = JsonConvert.SerializeObject(flowListOfCollect); //课程总览 var lessonInfoData = lessonInfoIBLL.GetAllList(); ViewBag.LessonTotalNum = lessonInfoData.Count(); @@ -1698,6 +1724,18 @@ namespace Learun.Application.Web.Controllers name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName }); ViewBag.StuScoreByMajorStr = JsonConvert.SerializeObject(stuScoreByMajor); + //学生到课率预警（考勤表中：是） + var stuSelectLessonListData = openLessonPlanIBLL.GetStuSelectLessonList("{\"AcademicYearNo\":\"" + Common.GetSemesterAndYear().AcademicYearShort + "\",\"Semester\":\"" + Common.GetSemesterAndYear().Semester + "\"}"); + var stuAttendanceData = stuAttendanceIBLL.GetAllList().Where(x => x.AcademicYearNo == Common.GetSemesterAndYear().AcademicYearShort && x.Semester == Common.GetSemesterAndYear().Semester); + var stuDaoKeData = stuAttendanceData.Where(x => x.AttendOrNo == "是"); + ViewBag.StuDaoKeTotalNum = 0; + if (stuSelectLessonListData.Any()) + { + ViewBag.StuDaoKeTotalNum = (stuDaoKeData.Count() / stuSelectLessonListData.Count() * 100).ToDecimal(2); + } + //学生逃课预警（考勤表中：否-旷课） + var stuTaoKeData = stuAttendanceData.Where(x => x.AttendOrNo == "否" && x.Sort == "旷课"); + ViewBag.StuTaoKeTotalNum = stuTaoKeData.Count(); //常用服务 List modulelist = new List(); List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList(); 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 fe76349bb..ab0751177 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 @@ -78,9 +78,9 @@ +'
' +'
' +'
' - +'累计在线时长' + +'累计登录次数' +'
' - + '
0
' + + '
@ViewBag.LoginTotalNum
' +'
' +'' +'' 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 585de09ec..6e7d63837 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 @@ -20,7 +20,16 @@ .searchLi > a > *{ display:inline-block; vertical-align:middle; - } + } + .inSec1List2 li { + padding-right: 30px; + position: relative; + } + + .inSec1List2 .fa { + right: 15px; + top: 5px; + }
+ +
@@ -81,23 +92,23 @@
@*
- 服务角色 -
    -
  • 全部
    • -
  • 校领导
    • -
  • 游客
    • -
  • 教师
    • -
  • 学生
    • -
-
-
- 服务角色 -
    -
  • 全部
    • -
  • 最新应用
    • -
  • 常用链接
    • -
-
*@ + 服务角色 +
    +
  • 全部
    • +
  • 校领导
    • +
  • 游客
    • +
  • 教师
    • +
  • 学生
    • +
+
+
+ 服务角色 +
    +
  • 全部
    • +
  • 最新应用
    • +
  • 常用链接
    • +
+
*@
@{ var searchModule = ViewBag.SearchModule as List; @@ -256,22 +267,24 @@
-
@@ -285,7 +298,7 @@ @foreach (DataItemDetailEntity item in ViewBag.FlowType) {
  • - + @item.F_ItemName @item.FlowCount
    • @@ -358,7 +371,7 @@
    - 学生到课率预警20% + 学生到课率预警@ViewBag.StuDaoKeTotalNum%
    @@ -384,7 +397,7 @@
    学生逃课预警
    -
    人
    +
    @ViewBag.StuTaoKeTotalNum人
    @@ -665,24 +678,68 @@