").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/menu.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/menu.js
new file mode 100644
index 000000000..8838d2ffb
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/menu.js
@@ -0,0 +1,2 @@
+var menu = document.getElementsByClassName('menu')[0]
+menu.style.height = (pageHeight * 0.064) + 'px'
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/title_search.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/title_search.js
new file mode 100644
index 000000000..19ae09d23
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/title_search.js
@@ -0,0 +1,7 @@
+var title_search = document.getElementsByClassName('title_search')[0]
+title_search.style.paddingTop = (pageHeight * 0.008) + 'px'
+title_search.style.paddingBottom = (pageHeight * 0.008) + 'px'
+search.style.height = (pageHeight * 0.0434) + 'px'
+search.style.width = (pageWidth * 0.388) + 'px'
+search_icon.style.width = (pageWidth * 0.0384) + 'px'
+search_icon.style.right = (pageWidth * 0.03) + 'px'
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 95bb11f1c..2222e5ab6 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
@@ -806,6 +806,7 @@
+
@@ -965,6 +966,8 @@
+
+
@@ -3232,6 +3235,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3951,6 +3985,14 @@
+
+
+
+
+
+
+
+
@@ -6381,6 +6423,7 @@
+
@@ -7189,6 +7232,7 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/index.html b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/index.html
new file mode 100644
index 000000000..1002f6cdc
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/index.html
@@ -0,0 +1,123 @@
+
+
+
+
+
+ 导航
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/newStudentGui.html b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/newStudentGui.html
new file mode 100644
index 000000000..e37bd79a4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/newStudentGui.html
@@ -0,0 +1,46 @@
+
+
+
+
+
+ 新生指引
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/proDsc.html b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/proDsc.html
new file mode 100644
index 000000000..4516f5845
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/proDsc.html
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+ 专业介绍
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolNewsDetails.html b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolNewsDetails.html
new file mode 100644
index 000000000..b13e9f503
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolNewsDetails.html
@@ -0,0 +1,117 @@
+
+
+
+
+
+ 学校新闻
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolNewsList.html b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolNewsList.html
new file mode 100644
index 000000000..55f469144
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolNewsList.html
@@ -0,0 +1,165 @@
+
+
+
+
+
+ 学校新闻
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 共有条新闻资讯
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolSceneryList.html b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolSceneryList.html
new file mode 100644
index 000000000..3eab5857d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/schoolSceneryList.html
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+ 校园风光
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/server.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/server.js
new file mode 100644
index 000000000..7ec5f54d6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/server.js
@@ -0,0 +1 @@
+var serverurl ="http://localhost:31173";
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/survey.html b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/survey.html
new file mode 100644
index 000000000..ccff8ea9a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/survey.html
@@ -0,0 +1,160 @@
+
+
+
+
+
+ 新生指引
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 建校半个多世纪以来,学校性质由技工改为中专,又由中专改为技工,继而进行半工半读教改实验,最后恢复中专性质。其间学校8易归属
+
+
+
1993
+
+
+
+
2月
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
+
+
+
3月
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
+
+
+
4月
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
+
+
+
5月
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
+
+
+
1995
+
+
+
+
2月
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
+
+
+
3月
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
+
+
+
4月
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
+
+
+
5月
+
学校名称:中华人民共和国重工业部建筑材料工业管理局琉璃河技工学校 办学性质:技工 隶属上级:重工业部建筑材料工业管理局
+
+
+
+
+
+
+
+
+
+
+
+
+
1980年11月,学校被国家教育部命名为“全国重点中等专业学校1980年11月,学校被国家教育部命名为“全国重点中等专业学校
+
1980年11月,学校被国家教育部命名为“全国重点中等专业学校1980年11月,学校被国家教育部命名为“全国重点中等专业学校
+
1980年11月,学校被国家教育部命名为“全国重点中等专业学校1980年11月,学校被国家教育部命名为“全国重点中等专业学校
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs
index a9dd22931..b7d528f79 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs
@@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using Learun.Application.Organization;
using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Util;
using Nancy;
namespace Learun.Application.WebApi.Modules
@@ -54,6 +55,16 @@ namespace Learun.Application.WebApi.Modules
//按条件重置基础数据同步状态
Get["/initbasicdata"] = InitBasicData;
+ //信息浏览
+ //校区简介
+ Get["/getBriefIntroductionById"] = GetBriefIntroductionById;
+ //学校新闻、校园风光
+ Get["/getSchoolNewList"] = GetSchoolNewList;
+ //专业列表
+ Get["/getCdMajorList"] = GetCdMajorList;
+ //新闻详情
+ Get["/getSchoolNewsDetails"] = GetSchoolNewsDetails;
+
}
private readonly ArrangeLessonTermIBLL arrangeLessonTermIBLL = new ArrangeLessonTermBLL();
private readonly StuScoreIBLL stuScoreIBLL = new StuScoreBLL();
@@ -66,6 +77,8 @@ namespace Learun.Application.WebApi.Modules
ClassInfoIBLL classInfoIbll = new ClassInfoBLL();
UserIBLL userIbll = new UserBLL();
private CompanyIBLL companyIbll = new CompanyBLL();
+ private SchoolNewsIBLL schoolNewsIBLL = new SchoolNewsBLL();
+ private CdMajorIBLL cdMajorIBLL = new CdMajorBLL();
private StuSelectLessonListOfElectiveIBLL stuSelectLessonListOfElectiveIbll =
new StuSelectLessonListOfElectiveBLL();
@@ -335,5 +348,110 @@ namespace Learun.Application.WebApi.Modules
var result = allList.Select(x => new { x.BuKaoFlag, x.AcademicYearNo, x.Semester, x.StuId, x.StuName, x.LessonId, x.LessonName, x.ClassId, x.ClassName, x.EmpId, x.EmpName }).OrderBy(x => x.BuKaoFlag).ThenByDescending(x => x.AcademicYearNo).ThenByDescending(x => x.Semester).ThenBy(x => x.StuId);
return Success(result);
}
+
+
+ ///
+ /// 获取学校简介
+ ///
+ ///
+ ///
+ private Response GetBriefIntroductionById(dynamic _)
+ {
+ string companyId = Request.Query["companyId"];
+ if (string.IsNullOrEmpty(companyId))
+ {
+ return Fail("参数有误!");
+ }
+ var result = companyIbll.GetEntity(companyId);
+ if (result == null)
+ return Fail("找不到数据!");
+ else
+ {
+ return Success(result.F_BriefIntroduction);
+ }
+ }
+
+ ///
+ /// 获取学校新闻列表、校园风光列表
+ ///
+ ///
+ ///
+ public Response GetSchoolNewList(dynamic _)
+ {
+ string categoryId = Request.Query["categoryId"];
+ var result = schoolNewsIBLL.GetListByCategoryId(categoryId);
+ return Success(result);
+ }
+ ///
+ /// 获取专业列表
+ ///
+ ///
+ ///
+ public Response GetCdMajorList(dynamic _)
+ {
+ string keyword = Request.Query["keyword"];
+ var result = cdMajorIBLL.GetAllList(keyword);
+ return Success(result);
+ }
+ ///
+ /// 获取详情
+ ///
+ ///
+ ///
+ public Response GetSchoolNewsDetails(dynamic _)
+ {
+ string Id = Request.Query["Id"];
+ //type: 1学校新闻,2校园风光,3 专业介绍
+ string type = Request.Query["type"];
+
+ var title = "";
+ var time = "";
+ var desc = "";
+ switch (type)
+ {
+ case "1":
+ {
+ //学校新闻
+ var result = schoolNewsIBLL.GetLR_OA_SchoolNewsEntity(Id);
+ if (result != null)
+ {
+ title = result.F_FullHead;
+ time = result.F_ReleaseTime.HasValue? result.F_ReleaseTime.Value.ToString("yyyy-MM-dd"):"";
+ desc = result.F_NewsContent;
+ }
+ break;
+ }
+ case "2":
+ {
+ //校园风光
+ var result = schoolNewsIBLL.GetLR_OA_SchoolNewsEntity(Id);
+ if (result != null)
+ {
+ title = result.F_FullHead;
+ time = result.F_ReleaseTime.HasValue ? result.F_ReleaseTime.Value.ToString("yyyy-MM-dd") : "";
+ desc = result.F_NewsContent;
+ }
+ break;
+ }
+ case "3":
+ {
+ //专业介绍
+ var result = cdMajorIBLL.GetCdMajorEntity(Id);
+ if (result != null)
+ {
+ title = result.MajorName;
+ time = "";
+ desc = result.Introduce;
+ }
+ break;
+ }
+
+ }
+
+ object obj = new { title = title, desc = WebHelper.HtmlDecode(desc) };
+ return Success(obj);
+ }
+
+
}
}
\ 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 5c759afed..66be4aeae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config
@@ -6,9 +6,9 @@
-->
-
-
-
+
+
+