From c5bf0d67580cf9b28006414a092a361753929ea8 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 14 Mar 2022 17:52:10 +0800 Subject: [PATCH 1/8] =?UTF-8?q?CMS=E4=B8=8B=E5=8F=91=E6=AD=A3=E6=96=87?= =?UTF-8?q?=E8=A7=A3=E5=AF=86=E7=BC=96=E8=BE=91=E5=99=A8=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CMSController.cs | 124 ++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../Learun.Application.OA/News/NewsService.cs | 2 +- 3 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/CMSController.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/CMSController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/CMSController.cs new file mode 100644 index 000000000..dbf494876 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/CMSController.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using Learun.Application.Base.SystemModule; +using Learun.Application.OA.File.FilePreview; +using Learun.Util; +using Quanjiang.DigitalSchool.AsposeHelper; + +namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers +{ + public class CMSController : MvcControllerBaseNoLogin + { + // GET: LR_SystemModule/CMS + private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL(); + + public ActionResult Index() + { + return View(); + } + + #region 预览附件 + /// + /// 文件预览 + /// + /// 文件ID + /// + public void PreviewFile(string fileId) + { + FilePreviewIBLL filePreviewIBLL = new FilePreviewBLL(); + var data = annexesFileIBLL.GetEntity(fileId); + if (data == null) + { + return; + } + string filename = data.F_FileName;//客户端保存的文件名 + string filepath = data.F_FilePath;//路径 + if (data.F_FileType == "xlsx" || data.F_FileType == "xls") + { + filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 + if (!DirFileHelper.IsExistFile(filepath)) + { + //filePreviewIBLL.GetExcelData(data.F_FilePath); + //liang 2021-6-25 改aspose预览 + AsposeCore.GetExcelData(data.F_FilePath); + } + } + if (data.F_FileType == "docx" || data.F_FileType == "doc") + { + filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 + if (!DirFileHelper.IsExistFile(filepath)) + { + //filePreviewIBLL.GetWordData(data.F_FilePath); + //liang 2021-6-25 改aspose预览 + AsposeCore.GetWordData(data.F_FilePath); + } + } + if (data.F_FileType == "ppt" || data.F_FileType == "pptx") + { + filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 + if (!DirFileHelper.IsExistFile(filepath)) + { + //filePreviewIBLL.GetPptData(data.F_FilePath); + //liang 2021-6-25 改aspose预览 + AsposeCore.GetWordData(data.F_FilePath); + } + } + Response.ClearContent(); + switch (data.F_FileType) + { + case "jpg": + Response.ContentType = "image/jpeg"; + break; + case "gif": + Response.ContentType = "image/gif"; + break; + case "png": + Response.ContentType = "image/png"; + break; + case "bmp": + Response.ContentType = "application/x-bmp"; + break; + case "jpeg": + Response.ContentType = "image/jpeg"; + break; + case "doc": + Response.ContentType = "application/pdf"; + break; + case "docx": + Response.ContentType = "application/pdf"; + break; + case "ppt": + Response.ContentType = "application/pdf"; + break; + case "pptx": + Response.ContentType = "application/pdf"; + break; + case "xls": + Response.ContentType = "application/pdf"; + break; + case "xlsx": + Response.ContentType = "application/pdf"; + break; + case "pdf": + Response.ContentType = "application/pdf"; + break; + case "txt": + Response.ContentType = "text/plain"; + break; + case "csv": + Response.ContentType = ""; + break; + default: + Response.ContentType = "application/pdf"; + break; + } + Response.Charset = "GB2312"; + Response.WriteFile(filepath); + //Response.BinaryWrite(ms.ToArray()); + } + #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 b4692d004..d6fe45c1b 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 @@ -459,6 +459,7 @@ + @@ -6707,6 +6708,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs index 09e1fed2c..a1a3bf396 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs @@ -237,7 +237,7 @@ namespace Learun.Application.OA { Title = newEntity.F_FullHead, SubTitle = newEntity.F_BriefHead, - Content = newEntity.F_NewsContent, + Content = HttpUtility.HtmlDecode(newEntity.F_NewsContent), Author = newEntity.F_AuthorName, Source = newEntity.F_SourceName, AddDate = DateTime.Now, From 8d1e1d1611639fba3cdda8bdc5518fe593b1492d Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 15 Mar 2022 10:56:18 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=B0=83=E8=AF=95CMS=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CMSController.cs | 124 ------------------ .../Learun.Application.Web.csproj | 1 - .../Learun.Application.OA/News/NewsService.cs | 9 +- 3 files changed, 7 insertions(+), 127 deletions(-) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/CMSController.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/CMSController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/CMSController.cs deleted file mode 100644 index dbf494876..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/CMSController.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; -using Learun.Application.Base.SystemModule; -using Learun.Application.OA.File.FilePreview; -using Learun.Util; -using Quanjiang.DigitalSchool.AsposeHelper; - -namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers -{ - public class CMSController : MvcControllerBaseNoLogin - { - // GET: LR_SystemModule/CMS - private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL(); - - public ActionResult Index() - { - return View(); - } - - #region 预览附件 - /// - /// 文件预览 - /// - /// 文件ID - /// - public void PreviewFile(string fileId) - { - FilePreviewIBLL filePreviewIBLL = new FilePreviewBLL(); - var data = annexesFileIBLL.GetEntity(fileId); - if (data == null) - { - return; - } - string filename = data.F_FileName;//客户端保存的文件名 - string filepath = data.F_FilePath;//路径 - if (data.F_FileType == "xlsx" || data.F_FileType == "xls") - { - filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 - if (!DirFileHelper.IsExistFile(filepath)) - { - //filePreviewIBLL.GetExcelData(data.F_FilePath); - //liang 2021-6-25 改aspose预览 - AsposeCore.GetExcelData(data.F_FilePath); - } - } - if (data.F_FileType == "docx" || data.F_FileType == "doc") - { - filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 - if (!DirFileHelper.IsExistFile(filepath)) - { - //filePreviewIBLL.GetWordData(data.F_FilePath); - //liang 2021-6-25 改aspose预览 - AsposeCore.GetWordData(data.F_FilePath); - } - } - if (data.F_FileType == "ppt" || data.F_FileType == "pptx") - { - filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 - if (!DirFileHelper.IsExistFile(filepath)) - { - //filePreviewIBLL.GetPptData(data.F_FilePath); - //liang 2021-6-25 改aspose预览 - AsposeCore.GetWordData(data.F_FilePath); - } - } - Response.ClearContent(); - switch (data.F_FileType) - { - case "jpg": - Response.ContentType = "image/jpeg"; - break; - case "gif": - Response.ContentType = "image/gif"; - break; - case "png": - Response.ContentType = "image/png"; - break; - case "bmp": - Response.ContentType = "application/x-bmp"; - break; - case "jpeg": - Response.ContentType = "image/jpeg"; - break; - case "doc": - Response.ContentType = "application/pdf"; - break; - case "docx": - Response.ContentType = "application/pdf"; - break; - case "ppt": - Response.ContentType = "application/pdf"; - break; - case "pptx": - Response.ContentType = "application/pdf"; - break; - case "xls": - Response.ContentType = "application/pdf"; - break; - case "xlsx": - Response.ContentType = "application/pdf"; - break; - case "pdf": - Response.ContentType = "application/pdf"; - break; - case "txt": - Response.ContentType = "text/plain"; - break; - case "csv": - Response.ContentType = ""; - break; - default: - Response.ContentType = "application/pdf"; - break; - } - Response.Charset = "GB2312"; - Response.WriteFile(filepath); - //Response.BinaryWrite(ms.ToArray()); - } - #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 df2749814..4d5691e1f 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 @@ -459,7 +459,6 @@ - diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs index a1a3bf396..35fa42b1e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs @@ -250,6 +250,9 @@ namespace Learun.Application.OA }; string responses = HttpMethods.HttpPosts("http://" + ports + "/api/v1/contents/" + siteId + "/" + channelId, SendNew.ToJson(), ApiId); + BaseRepository() + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson),VALUES (newid(),,'2222','" + + responses + "') "); //#region 修改审核状态 //string Nid = JsonConvert.DeserializeObject(responses).value.id; @@ -270,9 +273,11 @@ namespace Learun.Application.OA //#endregion } } - catch (Exception ex) + catch (ArithmeticException ex) { - + BaseRepository() + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson),VALUES (newid(),'2222','" + + ex.Message + "') "); } } From 243db39d17ecfce91658d8cee641fe53a435b450 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 15 Mar 2022 11:06:56 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95cms=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.OA/News/NewsService.cs | 8 ++-- .../Learun.Util/Web/HttpMethods.cs | 42 +++++++++++-------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs index 35fa42b1e..bbd34ee64 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs @@ -251,8 +251,7 @@ namespace Learun.Application.OA string responses = HttpMethods.HttpPosts("http://" + ports + "/api/v1/contents/" + siteId + "/" + channelId, SendNew.ToJson(), ApiId); BaseRepository() - .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson),VALUES (newid(),,'2222','" + - responses + "') "); + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson),VALUES (newid(),'2222','"+responses+"') "); //#region 修改审核状态 //string Nid = JsonConvert.DeserializeObject(responses).value.id; @@ -273,11 +272,10 @@ namespace Learun.Application.OA //#endregion } } - catch (ArithmeticException ex) + catch (Exception ex) { BaseRepository() - .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson),VALUES (newid(),'2222','" + - ex.Message + "') "); + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson),VALUES (newid(),'2222','"+ex.Message + "') "); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs index 6e1f9085d..a177705c6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs @@ -152,28 +152,36 @@ namespace Learun.Util public static string HttpPosts(string url, string json, WebHeaderCollection header) { string result = ""; - HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url); - req.Method = "POST"; - req.ContentType = "application/json;charset=UTF-8"; - req.Headers.Add(header); - byte[] data = Encoding.UTF8.GetBytes(json);//把字符串转换为字节 + try + { + HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url); + req.Method = "POST"; + req.ContentType = "application/json;charset=UTF-8"; + req.Headers.Add(header); + byte[] data = Encoding.UTF8.GetBytes(json);//把字符串转换为字节 - req.ContentLength = data.Length; //请求长度 + req.ContentLength = data.Length; //请求长度 - using (Stream reqStream = req.GetRequestStream()) //获取 - { - reqStream.Write(data, 0, data.Length);//向当前流中写入字节 - reqStream.Close(); //关闭当前流 - } + using (Stream reqStream = req.GetRequestStream()) //获取 + { + reqStream.Write(data, 0, data.Length);//向当前流中写入字节 + reqStream.Close(); //关闭当前流 + } - HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); //响应结果 - Stream stream = resp.GetResponseStream(); - //获取响应内容 - using (StreamReader reader = new StreamReader(stream, Encoding.UTF8)) + HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); //响应结果 + Stream stream = resp.GetResponseStream(); + //获取响应内容 + using (StreamReader reader = new StreamReader(stream, Encoding.UTF8)) + { + result = reader.ReadToEnd(); + } + return result; + } + catch (Exception e) { - result = reader.ReadToEnd(); + throw e; } - return result; + } } } From 26a0f71682f719a04c0cfd6e853a9cdc2c68ee53 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 15 Mar 2022 11:50:19 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=B0=83=E8=AF=95post=20cms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.OA/News/NewsService.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs index bbd34ee64..e15250c2d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs @@ -202,11 +202,15 @@ namespace Learun.Application.OA if (newEntity.IsSend == "1" && status == 2) { + BaseRepository() + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始run task') "); Task.Run(async () => { sendNew(newEntity); }); } } catch (Exception ex) { + BaseRepository() + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'run task 报错"+ex.Message+"') "); if (ex is ExceptionEx) { throw; @@ -233,6 +237,8 @@ namespace Learun.Application.OA string ports = ConfigurationManager.AppSettings["Ports"]; #endregion + BaseRepository() + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始组装实体') "); SemdNewList SendNew = new SemdNewList { Title = newEntity.F_FullHead, @@ -248,10 +254,12 @@ namespace Learun.Application.OA { { "X-SS-API-KEY", ApiKey } }; + BaseRepository() + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始post cms') "); string responses = HttpMethods.HttpPosts("http://" + ports + "/api/v1/contents/" + siteId + "/" + channelId, SendNew.ToJson(), ApiId); BaseRepository() - .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson),VALUES (newid(),'2222','"+responses+"') "); + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'"+HttpUtility.UrlEncode(responses)+"') "); //#region 修改审核状态 //string Nid = JsonConvert.DeserializeObject(responses).value.id; @@ -275,7 +283,7 @@ namespace Learun.Application.OA catch (Exception ex) { BaseRepository() - .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson),VALUES (newid(),'2222','"+ex.Message + "') "); + .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'"+ex.Message + "') "); } } From a3c9117f3e002a3abb9f5ea87f87debcf320faeb Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 15 Mar 2022 14:05:20 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=B5=81=E7=A8=8B=E8=8E=B7=E5=8F=96=E5=AF=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/LR_Content/script/lr-form.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js index 75ab83149..149723df4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js @@ -130,7 +130,7 @@ break; case "datepicker": var _dateFmt = $obj.attr('data-dateFmt') || 'yyyy-MM-dd'; - $obj.val(learun.formatDate(value, _dateFmt.replace('HH','hh'))); + $obj.val(learun.formatDate(value, _dateFmt.replace('HH', 'hh'))); break; case "lr-Uploader": $obj.lrUploaderSet(value); @@ -865,6 +865,11 @@ if ($(this).hasClass('edui-default')) { if ($(this)[0].ue) { point.text = $(this)[0].ue.getContent(null, null, true); + } else { + if ($(this)[0].getAttribute('id') == 'edui1_iframeholder') { + var idNowIframe = $(this)[0].getElementsByTagName('iframe')[0].getAttribute('id') + point.text = window.frames[idNowIframe].contentWindow.document.body.innerHTML + } } } else { From 8b0b7893e3857912d109808431ff9d635368aa29 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 15 Mar 2022 17:18:02 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Form.cshtml | 110 +++++++-------- .../Views/StuInfoBasic/FormTran.cshtml | 126 +++++++++--------- 2 files changed, 118 insertions(+), 118 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index f78d6348d..38864e88f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -20,9 +20,9 @@ @*
-
通知书号*
- -
*@ +
通知书号*
+ + *@
学号
@@ -52,12 +52,20 @@
+
健康状况
+
+
+
出生日期*
-
-
健康状况
-
+
+
入学年月*
+ +
+
+
报到日期*
+
户口分类
@@ -83,6 +91,10 @@
E-mail
+
+
QQ
+ +
家庭地址*
@@ -111,6 +123,22 @@
与监护人关系
+
+
系部*
+
+
+
+
专业*
+
+
+
+
班级*
+
+
+
+
年级*
+
+
实习状态
@@ -167,69 +195,33 @@
-
年级*
-
-
-
-
本专科
+
现有学历
学制
-
-
报到日期*
- -
学习形式
+ @*
+
入党时间
+ +
*@
-
毕业证号
- -
-
-
毕业日期
- -
-
-
系所*
-
-
-
-
专业*
-
-
-
-
班级*
-
-
-
-
入学年月*
- -
-
-
入党时间
- -
-
入团时间
-
-
校内地址
- -
-
-
校内电话
- -
-
-
QQ
- -
+ @*
+
校内地址
+ +
+
+
校内电话
+ +
*@
特长
@@ -238,6 +230,14 @@
备注
+
+
毕业证号
+ +
+
+
毕业日期
+ +
毕业证书备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml index 5afdf383e..239376159 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml @@ -20,9 +20,9 @@
@*
-
通知书号*
- -
*@ +
通知书号*
+ +
*@
学号
@@ -52,12 +52,20 @@
+
健康状况
+
+
+
出生日期*
-
-
健康状况
-
+
+
入学年月*
+ +
+
+
报到日期*
+
户口分类
@@ -83,6 +91,10 @@
E-mail
+
+
QQ
+ +
家庭地址*
@@ -111,6 +123,22 @@
与监护人关系
+
+
系部*
+
+
+
+
专业*
+
+
+
+
班级*
+
+
+
+
年级*
+
+
实习状态
@@ -134,15 +162,15 @@
母亲电话*
+
+
+
家庭出身
+
+
+
+
港澳台侨
+
*@ -
-
家庭出身
-
-
-
-
港澳台侨
-
-
分段培养方式
@@ -168,69 +196,33 @@
-
年级*
-
-
-
-
本专科
+
现有学历
学制
-
-
报到日期*
- -
学习形式
+ @*
+
入党时间
+ +
*@
-
毕业证号
- -
-
-
毕业日期
- -
-
-
系所*
-
-
-
-
专业*
-
-
-
-
班级*
-
-
-
-
入学年月*
- -
-
-
入党时间
- -
-
入团时间
-
-
校内地址
- -
-
-
校内电话
- -
-
-
QQ
- -
+ @*
+
校内地址
+ +
+
+
校内电话
+ +
*@
特长
@@ -239,6 +231,14 @@
备注
+
+
毕业证号
+ +
+
+
毕业日期
+ +
毕业证书备注
From 306bbe1b709b9cb8982b4803f8b3ffd441470c6a Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 15 Mar 2022 18:18:34 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E7=AE=A1=E7=90=86=E6=9F=A5=E7=9C=8B=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/FormView.cshtml | 125 +++++++++--------- .../Views/StuInfoBasic/Index.js | 2 +- .../Views/ResourceFile/Index.cshtml | 1 + 3 files changed, 68 insertions(+), 60 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml index 8f011d1cd..99e50689b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml @@ -30,11 +30,7 @@
  • 性       别 : {{studentInfo.GenderNo | sex}}
  • 出生日期 : {{studentInfo.Birthday | date}}
    • -
  • 联系电话 : {{studentInfo.mobile}}
  • 校       区 : {{baseInfo.companyId | company}}
    • -
  • 学       号 : {{studentInfo.StuNo}}
    • -
  • 本  专  科 : {{studentInfo.GraduateNo | graduateNo}}
    • -
  • 年       级 : {{studentInfo.Grade}}
@@ -47,23 +43,16 @@
  • 民 族 : {{studentInfo.NationalityNo |nationalityNo}}
  • 政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}
  • 身份证号 : {{studentInfo.IdentityCardNo}}
    • -
  • E-mail : {{studentInfo.EMail}}
    • -
  • 户 籍 省 : {{studentInfo.F_ProvinceId | province}}
    • -
  • 户籍地市 : {{studentInfo.F_CityId | city}}
    • -
  • 户籍县区 : {{studentInfo.F_CountyId | area}}
    • -
  • 户籍地址 : {{studentInfo.FatherUnit}}
    • +
  • 户口所在地 : {{studentInfo.FatherUnit}}
    • 家庭情况
      -
    • 父亲姓名 : {{studentInfo.FatherName}}
      • -
    • 父亲电话 : {{studentInfo.FatherPhone}}
      • -
    • 母亲姓名 : {{studentInfo.MatherName}}
      • -
    • 母亲电话 : {{studentInfo.MatherPhone}}
      • -
    • 港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}
      • -
    • 健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}
      • +
    • 监护人姓名 : {{studentInfo.Guardian}}
      • +
    • 监护人联系电话 : {{studentInfo.GuardianPhone}}
      • +
    • 与监护人关系 : {{studentInfo.GuardianType |guardiantype}}
    • 邮政编码 : {{studentInfo.PostalCode}}
    • 家庭地址 : {{studentInfo.MailAddress}}
    @@ -72,25 +61,25 @@
    学籍信息
      -
    • 通知书号 : {{studentInfo.NoticeNo}}
      • -
    • 考 生 号 : {{studentInfo.ksh}}
      • -
    • 系所 : {{studentInfo.DeptNo | deptNo}}
      • +
    • 学   籍   号 : {{studentInfo.StuCode}}
      • +
    • 学 号 : {{studentInfo.StuNo}}
      • +
    • 年       级 : {{studentInfo.Grade}}
      • +
    • 系 部 : {{studentInfo.DeptNo | deptNo}}
    • 专 业 : {{studentInfo.MajorNo | majorNo}}
    • 班 级 : {{studentInfo.ClassNo | class}}
      • -
    • 报到日期 : {{studentInfo.RegisterDate | date}}
      • -
    • 入学年月 : {{studentInfo.EntranceDate | date}}
      • -
    • 入党时间 : {{studentInfo.JoinPartyDate | date}}
    • 入团时间 : {{studentInfo.JoinLeagueDate | date}}
      • -
    • 档案地址 : {{studentInfo.MatherUnit}}
      • +
    • 现有学历 : {{studentInfo.GraduateNo | graduateNo}}
      • +
    • 报到日期 : {{studentInfo.RegisterDate | date}}
      • +
    • 入学年月 : {{studentInfo.EntranceDate | date}}
    联系方式
      -
    • 校内地址 : {{studentInfo.InSchoolAddress}}
      • +
    • 联系电话 : {{studentInfo.mobile}}
    • QQ : {{studentInfo.QQ}}
      • -
    • 校内电话 : {{studentInfo.InSchoolTelephone}}
      • +
    • E-mail : {{studentInfo.EMail}}
    @@ -110,12 +99,14 @@ }, methods: { getData: function () { - $.get('/UserCenter/GetStudentInfo?stuId=' + keyValue, function (ref) { - this.studentInfo = ref.data.userInfo; - this.baseInfo = ref.data.basicInfo; - this.headUrl = ref.data.userInfo.Photo; + $.get('/UserCenter/GetStudentInfo?stuId=' + keyValue, + function (ref) { + this.studentInfo = ref.data.userInfo; + this.baseInfo = ref.data.basicInfo; + this.headUrl = ref.data.userInfo.Photo; - }.bind(this), "json"); + }.bind(this), + "json"); }, getUrl: function () { var loginInfo = top.learun.clientdata.get(['userinfo']); @@ -133,26 +124,28 @@ }, company: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', - key: value, - keyId: 'f_companyid', - callback: function (_data) { - result = _data.f_fullname; - } - }); + top.learun.clientdata.getAsync('custmerData', + { + sync: true, + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + key: value, + keyId: 'f_companyid', + callback: function (_data) { + result = _data.f_fullname; + } + }); return result; }, graduateNo: function (value) { var result; - top.learun.clientdata.getAsync('dataItem', { - key: value, - code: 'CollegeType', - callback: function (_data) { - result = _data.text; - } - }); + top.learun.clientdata.getAsync('dataItem', + { + key: value, + code: 'CollegeType', + callback: function (_data) { + result = _data.text; + } + }); return result; }, date: function (value) { @@ -166,24 +159,38 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('dataItem', { - key: value, - code: 'National', - callback: function (_data) { - result = _data.text; - } - }); + top.learun.clientdata.getAsync('dataItem', + { + key: value, + code: 'National', + callback: function (_data) { + result = _data.text; + } + }); return result; }, partyFaceNo: function (value) { var result; - top.learun.clientdata.getAsync('dataItem', { - key: value, - code: 'BCdPartyFace', - callback: function (_data) { - result = _data.text; - } - }); + top.learun.clientdata.getAsync('dataItem', + { + key: value, + code: 'PolityStatus', + callback: function (_data) { + result = _data.text; + } + }); + return result; + }, + guardiantype: function (value) { + var result; + top.learun.clientdata.getAsync('dataItem', + { + key: value, + code: 'GuardianType', + callback: function (_data) { + result = _data.text; + } + }); return result; }, province: function (value) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 658244de8..7e6cf302f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -159,7 +159,7 @@ var bootstrap = function ($, learun) { } learun.layerForm({ id: 'form', - title: '编辑', + title: '查看', url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue, width: 1162, height: 600, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml index c7ae00fc7..cd74ce967 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml @@ -31,6 +31,7 @@
    + 文件大小不能超过200M
    From 76918a1d2b8c5346d037ed905853a328175ab66a Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 16 Mar 2022 10:19:31 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9F=A5=E7=9C=8B=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=9F=A5=E7=9C=8B=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/Index.js | 11 ++++ .../Views/UserCenter/Index.cshtml | 53 ++++++++++++++++--- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 7e6cf302f..22171f71c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -437,7 +437,18 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue) { return cellvalue == "1" ? "已审核" : "未审核"; } + }, + { + label: "是否上传头像", name: "Photo", width: 80, align: "center", + formatter: function (cellvalue) { + if (cellvalue != null && cellvalue != "" && cellvalue != undefined) { + return cellvalue = "是"; + } else { + return cellvalue= "否"; + } + } } + ], mainId: 'StuId', isPage: true, 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 abe15e070..dfd60aa8d 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 @@ -95,11 +95,14 @@
    • 性       别 : {{studentInfo.GenderNo | sex}}
    • 出生日期 : {{studentInfo.Birthday | date}}
      • +
    • 校       区 : {{baseInfo.companyId | company}}
      • + @*
    • 性       别 : {{studentInfo.GenderNo | sex}}
      • +
    • 出生日期 : {{studentInfo.Birthday | date}}
    • 联系电话 : {{studentInfo.mobile}}
    • 校       区 : {{baseInfo.companyId | company}}
    • 学       号 : {{studentInfo.StuNo}}
    • 本  专  科 : {{studentInfo.GraduateNo | graduateNo}}
      • -
    • 年       级 : {{studentInfo.Grade}}
      • +
    • 年       级 : {{studentInfo.Grade}}
      • *@
    @@ -112,32 +115,51 @@
  • 民 族 : {{studentInfo.NationalityNo |nationalityNo}}
  • 政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}
  • 身份证号 : {{studentInfo.IdentityCardNo}}
    • +
  • 户口所在地 : {{studentInfo.FatherUnit}}
    • + @*
  • 民 族 : {{studentInfo.NationalityNo |nationalityNo}}
    • +
  • 政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}
    • +
  • 身份证号 : {{studentInfo.IdentityCardNo}}
  • E-mail : {{studentInfo.EMail}}
  • 户 籍 省 : {{studentInfo.F_ProvinceId | province}}
  • 户籍地市 : {{studentInfo.F_CityId | city}}
  • 户籍县区 : {{studentInfo.F_CountyId | area}}
    • -
  • 户籍地址 : {{studentInfo.FatherUnit}}
    • +
  • 户籍地址 : {{studentInfo.FatherUnit}}
    • *@
    家庭情况
      -
    • 父亲姓名 : {{studentInfo.FatherName}}
      • +
    • 监护人姓名 : {{studentInfo.Guardian}}
      • +
    • 监护人联系电话 : {{studentInfo.GuardianPhone}}
      • +
    • 与监护人关系 : {{studentInfo.GuardianType |guardiantype}}
      • +
    • 邮政编码 : {{studentInfo.PostalCode}}
      • +
    • 家庭地址 : {{studentInfo.MailAddress}}
      • + @*
    • 父亲姓名 : {{studentInfo.FatherName}}
    • 父亲电话 : {{studentInfo.FatherPhone}}
    • 母亲姓名 : {{studentInfo.MatherName}}
    • 母亲电话 : {{studentInfo.MatherPhone}}
    • 港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}
    • 健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}
    • 邮政编码 : {{studentInfo.PostalCode}}
      • -
    • 通信地址 : {{studentInfo.MailAddress}}
      • +
    • 通信地址 : {{studentInfo.MailAddress}}
      • *@
    学籍信息
      -
    • 通知书号 : {{studentInfo.NoticeNo}}
      • +
    • 学   籍   号 : {{studentInfo.StuCode}}
      • +
    • 学 号 : {{studentInfo.StuNo}}
      • +
    • 年       级 : {{studentInfo.Grade}}
      • +
    • 系 部 : {{studentInfo.DeptNo | deptNo}}
      • +
    • 专 业 : {{studentInfo.MajorNo | majorNo}}
      • +
    • 班 级 : {{studentInfo.ClassNo | class}}
      • +
    • 入团时间 : {{studentInfo.JoinLeagueDate | date}}
      • +
    • 现有学历 : {{studentInfo.GraduateNo | graduateNo}}
      • +
    • 报到日期 : {{studentInfo.RegisterDate | date}}
      • +
    • 入学年月 : {{studentInfo.EntranceDate | date}}
      • + @*
    • 通知书号 : {{studentInfo.NoticeNo}}
    • 考 生 号 : {{studentInfo.ksh}}
    • 系所 : {{studentInfo.DeptNo | deptNo}}
    • 专 业 : {{studentInfo.MajorNo | majorNo}}
      • @@ -146,16 +168,19 @@
    • 入学年月 : {{studentInfo.EntranceDate | date}}
    • 入党时间 : {{studentInfo.JoinPartyDate | date}}
    • 入团时间 : {{studentInfo.JoinLeagueDate | date}}
      • -
    • 档案地址 : {{studentInfo.MatherUnit}}
      • +
    • 档案地址 : {{studentInfo.MatherUnit}}
      • *@
    联系方式
      -
    • 校内地址 : {{studentInfo.InSchoolAddress}}
      • +
    • 联系电话 : {{studentInfo.mobile}}
      • +
    • QQ : {{studentInfo.QQ}}
      • +
    • E-mail : {{studentInfo.EMail}}
      • + @*
    • 校内地址 : {{studentInfo.InSchoolAddress}}
    • QQ : {{studentInfo.QQ}}
      • -
    • 校内电话 : {{studentInfo.InSchoolTelephone}}
      • +
    • 校内电话 : {{studentInfo.InSchoolTelephone}}
      • *@
    @@ -247,6 +272,18 @@ }); return result; }, + guardiantype: function (value) { + var result; + top.learun.clientdata.getAsync('dataItem', + { + key: value, + code: 'GuardianType', + callback: function (_data) { + result = _data.text; + } + }); + return result; + }, province: function (value) { var result; top.learun.clientdata.getAsync('custmerData', {