Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -13,8 +13,8 @@
 
 
 var config = {
-    webapi: 'http://localhost:8088/',
-    web: "http://localhost:8087/"//web地址，用于配置logo
+    webapi: 'http://localhost:31173/',
+    web: "http://localhost:20472/"//web地址，用于配置logo
 }; 
 // var config = {
 //    webapi: 'http://123.57.209.16:31173/',

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/ArrangeExamTerm/ArrangeExamTerm.js

@@ -62,7 +62,7 @@
 				value: _item.EmpName
 			}));
 			_$item.append($('<p class="lr-ellipsis"><span>教室名称:</span></p>').dataFormatter({
-				value: _item.ClassRoomName
+				value: _item.ClassroomName
 			}));
 			_$item.append($('<p class="lr-ellipsis"><span>座位编号:</span></p>').dataFormatter({
 				value: _item.SitNumber

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexStudent.js

@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
         },
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/GetItemPageList',
+                url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/GetItemPageList',
                 headData: [
                     { label: '学年', name: 'AcademicYearNo', width: 70, align: "left" },
                     { label: '学期', name: 'Semester', width: 60, align: "left" },
@@ -70,8 +70,8 @@ var bootstrap = function ($, learun) {
                     { label: '课程名称', name: 'LessonName', width: 200, align: "left" },
                     { label: '监考教师编号', name: 'EmpNo', width: 150, align: "left" },
                     { label: '监考教师姓名', name: 'EmpName', width: 150, align: "left" },
-                    { label: '教室编号', name: 'ClassRoomNo', width: 100, align: "left" },
-                    { label: '教室名称', name: 'ClassRoomName', width: 100, align: "left" },
+                    { label: '教室编号', name: 'ClassroomNo', width: 100, align: "left" },
+                    { label: '教室名称', name: 'ClassroomName', width: 100, align: "left" },
                     { label: '班级名称', name: 'ClassName', width: 100, align: "left" },
                     { label: '学生编号', name: 'StuNo', width: 100, align: "left" },
                     { label: '学生姓名', name: 'StuName', width: 200, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ArrangeExamTermApi.cs

@@ -23,7 +23,8 @@ namespace Learun.Application.WebApi.Modules
             Get["/teststulist"] = GetSutdentList;
         }
 
-        private ArrangeExamTermNewIBLL AeTerm = new ArrangeExamTermNewBLL();
+        //private ArrangeExamTermNewIBLL AeTerm = new ArrangeExamTermNewBLL();
+        Exam_ArrangeExamTermNewIBLL AeTerm=new Exam_ArrangeExamTermNewBLL();
 
         /// <summary>
         /// 获取学生待考试列表

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
   <!--本机-->
-  <add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=NewCollegeMIS_塔里木;User ID=sa;Password=123456" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
+  <add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->
 
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
@@ -25,8 +25,8 @@
   <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
 	<!--塔里木测试-->
-	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+	<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 	<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 	<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->
+	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
 </connectionStrings>