diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/VaccinationInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/VaccinationInfoController.cs index 9170e59cf..6321b6e77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/VaccinationInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/VaccinationInfoController.cs @@ -81,6 +81,27 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(jsonData); } /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForTeacher(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = vaccinationInfoIBLL.GetPageListForTeacher(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// /// 获取表单数据 /// /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js index baea3c994..3800be9ca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js @@ -111,7 +111,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/PM_EducationExperience/GetPageList', headData: [ { label: "开始时间", name: "STime", width: 130, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml index 53e88f8fe..679e71bea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml @@ -9,7 +9,7 @@
结束时间*
- +
工作单位*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js index f16ccd845..a863becb9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js @@ -112,11 +112,11 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/PM_Resume/GetPageList', headData: [ { label: "开始时间", name: "RTime", width: 130, align: "left" }, - { label: "结束时间", name: "ETime", width: 130, align: "left" }, + { label: "结束时间", name: "Etime", width: 130, align: "left" }, { label: "工作单位", name: "UnitName", width: 100, align: "left" }, { label: "证明人", name: "Witness", width: 100, align: "left" }, { label: "部门", name: "DepartmentID", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.cshtml index 942763c83..6af2a4e21 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.cshtml @@ -18,7 +18,7 @@
疫苗类型
-
+
第一针时间
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.js index db719b6e8..522bf0a2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachForm.js @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' }); + //$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.cshtml index 852d8a88a..a3fe9737d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.cshtml @@ -25,7 +25,7 @@
接种类型
-
+
身份证号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.js index ca687fd0b..a16204778 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VaccinationInfo/TeachIndex.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#VaccineType').lrDataItemSelect({ code: 'VaccineType' }); + //$('#VaccineType').lrDataItemSelect({ code: 'VaccineType' }); $('#DepartmentId').lrselect({ type: 'tree', allowSearch: true, @@ -139,10 +139,23 @@ var bootstrap = function ($, learun) { // 初始化列表 initGird: function () { $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/GetPageList', + url: top.$.rootUrl + '/EducationalAdministration/VaccinationInfo/GetPageListForTeacher', headData: [ { label: "职工编号", name: "EmpNo", width: 100, align: "left" }, { label: "姓名", name: "EmpName", width: 150, align: "left" }, + { + label: "员工状态", name: "IsInActiveStatus", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'JobStatus', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "身份证", name: "CardId", width: 160, align: "left" }, { label: "部门", name: "DepartmentId", width: 200, align: "left", @@ -160,15 +173,15 @@ var bootstrap = function ($, learun) { { label: "电话号码", name: "Mobile", width: 120, align: "left" }, { label: "疫苗类型", name: "VaccineType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'VaccineType', - callback: function (_data) { - callback(_data.text); - } - }); - } + //formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'VaccineType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + //} }, { label: "接种地", name: "VaccineAddress", width: 100, align: "left" }, { 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 d56004641..e3397e7c8 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 @@ -16,22 +16,26 @@ 经典风格
- +
-@*
+
    -
    *@ +
    @*
    在线人数 @ViewBag.OnlineUserNum 人
    *@ -
    - +
    + + @if (ViewBag.UnreadNum > 0) + { + @ViewBag.UnreadNum + }
    • 待办事项 @ViewBag.UnreadTask 条
      • diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml index fe82e2b59..972085dad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml @@ -1,6 +1,6 @@ @{ ViewBag.Title = "经典版风格"; - Layout = "~/Views/Shared/_Admin.cshtml"; + Layout = "~/Views/Shared/_AdminForDC.cshtml.cshtml"; } @Html.AppendCssFile("/Views/Home/AdminDefault/index.css") -@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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index b9a463551..9ae7bc749 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -165,8 +165,10 @@ + + Web.config @@ -190,6 +192,8 @@ + + @@ -210,8 +214,10 @@ + + @@ -259,6 +265,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs index 9e397ae1d..16f455967 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs @@ -175,6 +175,17 @@ namespace Learun.Application.WebApi /// private Response BeforeRequest(NancyContext ctx) { + ctx.Request.Url.Query = Learun.Util.WebHelper.Formatstr(ctx.Request.Url.Query); + foreach (var p in ctx.Parameters) + { + if (p.ParameterType == typeof(string)) + { + if (ctx.Parameters[p.ParameterName] != null) + { + ctx.Parameters[p.ParameterName] = Learun.Util.WebHelper.Formatstr(ctx.Parameters[p.ParameterName].ToString()); + } + } + } string path = ctx.ResolvedRoute.Description.Path; //验证登录状态 ReqParameter req = this.Bind(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml index 3dd3b0238..0b058ccca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Properties/PublishProfiles/FolderProfile1.pubxml @@ -13,6 +13,6 @@ True False bin\Release\Publish - False + True \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config index a26a6fe62..19868a88a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config @@ -25,7 +25,7 @@ --> - - + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoBLL.cs index c3564c4f7..9b6c58d25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoBLL.cs @@ -43,6 +43,32 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageListForTeacher(Pagination pagination, string queryJson) + { + try + { + return vaccinationInfoService.GetPageListForTeacher(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取VaccinationInfo表实体数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoEntity.cs index 0f89a2403..30472599e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoEntity.cs @@ -164,6 +164,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion #region 扩展字段 + [NotMapped] + public string IsInActiveStatus { get; set; } + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoIBLL.cs index 7a9435b31..1e9d40710 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoIBLL.cs @@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForTeacher(Pagination pagination, string queryJson); /// /// 获取VaccinationInfo表实体数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs index b137614c4..cdbb2edaa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs @@ -33,9 +33,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" t.* "); + strSql.Append(@" t.Id,t.StuNo,t.StuName,s.IdentityCardNo as CardId,s.DeptNo,s.MajorNo,s.ClassNo,s.Mobile,t.VaccineType, +t.VaccineAddress,t.FirstNeedle,t.SecondNeedle,t.ThirdNeedle,t.NotReason,t.Remark,t.CreateTime,t.CreateUser,t.LastTime,t.LastUser "); strSql.Append(" FROM VaccinationInfo t "); - strSql.Append(" left join ClassInfo c on t.classno = c.classno "); + strSql.Append(" left join StuInfoBasic s on s.stuno=t.stuno "); + strSql.Append(" left join ClassInfo c on s.classno = c.classno "); strSql.Append(" WHERE 1=1 "); var login = LoginUserInfo.Get(); var queryParam = queryJson.ToJObject(); @@ -103,8 +105,56 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - else if (StuOrTeach == "1") + + var data = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + if (data.Count() > 0 && StuOrTeach == "0") + { + foreach (var item in data) + { + if (!string.IsNullOrEmpty(item.CardId)) + { + item.Age = DateTime.Now.Year - Convert.ToInt32(item.CardId.ToString().Substring(6, 4)); + } + } + } + return data; + } + catch (Exception ex) + { + if (ex is ExceptionEx) { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取页面显示列表数据(老师) + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageListForTeacher(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" t.Id,t.EmpNo,s.EmpName,s.IdentityCardNo as CardId,s.F_DepartmentId,s.Mobile,s.IsInActiveStatus,t.VaccineType, +t.VaccineAddress,t.FirstNeedle,t.SecondNeedle,t.ThirdNeedle,t.NotReason,t.Remark,t.CreateTime,t.CreateUser,t.LastTime,t.LastUser "); + strSql.Append(" FROM VaccinationInfo t "); + strSql.Append(" left join empinfo s on s.empno=t.empno "); + strSql.Append(" WHERE 1=1 "); + var login = LoginUserInfo.Get(); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + var StuOrTeach = queryParam["StuOrTeach"].ToString(); + if (!queryParam["StuOrTeach"].IsEmpty()) { dp.Add("StuOrTeach", queryParam["StuOrTeach"].ToString(), DbType.Int32); @@ -140,14 +190,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EmpName", "%" + queryParam["EmpName"].ToString() + "%", DbType.String); strSql.Append(" AND t.EmpName Like @EmpName "); } - } + var data = this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); if (data.Count() > 0 && StuOrTeach == "0") { foreach (var item in data) { - item.Age = DateTime.Now.Year - Convert.ToInt32(item.CardId.ToString().Substring(6, 4)); + if (!string.IsNullOrEmpty(item.CardId)) + { + item.Age = DateTime.Now.Year - Convert.ToInt32(item.CardId.ToString().Substring(6, 4)); + } } } return data; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs index a05421892..68ae49dd7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs @@ -345,6 +345,7 @@ namespace Learun.Util System.Text.RegularExpressions.Regex regex10 = new System.Text.RegularExpressions.Regex(@"select", System.Text.RegularExpressions.RegexOptions.IgnoreCase); System.Text.RegularExpressions.Regex regex11 = new System.Text.RegularExpressions.Regex(@"update", System.Text.RegularExpressions.RegexOptions.IgnoreCase); System.Text.RegularExpressions.Regex regex12 = new System.Text.RegularExpressions.Regex(@"delete", System.Text.RegularExpressions.RegexOptions.IgnoreCase); + System.Text.RegularExpressions.Regex regex13 = new System.Text.RegularExpressions.Regex(@"exec", System.Text.RegularExpressions.RegexOptions.IgnoreCase); html = regex1.Replace(html, ""); //过滤标记 html = regex2.Replace(html, ""); //过滤href=javascript: () 属性 html = regex3.Replace(html, " _disibledevent="); //过滤其它控件的on...事件 @@ -352,6 +353,7 @@ namespace Learun.Util html = regex10.Replace(html, "s_elect"); html = regex11.Replace(html, "u_pudate"); html = regex12.Replace(html, "d_elete"); + html = regex13.Replace(html, "e_xec"); html = html.Replace("'", "’"); html = html.Replace(" ", " "); return html;