-
-
@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css
index c7ae0ee2e..cb5c6ca34 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css
@@ -4,13 +4,14 @@
width: 100%;
padding: 5px;
}
+
.lr-layout-panel {
position: relative;
height: 100%;
width: 100%;
border: 1px solid #ccc;
background: #fff;
- padding-top: 41px;
+ margin-top: 40px;
}
.lr-layout-panel-btn {
@@ -103,7 +104,10 @@
}
.tab-pane {
- position:relative;
- height:100%;
- width:100%;
-}
\ No newline at end of file
+ position: relative;
+/* height: auto;
+ width: auto;
+*/}
+#wf_timeline {
+ margin-top: 41px
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js
index d91892af3..3181196a6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js
@@ -182,9 +182,7 @@ var bootstrap = function ($, learun) {
}
});
- custmerForm.loadForm(nodeInfo.wfForms, true, true);
- console.log(nodeInfo);
if (!processId && nodeId) {
learun.httpAsync('GET', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetChildProcessDetails', { processId: processId, nodeId: nodeId }, function (data) {
@@ -212,12 +210,13 @@ var bootstrap = function ($, learun) {
history = info.TaskLogList;
currentIds = info.CurrentNodeIds;
- // page.loadFlowInfo();
+ // page.loadFlowInfo();
page.loadTimeLine();
}
});
}
+ custmerForm.loadForm(nodeInfo.wfForms, true, true);
},
bind: function () {
@@ -238,16 +237,7 @@ var bootstrap = function ($, learun) {
$('#print').on('click', function () {
//打印checkbox 选中效果打印不出来
$("input[type='checkbox']:checked").attr('checked', 'checked');
- var $iframes = $('#form_list_iframes');
- var iframeId = $iframes.find('.form-list-iframe.active').attr('id');
- if (iframeId) {
- var $iframe = learun.iframe(iframeId, frames);
- $iframe.$('.lr-form-wrap:visible').jqprint();
- }
- else {
- //$iframes.find('.form-list-container.active').find('.lr-form-wrap:visible').jqprint();
- $('#form_list_iframes').jqprint();
- }
+ $.print('.lr-layout-panel');
});
$('#print').show();
},
@@ -344,6 +334,7 @@ var bootstrap = function ($, learun) {
callback: function (departmentMap) {
learun.clientdata.getAllAsync('user', {
callback: function (userMap) {
+ history.sort(compareFunction("F_CreateDate"));
for (var i = 0, l = history.length; i < l; i++) {
var item = history[i];
@@ -414,7 +405,7 @@ var bootstrap = function ($, learun) {
nodelist.push(point);
}
- $('#wf_timeline').lrtimeline(nodelist);
+ $('#wf_timeline').lrtimelineEsc(nodelist);
}
});
}
@@ -427,4 +418,22 @@ var bootstrap = function ($, learun) {
};
page.init();
+}
+
+function compareFunction(propertyName) {
+ return function (src, tar) {
+ //获取比较的值
+ var v1 = src[propertyName];
+ var v2 = tar[propertyName];
+ if (v1 > v2) {
+ return 1;
+ }
+ if (v1 < v2) {
+ return -1;
+
+ }
+ return 0;
+
+ };
+
}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/_sgbak/UserController.cs.71093.4.2020-07-27.16-58-03.6089 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/_sgbak/UserController.cs.71093.4.2020-07-27.16-58-03.6089
deleted file mode 100644
index 13df7c92b..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/_sgbak/UserController.cs.71093.4.2020-07-27.16-58-03.6089
+++ /dev/null
@@ -1,400 +0,0 @@
-using Learun.Application.Organization;
-using Learun.Util;
-using System.Collections.Generic;
-using System.Web.Mvc;
-using Learun.Application.Base.AuthorizeModule;
-using System.Linq;
-using System;
-using Learun.Application.Base.SystemModule;
-
-namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
-{
- ///
- /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园
- /// Copyright (c) 2013-2018 北京泉江科技有限公司
- /// 创建人：陈彬彬
- /// 日 期：2017.03.09
- /// 描 述：用户管理控制器
- ///
- public class UserController : MvcControllerBase
- {
- private UserIBLL userIBLL = new UserBLL();
- private DepartmentIBLL departmentIBLL = new DepartmentBLL();
- private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
- private RoleIBLL roleIBLL = new RoleBLL();
-
-
- #region 获取视图
-
- [HttpGet]
- public ActionResult StudentIndex()
- {
- return View();
- }
-
- ///
- /// 用户管理主页
- ///
- ///
- [HttpGet]
- public ActionResult Index()
- {
- return View();
- }
- ///
- /// 用户管理表单
- ///
- ///
- [HttpGet]
- public ActionResult Form()
- {
- return View();
- }
-
- ///
- /// 人员选择
- ///
- ///
- [HttpGet]
- public ActionResult SelectForm()
- {
- return View();
- }
- [HttpGet]
- public ActionResult LookForm()
- {
- return View();
- }
- ///
- /// 人员选择
- ///
- ///
- [HttpGet]
- public ActionResult SelectOnlyForm()
- {
- return View();
- }
-
-
- #endregion
-
- #region 获取数据
- ///
- /// 获取分页数据
- ///
- ///
分页参数
- ///
关键字
- ///
公司主键
- ///
部门主键
- ///
0 教师 1学生
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetPageList(string pagination, string keyword, string companyId, string departmentId, string tp)
- {
- Pagination paginationobj = pagination.ToObject
();
- var data = userIBLL.GetPageList(companyId, departmentId, paginationobj, keyword, tp);
- var jsonData = new
- {
- rows = data,
- total = paginationobj.total,
- page = paginationobj.page,
- records = paginationobj.records,
- };
- return JsonResult(jsonData);
- }
- ///
- /// 获取用户列表
- ///
- /// 公司主键
- /// 部门主键
- /// 查询关键词
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetList(string companyId, string departmentId, string keyword)
- {
- if (string.IsNullOrEmpty(companyId))
- {
- var department = departmentIBLL.GetEntity(departmentId);
- if (department != null)
- {
- var data = userIBLL.GetList(department.F_CompanyId, departmentId, keyword);
- return JsonResult(data);
- }
- else
- {
- return JsonResult(new List());
- }
- }
- else
- {
- var data = userIBLL.GetList(companyId, departmentId, keyword);
- return JsonResult(data);
- }
- }
- ///
- /// 根据部门获取用户
- ///
- /// 部门主键
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetListByDepartmentId(string departmentId)
- {
- var data = userIBLL.GetListByDepartmentId(departmentId);
- return JsonResult(data);
- }
- ///
- /// 获取本部门的人员
- ///
- /// 公司主键
- /// 部门主键
- /// 查询关键词
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetMyDepartmentList()
- {
- UserInfo userinfo = LoginUserInfo.Get();
- var data = userIBLL.GetList(userinfo.companyId, userinfo.departmentId, "");
- return JsonResult(data);
- }
- ///
- /// 获取用户信息列表
- ///
- /// 用户主键串
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetListByUserIds(string keyValue)
- {
- var list = userIBLL.GetListByUserIds(keyValue);
- string text = "";
- foreach (var item in list)
- {
- if (!string.IsNullOrEmpty(text))
- {
- text += ",";
- }
- text += item.F_RealName;
- }
- return SuccessString(text);
- }
- ///
- /// 获取用户信息列表
- ///
- /// 用户主键串
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetEntityListByUserIds(string keyValue)
- {
- var list = userIBLL.GetListByUserIds(keyValue);
- return JsonResult(list);
- }
-
- ///
- /// 获取用户信息
- ///
- /// 用户主键
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetUserEntity(string userId)
- {
- var data = userIBLL.GetEntityByUserId(userId);
- return JsonResult(data);
- }
-
- ///
- /// 获取映射数据
- ///
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetMap(string ver)
- {
- var data = userIBLL.GetModelMap();
- string md5 = Md5Helper.Encrypt(data.ToJson(), 32);
- if (md5 == ver)
- {
- return Success("no update");
- }
- else
- {
- var jsondata = new
- {
- data = data,
- ver = md5
- };
- return JsonResult(jsondata);
- }
- }
- ///
- /// 获取头像
- ///
- /// 用户主键
- ///
- [HttpGet]
- public ActionResult GetImg(string userId)
- {
- userIBLL.GetImg(userId);
- return Success("获取成功。");
- }
- [HttpGet]
- public ActionResult GetImgForDC(string userId)
- {
- userIBLL.GetImg(userId);
- return Success("获取成功。");
- }
- [HttpGet]
- public ActionResult GetRoleList(string objectId)
- {
- var roleList = userRelationIBLL.GetRoleListByUserId(objectId);
- var jsonResult = new { roleInfoList = roleList };
- return Success(jsonResult);
- }
-
- [HttpGet]
- [AjaxOnly]
- public ActionResult GetLastLoginTime(string userId)
- {
- return Success(LogBLL.GetUserLogList(userId)?.F_OperateTime);
- }
-
- #endregion
-
- #region 提交数据
- ///
- /// 保存表单数据
- ///
- /// 主键
- /// 实体
- ///
- [HttpPost]
- [ValidateAntiForgeryToken]
- [AjaxOnly]
- public ActionResult SaveForm(string keyValue, UserEntity entity)
- {
- userIBLL.SaveEntity(keyValue, entity);
- return Success("保存成功！");
- }
- ///
- /// 删除表单数据
- ///
- /// 主键
- ///
- [HttpPost]
- [AjaxOnly]
- public ActionResult DeleteForm(string keyValue)
- {
- //userIBLL.VirtualDelete(keyValue);
- userIBLL.VirtualDeleteBatch(keyValue);
- return Success("删除成功！");
- }
- ///
- /// 启用禁用账号
- ///
- /// 主键
- ///
- [HttpPost]
- [AjaxOnly]
- public ActionResult UpdateState(string keyValue, int state)
- {
- userIBLL.UpdateState(keyValue, state);
- return Success("操作成功！");
- }
- ///
- /// 重置用户账号密码
- ///
- /// 主键
- ///
- [HttpPost]
- [AjaxOnly]
- public ActionResult ResetPassword(string keyValue)
- {
- userIBLL.ResetPassword(keyValue);
- return Success("操作成功！");
- }
- ///
- /// 重置用户账号密码(八位)
- ///
- /// 主键
- ///
- [HttpPost]
- [AjaxOnly]
- public ActionResult ResetPasswordEight(string keyValue)
- {
- userIBLL.ResetPasswordEight(keyValue);
- return Success("操作成功！");
- }
-
-
- [HttpGet]
- [AjaxOnly]
- public ActionResult ResetStudentRelation()
- {
- var allStudents = userIBLL.GetStudents();
- var studentRoleId = roleIBLL.GetIdByRoleName("学生");
-
- var hasStudentsRolePeople = userRelationIBLL.GetUserIdList(studentRoleId).Select(a => a.F_UserId);
- var studentList = allStudents.Where(a => !hasStudentsRolePeople.Contains(a.F_UserId));
- var relationList = new List();
- var userIds = "";
- foreach (var item in allStudents)
- {
- if (userIds != "")
- {
- userIds += ",";
- }
- userIds += item.F_UserId;
-
- }
- userRelationIBLL.SaveEntityList(studentRoleId, 1, userIds);
- return Success("操作成功");
-
-
- }
- #endregion
-
- #region 数据导出
- ///
- /// 导出用户列表
- ///
- ///
- [HttpGet]
- public ActionResult ExportUserList()
- {
- userIBLL.GetExportList();
- return Success("导出成功。");
- }
- ///
- /// 导出用户列表【学生】
- ///
- ///
- [HttpGet]
- public ActionResult ExportUserListOfStudent()
- {
- userIBLL.GetExportListOfStudent();
- return Success("导出成功。");
- }
- #endregion
-
- #region 验证数据
- ///
- /// 账号不能重复
- ///
- /// 主键
- /// 账号
- ///
- [HttpGet]
- [AjaxOnly]
- public ActionResult ExistAccount(string keyValue, string F_Account)
- {
- bool res = userIBLL.ExistAccount(F_Account, keyValue);
- return JsonResult(res);
- }
- #endregion
- }
-}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_Function/_sgbak/Form.cshtml.16888.1.2020-06-19.10-50-39.9112 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_Function/_sgbak/Form.cshtml.16888.1.2020-06-19.10-50-39.9112
deleted file mode 100644
index 3283afc24..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_Function/_sgbak/Form.cshtml.16888.1.2020-06-19.10-50-39.9112
+++ /dev/null
@@ -1,47 +0,0 @@
-@{
- ViewBag.Title = "应用管理";
- Layout = "~/Views/Shared/_Form.cshtml";
-}
-
-@Html.AppendJsFile("/Areas/Permission/Views/Perm_Function/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/echarts/map/china/_sgbak/taiwan.js.17026.1.2019-11-25.12-02-55.3777 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/echarts/map/china/_sgbak/taiwan.js.17026.1.2019-11-25.12-02-55.3777
deleted file mode 100644
index 95afe195e..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/echarts/map/china/_sgbak/taiwan.js.17026.1.2019-11-25.12-02-55.3777
+++ /dev/null
@@ -1 +0,0 @@
-(function (root, factory) {if (typeof define === 'function' && define.amd) {define(['exports', 'echarts'], factory);} else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {factory(exports, require('echarts'));} else {factory({}, root.echarts);}}(this, function (exports, echarts) {var log = function (msg) {if (typeof console !== 'undefined') {console && console.error && console.error(msg);}};if (!echarts) {log('ECharts is not Loaded');return;}if (!echarts.registerMap) {log('ECharts Map is not loaded');return;}echarts.registerMap('台湾', {"type":"FeatureCollection","features":[{"type":"Feature","id":"710000","properties":{"name":"台湾省","cp":[121.509062,25.044332],"childNum":82},"geometry":{"type":"MultiPolygon","coordinates":[["@@@BBB@@B@@@@@@B@@@@B@@A@@@@@@BB@@B@@AB@@@@@BA@@@@@@BA@@@@BA@@@@@A@@B@@@@@@@@A@@@@@@B@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@A@@@@@@AA@@@@@@@@@@@@@@@@A@@@@@@@@@@A@@@@@@A@@@@@@@@@A@@A@@@BA@@@AA@@@@A@AB@@A@@@A@@@@B@@A@@BA@@B@@A@@@@@@@@B@@@@@@@@@@@B@@@@@BDB"],["@@@@@@@@@@@A@@@@@@@@@@@@@B"],["@@@@@@@@@@@@B@A@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@B@@@@@A@@@@@@@@@B@@@AA@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@B@@@@@@B@@@@@@@"],["@@B@DA@@@@B@@@@@@@@AA@@@A@@@@@A@@@@@@AA@@@A@@@A@@@A@@@@B@@@@@BB@@@@@@@@@BB@@@@B@"],["@@@@B@@@@@@@@@@@@@@@A@@@@@@@@@@@"],["@@@@@@@@@A@@@@@@@@@@@B@@"],["@@DHBDB@DC@KACEA@@ADAF"],["@@BDDBBBDAFE@C@@CAI@@@CF"],["@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@@@@@@@@@@@@@@B@A@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@A@@@@@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@B@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@"],["@@@@@@@@@@B@@@@B@@@A@@@@@B@@@@@@@AB@@@@@@@@@@@@@A@@@@@@@@@@@@@@@@@A@@@@@@@"],["@@@FFD@@BABABCCE@CA@ABCF@@"],["@@B@@@@@@@@@@@@@@@@@@@@@AA@@@@@BA@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@"],["@@BBFDD@@@B@@BB@@@@@B@@@B@B@@@@@D@@@B@B@@AB@@@B@B@BA@@@@@B@@B@@@@@@A@@@@B@@@B@@@@@@@@@@@@@@@@@B@@@BABADABABA@A@@B@AA@@@AA@@@AA@@A@@@A@@@@@A@@@A@@@@@A@A@@@@@A@@@A@@@A@@@A@@@A@@@A@@@@@@@AB@@@@@@A@A@@@@A@@@@A@@A@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@A@@AB@@@A@@A@@@BA@@@A@@@A@AAAAC@CAAAC@@BA@@@A@@@@@A@@@@@@B@@AB@B@B@BBFDDDBDB"],["@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@B@@@@@@AA@@@@@"],["@@@@@@B@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@"],["@@@@B@@@@@@@@@A@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@B@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@A@@@@A@@@@B@@B@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@B@@@@@A@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@A@@@@@@@B@@@@"],["@@@B@@B@@@@@@@@A@@@@@@@@A@@@@@@@@@"],["@@B@@AB@@A@@@@@@@@B@@@@@@@B@@@A@@A@@@@@@@@@@@@@@@@@@@@@A@@@@@@A@@@@@@@@@@@@@@@@@B@@A@@@@@@@@A@@@A@@@@AA@@@@@@@@@@@@B@@@@@@@@A@@@@@@@@@@B@@@B@@@@@@@BA@@@@BA@@B@BA@@@@@@@@@@@A@@@@@B@@@@@@@@BB@@@@@B@@@@@@B@@@@@@@BB@@@@@@@@@B@@@@A@@@@@@@@A@@@@@@@@@@@@@B@@A@@A@@@@AB@@@@@@@@@@@@@@@@@@@@@@A"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@A@@@@@B@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@B@@@@@BA@@@@B@@AB@@@B@@A@@@@@@@@@A@@@@@@@@B@@@@@@@@@@A@@@@@@@@@@@@A@@A@@@@A@C@ABA@A@AB@@@@@@@@@@@@@@@@@@A@@@@@A@@@A@@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@BB@@@B@B@@@DB"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@B"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@B@@@@@@@@@@@A@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@A@@@@@@@@@@@B@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@B@@@@@"],["@@BB@@D@BA@@ACAA@@CB@D"],["@@@BD@BA@A@@AAABA@@B"],["@@BNHFNHN@@@BGFI@@AAEAECECIEEAGBAH"],["@@@@@BB@BAB@@AAAA@AB@B"],["@@BVFLTZLLHJLPHJJNNPHJFFFB@@BC@AKOW[WaEM@GGIGGGGCGCEAGEEAA@@EF@@"],["@@LTHHFHHHDDDBJADB@@@@@@KMIIIIOQEA@@@@AD"],["@@BD@@F@BCB@ACC@A@ABAB"],["@@@BBBF@@@@@@CAACAAB@B"],["@@@BDBDABC@@CA@@C@AB@B"],["@@nn]Nµoz[¹ňiÚĎUÒGtANCDV±v]ROXEZDhD`J\\N\\NX^°f¼FfHVLRTZVzHDH¦H ALK^[|I`AdFdFpF¸A\\FP^f\\\\XlZhVbLRnXbRhRXHTXHTTBRPdZZ^XVv`ºtzPxV|l~t¸¾|rv\\`b|f`~lVV\\TrVdRhTX\\`fLPJJ^TJFNXHTJFpHZJXLZZlZhZlPZ^`jd\\jLZHjFRFJJFHDPD^BZLfZPJNFhDL@LDjd|bv^xJèRV^PfnVZrdVpV|VhHvDr@bIjShuP]LWHE^KZA\\IJO@aDU|qRKJA`BbAlKbK^WNCt@F\\@LILEBGCMBaBgDSTLMNATBbARGNEHERKHMAMc_oeycgya_sIoC{@oFul¿|D]G§ImUcGWEkOYUMk
w¿ckW[QoCa[giaK[DiL[XiH[CQeg
ƅƙcCiDaAeEIQeYU¹GsEWMYIKKMUWW[M]OkBQCMSq@KHgRsFO@QAIEGGIKKMKMGYKOASICEQyMYycasce[YMSgOgYew{scÇyUaOKMU}AeAUSOSU[{ċmË_µEE«EC{@]@MFMHMDgCE[ISKKOYKSWKIIEYBcFcDaFoKOIGMCWDMH]^j_FQBQMIKWAWFQFSNmW\\_¦@ZJVJVAA¤OMI^M\\_xecvWd_^WPmT^"],["@@LFBBHLBB@DBDB@F@@A@AAA@ABAD@D@DAFEBE@CACCAE@A@@C@CA@EBE@A@CAAECIAC@@AB@B@DCJA@ABC@@B@D@BBD"],["@@BBB@B@BABA@A@@@@B@@@@B@@@@@@B@@AAA@@@@A@@@@@@A@@@AAA@@@@@A@A@@@@B@@A@@@A@@B@@@AAAAA@@@A@@B@@@@@B@@@BB@@D@B@@@B@B@@@@@@ABA@@BA@@B@B"],["@@BBBBF@B@@@BBB@B@BAB@B@BA@@@ACACAAAA@@@E@A@A@@@CB@B@B@@"],["@@@JDHB@BBFHBLDFHBF@HGLIFALAJDDABC@CGKEAKAOACAAAAC@EDKBI@M@IEKAAC@C@A@@CDIBACGAE@A@EBCDEBEACECG@QDEBCBA@A@CAAEE@I@ECICG@IBAB@DBFRHDBDJDBD@FCFCF@FDBDBDF@BDBJ@FCDGFIBABBHDDF@BC@AB@D@BD@HBHDFBBBBABCBEFAD@DDF@D@D"],["@@DDBB@@B@DAD@D@@AB@@C@GACEEE@C@AAA@ADE@@BBB@@GD@D@B@BB@B@BAD@BBBB"],["@@`JPDLFHAFEFAF@BBD@JAHGDIFC@ACCBGFEAGAGA@GBEACC@EBEFAH@DCAECAC@AA@C@EACCCECCB@DCBC@CAEAA@ADDLBDFDBHADKHKPEL@FCBE@GEEICCEAMDIHAFBNFH"],["@@IGEGOGEGECEBECGMAE@AFA@EAECCACBGACACE@MFIBGASCGCGBCF@F@FBFAFEDGBGCCBEFAD@DAD@BC@A@AB@DCBABCAEBAHBLHLDFH@DIBC@IHIBGBC@CD@DFHDHCDABGDAD@BDDFF@JAFAFBBBAF@DBDBDBDADEDK@YEOBIFAH@FBDBBFADAB@BDADABICG@C@AD@BBBDB@B@FADDDDBFBBDCHEH@DBBN@LBFDDHDBDBDADIBGDKDEF@DB@HBDFDFFBHEH@LDFDBVBF@FFLBFCJMFAHBFHDHJBF@FGBGDEF@D@DHF@FCJMLSBW@MHELCFGCKSEOAMDOJMDUAIE"],["@@@F@@BBF@BA@A@AB@B@DA@@DB@BBB@BBBF@FDDBFBDABBBBBBB@JEBA@A@ACAC@EAMICAE@E@EAA@C@CCC@C@CBADBF"],["@@CBAB@DBBBB@BBBBAB@B@@@BBB@BA@C@E@AEAE@"],["@@DBDAB@B@BBAD@BDDD@BAB@@BB@@@D@B@BBDBDADABC@EBA@A@A@@AACBA@C@A@CBCAEACCAC@A@AAAABAB@BC@A@A@AF@D@D"],["@@ADADAB@DDDF@DEBEBAD@@@DDBDD@DABC@C@CAIBEBEBABA@ACC@AD@BBBDBBDABCAIAAE@CAA@@A@C@C@C@CFE@A@@G@EBCBCAE@E@G@AAC@CD@D@FFHFB@FAFAL@LBDDB@DAB@B"],["@@B@@BB@@B@B@B@B@BB@B@DAFCBA@@@@@AB@BBB@BABABA@AA@AAA@@A@@@CAAA@EAC@A@AAA@A@AAA@A@@DCDBDBDBD"],["@@@BB@@B@@@@@B@A@@BA@@BA@@@A@@B@@@@A@@A@A@@@@@@B@@A@@@@A@@@@AB@@@@@@@B@@@@"],["@@@B@BBB@@B@@@BA@A@@@A@A@@B@@A@A@@A@@@A@@@A@A@@@@B@B@B"],["@@`FPBLAFC@AEGAG@K@GCCA@EBC@GCAG@GACA@C@MDIBABADBDDFDFEFCDGHAF@DDDJB"],["@@DBD@B@B@B@BA@@@CAAA@A@@A@@@@@AA@@@@AA@AA@@@@@A@AA@@@ABCA@@@AAAA@AB@B@B@BDBB@BB@D@BBB@B"],["@@CF@B@BBBB@DADBBAB@BEACB@AA@@E@CBA@"],["@@HBHBF@DABA@AAAAA@@@A@AB@@A@AA@A@A@AAA@C@@BA@A@CBAD@@A@@B@B@B@B"],["@@LDH@HABA@CAC@A@AAACAAAAC@C@CAAAC@@AA@BED@DA@CF@BBB@D@BAB@B@D@B@B"],["@@NHBJBJ@FBDJJHBTHHAPKBEAGGIMIMKGEIIICG@GHCFBH"],["@@NIHAzBVDPBL@DADIAGAE@KFKDEBCCAGAC@CE@IBIDGPIXKVGBE@GAIGOMOGAK@]LIXMJODS@MFY\\UNELDXDF@FCHOLCD@JBFJDJ@"],["@@AB@BBBD@JDD@D@@ABA@C@E@CAAAACAC@C@ABAD@DABAB"],["@@RCL@JDFBDADBB@BAF@FAJDL@DA@EBIDE@EACACAEBGCCEACCCE@CDGHG@CAEEAO@EBCDAHGFOFG@GBAD@DBHBHCDAJEDEHAJAHDB"],["@@HED@D@B@BFDHFBD@HAHEBC@EBADAB@BA@CACCCC@A@ADA@E@EAC@G@IDCHCDCBAB@B@B@@B@"],["@@@DBDB@BBDA@ABC@AACAAA@A@CB@D"],["@@HFH@F@BABC@E@EACECCAEBEDCFAFDD"],["@@LFN@JCHI@I@IEGGAMBKBCLCJDL"]],"encodeOffsets":[[[126651,26546]],[[126660,26547]],[[126659,26546]],[[126661,26545]],[[127552,26543]],[[126662,26541]],[[126660,26540]],[[126515,26405]],[[126526,26402]],[[126513,26397]],[[126513,26396]],[[126509,26395]],[[126510,26395]],[[126548,26376]],[[126537,26371]],[[126433,26363]],[[126456,26365]],[[126461,26357]],[[126459,26356]],[[126459,26356]],[[126460,26356]],[[126459,26356]],[[126445,26356]],[[126458,26356]],[[126458,26356]],[[126458,26356]],[[126457,26356]],[[126457,26356]],[[126429,26350]],[[126512,26346]],[[126512,26347]],[[126512,26347]],[[126515,26343]],[[126520,26341]],[[126514,26339]],[[126514,26339]],[[126515,26339]],[[126513,26338]],[[126513,26338]],[[126526,26337]],[[126527,26337]],[[126526,26337]],[[126527,26336]],[[126526,26336]],[[126527,26336]],[[122469,24374]],[[122474,24363]],[[122424,24251]],[[122554,24186]],[[122886,24033]],[[122929,24079]],[[122214,23857]],[[123719,22284]],[[123719,22276]],[[123335,22980]],[[122472,24310]],[[122427,24288]],[[122531,24227]],[[122375,24193]],[[122479,24184]],[[122427,24235]],[[122518,24117]],[[122382,24050]],[[122390,24070]],[[122392,23926]],[[122366,23948]],[[122185,23966]],[[122188,23883]],[[122204,23878]],[[122288,23774]],[[122388,23820]],[[122378,23824]],[[122484,23808]],[[122542,23818]],[[123244,22864]],[[124427,22618]],[[124526,22475]],[[124384,23221]],[[124866,25441]],[[125038,26094]],[[125007,26245]],[[124862,26043]]]}}],"UTF8Encoding":true});}));
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jQuery.print.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jQuery.print.js
new file mode 100644
index 000000000..19049eca7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jQuery.print.js
@@ -0,0 +1,255 @@
+/* @license
+ * jQuery.print, version 1.5.1
+ * (c) Sathvik Ponangi, Doers' Guild
+ * Licence: CC-By (http://creativecommons.org/licenses/by/3.0/)
+ *--------------------------------------------------------------------------*/
+(function ($) {
+ "use strict";
+ // A nice closure for our definitions
+ function getjQueryObject(string) {
+ // Make string a vaild jQuery thing
+ var jqObj = $("");
+ try {
+ jqObj = $(string)
+ .clone();
+ } catch (e) {
+ jqObj = $("")
+ .html(string);
+ }
+ return jqObj;
+ }
+
+ function printFrame(frameWindow, content, options) {
+ // Print the selected window/iframe
+ var def = $.Deferred();
+ try {
+ frameWindow = frameWindow.contentWindow || frameWindow.contentDocument || frameWindow;
+ var wdoc = frameWindow.document || frameWindow.contentDocument || frameWindow;
+ if(options.doctype) {
+ wdoc.write(options.doctype);
+ }
+ wdoc.write(content);
+ wdoc.close();
+ var printed = false;
+ var callPrint = function () {
+ if(printed) {
+ return;
+ }
+ // Fix for IE : Allow it to render the iframe
+ frameWindow.focus();
+ try {
+ // Fix for IE11 - printng the whole page instead of the iframe content
+ if (!frameWindow.document.execCommand('print', false, null)) {
+ // document.execCommand returns false if it failed -http://stackoverflow.com/a/21336448/937891
+ frameWindow.print();
+ }
+ // focus body as it is losing focus in iPad and content not getting printed
+ $('body').focus();
+ } catch (e) {
+ frameWindow.print();
+ }
+ frameWindow.close();
+ printed = true;
+ def.resolve();
+ }
+ // Print once the frame window loads - seems to work for the new-window option but unreliable for the iframe
+ $(frameWindow).on("load", callPrint);
+ // Fallback to printing directly if the frame doesn't fire the load event for whatever reason
+ setTimeout(callPrint, options.timeout);
+ } catch (err) {
+ def.reject(err);
+ }
+ return def;
+ }
+
+ function printContentInIFrame(content, options) {
+ var $iframe = $(options.iframe + "");
+ var iframeCount = $iframe.length;
+ if (iframeCount === 0) {
+ // Create a new iFrame if none is given
+ $iframe = $('')
+ .prependTo('body')
+ .css({
+ "position": "absolute",
+ "top": -999,
+ "left": -999
+ });
+ }
+ var frameWindow = $iframe.get(0);
+ return printFrame(frameWindow, content, options)
+ .done(function () {
+ // Success
+ setTimeout(function () {
+ // Wait for IE
+ if (iframeCount === 0) {
+ // Destroy the iframe if created here
+ $iframe.remove();
+ }
+ }, 1000);
+ })
+ .fail(function (err) {
+ // Use the pop-up method if iframe fails for some reason
+ console.error("Failed to print from iframe", err);
+ printContentInNewWindow(content, options);
+ })
+ .always(function () {
+ try {
+ options.deferred.resolve();
+ } catch (err) {
+ console.warn('Error notifying deferred', err);
+ }
+ });
+ }
+
+ function printContentInNewWindow(content, options) {
+ // Open a new window and print selected content
+ var frameWindow = window.open();
+ return printFrame(frameWindow, content, options)
+ .always(function () {
+ try {
+ options.deferred.resolve();
+ } catch (err) {
+ console.warn('Error notifying deferred', err);
+ }
+ });
+ }
+
+ function isNode(o) {
+ /* http://stackoverflow.com/a/384380/937891 */
+ return !!(typeof Node === "object" ? o instanceof Node : o && typeof o === "object" && typeof o.nodeType === "number" && typeof o.nodeName === "string");
+ }
+ $.print = $.fn.print = function () {
+ // Print a given set of elements
+ var options, $this, self = this;
+ // console.log("Printing", this, arguments);
+ if (self instanceof $) {
+ // Get the node if it is a jQuery object
+ self = self.get(0);
+ }
+ if (isNode(self)) {
+ // If `this` is a HTML element, i.e. for
+ // $(selector).print()
+ $this = $(self);
+ if (arguments.length > 0) {
+ options = arguments[0];
+ }
+ } else {
+ if (arguments.length > 0) {
+ // $.print(selector,options)
+ $this = $(arguments[0]);
+ if (isNode($this[0])) {
+ if (arguments.length > 1) {
+ options = arguments[1];
+ }
+ } else {
+ // $.print(options)
+ options = arguments[0];
+ $this = $("html");
+ }
+ } else {
+ // $.print()
+ $this = $("html");
+ }
+ }
+ // Default options
+ var defaults = {
+ globalStyles: true,
+ mediaPrint: false,
+ stylesheet: null,
+ noPrintSelector: ".no-print",
+ iframe: true,
+ append: null,
+ prepend: null,
+ manuallyCopyFormValues: true,
+ deferred: $.Deferred(),
+ timeout: 750,
+ title: null,
+ doctype: ''
+ };
+ // Merge with user-options
+ options = $.extend({}, defaults, (options || {}));
+ var $styles = $("");
+ if (options.globalStyles) {
+ // Apply the stlyes from the current sheet to the printed page
+ $styles = $("style, link, meta, base, title");
+ } else if (options.mediaPrint) {
+ // Apply the media-print stylesheet
+ $styles = $("link[media=print]");
+ }
+ if (options.stylesheet) {
+ // Add a custom stylesheet if given
+ $styles = $.merge($styles, $(''));
+ }
+ // Create a copy of the element to print
+ var copy = $this.clone();
+ // Wrap it in a span to get the HTML markup string
+ copy = $("")
+ .append(copy);
+ // Remove unwanted elements
+ copy.find(options.noPrintSelector)
+ .remove();
+ // Add in the styles
+ copy.append($styles.clone());
+ // Update title
+ if (options.title) {
+ var title = $("title", copy);
+ if (title.length === 0) {
+ title = $("");
+ copy.append(title);
+ }
+ title.text(options.title);
+ }
+ // Appedned content
+ copy.append(getjQueryObject(options.append));
+ // Prepended content
+ copy.prepend(getjQueryObject(options.prepend));
+ if (options.manuallyCopyFormValues) {
+ // Manually copy form values into the HTML for printing user-modified input fields
+ // http://stackoverflow.com/a/26707753
+ copy.find("input")
+ .each(function () {
+ var $field = $(this);
+ if ($field.is("[type='radio']") || $field.is("[type='checkbox']")) {
+ if ($field.prop("checked")) {
+ $field.attr("checked", "checked");
+ }
+ } else {
+ $field.attr("value", $field.val());
+ }
+ });
+ copy.find("select").each(function () {
+ var $field = $(this);
+ $field.find(":selected").attr("selected", "selected");
+ });
+ copy.find("textarea").each(function () {
+ // Fix for https://github.com/DoersGuild/jQuery.print/issues/18#issuecomment-96451589
+ var $field = $(this);
+ $field.text($field.val());
+ });
+ }
+ // Get the HTML markup string
+ var content = copy.html();
+ // Notify with generated markup & cloned elements - useful for logging, etc
+ try {
+ options.deferred.notify('generated_markup', content, copy);
+ } catch (err) {
+ console.warn('Error notifying deferred', err);
+ }
+ // Destroy the copy
+ copy.remove();
+ if (options.iframe) {
+ // Use an iframe for printing
+ try {
+ printContentInIFrame(content, options);
+ } catch (e) {
+ // Use the pop-up method if iframe fails for some reason
+ console.error("Failed to print from iframe", e.stack, e.message);
+ printContentInNewWindow(content, options);
+ }
+ } else {
+ // Use a new window for printing
+ printContentInNewWindow(content, options);
+ }
+ return this;
+ };
+})(jQuery);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/_sgbak/LoginController.cs.33525.3.2019-11-29.16-47-29.4693 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/_sgbak/LoginController.cs.33525.3.2019-11-29.16-47-29.4693
deleted file mode 100644
index d844e272d..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/_sgbak/LoginController.cs.33525.3.2019-11-29.16-47-29.4693
+++ /dev/null
@@ -1,409 +0,0 @@
-using System;
-using System.Configuration;
-using System.IO;
-using Learun.Application.Organization;
-using Learun.Application.Base.SystemModule;
-using Learun.Util;
-using Learun.Util.Operat;
-using System.Web.Mvc;
-using ServiceStack;
-using ServiceStack.Text;
-using HttpMethods = Learun.Util.HttpMethods;
-using Learun.Application.TwoDevelopment.LR_Desktop;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using Quanjiang.DigitalScholl.WebLicense;
-using Learun.Application.TwoDevelopment.EducationalAdministration;
-using Newtonsoft.Json;
-
-namespace Learun.Application.Web.Controllers
-{
- ///
- /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园
- /// Copyright (c) 2013-2018 北京泉江科技有限公司
- /// 创建人：陈彬彬
- /// 日 期：2017.03.08
- /// 描 述：登录控制器
- ///
- [HandlerLogin(FilterMode.Ignore)]
- public class LoginController : MvcControllerBase
- {
- #region 模块对象
- private UserIBLL userBll = new UserBLL();
- private Sys_QRCodeInLoginIBLL sys_QRCodeInLoginIBLL = new Sys_QRCodeInLoginBLL();
- private Sys_UpdateRecordIBLL sys_UpdateRecordIBLL = new Sys_UpdateRecordBLL();
- private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL();
- #endregion
-
- #region 视图功能
- ///
- /// 默认页面
- ///
- ///
- [HttpGet]
- public ActionResult Default()
- {
-
- return RedirectToAction("Index", "Login");
- }
- ///
- /// 登录页面
- ///
- ///
- [HttpGet]
- public ActionResult Index()
- {
- //授权验证
- var lc = LicenseChecker.CheckLicense();
- if (!lc.Result)
- {
- return Content("");
- }
- ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum();
- //获取高职版跳转地址
- ViewBag.DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"];
- ViewBag.Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port;
-
- //获取登录页二维码配置信息
- ViewBag.HasQRCode = false;
- var qrcodelist = sys_QRCodeInLoginIBLL.GetList().ToList().Where(x => x.EnabledMark == 1).OrderByDescending(x => x.CreateTime);
- if (qrcodelist.Any())
- {
- ViewBag.HasQRCode = true;
- ViewBag.QRCodeUrl = qrcodelist.FirstOrDefault().QRCodeUrl;
- ViewBag.Title = qrcodelist.FirstOrDefault().Title;
- }
-
- //获取登录页面版本号
- ViewBag.Version = false;
- var versionlist = sys_UpdateRecordIBLL.GetList().OrderByDescending(x => x.UpdateTime);
- if (versionlist.Any())
- {
- ViewBag.Version = true;
- ViewBag.VersionNum = versionlist.FirstOrDefault().VersionNum;
- ViewBag.VersionList = JsonConvert.SerializeObject(versionlist);
- }
-
- var result = teachSwitchIBLL.FindFirst();
- ViewBag.TeachSwitch = result;
-
- //获取在线用户人数
- ViewBag.OnlineUserNum = 0;
- var onlineUserResult = sys_UpdateRecordIBLL.GetOnlineUserNum();
- if (onlineUserResult != null)
- {
- ViewBag.OnlineUserNum = onlineUserResult.OnlineUserNum;
- }
-
- return View("Default");
- //string learn_UItheme = WebHelper.GetCookie("Learn_ADMS_V6.1_UItheme");
- //switch (learn_UItheme)
- //{
- // case "1":
- // return View("Default"); // 经典版本
- // case "2":
- // return View("Accordion"); // 手风琴版本
- // case "3":
- // return View("Window"); // Windos版本
- // case "4":
- // return View("Top"); // 顶部菜单版本
- // default:
- // return View("Default"); // 经典版本
- //}
- }
- #endregion
-
- #region 获取数据
- ///
- /// 生成验证码
- ///
- ///
- [HttpGet]
- public ActionResult VerifyCode()
- {
- return File(new VerifyCode().GetVerifyCode(), @"image/Gif");
- }
-
- ///
- /// 获取用户登录信息
- ///
- ///
- [HttpGet]
- [AjaxOnly]
- [HandlerLogin(FilterMode.Enforce)]
- public ActionResult GetUserInfo()
- {
- var data = LoginUserInfo.Get();
- data.imUrl = Config.GetValue("IMUrl");
- data.password = null;
- data.secretkey = null;
- return JsonResult(data);
- }
- #endregion
-
- #region 提交数据
- ///
- /// 安全退出
- ///
- ///
- [HttpPost]
- [AjaxOnly]
- [HandlerLogin(FilterMode.Enforce)]
- public ActionResult OutLogin()
- {
- var userInfo = LoginUserInfo.Get();
- LogEntity logEntity = new LogEntity();
- logEntity.F_CategoryId = 1;
- logEntity.F_OperateTypeId = ((int)OperationType.Exit).ToString();
- logEntity.F_OperateType = EnumAttribute.GetDescription(OperationType.Exit);
- logEntity.F_OperateAccount = userInfo.account + "(" + userInfo.realName + ")";
- logEntity.F_OperateUserId = userInfo.userId;
- logEntity.F_ExecuteResult = 1;
- logEntity.F_ExecuteResultJson = "退出系统";
- logEntity.F_Module = "登录";
- logEntity.WriteLog();
- Session.Abandon(); //清除当前会话
- Session.Clear(); //清除当前浏览器所有Session
- OperatorHelper.Instance.EmptyCurrent();
- return Success("退出系统");
- }
- ///
- /// 登录验证
- ///
- /// 用户名
- /// 密码
- /// 验证码
- ///
- [HttpPost]
- [AjaxOnly]
- [HandlerValidateAntiForgeryToken]
- public ActionResult CheckLogin(string username, string password, string verifycode)
- {
-
- int error = OperatorHelper.Instance.GetCurrentErrorNum();
- if (error >= 3)
- {
- #region 验证码验证
- verifycode = Md5Helper.Encrypt(verifycode.ToLower(), 16);
- if (Session["session_verifycode"].IsEmpty() || verifycode != Session["session_verifycode"].ToString())
- {
- return Fail("验证码错误");
- }
- #endregion
- }
-
- #region 内部账户验证
- UserEntity userEntity = userBll.CheckLogin(username, password);
-
- #region 写入日志
- LogEntity logEntity = new LogEntity();
- logEntity.F_CategoryId = 1;
- logEntity.F_OperateTypeId = ((int)OperationType.Login).ToString();
- logEntity.F_OperateType = EnumAttribute.GetDescription(OperationType.Login);
- logEntity.F_OperateAccount = username + "(" + userEntity.F_RealName + ")";
- logEntity.F_OperateUserId = !string.IsNullOrEmpty(userEntity.F_UserId) ? userEntity.F_UserId : username;
- logEntity.F_Module = Config.GetValue("SoftName");
- #endregion
-
- if (!userEntity.LoginOk)//登录失败
- {
- //写入日志
- logEntity.F_ExecuteResult = 0;
- logEntity.F_ExecuteResultJson = "登录失败:" + userEntity.LoginMsg;
- logEntity.WriteLog();
- int num = OperatorHelper.Instance.AddCurrentErrorNum();
- return Fail(userEntity.LoginMsg, num);
- }
- else
- {
- OperatorHelper.Instance.AddLoginUser(userEntity.F_Account, "Learun_ADMS_6.1_PC", null);//写入缓存信息
- //写入日志
- logEntity.F_ExecuteResult = 1;
- logEntity.F_ExecuteResultJson = "登录成功";
- logEntity.WriteLog();
- OperatorHelper.Instance.ClearCurrentErrorNum();
- return Success("登录成功");
- }
- #endregion
- }
- #endregion
-
- #region 飞星网盘
- [HttpGet]
- public ActionResult GetResumFile()
- {
- //用于获取当前文件是否是续传。和续传的字节数开始点。
- var md5str = Request.QueryString["md5str"];
- var userId = Request.QueryString["uid"];
- string uploadDate = DateTime.Now.ToString("yyyyMMdd");
- string virtualPath = $"~/Resource/DocumentFile/{userId}/{uploadDate}/";
- string fullFileName = this.Server.MapPath(virtualPath);
- var saveFilePath = fullFileName + md5str;
- if (!Directory.Exists(fullFileName))
- {
- Directory.CreateDirectory(fullFileName);
- }
- if (System.IO.File.Exists(saveFilePath))
- {
- var fs = new FileStream(saveFilePath, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
- var fslength = fs.Length.ToString();
- fs.Close();
- return Json(fslength, JsonRequestBehavior.AllowGet);
- }
- return Json(0, JsonRequestBehavior.AllowGet);
- }
-
- [HttpPost]
- public HttpResponseMessage Rsume()
- {
- try
- {
- var file = Request.InputStream;
- var filename = Request.QueryString["filename"];
- var userId = Request.QueryString["uid"];
- string uploadDate = DateTime.Now.ToString("yyyyMMdd");
- string virtualPath = $"~/Resource/DocumentFile/{userId}/{uploadDate}/";
- string fullFileName = this.Server.MapPath(virtualPath);
- var saveFilePath = fullFileName + filename;
- Save(saveFilePath, file);
- Response.StatusCode = 200;
- return new HttpResponseMessage(HttpStatusCode.OK);
- }
- catch (Exception e)
- {
- return new HttpResponseMessage(HttpStatusCode.InternalServerError);
- }
- }
- private void Save(string saveFilePath, Stream stream)
- {
-
- try
- {
- long lStartPos = 0;
- int startPosition = 0;
- int endPosition = 0;
- //var contentRange = HttpContext.Current.Request.Headers["Content-Range"];
- var contentRange = HttpContext.Request.Headers["Content-Range"].ToString();
- if (!string.IsNullOrEmpty(contentRange))
- {
- contentRange = contentRange.Replace("bytes", "").Trim();
- contentRange = contentRange.Substring(0, contentRange.IndexOf("/"));
- string[] ranges = contentRange.Split('-');
- startPosition = int.Parse(ranges[0]);
- endPosition = int.Parse(ranges[1]);
- }
- FileStream fs;
-
- if (System.IO.File.Exists(saveFilePath))
- {
-
- fs = new System.IO.FileStream(saveFilePath, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
- lStartPos = fs.Length;
- }
- else
- {
- fs = new FileStream(saveFilePath, System.IO.FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite);
- lStartPos = 0;
- }
- if (lStartPos > endPosition)
- {
- fs.Close();
- return;
- }
- if (lStartPos < startPosition)
- {
- lStartPos = startPosition;
- }
- else if (lStartPos > startPosition && lStartPos < endPosition)
- {
- lStartPos = startPosition;
- }
- fs.Seek(lStartPos, System.IO.SeekOrigin.Current);
- byte[] nbytes = new byte[512];
- int nReadSize = 0;
- nReadSize = stream.Read(nbytes, 0, 512);
- while (nReadSize > 0)
- {
- fs.Write(nbytes, 0, nReadSize);
- nReadSize = stream.Read(nbytes, 0, 512);
- }
- stream.Close();
- fs.Close();
- }
- catch (Exception e)
- {
-
- }
-
- }
- #endregion
-
- #region 接口登录
-
- [HttpGet]
- public ActionResult CheckLoginForSSO(string u, string p, string t)
- {
- try
- {
- string publickey = ConfigurationManager.AppSettings["SSOPublicSecret"];
- string userkey = ConfigurationManager.AppSettings["SSOUserSecret"];
- string uid = Request.QueryString["u"];
- string pwd = Request.QueryString["p"];
- string logintime = Request.QueryString["t"];
- if (!string.IsNullOrEmpty(uid) && !string.IsNullOrEmpty(logintime))
- {
- decimal decodelogintime = Convert.ToDecimal(DESEncrypt.Decrypt(DESEncrypt.Decrypt(logintime, publickey), userkey));
- decimal datetimenow = Convert.ToDecimal(DateTime.Now.ToString("yyyyMMddHHmmss"));
- if (datetimenow - 300 <= decodelogintime && datetimenow + 300 >= decodelogintime)
- {
- string username = DESEncrypt.Decrypt(DESEncrypt.Decrypt(uid, publickey), userkey);
- string password = DESEncrypt.Decrypt(DESEncrypt.Decrypt(pwd, publickey), userkey);
- UserEntity userEntity = userBll.CheckLogin(username, Md5Helper.Encrypt(password, 32));
-
- LogEntity logEntity = new LogEntity();
- logEntity.F_CategoryId = 1;
- logEntity.F_OperateTypeId = ((int)OperationType.Login).ToString();
- logEntity.F_OperateType = EnumAttribute.GetDescription(OperationType.Login);
- logEntity.F_OperateAccount = username + "(" + userEntity.F_RealName + ")";
- logEntity.F_OperateUserId = !string.IsNullOrEmpty(userEntity.F_UserId) ? userEntity.F_UserId : username;
- logEntity.F_Module = "接口登录";
- if (!userEntity.LoginOk)//登录失败
- {
- //写入日志
- logEntity.F_ExecuteResult = 0;
- logEntity.F_ExecuteResultJson = "接口登录失败:" + userEntity.LoginMsg;
- logEntity.WriteLog();
- return Fail(userEntity.LoginMsg);
- }
- else
- {
- OperatorHelper.Instance.AddLoginUser(userEntity.F_Account, "Learun_ADMS_6.1_PC", null);//写入缓存信息
- //写入日志
- logEntity.F_ExecuteResult = 1;
- logEntity.F_ExecuteResultJson = "接口登录成功";
- logEntity.WriteLog();
- var DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"];
- var Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port;
- return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index");
- }
- }
- else
- {
- return Fail("时间戳验证失败");
- }
- }
- else
- {
- return Fail("参数错误");
- }
- }
- catch (Exception e)
- {
- return Fail("参数错误");
- }
- }
-
- #endregion
- }
-}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index b38d0bd04..9bab103ef 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
@@ -1959,6 +1959,7 @@
+
@@ -3784,6 +3785,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timelineEsc.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timelineEsc.js
new file mode 100644
index 000000000..8f3639867
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/timeline/lr-timelineEsc.js
@@ -0,0 +1,64 @@
+/*
+ * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+ * Copyright (c) 2013-2018 北京泉江科技有限公司
+ * 创建人：Learun智慧校园-前端开发组
+ * 日 期：2017.03.22
+ * 描 述：时间轴方法（升序）
+ */
+$.fn.lrtimelineEsc = function (nodelist) {
+
+ // title 标题
+ // people 审核人
+ // content 内容
+ // time 时间
+
+ var $self = $(this);
+ if ($self.length == 0) {
+ return $self;
+ }
+ $self.addClass('lr-timeline');
+ var $wrap = $('');
+ var $ul = $('');
+
+ if (nodelist.length > 0) {
+ // 开始节点
+ var $begin = $('')
+ $ul.append($begin);
+
+ $.each(nodelist, function (_index, _item) {
+ // 中间节点
+ var $li = $('');
+ if (_index == 0) {
+ $li.find('div').addClass('lr-timeline-current');
+ }
+ var $itemwrap = $li.find('.lr-timeline-wrap');
+ var $itemcontent = $('
');
+ $itemcontent.append('' + _item.title + '
');
+ $itemcontent.append('' + _item.people + '' + _item.content + '
')
+ $itemwrap.append('' + _item.time + '');
+ $itemwrap.append($itemcontent);
+
+ var $event = $itemcontent.find('.lr-event');
+ if ($event.length > 0) {
+ $event[0].lrdata = _item;
+ $itemcontent.find('.lr-event').on('click', function () {
+ var data = $(this)[0].lrdata;
+ data.callback && data.callback(data);
+ });
+ }
+
+
+ $ul.append($li);
+
+
+
+ });
+
+ // 结束节点
+ $ul.append('当前
');
+ }
+
+ $wrap.html($ul);
+ $self.html($wrap);
+
+};
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/_sgbak/lr-validator-helper.js.24565.2.2019-11-21.17-12-19.2652 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/_sgbak/lr-validator-helper.js.24565.2.2019-11-21.17-12-19.2652
deleted file mode 100644
index 431f7f332..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/_sgbak/lr-validator-helper.js.24565.2.2019-11-21.17-12-19.2652
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
- * Copyright (c) 2013-2018 北京泉江科技有限公司
- * 创建人：陈彬彬
- * 日 期：2017.03.16
- * 描 述：数据验证完整性
- */
-(function ($, learun) {
- "use strict";
-
- // 数据验证方法
- learun.validator = {
- validReg: function (obj, reg, msg) {
- var res = { code: true, msg: '' };
- if (!reg.test(obj)) {
- res.code = false;
- res.msg = msg;
- }
- return res;
- },
- validRegOrNull: function (obj, reg, msg) {
- var res = { code: true, msg: '' };
- if (obj == null || obj == undefined || obj.length == 0) {
- return res;
- }
- if (!reg.test(obj)) {
- res.code = false;
- res.msg = msg;
- }
- return res;
- },
- isNotNull: function (obj) {// 验证不为空
- var res = { code: true, msg: '' };
- obj = $.trim(obj);
- if (obj == null || obj == undefined || obj.length == 0) {
- res.code = false;
- res.msg = '不能为空';
- }
- return res;
- },
- isNum: function (obj) {// 验证数字
- return learun.validator.validReg(obj, /^[-+]?\d+$/, '必须为数字');
- },
- isPositiveInteger: function (obj) {// 正整数
- return learun.validator.validReg(obj, /^[1-9]\d*$/, '必须为正整数');
- },
- isPositiveFloatintZero: function (obj) {// 整数或小数(不能为负数)
- return learun.validator.validReg(obj, /^(0|[1-9]\d*|(0|[1-9]\d*)\.\d*[1-9])$/, '必须为整数或小数(不能为负数)');
- },
- isPositiveFloatint: function (obj) {// 整数或小数(不能为零和负数)
- return learun.validator.validReg(obj, /^([1-9]\d*|(0|[1-9]\d*)\.\d*[1-9])$/, '请输入正确的整数或小数(不能为零和负数)');
- },
- isNumOrNull: function (obj) {// 验证数字 或者空
- return learun.validator.validRegOrNull(obj, /^[-+]?\d+$/, '数字或空');
- },
- isEmail: function (obj) {//Email验证 email
- return learun.validator.validReg(obj, /^\w{3,}@\w+(\.\w+)+$/, '必须为E-mail格式');
- },
- isEmailOrNull: function (obj) {//Email验证 email 或者null,空
- return learun.validator.validRegOrNull(obj, /^\w{3,}@\w+(\.\w+)+$/, '必须为E-mail格式或空');
- },
- isEnglishStr: function (obj) {//验证只能输入英文字符串 echar
- return learun.validator.validReg(obj, /^[a-z,A-Z]+$/, '必须为英文字符串');
- },
- isEnglishStrOrNull: function (obj) {//验证只能输入英文字符串 echar 或者null,空
- return learun.validator.validRegOrNull(obj, /^[a-z,A-Z]+$/, '必须为英文字符串或空');
- },
- isTelephone: function (obj) { //验证是否电话号码 phone
- return learun.validator.validReg(obj, /^(\d{3,4}\-)?[1-9]\d{6,7}$/, '必须为电话格式');
- },
- isTelephoneOrNull: function (obj) {//验证是否电话号码 phone或者null,空
- return learun.validator.validRegOrNull(obj, /^(\d{3,4}\-)?[1-9]\d{6,7}$/, '必须为电话格式或空');
- },
- isMobile: function (obj) {//验证是否手机号 mobile
- return learun.validator.validReg(obj, /^(\+\d{2,3}\-)?\d{11}$/, '必须为手机格式');
- },
- isMobileOrnull: function (obj) {//验证是否手机号 mobile或者null,空
- return learun.validator.validRegOrNull(obj, /^(\+\d{2,3}\-)?\d{11}$/, '必须为手机格式或空');
- },
- isMobileOrPhone: function (obj) {//验证是否手机号或电话号码 mobile phone
- var res = { code: true, msg: '' };
- if (!learun.validator.isTelephone(obj).code && !learun.validator.isMobile(obj).code) {
- res.code = false;
- res.msg = '为电话格式或手机格式';
- }
- return res;
- },
- isMobileOrPhoneOrNull: function (obj) {//验证是否手机号或电话号码 mobile phone或者null,空
- var res = { code: true, msg: '' };
- if (learun.validator.isNotNull(obj).code && !learun.validator.isTelephone(obj).code && !learun.validator.isMobile(obj).code) {
- res.code = false;
- res.msg = '为电话格式或手机格式或空';
- }
- return res;
- },
- isUri: function (obj) {//验证网址 uri
- return learun.validator.validReg(obj, /^http:\/\/[a-zA-Z0-9]+\.[a-zA-Z0-9]+[\/=\?%\-&_~`@[\]\':+!]*([^<>\"\"])*$/, '必须为网址格式');
- },
- isUriOrNull: function (obj) {//验证网址 uri或者null,空
- return learun.validator.validRegOrNull(obj, /^http:\/\/[a-zA-Z0-9]+\.[a-zA-Z0-9]+[\/=\?%\-&_~`@[\]\':+!]*([^<>\"\"])*$/, '必须为网址格式或空');
- },
- isDate: function (obj) {//判断日期类型是否为YYYY-MM-DD格式的类型 date
- return learun.validator.validReg(obj, /^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/, '必须为日期格式');
- },
- isDateOrNull: function (obj) {//判断日期类型是否为YYYY-MM-DD格式的类型 date或者null,空
- return learun.validator.validRegOrNull(obj, /^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/, '必须为日期格式或空');
- },
- isDateTime: function (obj) {//判断日期类型是否为YYYY-MM-DD hh:mm:ss格式的类型 datetime
- return learun.validator.validReg(obj, /^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/, '必须为日期时间格式');
- },
- isDateTimeOrNull: function (obj) {//判断日期类型是否为YYYY-MM-DD hh:mm:ss格式的类型 datetime或者null,空
- return learun.validator.validRegOrNull(obj, /^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/, '必须为日期时间格式');
- },
- isTime: function (obj) {//判断日期类型是否为hh:mm:ss格式的类型 time
- return learun.validator.validReg(obj, /^((20|21|22|23|[0-1]\d)\:[0-5][0-9])(\:[0-5][0-9])?$/, '必须为时间格式');
- },
- isTimeOrNull: function (obj) {//判断日期类型是否为hh:mm:ss格式的类型 time或者null,空
- return learun.validator.validRegOrNull(obj, /^((20|21|22|23|[0-1]\d)\:[0-5][0-9])(\:[0-5][0-9])?$/, '必须为时间格式或空');
- },
- isChinese: function (obj) {//判断输入的字符是否为中文 cchar
- return learun.validator.validReg(obj, /^[\u0391-\uFFE5]+$/, '必须为中文');
- },
- isChineseOrNull: function (obj) {//判断输入的字符是否为中文 cchar或者null,空
- return learun.validator.validRegOrNull(obj, /^[\u0391-\uFFE5]+$/, '必须为中文或空');
- },
- isZip: function (obj) {//判断输入的邮编(只能为六位)是否正确 zip
- return learun.validator.validReg(obj, /^\d{6}$/, '必须为邮编格式');
- },
- isZipOrNull: function (obj) {//判断输入的邮编(只能为六位)是否正确 zip或者null,空
- return learun.validator.validRegOrNull(obj, /^\d{6}$/, '必须为邮编格式或空');
- },
- isDouble: function (obj) {//判断输入的字符是否为双精度 double
- return learun.validator.validReg(obj, /^[-\+]?\d+(\.\d+)?$/, '必须为小数');
- },
- isDoubleOrNull: function (obj) {//判断输入的字符是否为双精度 double或者null,空
- return learun.validator.validRegOrNull(obj, /^[-\+]?\d+(\.\d+)?$/, '必须为小数或空');
- },
- isIDCard: function (obj) {//判断是否为身份证 idcard
- return learun.validator.validReg(obj, /^\d{15}(\d{2}[A-Za-z0-9;])?$/, '必须为身份证格式');
- },
- isIDCardOrNull: function (obj) {//判断是否为身份证 idcard或者null,空
- return learun.validator.validRegOrNull(obj, /^\d{15}(\d{2}[A-Za-z0-9;])?$/, '必须为身份证格式或空');
- },
- isIP: function (obj) {//判断是否为IP地址格式
- var res = { code: true, msg: '' };
- var reg = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/g //匹配IP地址的正则表达式
- var flag = false;
- if (reg.test(obj)) {
- if (RegExp.$1 < 256 && RegExp.$2 < 256 && RegExp.$3 < 256 && RegExp.$4 < 256) { flag = true };
- }
- if (!flag) {
- res.code = false;
- res.msg = '必须为IP格式';
- }
- return res;
- },
- isIPOrNull: function (obj) {//判断是否为IP地址格式 或者null,空
- var res = { code: true, msg: '' };
- if (learun.validator.isNotNull(obj) && !learun.validator.isIP(obj).code) {
- res.code = false;
- res.msg = '必须为IP格式或空';
- }
- return res;
- },
-
- isLenNum: function (obj, n) {//验证是否是n位数字字符串编号 nnum
- var res = { code: true, msg: '' };
- var reg = /^[0-9]+$/;
- obj = $.trim(obj);
- if (obj.length > n || !reg.test(obj)) {
- res.code = false;
- res.msg = '必须为' + n + '位数字';
- }
- return res;
- },
- isLenNumOrNull: function (obj, n) {//验证是否是n位数字字符串编号 nnum或者null,空
- var res = { code: true, msg: '' };
- if (learun.validator.isNotNull(obj).code && !learun.validator.isLenNum(obj)) {
- res.code = false;
- res.msg = '必须为' + n + '位数字或空';
- }
- return res;
- },
- isLenStr: function (obj, n) {//验证是否小于等于n位数的字符串 nchar
- var res = { code: true, msg: '' };
- obj = $.trim(obj);
- if (!learun.validator.isNotNull(obj).code || obj.length > n) {
- res.code = false;
- res.msg = '必须小于等于' + n + '位字符';
- }
- return res;
- },
- isLenStrOrNull: function (obj, n) {//验证是否小于等于n位数的字符串 nchar或者null,空
- var res = { code: true, msg: '' };
- obj = $.trim(obj);
- if (learun.validator.isNotNull(obj).code && obj.length > n) {
- res.code = false;
- res.msg = '必须小于等于' + n + '位字符或空';
- }
- return res;
- }
- };
-
-})(window.jQuery, top.learun);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/_sgbak/lr-validator.js.24566.2.2019-11-21.17-12-19.2552 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/_sgbak/lr-validator.js.24566.2.2019-11-21.17-12-19.2552
deleted file mode 100644
index 070eaa0ea..000000000
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/_sgbak/lr-validator.js.24566.2.2019-11-21.17-12-19.2552
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
- * Copyright (c) 2013-2018 北京泉江科技有限公司
- * 创建人：陈彬彬
- * 日 期：2017.03.16
- * 描 述：表单数据验证完整性
- */
-(function ($, learun) {
- "use strict";
-
- $.lrValidformMessage = function ($this, errormsg) {
- /*错误处理*/
- $this.addClass('lr-field-error');
- $this.parent().append('
');
- var validatemsg = $this.parent().find('.form-item-title').text() + ' ' + errormsg;
- learun.alert.error('表单信息输入有误,请检查！' + validatemsg);
- if ($this.attr('type') == 'lrselect') {
- $this.on('change', function () {
- removeErrorMessage($(this));
- })
- }
- else if ($this.attr('type') == 'formselect') {
- $this.on('change', function () {
- removeErrorMessage($(this));
- });
- }
- else if ($this.hasClass('lr-input-wdatepicker')) {
- $this.on('change', function () {
- var $input = $(this);
- if ($input.val()) {
- removeErrorMessage($input);
- }
- });
- }
- else {
- $this.on('input propertychange', function () {
- var $input = $(this);
- if ($input.val()) {
- removeErrorMessage($input);
- }
- });
- }
- };
-
- $.fn.lrRemoveValidMessage = function () {
- removeErrorMessage($(this));
- }
-
- $.fn.lrValidform = function () {
- var validateflag = true;
- var validHelper = learun.validator;
- var formdata = $(this).lrGetFormData();
-
- $(this).find("[isvalid=yes]").each(function () {
- var $this = $(this);
-
- if ($this.parent().find('.lr-field-error-info').length > 0) {
- validateflag = false;
- return true;
- }
-
- var checkexpession = $(this).attr("checkexpession");
- var checkfn = validHelper['is' + checkexpession];
- if (!checkexpession || !checkfn) { return false; }
- var errormsg = $(this).attr("errormsg") || "";
-
- var id = $this.attr('id');
- var value = formdata[id];
-
- //var type = $this.attr('type');
- //if (type == 'lrselect') {
- // value = $this.lrselectGet();
- //}
- //else if (type == 'formselect') {
- // value = $this.lrformselectGet();
- //}
- //else {
- // value = $this.val();
- //}
- var r = { code: true, msg: '' };
- if (checkexpession == 'LenNum' || checkexpession == 'LenNumOrNull' || checkexpession == 'LenStr' || checkexpession == 'LenStrOrNull') {
- var len = $this.attr("length");
- r = checkfn(value, len);
- } else {
- r = checkfn(value);
- }
- if (!r.code) {
- validateflag = false;
- $.lrValidformMessage($this, errormsg + r.msg);
- }
- });
- return validateflag;
- }
-
- function removeErrorMessage($obj) {
- $obj.removeClass('lr-field-error');
- $obj.parent().find('.lr-field-error-info').remove();
- }
-
-})(window.jQuery, top.learun);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_AllIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_AllIndex.cshtml
index db1b7c6db..dd943940a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_AllIndex.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_AllIndex.cshtml
@@ -90,6 +90,7 @@
"/Views/LR_Content/plugin/wizard/wizard.js",
"/Views/LR_Content/plugin/layerselect/lr-layerselect.js",
"/Views/LR_Content/plugin/timeline/lr-timeline.js",
+ "/Views/LR_Content/plugin/timeline/lr-timelineEsc.js",
"/Views/LR_Content/plugin/formselect/lr-formselect.js",
"/Views/LR_Content/plugin/uploader/lr-uploader.js",
"/Views/LR_Content/plugin/date/lr-datepicker.js",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml
index ca7962d3d..436ddec67 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml
@@ -63,6 +63,7 @@
"/Views/LR_Content/plugin/select/lr-select.js",
"/Views/LR_Content/plugin/layerselect/lr-layerselect.js",
"/Views/LR_Content/plugin/timeline/lr-timeline.js",
+ "/Views/LR_Content/plugin/timeline/lr-timelineEsc.js",
"/Views/LR_Content/plugin/formselect/lr-formselect.js",
"/Views/LR_Content/plugin/inputsearch/lr-isearch.js",
"/Views/LR_Content/plugin/uploader/lr-uploader.js",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Index.cshtml
index be8cde902..db9f10cb5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Index.cshtml
@@ -62,6 +62,7 @@
"/Views/LR_Content/plugin/tree/lr-tree.js",
"/Views/LR_Content/plugin/select/lr-select.js",
"/Views/LR_Content/plugin/timeline/lr-timeline.js",
+ "/Views/LR_Content/plugin/timeline/lr-timelineEsc.js",
"/Views/LR_Content/plugin/formselect/lr-formselect.js",
"/Views/LR_Content/plugin/custmerquery/lr-custmerquery.js",
"/Views/LR_Content/plugin/date/lr-datepicker.js",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowForm.cshtml
index 9db1a6048..67b93b55f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowForm.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_WorkFlowForm.cshtml
@@ -17,8 +17,8 @@
"/Views/LR_Content/style/lr-common.css",
"/Views/LR_Content/plugin/scroll/scroll.css",
"/Views/LR_Content/style/lr-iframe-form.css",
-
- "/Views/LR_Content/plugin/wizard/wizard.css",
+
+ "/Views/LR_Content/plugin/wizard/wizard.css",
"/Views/LR_Content/plugin/tree/lr-tree.css",
"/Views/LR_Content/plugin/select/lr-select.css",
"/Views/LR_Content/plugin/timeline/lr-timeline.css",
@@ -31,6 +31,7 @@
+
-
-
-
- @RenderBody()
-
-
-
-
-