【修改】网上办事大厅拖拽版：功能优化；

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;

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()
+        })
+    })
 
 
 

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: {

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
         /// <summary>
@@ -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<ModuleEntity> modulelist = new List<ModuleEntity>();
             List<string> offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList();

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml

@@ -78,9 +78,9 @@
             +'<div class="inSec3Major">'
             +'<div class="inSec3MajorImgBox">'
             +'<div class="inSec3MajorImg"><img src="../../Content/images/DragSSO/indexSec3-8.png" alt=""></div>'
-            +'<span>累计在线时长</span>'
+            +'<span>累计登录次数</span>'
             +'</div>'
-            + '<div class="inSec3MajorTxt"><span>0</span></div>'
+            + '<div class="inSec3MajorTxt"><span>@ViewBag.LoginTotalNum</span></div>'
             +'</div>'
             +'</div>'
             +'</div>'

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;
+    }
 </style>
 <script>
     var randomFun = function (x, y) {
@@ -61,6 +70,8 @@
 </script>
 <!--  / warpper  -->
 <div class="warpper">
+    <input type="hidden" name="ModelCode" value="three" id="ModelCode" />
+    <input type="hidden" name="UserId" value="@ViewBag.UserId" id="UserId" />
     <!-- search -->
     <div class="search">
         <div class="searchL">
@@ -81,23 +92,23 @@
         </div>
         <div class="searchR">
             @*<div class="searchTop">
-                <span>服务角色</span>
-                <ul class="searchTopList">
-                    <li class="active">全部</li>
-                    <li>校领导</li>
-                    <li>游客</li>
-                    <li>教师</li>
-                    <li>学生</li>
-                </ul>
-            </div>
-            <div class="searchTop">
-                <span>服务角色</span>
-                <ul class="searchTopList">
-                    <li class="active">全部</li>
-                    <li>最新应用</li>
-                    <li>常用链接</li>
-                </ul>
-            </div>*@
+                    <span>服务角色</span>
+                    <ul class="searchTopList">
+                        <li class="active">全部</li>
+                        <li>校领导</li>
+                        <li>游客</li>
+                        <li>教师</li>
+                        <li>学生</li>
+                    </ul>
+                </div>
+                <div class="searchTop">
+                    <span>服务角色</span>
+                    <ul class="searchTopList">
+                        <li class="active">全部</li>
+                        <li>最新应用</li>
+                        <li>常用链接</li>
+                    </ul>
+                </div>*@
             <div class="searchRBox">
                 @{
                     var searchModule = ViewBag.SearchModule as List<ModuleEntity>;
@@ -256,22 +267,24 @@
             <div class="indSec1Box">
                 <div class="inSec1Box">
                     <!-- 第一级列表 -->
-                    <ul class="inSec1List1">
+                    <ul class="inSec1List1" id="flowTypeListOfCollect">
                         <li class="active">
-                            <a href="#">
-                                <span>全部</span> <span>0</span>
+                            <a href="#" class="itemName" itemName="全部">
+                                <span>全部</span> <span class="collectCount">@ViewBag.AllCountOfCollect</span>
                             </a>
                         </li>
+                        @foreach (DataItemDetailEntity item in ViewBag.FlowType)
+                        {
+                            <li>
+                                <a href="#" class="itemName" itemName="@item.F_ItemValue">
+                                    <span>@item.F_ItemName</span>  <span class="collectCount">@item.FlowCountOfCollect</span>
+                                </a>
+                            </li>
+                        }
                     </ul>
                     <!-- 第一级列表 -->
                     <!-- 第二级列表 -->
-                    <ul class="inSec1List2 inSecShadow">
-                        @*<li class="active">
-                            <a href="/Home/Index?autoopen=92a85055-67f2-4a06-902a-f10ec5576d92" target="_blank">
-                                <img src="/Content/images/DragSSO/inSec1-2.png" alt="" /><span>人事管理系统</span>
-                            </a>
-                        </li>*@
-                    </ul>
+                    <ul class="inSec1List2 inSecShadow" id="flowListOfCollect"></ul>
                     <!-- 第二级列表 -->
                 </div>
                 <div class="inSec1Box">
@@ -285,7 +298,7 @@
                         @foreach (DataItemDetailEntity item in ViewBag.FlowType)
                         {
                             <li>
-                                <a href="#" class="itemName" itemName="@item.F_ItemName">
+                                <a href="#" class="itemName" itemName="@item.F_ItemValue">
                                     <span>@item.F_ItemName</span>  <span>@item.FlowCount</span>
                                 </a>
                             </li>
@@ -358,7 +371,7 @@
                                 </div>
                                 <div class="in3Sec3Echart1Box">
                                     <div class="in3Sec3Echart1Con2">
-                                        学生到课率预警<b>20%</b>
+                                        学生到课率预警<b><span id="StuInfoOfDaoKe">@ViewBag.StuDaoKeTotalNum</span>%</b>
                                     </div>
                                     <div class="echartBox" id="">
                                         <div class="toClass">
@@ -384,7 +397,7 @@
                                 <div class="in3Sec3Echart1Box">
                                     <div class="in3Sec3Echart1Con3">
                                         <div>学生逃课预警</div>
-                                        <div><b><span id="StuInfoOfTaoKe"></span>人</b></div>
+                                        <div><b><span id="StuInfoOfTaoKe">@ViewBag.StuTaoKeTotalNum</span>人</b></div>
                                     </div>
                                     <div class="echartBox" id="skipClass"></div>
                                     <div class="toClassLegend">
@@ -665,24 +678,68 @@
 <script>
     //左侧-可用应用
     var flowList = '@ViewBag.FlowList';
-                                        flowList = flowList.replace(/&quot;/g, "\"");
+    flowList = flowList.replace(/&quot;/g, "\"");
     var flowListJson = JSON.parse(flowList);
     $("#flowTypeList").find(".itemName").bind("click", function() {
-                                            var html = "";
-                                            var category = $(this).attr("itemName");
+        var html = "";
+        var category = $(this).attr("itemName");
         $('#flowTypeList').find('li.active').removeClass('active');
         $(this).parent('li').addClass("active");
-        $.each(flowListJson,function(i, item) {
-                                                if (category == "全部") {
-                                                    html += "<li> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id="+item.F_Id+"&shcemeCode="+item.F_Code+"\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-"+Math.floor(Math.random()*21+2)+".png\" /><span>"+item.F_Name+"</span> </a> </li>";
-                                                }else if (item.F_Category==category) {
-                                                    html += "<li> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code +"\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-"+Math.floor(Math.random()*21+2)+".png\" /><span>"+item.F_Name+"</span> </a> </li>";
-                                                }
-                                            });
+        $.each(flowListJson, function (i, item) {
+            var collectClass = "fa-heart-o";
+            if (item.IsCollect == true) {
+                collectClass = "fa-heart";
+            }
+                if (category == "全部") {
+                    html += "<li data-Id=\""+item.F_Id+"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
+                }else if (item.F_Category==category) {
+                    html += "<li data-Id=\"" + item.F_Id +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
+                }
+            });
         $("#flowList").html(html);
-                                        })
+    })
     $("#flowTypeList").find(".itemName").eq(0).trigger("click");
-    
+
+    //左侧-我的收藏
+    var flowListOfCollect = '@ViewBag.FlowListOfCollect';
+    flowListOfCollect = flowListOfCollect.replace(/&quot;/g, "\"");
+    var flowListOfCollectJson = JSON.parse(flowListOfCollect);
+    $("#flowTypeListOfCollect").find(".itemName").bind("click", function() {
+        var html = "";
+        var category = $(this).attr("itemName");
+        $('#flowTypeListOfCollect').find('li.active').removeClass('active');
+        $(this).parent('li').addClass("active");
+        $.each(flowListOfCollectJson, function (i, item) {
+            var collectClass = "fa-heart";
+                if (category == "全部") {
+                    html += "<li data-Id=\"" + item.SchemeInfoId +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.SchemeInfoId + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
+                }else if (item.F_Category==category) {
+                    html += "<li data-Id=\"" + item.SchemeInfoId +"\"> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.SchemeInfoId + "&shcemeCode=" + item.F_Code + "\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-" + Math.floor(Math.random() * 21 + 2) + ".png\" /><span>" + item.F_Name + "</span> </a> <i class=\"fa " + collectClass +"\"></i> </li>";
+                }
+            });
+        $("#flowListOfCollect").html(html);
+    })
+    $("#flowTypeListOfCollect").find(".itemName").eq(0).trigger("click");
+
+    //更新“左侧-我的收藏”左侧分类数量
+    var updateCollectCount = function (data) {
+        $.each($("#flowTypeListOfCollect").find(".itemName"), function (i, item) {
+            var category = $(item).attr("itemName");
+            if (category == "全部") {
+                $(item).find('.collectCount').html(data.length);
+            } else {
+                var count = 0;
+                $.each(data, function (j, jtem) {
+                    if (jtem.F_Category == category) {
+                        count++;
+                    }
+                });
+                $(item).find('.collectCount').html(count);
+            }
+        });
+    };
+
+
     //学生总览
     var StuInfoOfManRate = parseInt((@ViewBag.StuInfoTotalNumOfMan) / (@ViewBag.StuInfoTotalNum) * 100);
     //男比例
@@ -690,7 +747,7 @@
     //女比例
     $("#StuInfoOfWomanRate").html((100 - StuInfoOfManRate) + "%");
     //学生逃课预警
-    $("#StuInfoOfTaoKe").html(parseInt(@ViewBag.StuInfoTotalNum * 0.05));
+    //$("#StuInfoOfTaoKe").html(parseInt(@ViewBag.StuInfoTotalNum * 0.05));
     //教师总览
     var TeacherOfManRate = parseInt((@ViewBag.TeacherTotalNumOfMan) / (@ViewBag.TeacherTotalNum) * 100);
     var TeacherOfBianNeiRate = parseInt((@ViewBag.TeacherTotalNumOfBianNei) / (@ViewBag.TeacherTotalNum) * 100);

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml

@@ -79,9 +79,9 @@
             +'<div class="inSec3Major">'
             +'<div class="inSec3MajorImgBox">'
             +'<div class="inSec3MajorImg"><img src="../../Content/images/DragSSO/indexSec3-8.png" alt=""></div>'
-            +'<span>累计在线时长</span>'
+            +'<span>累计登录次数</span>'
             +'</div>'
-            + '<div class="inSec3MajorTxt"><span>0</span></div>'
+            + '<div class="inSec3MajorTxt"><span>@ViewBag.LoginTotalNum</span></div>'
             +'</div>'
             +'</div>'
             +'</div>'
@@ -1095,24 +1095,24 @@
         <div class="inSecLeftBox">
             <div class="inSecLeftCon">
                 <div class="inSecLeftImg">
-                    <img src="~/Content/images/DragSSO/indSec1-15.png" alt="">
-                    <img src="~/Content/images/DragSSO/indSec1-16.png" alt="">
+                    <img src="~/Content/images/DragSSO/indSec1-7.png" alt="">
+                    <img src="~/Content/images/DragSSO/indSec1-8.png" alt="">
                 </div>
-                <div class="inSecLeftTxt">网站设置</div>
+                <div class="inSecLeftTxt">待办任务</div>
             </div>
             <div class="inSecLeftCon">
                 <div class="inSecLeftImg">
-                    <img src="~/Content/images/DragSSO/indSec1-17.png" alt="">
-                    <img src="~/Content/images/DragSSO/indSec1-18.png" alt="">
+                    <img src="~/Content/images/DragSSO/indSec1-9.png" alt="">
+                    <img src="~/Content/images/DragSSO/indSec1-10.png" alt="">
                 </div>
-                <div class="inSecLeftTxt">用户管理</div>
+                <div class="inSecLeftTxt">我发起的</div>
             </div>
             <div class="inSecLeftCon">
                 <div class="inSecLeftImg">
-                    <img src="~/Content/images/DragSSO/indSec1-19.png" alt="">
-                    <img src="~/Content/images/DragSSO/indSec1-20.png" alt="">
+                    <img src="~/Content/images/DragSSO/indSec1-13.png" alt="">
+                    <img src="~/Content/images/DragSSO/indSec1-14.png" alt="">
                 </div>
-                <div class="inSecLeftTxt">权限分配</div>
+                <div class="inSecLeftTxt">未读消息</div>
             </div>
         </div>
         <div class="inSec2Box inSecShadow">
@@ -1121,48 +1121,105 @@
             </div>
             <div class="inSec2Tab">
                 <div class="inSec2TabBox">
-                    <span>网站设置</span>
-                </div>
-                <div class="inSec2TabBox">
-                    <span>用户管理</span>
+                    <img src="~/Content/images/DragSSO/indexSec2-1.png" alt="">
+                    <span>任务</span>
                 </div>
                 <div class="inSec2TabBox">
-                    <span>权限分配</span>
+                    <img src="~/Content/images/DragSSO/indexSec2-2.png" alt="">
+                    <span>消息</span>
                 </div>
             </div>
             <div class="indSec1Line"></div>
             <div class="indexSec2Box">
                 <div class="inSec2Con">
-                    <div class="in2Sec3Row">
-                        <div class="in2Sec3Col6">
-                            <a href="/Home/Index?autoopen=7b27bd59-ac35-414e-9362-9deee5329fd9" target="_blank" class="in2Sec3Con">
-                                <span class="in2Sec3Img"><img src="~/Content/images/DragSSO/inSec3-2.png" alt=""></span>
-                                <span class="in2Sec3Txt">登录页风格</span>
-                            </a>
-                        </div>
-                        <div class="in2Sec3Col6">
-                            <a href="/Home/Index?autoopen=9e3b9b5a-478f-49e8-85ad-4d636579c890" target="_blank" class="in2Sec3Con">
-                                <span class="in2Sec3Img"><img src="~/Content/images/DragSSO/inSec3-3.png" alt=""></span>
-                                <span class="in2Sec3Txt">桌面客服配置</span>
-                            </a>
-                        </div>
-                        <div class="in2Sec3Col6">
-                            <a href="/Home/Index?autoopen=4aa662b6-599c-4d46-855a-a3334ae4dbd9" target="_blank" class="in2Sec3Con">
-                                <span class="in2Sec3Img"><img src="~/Content/images/DragSSO/inSec3-4.png" alt=""></span>
-                                <span class="in2Sec3Txt">统计配置</span>
-                            </a>
+                    <div class="inSec2L">
+                        <ul class="inSec2Llist">
+                            <li class="active">
+                                <i class="">@ViewBag.TaskTotalNum</i>
+                                <span>待办任务</span>
+                            </li>
+                            <li>
+                                <i class="">@ViewBag.MyListTotalNum</i>
+                                <span>我发起的</span>
+                            </li>
+                            <li>
+                                <i class="">@ViewBag.FinishTaskTotalNum</i>
+                                <span>已办任务</span>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="inSec2R inSecShadow">
+                        <div class="inSec3WorkBox">
+                            @{
+                                var TaskListIEnumerable = ViewBag.TaskList as IEnumerable<NWFProcessEntity>;
+                                if (TaskListIEnumerable.Any())
+                                {
+                                    foreach (NWFProcessEntity item in ViewBag.TaskList)
+                                    {
+                                        <div class="inSec3Work">
+                                            <div class="inSec3WorkT" title="@item.F_TaskName [@item.F_SchemeName]">@item.F_TaskName [@item.F_SchemeName]</div>
+                                            <div class="inSec3WorkTime">@item.F_CreateDate</div>
+                                            <div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=@item.F_Id&F_TaskId=@item.F_TaskId&F_TaskType=@item.F_TaskType" target="_blank">请处理</a></div>
+                                        </div>
+                                    }
+                                }
+                                else
+                                {
+                                    <div class="noLogin">
+                                        <div class="noLoginImg"><img src="~/Content/images/DragSSO/noLogin.png" alt=""></div>
+                                        <div class="noLoginTxt">暂时没有数据</div>
+                                    </div>
+                                }
+                            }
+
                         </div>
-                        <div class="in2Sec3Col6">
-                            <a href="/Home/Index?autoopen=9fd21b1d-efe1-452c-975b-3a2f85ba31d9" target="_blank" class="in2Sec3Con">
-                                <span class="in2Sec3Img"><img src="~/Content/images/DragSSO/inSec3-5.png" alt=""></span>
-                                <span class="in2Sec3Txt">图表配置</span>
-                            </a>
+                        <div class="inSec3WorkBox">
+                            @{
+                                var MyListIEnumerable = ViewBag.MyList as IEnumerable<NWFProcessEntity>;
+                                if (MyListIEnumerable.Any())
+                                {
+                                    foreach (NWFProcessEntity item in ViewBag.MyList)
+                                    {
+                                        <div class="inSec3Work">
+                                            <div class="inSec3WorkT" title="@item.F_TaskName [@item.F_SchemeName]">@item.F_TaskName [@item.F_SchemeName]</div>
+                                            <div class="inSec3WorkTime">@item.F_CreateDate</div>
+                                            <div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=@item.F_Id&F_TaskId=@item.F_TaskId&F_TaskType=@item.F_TaskType" target="_blank">请处理</a></div>
+                                        </div>
+                                    }
+                                }
+                                else
+                                {
+                                    <div class="noLogin">
+                                        <div class="noLoginImg"><img src="~/Content/images/DragSSO/noLogin.png" alt=""></div>
+                                        <div class="noLoginTxt">暂时没有数据</div>
+                                    </div>
+                                }
+                            }
+
                         </div>
-                        <div class="in2Sec3Col6">
-                            <a href="/Home/Index?autoopen=32b6f318-d90c-4548-9b11-9527563b548d" target="_blank" class="in2Sec3Con">
-                                <span class="in2Sec3Img"><img src="~/Content/images/DragSSO/inSec3-6.png" alt=""></span>
-                                <span class="in2Sec3Txt">消息列配置</span>
-                            </a>
+                        <div class="inSec3WorkBox">
+                            @{
+                                var FinishTaskListIEnumerable = ViewBag.FinishTaskList as IEnumerable<NWFProcessEntity>;
+                                if (FinishTaskListIEnumerable.Any())
+                                {
+                                    foreach (NWFProcessEntity item in ViewBag.FinishTaskList)
+                                    {
+                                        <div class="inSec3Work">
+                                            <div class="inSec3WorkT" title="@item.F_TaskName [@item.F_SchemeName]">@item.F_TaskName [@item.F_SchemeName]</div>
+                                            <div class="inSec3WorkTime">@item.F_CreateDate</div>
+                                            <div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=@item.F_Id&F_TaskId=@item.F_TaskId&F_TaskType=@item.F_TaskType" target="_blank">请处理</a></div>
+                                        </div>
+                                    }
+                                }
+                                else
+                                {
+                                    <div class="noLogin">
+                                        <div class="noLoginImg"><img src="~/Content/images/DragSSO/noLogin.png" alt=""></div>
+                                        <div class="noLoginTxt">暂时没有数据</div>
+                                    </div>
+                                }
+                            }
+
                         </div>
                     </div>
                 </div>
@@ -1172,12 +1229,6 @@
                         <div class="noLoginTxt">暂时没有数据</div>
                     </div>
                 </div>
-                <div class="inSec2Con">
-                    <div class="noLogin">
-                        <div class="noLoginImg"><img src="~/Content/images/DragSSO/noLogin.png" alt=""></div>
-                        <div class="noLoginTxt">暂时没有数据</div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Log/LogBLL.cs

@@ -82,6 +82,31 @@ namespace Learun.Application.Base.SystemModule
                 }
             }
         }
+
+        /// <summary>
+        /// 日志列表
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public static IEnumerable<LogEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return service.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Log/LogService.cs

@@ -1,9 +1,11 @@
-using Learun.Application.Base.AuthorizeModule;
+using Dapper;
+using Learun.Application.Base.AuthorizeModule;
 using Learun.Application.Organization;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 
@@ -162,6 +164,51 @@ namespace Learun.Application.Base.SystemModule
         {
             return this.BaseRepository().FindEntity<LogEntity>(keyValue);
         }
+
+
+        /// <summary>
+        /// 日志列表
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<LogEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM LR_Base_Log t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["F_OperateUserId"].IsEmpty())
+                {
+                    dp.Add("F_OperateUserId", queryParam["F_OperateUserId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.F_OperateUserId = @F_OperateUserId ");
+                }
+                if (!queryParam["F_OperateTypeId"].IsEmpty())
+                {
+                    dp.Add("F_OperateTypeId", queryParam["F_OperateTypeId"].ToString(), DbType.String);
+                    strSql.Append(" AND t.F_OperateTypeId = @F_OperateTypeId ");
+                }
+                return this.BaseRepository().FindList<LogEntity>(strSql.ToString(), dp);
+
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据
@@ -288,9 +335,9 @@ namespace Learun.Application.Base.SystemModule
         {
             try
             {
-                LogEntity logEntity=null;
+                LogEntity logEntity = null;
                 var log = BaseRepository().FindList<LogEntity>(m => m.F_OperateUserId == userId);
-                if (log.Count()>0)
+                if (log.Count() > 0)
                 {
                     logEntity = log.OrderByDescending(m => m.F_OperateTime).First();
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanBLL.cs

@@ -66,6 +66,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuSelectLessonListEntity> GetStuSelectLessonList(string queryJson)
+        {
+            try
+            {
+                return openLessonPlanService.GetStuSelectLessonList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanIBLL.cs

@@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         OpenLessonPlanEntity GetOpenLessonPlanEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuSelectLessonListEntity> GetStuSelectLessonList(string queryJson);
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanService.cs

@@ -135,6 +135,46 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuSelectLessonListEntity> GetStuSelectLessonList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("select t.* from StuSelectLessonList t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuSelectLessonListEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据