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 5a91114b6..281f4480d 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 @@ -19,84 +19,84 @@ //定义卡片块 //数据看板 var card1Fun = function (ind) { - var html = '
' - +'
' - +'
' - +'数据看板' - +'' - +'
' - +'
' - +'
' - +'
' - +'
' - +'校园一卡通余额' + var html = '
' + + '
' + + '
' + + '数据看板' + + '' + + '
' + + '
' + + '
' + + '
' + + '
' + + '校园一卡通余额' + '
' + '
@ViewBag.StuSaveRecordTotalNum
' - +'
' - +'
' - +'
' - +'
' - +'校园一卡通消费金额' + + '
' + + '
' + + '
' + + '
' + + '校园一卡通消费金额' + '
' + '
@ViewBag.StuConsumptionTotalNum
' - +'
' - +'
' - +'
' - +'
' - +'图书馆借阅(未还) ' + + '
' + + '
' + + '
' + + '
' + + '图书馆借阅(未还) ' + '
' + '
0
' - +'
' - +'
' - +'
' - +'
' - +'已完成办公事项' - +'
' - +'
@ViewBag.FinishTaskTotalNum
' - +'
' - +'
' - +'
' - +'
' - +'智慧教育在线学习时长' - +'
' + + '
' + + '
' + + '
' + + '
' + + '已完成办公事项' + + '
' + + '
@ViewBag.FinishTaskTotalNum
' + + '
' + + '
' + + '
' + + '
' + + '智慧教育在线学习时长' + + '
' + '
0
' - +'
' - +'
' - +'
' - +'
' - +'办公业务往来人员' - +'
' + + '
' + + '
' + + '
' + + '
' + + '办公业务往来人员' + + '
' + '
0
' - +'
' - +'
' - +'
' - +'
' - +'来往邮件数量' - +'
' - +'
@ViewBag.LanMailTotalNum
' - +'
' - +'
' - +'
' + + '
' + + '
' + + '
' + + '
' + + '来往邮件数量' + + '
' + + '
@ViewBag.LanMailTotalNum
' + + '
' + + '
' + + '
' // +'
' - +'
' - +'在线人数' - +'
' + + '
' + + '在线人数' + + '
' + '
@ViewBag.OnlineUserNum
' - +'
' - +'
' - +'
' - +'
' + + '
' + + '
' + + '
' + + '
' ; return html; }; function getStatus(row) { - let obj = { - starting:'创建中', - processing:'进行中', - completed:'流转完成', - finished:'手动结束', - } - return obj[row.stage]; + let obj = { + starting: '创建中', + processing: '进行中', + completed: '流转完成', + finished: '手动结束', + } + return obj[row.stage]; if (row.F_IsFinished == 0) { if (row.F_EnabledMark == 1) { return "请处理"; @@ -119,6 +119,7 @@ var list2 = JSON.parse(listStr2.replace(/"/g, "\"")); var listStr3 = "@ViewBag.MyListStr"; var list3 = JSON.parse(listStr3.replace(/"/g, "\"")); + var TYRZ = "@ViewBag.TYRZ"; var html = '
' + '
' @@ -153,9 +154,9 @@ + '
' + list[i].formName + '
' //+ '
' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '
' + '
' + list[i].createTime.replace("T", " ").slice(0, 19) + '
' - //+ '' - + '' - + '
'; + //+ '' + + '' + + '
'; } } else { html += noHtml; @@ -169,8 +170,8 @@ + '
' + list2[i].formName + '
' //+ '
' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '
' + '
' + list2[i].createTime.replace("T", " ").slice(0, 19) + '
' - //+ '' - + '' + //+ '' + + '' + '
'; } } else { @@ -185,18 +186,18 @@ + '
' + list3[i].formName + '
' //+ '
' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '
' + '
' + list3[i].createTime.replace("T", " ").slice(0, 19) + '
' - //+ '' - + '' - + '
'; + //+ '
' + getStatus(list2[i]) + '
' + + '
' + getStatus(list3[i]) + '
' + + '
'; } } else { html += noHtml; } - html+='' - +'' - +'' - +'' - +'' + html += '' + + '' + + '' + + '' + + '' ; return html; }; @@ -216,17 +217,17 @@ html += ''; + html += ''; } else { html += noHtml; } - html+= '' + html += '' + '' + '' ; @@ -235,28 +236,28 @@ //专业总览 var card4Fun = function (ind) { var html = '
' - +'
' - +'
' - +'专业总览' - +'' - +'
' + + '
' + + '
' + + '专业总览' + + '' + + '
' + '
' + '
' - +'
' - +'
班级总数
' - +'
@ViewBag.ClassInfoTotalNum
' - +'
' - +'
' - +'
专业学生
' - +'
@ViewBag.StuInfoTotalNum
' - +'
' - +'
' - +'
专业教室
' - +'
@ViewBag.ClassRoomTotalNum
' - +'
' - +'
' - +'
' - +'
' + + '
' + + '
班级总数
' + + '
@ViewBag.ClassInfoTotalNum
' + + '
' + + '
' + + '
专业学生
' + + '
@ViewBag.StuInfoTotalNum
' + + '
' + + '
' + + '
专业教室
' + + '
@ViewBag.ClassRoomTotalNum
' + + '
' + + '
' + + '' + + '' ; return html; }; @@ -275,10 +276,10 @@ + '
' + '' @@ -287,14 +288,14 @@ 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 += '' + list[i].PFunctionList[j].FName + ''; } - html+= '
'; + html += '
'; } - html+='' - +'' - +'' - +'' + html += '' + + '' + + '' + + '' ; return html; }; @@ -313,9 +314,9 @@ + '
' + '
' + '
'; for (var i = 0; i < list.length; i++) { - html+= '
' + html += '
' + '
'; if (list[i].ChildrenList.length > 0) { for (var j = 0; j < list[i].ChildrenList.length; j++) { @@ -341,67 +342,67 @@ + '
'; } - html+='
' - +'
' - +'
' - +'' + html += '' + + '' + + '' + + '' ; return html; }; //校园总览 var card7Fun = function (ind) { var html = '
' - +'
' - +'
' - +'校园总览' - +'' - +'
' - +'
' - +'
' - +'
' - +'' - +'专业总数' - +'
' - +'
@ViewBag.MajorTotalNum
' - +'
' - +'
' - +'
' - +'' - +'班级总数' - +'
' - +'
@ViewBag.ClassInfoTotalNum
' - +'
' - +'
' - +'
' - +'' - +'在校学生' - +'
' - +'
@ViewBag.StuInfoTotalNum
' - +'
' - +'
' - +'
' - +'' - +'在校教师' - +'
' - +'
@ViewBag.TeacherTotalNum
' - +'
' - +'
' - +'
' - +'' - +'在用教室' - +'
' - +'
@ViewBag.ClassRoomTotalNum
' - +'
' - +'
' - +'
' - +'' - +'课程总数' - +'
' - +'
@ViewBag.LessonTotalNum
' - +'
' - +'
' - +'
' - +'
' + + '
' + + '
' + + '校园总览' + + '' + + '
' + + '
' + + '
' + + '
' + + '' + + '专业总数' + + '
' + + '
@ViewBag.MajorTotalNum
' + + '
' + + '
' + + '
' + + '' + + '班级总数' + + '
' + + '
@ViewBag.ClassInfoTotalNum
' + + '
' + + '
' + + '
' + + '' + + '在校学生' + + '
' + + '
@ViewBag.StuInfoTotalNum
' + + '
' + + '
' + + '
' + + '' + + '在校教师' + + '
' + + '
@ViewBag.TeacherTotalNum
' + + '
' + + '
' + + '
' + + '' + + '在用教室' + + '
' + + '
@ViewBag.ClassRoomTotalNum
' + + '
' + + '
' + + '
' + + '' + + '课程总数' + + '
' + + '
@ViewBag.LessonTotalNum
' + + '
' + + '
' + + '
' + + '' ; return html; }; @@ -421,31 +422,31 @@ for (var i = 0; i < list.length; i++) { if (i == 0) { html += '
  • ' - + '' + + '' + '' - + '' + + '' + '' - + '' + list[i].F_FullHead+'' - + '' + list[i].F_CreateDate.replace("T", " ").slice(0, 10) +'' + + '' + list[i].F_FullHead + '' + + '' + list[i].F_CreateDate.replace("T", " ").slice(0, 10) + '' + '' + '' + '
  • '; } else { - html+= '
  • ' - + '' - + '' + list[i].F_CreateDate.replace("T", " ").slice(0, 10) +'' - + '' + list[i].F_FullHead +'' + html += '
  • ' + + '' + + '' + list[i].F_CreateDate.replace("T", " ").slice(0, 10) + '' + + '' + list[i].F_FullHead + '' + '' + '
  • '; } } - html+= ''; + html += ''; } else { html += noHtml; } - html+='' - +'' - +'' + html += '' + + '' + + '' ; return html; }; @@ -483,13 +484,13 @@ html += ''; + html += ''; } else { html += noHtml; } @@ -509,12 +510,12 @@ } else { html += noHtml; } - html+='' - +'' - +'' - +'' - +'' - ; + html += '' + + '' + + '' + + '' + + '' + ; return html; }; //通知公告 @@ -532,17 +533,17 @@ html += ''; + html += ''; } else { html += noHtml; } - html+= '' + html += '' + '' + '' ; @@ -561,12 +562,12 @@ + '
    '; if (list.length > 0) { for (var i = 0; i < list.length; i++) { - html += '' + list[i].F_FullHead+''; + html += '' + list[i].F_FullHead + ''; } } else { html += noHtml; } - html+= '
    ' + html += '' + '' + '' ; @@ -588,51 +589,51 @@ if (i == 0) { html += '' + '' - + '
    ' + list[i].F_FullHead +'
    ' + + '
    ' + list[i].F_FullHead + '
    ' + '
    ' + '
    '; } else { html += '
    ' + '' + '' - + '
    ' + list[i].F_FullHead +'
    ' + + '
    ' + list[i].F_FullHead + '
    ' + '
    ' + '
    '; } } - html+= '
    '; + html += ''; } else { html += noHtml; } - html+='' - +'' - +'' + html += '' + + '' + + '' ; return html; }; //办公业务流量 var card13Fun = function (ind) { var html = '
    ' - +'
    ' - +'
    ' - +'办公业务流量' - +'' - +'
    ' + + '
    ' + + '
    ' + + '办公业务流量' + + '' + + '
    ' + '
    ' + '
    ' + '
    ' + '' - +'
    ' - +'
    ' - +'
    ' - +'
    ' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
    ' + + '' + + '' + + '' ; return html; }; @@ -645,7 +646,7 @@ var listStr = "@ViewBag.StuByMajorStr"; var list = JSON.parse(listStr.replace(/"/g, "\"")); - var myChart5 = echarts.init($('.inSec3RowBox').find('#' + ind + '_major')[0], null, { width: 820, height:200 }); + var myChart5 = echarts.init($('.inSec3RowBox').find('#' + ind + '_major')[0], null, { width: 820, height: 200 }); option = { tooltip: { @@ -704,15 +705,15 @@ window.addEventListener("resize", function () { myChart5.resize(); }); - setTimeout(function(){ - console.log(123) + setTimeout(function () { + console.log(123) myChart5.resize(); - },2000) + }, 2000) } //办公业务流量 function serviceEchart(ind) { // 基于准备好的dom,初始化echarts实例 - var myChart2 = echarts.init($('.inSec3RowBox').find('#' + ind + '_serviceEchart')[0], null, { height: 200,width:242 }); + var myChart2 = echarts.init($('.inSec3RowBox').find('#' + ind + '_serviceEchart')[0], null, { height: 200, width: 242 }); option = { tooltip: { @@ -768,6 +769,7 @@ .desktopSetBox b { font-weight: normal; } + .searchLi > a { width: 100%; } @@ -792,10 +794,11 @@ {
  • - @item.F_FullName - -
  • - } + @item.F_FullName + + + } } @@ -827,11 +830,15 @@
    @{ - foreach (var item in searchModule.Where(x => "abcd".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + foreach (var item in searchModule.Where(x => "abcd".Contains(x.FirstLetter)).OrderBy(x => + x.FirstLetter)) {
    -
    +
    + +
    @item.F_FullName
    @@ -843,11 +850,15 @@
    @{ - foreach (var item in searchModule.Where(x => "efgh".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + foreach (var item in searchModule.Where(x => "efgh".Contains(x.FirstLetter)).OrderBy(x => + x.FirstLetter)) {
    -
    +
    + +
    @item.F_FullName
    @@ -859,11 +870,15 @@
    @{ - foreach (var item in searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + foreach (var item in searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).OrderBy(x => + x.FirstLetter)) {
    -
    +
    + +
    @item.F_FullName
    @@ -875,11 +890,15 @@
    @{ - foreach (var item in searchModule.Where(x => "mnop".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + foreach (var item in searchModule.Where(x => "mnop".Contains(x.FirstLetter)).OrderBy(x => + x.FirstLetter)) {
    -
    +
    + +
    @item.F_FullName
    @@ -891,11 +910,15 @@
    @{ - foreach (var item in searchModule.Where(x => "qrst".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + foreach (var item in searchModule.Where(x => "qrst".Contains(x.FirstLetter)).OrderBy(x => + x.FirstLetter)) {
    -
    +
    + +
    @item.F_FullName
    @@ -907,11 +930,15 @@
    @{ - foreach (var item in searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + foreach (var item in searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).OrderBy(x => + x.FirstLetter)) {
    -
    +
    + +
    @item.F_FullName
    @@ -923,11 +950,15 @@
    @{ - foreach (var item in searchModule.Where(x => "yz".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + foreach (var item in searchModule.Where(x => "yz".Contains(x.FirstLetter)).OrderBy(x => + x.FirstLetter)) {
    -
    +
    + +
    @item.F_FullName
    @@ -1017,7 +1048,7 @@ {
  • - @item.F_ItemName @item.FlowCount + @item.F_ItemName @item.FlowCount
  • } @@ -1117,7 +1148,7 @@
    -
    +
    @@ -1157,98 +1188,22 @@
    -
      -
    • +
        +
      • @ViewBag.TaskTotalNum 待办任务
      • -
      • +
      • @ViewBag.MyListTotalNum 我发起的
      • -
      • +
      • @ViewBag.FinishTaskTotalNum 已办任务
    -
    -
    - @{ - var TaskListIEnumerable = ViewBag.TaskList as IEnumerable; - if (TaskListIEnumerable.Any()) - { - foreach (Learun.Application.Web.Controllers.SSOSystemController.rows item in ViewBag.TaskList) - { -
    -
    @item.formName
    -
    @item.createTime
    - @*
    *@ -
    -
    - } - } - else - { -
    -
    -
    暂时没有数据
    -
    - } - } - -
    -
    - @{ - - var MyListIEnumerable = ViewBag.MyList as IEnumerable; - if (MyListIEnumerable.Any()) - { - foreach (Learun.Application.Web.Controllers.SSOSystemController.rows item in ViewBag.MyList) - { -
    -
    @item.formName
    -
    @item.createTime
    - @*
    *@ -
    -
    - } - } - else - { -
    -
    -
    暂时没有数据
    -
    - } - } - -
    -
    - @{ - var FinishTaskListIEnumerable = ViewBag.FinishTaskList as IEnumerable; - if (FinishTaskListIEnumerable.Any()) - { - foreach (Learun.Application.Web.Controllers.SSOSystemController.rows item in ViewBag.FinishTaskList) - { -
    -
    @item.formName
    -
    @item.createTime
    - @*
    *@ -
    -
    - } - } - else - { -
    -
    -
    暂时没有数据
    -
    - } - } - -
    +
    @@ -1269,7 +1224,9 @@
    @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList) { -
    +
    @desktopItem.DesktopName
    @@ -1278,8 +1235,7 @@ @{ var DesktopList = ViewBag.DesktopList as IEnumerable; if (DesktopList.Count() < 5) - { -
    + {
    @@ -1292,11 +1248,12 @@
    @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList) { -
    +
    @if (string.IsNullOrEmpty(desktopItem.CardSort)) { } else @@ -1307,69 +1264,69 @@ { case "card1": break; case "card2": break; case "card3": break; case "card4": break; case "card5": break; case "card6": break; case "card7": break; case "card8": break; case "card9": break; case "card10": break; case "card11": break; case "card12": break; case "card13": break; default: @@ -1384,69 +1341,69 @@ { case "card1": break; case "card2": break; case "card3": break; case "card4": break; case "card5": break; case "card6": break; case "card7": break; case "card8": break; case "card9": break; case "card10": break; case "card11": break; case "card12": break; case "card13": break; default: @@ -1478,28 +1435,32 @@
    -
    @item.DesktopName@(item.DefaultFlag == "1" ? "(默认桌面)" : "")
    -
    - - 8/8 -
    +
    + @item.DesktopName + @(item.DefaultFlag == "1" ? "(默认桌面)" : +"") +
    - -
    - @(item.DefaultFlag == "1" ? "确认恢复默认设置?" : "确认删除该桌面?") -
    - -
    -
    - -
    +
    + + 8/8
    - } + +
    + @(item.DefaultFlag == "1" ? "确认恢复默认设置?" : "确认删除该桌面?") +
    + +
    +
    + +
    +
    +
    + }
    @if (DesktopList.Count() < 5) - { -
    + {
    新建桌面
    @@ -1554,8 +1515,7 @@
    验证码
    - +
    @@ -1589,7 +1549,8 @@ -@**@ +@* + *@ + \ No newline at end of file