From 0dd45eb5ca2bda4ab5e832e08261f5b321b7085a Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 8 Apr 2021 18:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=8E=A7=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A7=E4=BB=B6=E9=A2=84=E8=A7=88=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Sys_ReceiveFile/Form.js | 2 +- .../Controllers/DTListController.cs | 5 + .../Controllers/NWFProcessController.cs | 1 + .../Views/NWFProcess/htPrint.cshtml | 8 +- .../Views/MP_ManagementPlan/Index.js | 4 + .../MP_ManagementPlan/IndexManagement.js | 4 + .../Views/MP_PerformanceTracking/Index.js | 4 + .../MP_PerformanceTracking/IndexManagement.js | 4 + .../Views/MP_QualityObjectives/Index.js | 4 + .../MP_QualityObjectives/IndexManagement.js | 4 + .../Views/Home/AdminDesktop.cshtml | 3 + .../Views/Home/AdminDesktop/Index.js | 589 +++++++++--------- .../Views/LR_Content/script/lr-admin.js | 2 +- 13 files changed, 345 insertions(+), 289 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js index 307cde319..9bc8406b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js @@ -46,7 +46,7 @@ var bootstrap = function ($, learun) { $('#Url').lrUploader({ RFileId: selectedRow.RFileId }); } } else { - $('#Url').lrUploader({ RFileId: keyValue }); + $('#Url').lrUploader({ RFileId: keyValue, isView:false }); } }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs index 5876db2ca..0cec6ff9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/DTListController.cs @@ -195,6 +195,11 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers "SELECT RFileId as F_Id,Title as f_title,SendTime as f_time FROM dbo.Sys_ReceiveFile WHERE DelFlag=0 AND ReadFlag<>1 and STypeId=4 AND ReceiverId='" + loginUserInfo.userId + "'"; } + //金隅学校增加通知新闻已读标志 + if (dtListEntity.F_Url.Contains("/Notice/ViewIndex")) + { + dtListEntity.F_Sql=dtListEntity.F_Sql.Replace("@userId", "'"+loginUserInfo.userId+"'"); + } var reqDataTable = databaseLinkIbll.FindTable(dtListEntity.F_DataSourceId.Trim(), dtListEntity.F_Sql); if (dtListEntity.F_Id == "88f94781-acb8-47ca-864b-f96e3d9b5587") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index bb4c8fdc8..9de58d880 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -129,6 +129,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers var operationTime = nwfTaskLogEntity?.F_CreateDate; ViewBag.UserName = userInfo?.F_RealName; ViewBag.IDCard = userInfo?.F_IdentityCardNo; + ViewBag.Htmc = data?.LC_htmc; ViewBag.BeginYear = beginTime?.Year; ViewBag.BeginMonth = beginTime?.Month; ViewBag.BeginDay = beginTime?.Day; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml index e0b0bedc8..f3e326027 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml @@ -15,7 +15,13 @@
授权委托书
- 兹委托@ViewBag.UserName(身份证号码：@ViewBag.IDCard)负责联系办理业务并签订合同或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。 + 兹委托@ViewBag.UserName(身份证号码：@ViewBag.IDCard)负责联系办理业务并签订合同，合同名称： +
+
+ @ViewBag.Htmc +
+
+ 或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。
特此授权！ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js index b725aefd4..82c7fea38 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js @@ -205,6 +205,10 @@ var bootstrap = function ($, learun) { var jsdate = new Date(); param.MPAcademicYearNo = jsdate.getFullYear(); } + if (!param.MPMonth) { + var jsdate = new Date(); + param.MPMonth = jsdate.getMonth() + 1; + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, downLoad: function (fileId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js index b45288a08..02082afe6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js @@ -291,6 +291,10 @@ var bootstrap = function ($, learun) { var jsdate = new Date(); param.MPAcademicYearNo = jsdate.getFullYear(); } + if (!param.MPMonth) { + var jsdate = new Date(); + param.MPMonth = jsdate.getMonth()+1; + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, downLoad: function (fileId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js index d0e5f577b..e9e70bfcd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js @@ -173,6 +173,10 @@ var bootstrap = function ($, learun) { var jsdate = new Date(); param.MPAcademicYearNo = jsdate.getFullYear(); } + if (!param.MPMonth) { + var jsdate = new Date(); + param.MPMonth = jsdate.getMonth() + 1; + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js index a1158b3f9..d09f68dee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js @@ -249,6 +249,10 @@ var bootstrap = function ($, learun) { var jsdate = new Date(); param.MPAcademicYearNo = jsdate.getFullYear(); } + if (!param.MPMonth) { + var jsdate = new Date(); + param.MPMonth = jsdate.getMonth() + 1; + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js index d7a823c53..ebcdf2b5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js @@ -196,6 +196,10 @@ var bootstrap = function ($, learun) { var jsdate = new Date(); param.MPAcademicYearNo = jsdate.getFullYear(); } + if (!param.MPMonth) { + var jsdate = new Date(); + param.MPMonth = jsdate.getMonth() + 1; + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js index c8698e6d7..07c128ac2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js @@ -249,6 +249,10 @@ var bootstrap = function ($, learun) { var jsdate = new Date(); param.MPAcademicYearNo = jsdate.getFullYear(); } + if (!param.MPMonth) { + var jsdate = new Date(); + param.MPMonth = jsdate.getMonth() + 1; + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml index 16760f5c5..a9500efe0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop.cshtml @@ -15,6 +15,9 @@ display: block; margin-right: 140px; } + .lr-msg-line.lr-msg-line2 > a { + color: cornflowerblue; + } .lr-desktop-panel{ background-image: url(/Content/images/indexBg.png); background-position: 100% center; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js index 0dde12d35..e50cacd4e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js @@ -1,289 +1,306 @@ -$(function() { - var f = {}; - var d = {}; - //暂无数据 - var noHtml = '
'+ - '
'+ - ''+ - '
'+ - '
'; - function e(i) { - top.learun.httpSync('get', top.$.rootUrl + '/LR_Desktop/DTTitle/GetID', '{}', function(res) { - var background = res.Background; - var color = res.Color; - if(background){ - $("#TitleColor").css({background: background, color: color, borderColor: 'transparent'}) - } - }) - if(i.length > 0) { - $("#lr_target").lrscroll(); - var j = 210; - var h = 0; - var k = $("#lr_target").width() - 10; - var j = k / i.length; - if(j < 210) { - j = 210 - } - h = j * i.length; - var g = $("#lr_target .lr-scroll-box"); - g.css("width", h); - $.each(i, - function(m, n) { - f[n.F_Id] = n; - var l = '
' + n.F_Name + '
'; - if(n.F_Url) { - l += '查看更多 ' - } - l += "
"; - g.append(l); - top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTTarget/GetSqlData", { - Id: n.F_Id - }, - function(o) { - if(o) { - g.find('[data-value="' + o.Id + '"]').text(o.value) - } - }) - }); - g.find(".lr-item-20 .more").on("click", - function() { - var l = $(this).attr("data-Id"); - top.learun.frameTab.open({ - F_ModuleId: l, - F_FullName: f[l].F_Name, - F_UrlAddress: f[l].F_Url - }); - return false - }); - g.find(".lr-item-20").css("width", j); - $("#lr_target").resize(function() { - var m = $("#lr_target").width() - 10; - var l = m / i.length; - if(l < 210) { - l = 210 - } - h = l * i.length; - g.css("width", h); - g.find(".lr-item-20").css("width", l) - }) - } - } +$(function () { + var f = {}; + var d = {}; + //暂无数据 + var noHtml = '
' + + '
' + + '' + + '
' + + '
'; + function e(i) { + top.learun.httpSync('get', top.$.rootUrl + '/LR_Desktop/DTTitle/GetID', '{}', function (res) { + var background = res.Background; + var color = res.Color; + if (background) { + $("#TitleColor").css({ background: background, color: color, borderColor: 'transparent' }) + } + }) + if (i.length > 0) { + $("#lr_target").lrscroll(); + var j = 210; + var h = 0; + var k = $("#lr_target").width() - 10; + var j = k / i.length; + if (j < 210) { + j = 210 + } + h = j * i.length; + var g = $("#lr_target .lr-scroll-box"); + g.css("width", h); + $.each(i, + function (m, n) { + f[n.F_Id] = n; + var l = '
' + n.F_Name + '
'; + if (n.F_Url) { + l += '查看更多 ' + } + l += "
"; + g.append(l); + top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTTarget/GetSqlData", { + Id: n.F_Id + }, + function (o) { + if (o) { + g.find('[data-value="' + o.Id + '"]').text(o.value) + } + }) + }); + g.find(".lr-item-20 .more").on("click", + function () { + var l = $(this).attr("data-Id"); + top.learun.frameTab.open({ + F_ModuleId: l, + F_FullName: f[l].F_Name, + F_UrlAddress: f[l].F_Url + }); + return false + }); + g.find(".lr-item-20").css("width", j); + $("#lr_target").resize(function () { + var m = $("#lr_target").width() - 10; + var l = m / i.length; + if (l < 210) { + l = 210 + } + h = l * i.length; + g.css("width", h); + g.find(".lr-item-20").css("width", l) + }) + } + } - function c(h) { - if(h.length > 0) { - var g = $(".lr-desktop-panel>.lr-scroll-box"); - $.each(h, - function(j, k) { - d[k.F_Id] = k; - var stylex = k.Background? 'background:' + k.Background + ';color:' + k.Color + ';border-color:transparent' : ''; - var i = '
  ' + k.F_Name + '
'; - - g.append(i); - top.learun.httpSync("GET", top.$.rootUrl + "/LR_Desktop/DTList/GetSqlData", { - Id: k.F_Id - }, - function(m) { - if(m) { - var l = g.find('[data-value="' + m.Id + '"]'); - $.each(m.value, - function(p, q) { - var o = '
' + q.f_title + "
"; - var n = $(o); - n.find("a")[0].item = q; - l.append(n) - }); - l.find(".lr-msg-line>a").on("click", - function() { - var n = $(this).parents(".col-xs-6"); - var o = n.attr("data-Id"); - var p = $(this)[0].item; - if(d[o].F_ItemUrl) { - top.learun.frameTab.open({ - F_ModuleId: "dtlist" + p.f_id, - F_FullName: p.f_title, - F_UrlAddress: d[o].F_ItemUrl + p.f_id - }) - } else { - //判断点击项是否为‘待办’的子项 - if(d[o].F_Id == "33d50f1a-a64d-4b86-a6d4-2d937226de95") { - if(p.f_tasktype != 2) { - top.learun.frameTab.open({ - F_ModuleId: p.f_id + "_homeopen", - F_Icon: 'fa magic', - F_FullName: '审核流程【' + p.f_processname + '/' + p.f_content + '】', - F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/Index' - //F_UrlAddress: '/LR_WorkFlowModule/WfMyTask/CustmerWorkFlowForm?tabIframeId=' + p.f_id + '&type=' + p.f_tasktype + '' + "&processId=" + p.f_processid + "&taskId=" + p.f_id - }); - } - } else { - top["dtlist" + p.f_id] = p; - top.learun.frameTab.open({ - F_ModuleId: "dtlist" + p.f_id, - F_FullName: p.f_title, - F_UrlAddress: "/Utility/ListContentIndex?id=" + p.f_id - }) - } - } - return false - }) - } - }) - }); - //暂无数据 - g.find('.portal-panel-content2').each(function(i,n){ - var len = $(n).find('.lr-msg-line').length; - if(len == 0){ - $(n).html(noHtml) - } - }) - //青桔课堂图片插入 - var htmlQj = '
' + - '' + - '
关闭
' + - '
'; - //g.append(htmlQj); - g.find(".portal-panel-title>.menu").on("click", - function() { - var i = $(this).parents(".col-xs-6"); - var j = i.attr("data-Id"); - top.learun.frameTab.open({ - F_ModuleId: j, - F_FullName: d[j].F_Name, - F_UrlAddress: d[j].F_Url - }); - return false - }).end().on('click', '.qjClose', function() { - $(this).parent().addClass('active').slideUp(500) - }); - if(h.length % 2 > 0) { - g.find('[data-value="' + h[h.length - 1].F_Id + '"]').css("height", 425) - } - } - } - var b = {}; + function c(h) { + if (h.length > 0) { + var g = $(".lr-desktop-panel>.lr-scroll-box"); + $.each(h, + function (j, k) { + d[k.F_Id] = k; + var stylex = k.Background ? 'background:' + k.Background + ';color:' + k.Color + ';border-color:transparent' : ''; + var i = '
  ' + k.F_Name + '
'; - function a(h) { - if(h.length > 0) { - var g = $(".lr-desktop-panel>.lr-scroll-box"); - $.each(h, - function(j, k) { - var stylex = k.Background? 'background:' + k.Background + ';color:' + k.Color + ';border-color:transparent' : ''; - var i = '
  ' + k.F_Name + '
'; - g.append(i); - b[k.F_Id] = echarts.init(document.getElementById(k.F_Id)); - top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTChart/GetSqlData", { - Id: k.F_Id - }, - function(l) { - // console.log(l) - if(l) { - if(l.value.length == 0){ - $('#' + k.F_Id).html(noHtml) - return - } - var o = $("#" + l.Id).attr("data-type"); - var m = []; - var p = []; - $.each(l.value, - function(q, r) { - m.push(r.name); - p.push(r.value) - }); - var n = {}; - switch(o) { - case "0": - n.legend = { - bottom: "bottom", - data: m - }; - n.series = [{ - name: "占比", - type: "pie", - radius: "75%", - center: ["50%", "50%"], - label: { - normal: { - formatter: "{b}:{c}: ({d}%)", - textStyle: { - fontWeight: "normal", - fontSize: 12, - color: "#333" - } - } - }, - data: l.value, - itemStyle: { - emphasis: { - shadowBlur: 10, - shadowOffsetX: 0, - shadowColor: "rgba(0, 0, 0, 0.5)" - } - } - }]; - n.color = ["#df4d4b", "#304552", "#52bbc8", "rgb(224,134,105)", "#8dd5b4", "#5eb57d", "#d78d2f"]; - break; - case "1": - n.tooltip = { - trigger: "axis" - }; - n.grid = { - bottom: "8%", - containLabel: true - }; - n.xAxis = { - type: "category", - boundaryGap: false, - data: m - }; - n.yAxis = { - type: "value" - }; - n.series = [{ - type: "line", - data: p - }]; - break; - case "2": - n.tooltip = { - trigger: "axis" - }; - n.grid = { - bottom: "8%", - containLabel: true - }; - n.xAxis = { - type: "category", - boundaryGap: false, - data: m - }; - n.yAxis = { - type: "value" - }; - n.series = [{ - type: "bar", - data: p - }]; - break - } - b[l.Id].setOption(n) - } - }) - }); - window.onresize = function(i) { - $.each(b, - function(j, k) { - k.resize(i) - }) - } - } - } - - $(".lr-desktop-panel").lrscroll(); - top.learun.clientdata.getAsync("desktop", { - callback: function(g) { - c(g.list || []); - e(g.target || []); - a(g.chart || []) - } - }) + g.append(i); + top.learun.httpSync("GET", top.$.rootUrl + "/LR_Desktop/DTList/GetSqlData", { + Id: k.F_Id + }, + function (m) { + if (m) { + var l = g.find('[data-value="' + m.Id + '"]'); + $.each(m.value, + function (p, q) { + console.log(q.rnewsid); + if (q.rnewsid) { + if (q.rnewsid === '0') { + var o = '
' + q.f_title + "
"; + var n = $(o); + n.find("a")[0].item = q; + l.append(n); + } else { + var o = '
' + q.f_title + "
"; + var n = $(o); + n.find("a")[0].item = q; + l.append(n); + } + + } else { + var o = '
' + q.f_title + "
"; + var n = $(o); + n.find("a")[0].item = q; + l.append(n); + } + + }); + l.find(".lr-msg-line>a").on("click", + function () { + var n = $(this).parents(".col-xs-6"); + var o = n.attr("data-Id"); + var p = $(this)[0].item; + if (d[o].F_ItemUrl) { + top.learun.frameTab.open({ + F_ModuleId: "dtlist" + p.f_id, + F_FullName: p.f_title, + F_UrlAddress: d[o].F_ItemUrl + p.f_id + }) + } else { + //判断点击项是否为‘待办’的子项 + if (d[o].F_Id == "33d50f1a-a64d-4b86-a6d4-2d937226de95") { + if (p.f_tasktype != 2) { + top.learun.frameTab.open({ + F_ModuleId: p.f_id + "_homeopen", + F_Icon: 'fa magic', + F_FullName: '审核流程【' + p.f_processname + '/' + p.f_content + '】', + F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/Index' + //F_UrlAddress: '/LR_WorkFlowModule/WfMyTask/CustmerWorkFlowForm?tabIframeId=' + p.f_id + '&type=' + p.f_tasktype + '' + "&processId=" + p.f_processid + "&taskId=" + p.f_id + }); + } + } else { + top["dtlist" + p.f_id] = p; + top.learun.frameTab.open({ + F_ModuleId: "dtlist" + p.f_id, + F_FullName: p.f_title, + F_UrlAddress: "/Utility/ListContentIndex?id=" + p.f_id + }) + } + } + return false + }) + } + }) + }); + //暂无数据 + g.find('.portal-panel-content2').each(function (i, n) { + var len = $(n).find('.lr-msg-line').length; + if (len == 0) { + $(n).html(noHtml) + } + }) + //青桔课堂图片插入 + var htmlQj = '
' + + '' + + '
关闭
' + + '
'; + //g.append(htmlQj); + g.find(".portal-panel-title>.menu").on("click", + function () { + var i = $(this).parents(".col-xs-6"); + var j = i.attr("data-Id"); + top.learun.frameTab.open({ + F_ModuleId: j, + F_FullName: d[j].F_Name, + F_UrlAddress: d[j].F_Url + }); + return false + }).end().on('click', '.qjClose', function () { + $(this).parent().addClass('active').slideUp(500) + }); + if (h.length % 2 > 0) { + g.find('[data-value="' + h[h.length - 1].F_Id + '"]').css("height", 425) + } + } + } + var b = {}; + + function a(h) { + if (h.length > 0) { + var g = $(".lr-desktop-panel>.lr-scroll-box"); + $.each(h, + function (j, k) { + var stylex = k.Background ? 'background:' + k.Background + ';color:' + k.Color + ';border-color:transparent' : ''; + var i = '
  ' + k.F_Name + '
'; + g.append(i); + b[k.F_Id] = echarts.init(document.getElementById(k.F_Id)); + top.learun.httpAsync("GET", top.$.rootUrl + "/LR_Desktop/DTChart/GetSqlData", { + Id: k.F_Id + }, + function (l) { + // console.log(l) + if (l) { + if (l.value.length == 0) { + $('#' + k.F_Id).html(noHtml) + return + } + var o = $("#" + l.Id).attr("data-type"); + var m = []; + var p = []; + $.each(l.value, + function (q, r) { + m.push(r.name); + p.push(r.value) + }); + var n = {}; + switch (o) { + case "0": + n.legend = { + bottom: "bottom", + data: m + }; + n.series = [{ + name: "占比", + type: "pie", + radius: "75%", + center: ["50%", "50%"], + label: { + normal: { + formatter: "{b}:{c}: ({d}%)", + textStyle: { + fontWeight: "normal", + fontSize: 12, + color: "#333" + } + } + }, + data: l.value, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: "rgba(0, 0, 0, 0.5)" + } + } + }]; + n.color = ["#df4d4b", "#304552", "#52bbc8", "rgb(224,134,105)", "#8dd5b4", "#5eb57d", "#d78d2f"]; + break; + case "1": + n.tooltip = { + trigger: "axis" + }; + n.grid = { + bottom: "8%", + containLabel: true + }; + n.xAxis = { + type: "category", + boundaryGap: false, + data: m + }; + n.yAxis = { + type: "value" + }; + n.series = [{ + type: "line", + data: p + }]; + break; + case "2": + n.tooltip = { + trigger: "axis" + }; + n.grid = { + bottom: "8%", + containLabel: true + }; + n.xAxis = { + type: "category", + boundaryGap: false, + data: m + }; + n.yAxis = { + type: "value" + }; + n.series = [{ + type: "bar", + data: p + }]; + break + } + b[l.Id].setOption(n) + } + }) + }); + window.onresize = function (i) { + $.each(b, + function (j, k) { + k.resize(i) + }) + } + } + } + + $(".lr-desktop-panel").lrscroll(); + top.learun.clientdata.getAsync("desktop", { + callback: function (g) { + c(g.list || []); + e(g.target || []); + a(g.chart || []) + } + }) }); \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js index 816290f09..8aaa60412 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js @@ -74,7 +74,7 @@ var loaddfimg; _html += '
  • 解绑微信
    • '; _html += '
  • 我的日程
    • '; _html += '
  • 在线人员
    • '; - _html += '
  • 切换账号
    • '; + //_html += '
  • 切换账号
    • '; if (loginInfo.isSystem) { _html += '
  • 清空缓存
    • '; }