From 4d8015f8bed08c9d8de47489aad8692da6bd2aee Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 25 Aug 2020 17:44:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=8E=82=E4=B8=AA=E4=BA=BA=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E4=B8=8D=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/HomeController.cs | 2 +- .../Views/Home/AdminDefault.cshtml | 11 ++- .../Views/LR_Content/script/lr-admin.js | 6 +- .../Views/Shared/_Admin.cshtml | 8 +- .../Views/UserCenter/Index.cshtml | 95 ++++++++++++------- .../Views/UserCenter/Index.js | 2 + 6 files changed, 78 insertions(+), 46 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs index 15106427e..1ef696906 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs @@ -447,7 +447,7 @@ namespace Learun.Application.Web.Controllers switch (learn_UItheme) { case "1": - return View("AdminDefaultForDC"); // 经典版本 + return View("AdminDefault"); // 经典版本 case "2": return View("AdminAccordion"); // 风尚版 case "3": diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml index 51f4ece8a..d00bdda21 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml @@ -15,21 +15,24 @@ @*经典风格*@ 经典风格 -
+
-
+
- @* 即时通讯窗体 *@ @*
在线人数 @ViewBag.OnlineUserNum 人
*@
- + + @if (ViewBag.UnreadNum > 0) + { + @ViewBag.UnreadNum + }
- +
- + @@ -75,12 +75,12 @@ "/Views/LR_Content/plugin/tree/lr-tree.js", "/Views/LR_Content/plugin/select/lr-select.js", - + "/Views/LR_Content/plugin/workflow/lr-workflow-api.js", "/Views/LR_Content/plugin/contextmenu/lr-contextmenu.js", "/Views/LR_Content/script/lr-im.js", - + "/Views/LR_Content/script/lr-admin.js" ) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index 9f1ba9e88..0604b69c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -17,7 +17,7 @@ @@ -396,41 +395,39 @@
  • 民 族 : {{teacherInfo.NationalityNo | nationalityNo}}
  • 政治面貌 : {{teacherInfo.PartyFaceNo | partyFaceNo}}
  • 身份证号 : {{teacherInfo.IdentityCardNo}}
    • -
  • E-mail : {{teacherInfo.EMail}}
    • +
  • 健康状况 : {{teacherInfo.HealthStatusNo | healthStatusNo}}
  • 档案所在地 : {{teacherInfo.LocusOfArchives}}
  • 户口所在地 : {{teacherInfo.LocusOfResidence}}
    • -
    家庭情况
    +
    学历学位信息
    -
    其他
    +
    其他信息
    联系方式
    @@ -452,8 +449,6 @@ $.get('/UserCenter/GetTeacherInfo', function (ref) { this.teacherInfo = ref.data.userInfo; this.baseInfo = ref.data.basecInfo; - console.log(ref); - }.bind(this), "json"); }, getUrl: function () { @@ -485,6 +480,19 @@ }); return result; }, + department: function (value) { + var result; + top.learun.clientdata.getAsync('custmerData', { + sync: true, + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', + key: value, + keyId: 'f_departmentid', + callback: function (_data) { + result = _data.f_fullname; + } + }); + return result; + }, nationalityNo: function (value) { var result; top.learun.clientdata.getAsync('custmerData', { @@ -511,15 +519,15 @@ }); return result; }, - overseasChineseNo: function (value) { + HighestRecordNo: function (value) { var result; top.learun.clientdata.getAsync('custmerData', { sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', key: value, - keyId: 'overseaschineseno', + keyId: 'culturedegreeno', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.culturedegree; } }); @@ -575,15 +583,14 @@ }); return result; }, - foreignLanguageNo: function (value) { + ObtainWayNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdForeignLanguage', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'foreignlanguageno', + code: 'ObtainWay', callback: function (_data) { - result = _data.foreignlanguagename; - }.bind(this) + result = _data.text; + } }); return result; }, @@ -652,6 +659,17 @@ }); return result; }, + ObtainWayOfHighestDegreeNo: function (value) { + var result; + top.learun.clientdata.getAsync('dataItem', { + key: value, + code: 'ObtainWayOfDegree', + callback: function (_data) { + result = _data.text; + } + }); + return result; + }, empSortNo: function (value) { var result; top.learun.clientdata.getAsync('dataItem', { @@ -675,6 +693,17 @@ } }); return result; + }, + IsHasLessonNo: function (value) { + var result; + top.learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoBit', + callback: function (_data) { + result = _data.text; + } + }); + return result; } } @@ -756,7 +785,7 @@ $(function () { var loginInfo = top.learun.clientdata.get(['userinfo']); - $("#headUrl").attr("src", "/LR_OrganizationModule/User/GetImg?userId=" + loginInfo.userId); + $("#headUrl").attr("src", "/LR_OrganizationModule/User/GetImgForDC?userId=" + loginInfo.userId); if ('@ViewBag.UserType' == '学生') { $("#lr_left_list").children('li').eq(4).addClass("active"); @@ -796,4 +825,4 @@ } }); -@Html.AppendJsFile("/Views/UserCenter/Index.js") \ No newline at end of file +@Html.AppendJsFile("/Views/UserCenter/IndexForDC.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.js index ee13c3ed4..520ec786f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.js @@ -69,6 +69,8 @@ var bootstrap = function ($, learun) { learun.alert.error('数据加载失败'); } }.bind(this)); + + //console.log("成功"); } }; refreshGirdData = function () {