内控调整，首页样式调整，上传控件预览调整

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 () {

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")

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;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/htPrint.cshtml

@@ -15,7 +15,13 @@
                 <div class="tableT">授权委托书</div>
 
                 <div class="entrTxt">
-                    兹委托<span>@ViewBag.UserName</span>(身份证号码：<span style="width: 237px;">@ViewBag.IDCard</span>)负责联系办理业务并签订合同或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。
+                    兹委托<span>@ViewBag.UserName</span>(身份证号码：<span style="width: 237px;">@ViewBag.IDCard</span>)负责联系办理业务并签订合同，合同名称：
+                </div>
+                <div class="entrTxt">
+                    <span style="width: 768px;">@ViewBag.Htmc</span>
+                </div>
+                <div class="entrTxt">
+                    或协议等事宜，请予以配合，由此产生的一切责任和后果由我本人或单位承担。
                 </div>
                 <div class="entrTxt">
                     特此授权！

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

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

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) });
         }
     };

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) });
         }
     };

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) });
         }
     };

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) });
         }
     };

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;

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js

@@ -1,289 +1,306 @@
-$(function() {
-	var f = {};
-	var d = {};
-	//暂无数据
-	var noHtml = '<div class="noHtml">'+
-					'<div class="noImg" style="text-align: center;margin-top: 10px; line-height: 0;">'+
-						'<img src="/Content/images/noLogin.png" alt="">'+
-					'</div>'+
-				'</div>';
-	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 = '<div class="lr-item-20"><div class="task-stat" ><div class="visual"><i class="' + n.F_Icon + '"></i></div><div class="details"><div class="number" data-value="' + n.F_Id + '"></div><div class="desc">' + n.F_Name + '</div></div>';
-					if(n.F_Url) {
-						l += '<a class="more" data-Id="' + n.F_Id + '" >查看更多 <i class="fa fa-arrow-circle-right"></i>                        </a>'
-					}
-					l += "</div></div>";
-					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 = '<div class="noHtml">' +
+        '<div class="noImg" style="text-align: center;margin-top: 10px; line-height: 0;">' +
+        '<img src="/Content/images/noLogin.png" alt="">' +
+        '</div>' +
+        '</div>';
+    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 = '<div class="lr-item-20"><div class="task-stat" ><div class="visual"><i class="' + n.F_Icon + '"></i></div><div class="details"><div class="number" data-value="' + n.F_Id + '"></div><div class="desc">' + n.F_Name + '</div></div>';
+                    if (n.F_Url) {
+                        l += '<a class="more" data-Id="' + n.F_Id + '" >查看更多 <i class="fa fa-arrow-circle-right"></i>                        </a>'
+                    }
+                    l += "</div></div>";
+                    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 = '<div class="col-xs-6" data-Id="' + k.F_Id + '"> <div style="'+ stylex +'" class="portal-panel-title "><i class="' + k.F_Icon + '"></i>&nbsp;&nbsp;' + k.F_Name + '<span class="menu" title="更多"> <span style="border:1px solid ' + k.Color + '" class="point"></span><span style="border:1px solid ' + k.Color + '" class="point"></span><span style="border:1px solid ' + k.Color + '" class="point"></span> </span> </div> <div class="portal-panel-content portal-panel-content2" style="overflow: hidden;padding-top: 20px; padding-left: 30px; padding-right: 50px;height:225px;" data-value="' + k.F_Id + '" ></div></div>';
-					
-					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 = '                            <div class="lr-msg-line">                                <a href="#" style="text-decoration: none;" >' + q.f_title + "</a>                                <label>" + q.f_time + "</label>                            </div>";
-										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 = '<div class="col-xs-12" id="qjImg" style="position: relative;border-radius: 4px;overflow: hidden;">' +
-				'<a href="/Home/GoQingJu" target="_blank"><img src="/Content/images/qj.jpg" alt="" style="width: 100%;display: block;margin: 20px 0 10px" /></a>' +
-				'<div class="qjClose" style="background: #7c89f3;border-radius: 2px;text-align: center;line-height: 24px;width: 50px;font-size: 12px;color: #fff;position: absolute;top: 31px;right: 13px;height: 24px;cursor: pointer;">关闭</div>' +
-				'</div>';
-			//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 = '<div class="col-xs-6" data-Id="' + k.F_Id + '"> <div style="' + stylex + '" class="portal-panel-title "><i class="' + k.F_Icon + '"></i>&nbsp;&nbsp;' + k.F_Name + '<span class="menu" title="更多"> <span style="border:1px solid ' + k.Color + '" class="point"></span><span style="border:1px solid ' + k.Color + '" class="point"></span><span style="border:1px solid ' + k.Color + '" class="point"></span> </span> </div> <div class="portal-panel-content portal-panel-content2" style="overflow: hidden;padding-top: 20px; padding-left: 30px; padding-right: 50px;height:225px;" data-value="' + k.F_Id + '" ></div></div>';
 
-	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 = '<div class="col-xs-' + (12 / parseInt(k.F_Proportion1)) + '"><div style="'+ stylex+'" class="portal-panel-title">                        <i class="' + k.F_Icon + '"></i>&nbsp;&nbsp;' + k.F_Name + '                    </div>                    <div class="portal-panel-content">                        <div id="' + k.F_Id + '" class="lr-chart-container" data-type="' + k.F_Type + '"   ></div>                    </div>                </div>';
-					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 = '                            <div class="lr-msg-line">                                <a href="#" style="text-decoration: none;" >' + q.f_title + "</a>                                <label>" + q.f_time + "</label>                            </div>";
+                                                var n = $(o);
+                                                n.find("a")[0].item = q;
+                                                l.append(n);
+                                            } else {
+                                                var o = '                            <div class="lr-msg-line lr-msg-line2">                                <a href="#" style="text-decoration: none;" >' + q.f_title + "</a>                                <label>" + q.f_time + "</label>                            </div>";
+                                                var n = $(o);
+                                                n.find("a")[0].item = q;
+                                                l.append(n);
+                                            }
+
+                                        } else {
+                                            var o = '                            <div class="lr-msg-line">                                <a href="#" style="text-decoration: none;" >' + q.f_title + "</a>                                <label>" + q.f_time + "</label>                            </div>";
+                                            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 = '<div class="col-xs-12" id="qjImg" style="position: relative;border-radius: 4px;overflow: hidden;">' +
+                '<a href="/Home/GoQingJu" target="_blank"><img src="/Content/images/qj.jpg" alt="" style="width: 100%;display: block;margin: 20px 0 10px" /></a>' +
+                '<div class="qjClose" style="background: #7c89f3;border-radius: 2px;text-align: center;line-height: 24px;width: 50px;font-size: 12px;color: #fff;position: absolute;top: 31px;right: 13px;height: 24px;cursor: pointer;">关闭</div>' +
+                '</div>';
+            //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 = '<div class="col-xs-' + (12 / parseInt(k.F_Proportion1)) + '"><div style="' + stylex + '" class="portal-panel-title">                        <i class="' + k.F_Icon + '"></i>&nbsp;&nbsp;' + k.F_Name + '                    </div>                    <div class="portal-panel-content">                        <div id="' + k.F_Id + '" class="lr-chart-container" data-type="' + k.F_Type + '"   ></div>                    </div>                </div>';
+                    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 || [])
+        }
+    })
 });

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-admin.js

@@ -74,7 +74,7 @@ var loaddfimg;
             _html += '<li><a href="javascript:void(0);" id="lr_cancelweixinbind_btn"><i class="fa fa-unlock"></i>解绑微信</a></li>';
             _html += '<li><a href="javascript:void(0);" id="lr_schedule_btn"><i class="fa fa-calendar"></i>我的日程</a></li>';
             _html += '<li><a href="javascript:void(0);" id="lr_onlineuser_btn"><i class="fa fa-user"></i>在线人员</a></li>';
-            _html += '<li><a href="javascript:void(0);" id="lr_loginuserbind_btn"><i class="fa fa-group"></i>切换账号</a></li>';
+            //_html += '<li><a href="javascript:void(0);" id="lr_loginuserbind_btn"><i class="fa fa-group"></i>切换账号</a></li>';
             if (loginInfo.isSystem) {
                 _html += '<li><a href="javascript:void(0);" id="lr_clearredis_btn"><i class="fa fa-refresh"></i>清空缓存</a></li>';
             }