【修改】系统使用统计；登录页配置-预览；隐藏个人头像下拉中的“我的日程”；

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

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

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

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

@@ -72,7 +72,7 @@ var loaddfimg;
             _html += '<ul class="dropdown-menu pull-right">';
             _html += '<li><a href="javascript:void(0);" id="lr_userinfo_btn"><i class="fa fa-user"></i>个人信息</a></li>';
             _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_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>';
             if (loginInfo.isSystem) {

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
   <!--本机-->
-  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
+  <add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <!--126-->
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
@@ -20,10 +20,11 @@
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
 
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=123456;" providerName="MySql.Data.MySqlClient" /><!--金隅-->
+  <add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=123456;" providerName="MySql.Data.MySqlClient" />-->
+  <!--金隅-->
   <!--<add name="BaseDb" connectionString="Server=192.168.100.224;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.100.224;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=192.168.100.224;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
+  <!--本机-->
+  <add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
@@ -18,9 +23,9 @@
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
 
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   <!--金隅-->
 
   <!--西昌-->