diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs index 1338f1914..8c8b4d6c6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/LogController.cs @@ -245,7 +245,7 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers seriesData.Add(model); var model2 = new WfSchemeReportModelOfPie() { - value = aa2.FirstOrDefault(x => x.name == item.text) == null ? 0 : aa.FirstOrDefault(x => x.name == item.text).value, + value = aa2.FirstOrDefault(x => x.name == item.text) == null ? 0 : aa2.FirstOrDefault(x => x.name == item.text).value, name = item.text }; seriesData2.Add(model2); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/UseStatistics.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/UseStatistics.js index 480e571fe..f8e8d31ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/UseStatistics.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Log/UseStatistics.js @@ -1,6 +1,9 @@ var bootstrap = function ($, learun) { "use strict"; var date = ""; + var myChart1; + var myChart2; + var myChart3; var page = { init: function () { page.bind(); @@ -53,9 +56,18 @@ page.search(); }, initChart: function () { - var myChart1 = echarts.init(document.getElementById('main')); - var myChart2 = echarts.init(document.getElementById('main1')); - var myChart3 = echarts.init(document.getElementById('main2')); + if (myChart1 != null && myChart1 != "" && myChart1 != undefined) { + myChart1.dispose(); + } + if (myChart2 != null && myChart2 != "" && myChart2 != undefined) { + myChart2.dispose(); + } + if (myChart3 != null && myChart3 != "" && myChart3 != undefined) { + myChart3.dispose(); + } + myChart1 = echarts.init(document.getElementById('main')); + myChart2 = echarts.init(document.getElementById('main1')); + myChart3 = echarts.init(document.getElementById('main2')); var queryJson = { date: date }; learun.httpAsyncPost(top.$.rootUrl + "/LR_SystemModule/Log/GetUseChartList", { queryJson: JSON.stringify(queryJson) }, function (res) { if (res.code == 200) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs index a16874ce5..5a59b6ba1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs @@ -334,6 +334,9 @@ namespace Learun.Application.Web.Controllers //微信快捷登录 var result4 = teachSwitchIBLL.FindFirst("wxloginforpc"); ViewBag.WeixinLoginSwitch = result4; + //访客注册 + var result5 = teachSwitchIBLL.FindFirst("fk"); + ViewBag.VisitorSwitch = result5; //获取在线用户人数 ViewBag.OnlineUserNum = 0; var onlineUserResult = sys_UpdateRecordIBLL.GetOnlineUserNum(); 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 8aaa60412..da90228a5 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 @@ -72,7 +72,7 @@ var loaddfimg; _html += '