diff --git a/labs/Teacher/Infrastructure/Views/Shared/DisplayTemplates/MultilineText.cshtml b/labs/Teacher/Infrastructure/Views/Shared/DisplayTemplates/MultilineText.cshtml index 44165430..1025f84e 100644 --- a/labs/Teacher/Infrastructure/Views/Shared/DisplayTemplates/MultilineText.cshtml +++ b/labs/Teacher/Infrastructure/Views/Shared/DisplayTemplates/MultilineText.cshtml @@ -1,19 +1,2 @@ @model string -@if (Model != null) -{ - if (this.ViewContext.RouteData.Values["action"].ToString().ToLower() == "details") - { - @Model - } - else - { - if (Model.Length > 20) - { -
@Model.Substring(0, 17)...
- } - else - { - @Model - } - } -} \ No newline at end of file +@Model \ No newline at end of file diff --git a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs index aa520b82..3e1e1247 100644 --- a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs +++ b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs @@ -598,21 +598,25 @@ namespace TeacherExt.Models [DataType(DataType.MultilineText)] [SkipSearch, SkipList] [Display(Order = 570, Name = "审核失败原因")] + [MaxLength(100)] public string Comment { get; set; } [SkipSearch, SkipList] [Display(Order = 571, Name = "何年何月何人介绍加入中国共产党")] [DataType(DataType.MultilineText)] + [MaxLength(100)] public string CommunistPartyMessage { get; set; } [SkipSearch, SkipList] [Display(Order = 572, Name = "何年何月何人介绍加入何民主党派")] [DataType(DataType.MultilineText)] + [MaxLength(100)] public string DemocraticPartyMessage { get; set; } [SkipSearch, SkipList] [Display(Order = 573, Name = "何年何月何人介绍加入中国共青团")] [DataType(DataType.MultilineText)] + [MaxLength(100)] public string YouthPartyMessage { get; set; } public IEnumerable Validate(ValidationContext validationContext) diff --git a/labs/Teacher/TeacherExt/Resources/Resource.Zh-CN.resx b/labs/Teacher/TeacherExt/Resources/Resource.Zh-CN.resx index 4d54de4b..6250d243 100644 --- a/labs/Teacher/TeacherExt/Resources/Resource.Zh-CN.resx +++ b/labs/Teacher/TeacherExt/Resources/Resource.Zh-CN.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 最大长度为{0} + 必须同意才能继续 diff --git a/labs/Teacher/account.txt b/labs/Teacher/account.txt index 2ff93110..f13e672c 100644 --- a/labs/Teacher/account.txt +++ b/labs/Teacher/account.txt @@ -23,6 +23,8 @@ vpn下载&服务器地址:https://125.72.102.82:44331 用户名:靳发全 密码:DSideal!@#1234 Web:10.10.15.12 root DsIdeal@123 +/usr/local/openresty/nginx/sbin/nginx + /usr/local/openresty/nginx/conf/nginx.conf 数据库: 10.10.15.13:22066 root DsideaL147258369