【修改】网上办事大厅拖拽版：办事大厅模式；

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/index.js

@@ -7,7 +7,7 @@ layui.use('form', function() {
 	// form.render()
 	//监听select选择 专业总览
 	form.on('select', function(data) {
-		console.log(data);
+		//console.log(data);
 	});
 });
 // console.log(11)
@@ -74,9 +74,9 @@ $(window).load(function() {
 
 
 	//办公业务流量
-	serviceEchart()
+	//serviceEchart()
 	//专业总览
-	majorEchart()
+	//majorEchart()
 }).resize(function() {
 	resizes()
 })
@@ -88,158 +88,158 @@ function resizes() {
 
 
 //专业总览
-function majorEchart() {
-	var myChart5 = echarts.init(document.getElementById('major'));
-
-	option = {
-		tooltip: {
-			trigger: 'item',
-			formatter: '{b} : {c}'
-		},
-		series: [{
-			name: '专业学生',
-			type: 'pie',
-			radius: [60, 75],
-			center: ['50%', '50%'],
-			label: {
-				// show: true
-				show: false
-			},
-			color: ['#6C5CEA', '#57C5F5', '#E7C900', '#FF9C95', '#59D078', '#C97FEF', '#ECBD02', '#DF59B8', '#F6685E',
-				'#00E7B9', '#7A74F1', '#4A9ADE', '#33F0E5', '#ECBD02', '#DF59B8'
-			],
-			// hoverAnimation: false,
-			data: [{
-					value: 10,
-					name: '物理',
-				},
-				{
-					value: 5,
-					name: '数学',
-				},
-				{
-					value: 15,
-					name: '化学',
-				},
-				{
-					value: 15,
-					name: '历史',
-				},
-				{
-					value: 5,
-					name: '医学',
-				},
-				{
-					value: 15,
-					name: '计算机',
-				},
-				{
-					value: 15,
-					name: '矿业',
-				}
-			]
-		}, {
-			name: '班级总数',
-			type: 'pie',
-			radius: [50, 65],
-			center: ['17%', '50%'],
-			label: {
-				// show: true
-				show: false
-			},
-			color: ['#59D078', '#57C5F5', '#E7C900'],
-			// hoverAnimation: false,
-			data: [{
-				value: 10,
-				name: '班级总数',
-			}]
-		}, {
-			name: '专业教室',
-			type: 'pie',
-			radius: [50, 65],
-			center: ['83%', '50%'],
-			label: {
-				// show: true
-				show: false
-			},
-			color: ['#3E49E2', '#677BF5', '#67A0F5', '#E7C900'],
-			// hoverAnimation: false,
-			data: [{
-				value: 10,
-				name: '教室1',
-			}, {
-				value: 5,
-				name: '教室2',
-			}, {
-				value: 20,
-				name: '教室3',
-			}, {
-				value: 30,
-				name: '教室4',
-			}]
-		}, ]
-	};
-
-	// 使用刚指定的配置项和数据显示图表。
-	myChart5.setOption(option);
-	window.addEventListener("resize", function() {
-		myChart5.resize();
-	});
-}
+//function majorEchart() {
+//	var myChart5 = echarts.init(document.getElementById('major'));
+
+//	option = {
+//		tooltip: {
+//			trigger: 'item',
+//			formatter: '{b} : {c}'
+//		},
+//		series: [{
+//			name: '专业学生',
+//			type: 'pie',
+//			radius: [60, 75],
+//			center: ['50%', '50%'],
+//			label: {
+//				// show: true
+//				show: false
+//			},
+//			color: ['#6C5CEA', '#57C5F5', '#E7C900', '#FF9C95', '#59D078', '#C97FEF', '#ECBD02', '#DF59B8', '#F6685E',
+//				'#00E7B9', '#7A74F1', '#4A9ADE', '#33F0E5', '#ECBD02', '#DF59B8'
+//			],
+//			// hoverAnimation: false,
+//			data: [{
+//					value: 10,
+//					name: '物理',
+//				},
+//				{
+//					value: 5,
+//					name: '数学',
+//				},
+//				{
+//					value: 15,
+//					name: '化学',
+//				},
+//				{
+//					value: 15,
+//					name: '历史',
+//				},
+//				{
+//					value: 5,
+//					name: '医学',
+//				},
+//				{
+//					value: 15,
+//					name: '计算机',
+//				},
+//				{
+//					value: 15,
+//					name: '矿业',
+//				}
+//			]
+//		}, {
+//			name: '班级总数',
+//			type: 'pie',
+//			radius: [50, 65],
+//			center: ['17%', '50%'],
+//			label: {
+//				// show: true
+//				show: false
+//			},
+//			color: ['#59D078', '#57C5F5', '#E7C900'],
+//			// hoverAnimation: false,
+//			data: [{
+//				value: 10,
+//				name: '班级总数',
+//			}]
+//		}, {
+//			name: '专业教室',
+//			type: 'pie',
+//			radius: [50, 65],
+//			center: ['83%', '50%'],
+//			label: {
+//				// show: true
+//				show: false
+//			},
+//			color: ['#3E49E2', '#677BF5', '#67A0F5', '#E7C900'],
+//			// hoverAnimation: false,
+//			data: [{
+//				value: 10,
+//				name: '教室1',
+//			}, {
+//				value: 5,
+//				name: '教室2',
+//			}, {
+//				value: 20,
+//				name: '教室3',
+//			}, {
+//				value: 30,
+//				name: '教室4',
+//			}]
+//		}, ]
+//	};
+
+//	// 使用刚指定的配置项和数据显示图表。
+//	myChart5.setOption(option);
+//	window.addEventListener("resize", function() {
+//		myChart5.resize();
+//	});
+//}
 
 
 //办公业务流量
-function serviceEchart() {
-	// 基于准备好的dom，初始化echarts实例
-	myChart2 = echarts.init(document.getElementById('serviceEchart'));
-
-	option = {
-		tooltip: {
-			trigger: 'axis'
-		},
-		color: ['#CB0005', '#EF9116', '#466AD2', '#7408A6', '#0CB5C4', '#DEBC03', '#0BB56C', '#CB1FA1'],
-		legend: {
-			data: ['语文'],
-			icon: "circle",
-			itemWidth: 7,
-			right: '40px',
-			top: '20px'
-		},
-		grid: {
-			left: '3%',
-			right: '3%',
-			bottom: '3%',
-			top: '23%',
-			containLabel: true
-		},
-		xAxis: {
-			type: 'category',
-			name: '星期',
-			boundaryGap: false,
-			data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
-			formatter: function(params) {
-				console.log(params)
-				// return params[0].name + ' ：  ' + params[0].value + ' 小时';
-			},
-		},
-		yAxis: {
-			type: 'value',
-			name: '办公量',
-		},
-		series: [{
-			name: '办公量',
-			type: 'line',
-			stack: '总量',
-			// lineStyle: {
-			// 	color: '#000'
-			// },
-			data: [120, 132, 101, 134, 90, 230, 210]
-		}]
-	};
-
-	// 使用刚指定的配置项和数据显示图表。
-	myChart2.setOption(option);
-	window.addEventListener("resize", function() {
-		myChart2.resize();
-	});
-}
+//function serviceEchart() {
+//	// 基于准备好的dom，初始化echarts实例
+//	myChart2 = echarts.init(document.getElementById('serviceEchart'));
+
+//	option = {
+//		tooltip: {
+//			trigger: 'axis'
+//		},
+//		color: ['#CB0005', '#EF9116', '#466AD2', '#7408A6', '#0CB5C4', '#DEBC03', '#0BB56C', '#CB1FA1'],
+//		legend: {
+//			data: ['语文'],
+//			icon: "circle",
+//			itemWidth: 7,
+//			right: '40px',
+//			top: '20px'
+//		},
+//		grid: {
+//			left: '3%',
+//			right: '3%',
+//			bottom: '3%',
+//			top: '23%',
+//			containLabel: true
+//		},
+//		xAxis: {
+//			type: 'category',
+//			name: '星期',
+//			boundaryGap: false,
+//			data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
+//			formatter: function(params) {
+//				console.log(params)
+//				// return params[0].name + ' ：  ' + params[0].value + ' 小时';
+//			},
+//		},
+//		yAxis: {
+//			type: 'value',
+//			name: '办公量',
+//		},
+//		series: [{
+//			name: '办公量',
+//			type: 'line',
+//			stack: '总量',
+//			// lineStyle: {
+//			// 	color: '#000'
+//			// },
+//			data: [120, 132, 101, 134, 90, 230, 210]
+//		}]
+//	};
+
+//	// 使用刚指定的配置项和数据显示图表。
+//	myChart2.setOption(option);
+//	window.addEventListener("resize", function() {
+//		myChart2.resize();
+//	});
+//}

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js

@@ -47,12 +47,10 @@ function serializes() {
 		key: "sort"
 	});
 	//console.log(gg);//sort=1&sort=2&sort=3&sort=4&sort=5&sort=6&sort=7&sort=8&sort=9&sort=10&sort=11&sort=12&sort=13
+    var result = gg.replace(/sort=/g, "").replace(/&/g, ",");
+    //console.log(result);
+    //todo:ajax提交用户排序
 
-	var gg2 = $(".inSec3Row.active").sortable("toArray");
-	//console.log(gg2);//["id_1", "id_2", "id_3", "id_4", "id_5", "id_6", "id_7", "id_8", "id_9", "id_10", "id_11", "id_12", "id_13"]
-	//console.log(gg2.toString());//id_1,id_2,id_3,id_4,id_5,id_6,id_7,id_8,id_9,id_10,id_11,id_12,id_13
-	//console.log(gg2.toString().replace(new RegExp("id_","g"),""));//1,2,3,4,5,6,7,8,9,10,11,12,13
-    //console.log(gg2.toString().replace(/id_/g, ""));//1,2,3,4,5,6,7,8,9,10,11,12,13
 
 }
 //初始化可用卡片
@@ -67,12 +65,4 @@ function cardData() {
 }
 
 
-//初始化桌面下的卡片块：根据用户的卡片块设置表中的数据
-//todo:参数待定，包括排序号、桌面号、等
-function cardContentInit(){
-	var order = [3,2,1];
-	$.each(order,function(i,item){
-		$("#id_"+item).detach().appendTo('.inSec3Row.active');
-	});
-	//todo:卡片块重新排序后，调用cardData()
-}
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs

@@ -40,6 +40,11 @@ namespace Learun.Application.Web.Controllers
         private ICache redisCache = CacheFactory.CaChe();
         private SSO_Drag_DesktopManageIBLL sSO_Drag_DesktopManageIBLL = new SSO_Drag_DesktopManageBLL();
         private SYS_SendMessageIBLL sYS_SendMessageIBLL = new SYS_SendMessageBLL();
+        private CdMajorIBLL cdMajorIBLL = new CdMajorBLL();
+        private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+        private ClassroomInfoIBLL classroomInfoIBLL = new ClassroomInfoBLL();
+        private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
 
         #region 统一身份认证2.0
         /// <summary>
@@ -954,17 +959,68 @@ namespace Learun.Application.Web.Controllers
             ViewBag.FinishTaskListStr = JsonConvert.SerializeObject(ViewBag.FinishTaskList);
             ViewBag.FinishTaskTotalNum = finishTaskListAll.Count();
             //办公事项-我发起的
+            var myListAll = nWFProcessIBLL.GetMyPageList(userInfo.userId, "{}");
             ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}");
             ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList);
-            
-            //todo:
+            ViewBag.MyListTotalNum = myListAll.Count();
             //常用服务
-            //常用链接-系统直通 === 统一登录-GoTo
-
-
-
+            List<ModuleEntity> modulelist = new List<ModuleEntity>();
+            List<string> 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));
+            foreach (var oitem in offenused)
+            {
+                ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem);
+                if (fod != null)
+                {
+                    modulelist.Add(fod);
+                }
+            }
+            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 majorData = cdMajorIBLL.GetAllList();
+            ViewBag.MajorTotalNum = majorData.Count();
+            //班级
+            var classInfoData = classInfoIBLL.GetAllClass();
+            ViewBag.ClassInfoTotalNum = classInfoData.Count();
+            //学生
+            var stuInfoData = stuInfoBasicIBLL.GetAllList();
+            ViewBag.StuInfoTotalNum = stuInfoData.Count();
+            //教师
+            var teacherData = empInfoIBLL.GetAllList();
+            ViewBag.TeacherTotalNum = teacherData.Count();
+            //教室
+            var classRoomData = classroomInfoIBLL.GetAllList();
+            ViewBag.ClassRoomTotalNum = classRoomData.Count();
+            //专业总览
+            //专业学生
+            var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new
+            {
+                value = x.Select(y => y.StuId).Count(),
+                name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName
+            });
+            ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor);
+            //流程
+            var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
+            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+            var allCount = 0;
+            foreach (var flow in flowType)
+            {
+                var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+                flow.FlowCount = count;
+                allCount += count;
 
+            }
+            ViewBag.AllCount = allCount;
+            ViewBag.FlowType = flowType;
+            ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
 
+            
             return View();
         }
         /// <summary>