Merge branch '临城职教中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 临城职教中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs

@@ -304,7 +304,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 startDate = StartTime.ToString("yyyy-MM-dd");
             }
 
-            endDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).AddDays(10)
+            endDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).AddDays(13)
                 .ToString("yyyy-MM-dd");// StartTime.AddDays(((curWeek - 1) * 14)).AddDays(10).ToString("yyyy-MM-dd");
 
             var timeTableList = new List<TimeTable>();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.cshtml

@@ -78,7 +78,7 @@
             border-left: 1px solid #333;
         border-top: 1px solid #333;
             padding: 1px;
-            width: 9%;
+            width: 6.6%;
             font-size: 12px;
         }
     .perFestivalsBox table {
@@ -118,7 +118,7 @@
         height: 100%;
     }
     .leftDiv {
-        width: 80%;
+        width: 100%;
         float: left;
     }
     .rightDiv {
@@ -140,7 +140,7 @@
         }
     .perFestivalsBox td {
         padding: 1px;
-        width: 9%;
+        width: 6.6%;
     }
     .WeekTimes {
         text-align: left;
@@ -161,6 +161,11 @@
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
             </div>
             <div class="lr-layout-body" style="overflow: auto;">
                 <div class="warpper">
@@ -186,7 +191,7 @@
                                 <table id="lessonTermTable" cellspacing="0" border="0" style="width: 100%"></table>
                             </div>
                         </div>
-                        <div class="rightDiv">
+                        @*<div class="rightDiv">
                             <input id="ALTId" hidden="hidden" />
                             <div class="rdiv" id="LessonInfo"></div>
                             <div class="rdiv" id="EmpInfo"></div>
@@ -196,7 +201,7 @@
                             <div class="rdiv" id="NodeSelect"></div>
                             <button class="btn btn-default dbtn" id="delete">删除</button>
                             <button class="btn btn-default ebtn" id="edit">修改</button>
-                        </div>
+                        </div>*@
                        
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js

@@ -13,7 +13,7 @@ var bootstrap = function ($, learun) {
                 function (data) {
                     //console.log('res', data);
                     // 数据处理
-                    var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>';
+                    var html = '<tr style="height: 30px;"><td>节次/第几天</td><td>第1天</td><td>第2天</td><td>第3天</td><td>第4天</td><td>第5天</td><td>第6天</td><td>第7天</td><td>第8天</td><td>第9天</td><td>第10天</td><td>第11天</td><td>第12天</td><td>第13天</td><td>第14天</td></tr>';
                     var weekLists = data.weekList;
                     //十节课  2022.6.14 修改为一天十一节课
                     for (var i = 1; i < 12; i++) {
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
                     //某节课空
                     function tdHandle() {
                         var html = '';
-                        for (var j = 0; j < 11; j++) {
+                        for (var j = 0; j < 15; j++) {
                             html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>';
                         }
                         return html;
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) {
                     //某节课不空
                     function tdHandles(lists) {
                         var html = '';
-                        for (var k = 1; k < 12; k++) {
+                        for (var k = 1; k < 16; k++) {
                             (function (arg) {
                                 var args = arg - 1;
                                 var datas = flogs2(arg, lists, 'day');

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.cshtml

@@ -82,7 +82,7 @@
             border-left: 1px solid #333;
             border-top: 1px solid #333;
             padding: 1px;
-            width: 9%;
+            width: 6.6%;
             font-size: 12px;
         }
 
@@ -132,7 +132,7 @@
 
     .perFestivalsBox td {
         padding: 1px;
-        width: 9%;
+        width: 6.6%;
     }
 
     .WeekTimes {
@@ -146,6 +146,11 @@
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
             </div>
             <div class="lr-layout-body" style="overflow: auto;">
                 <div class="warpper">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js

@@ -8,12 +8,13 @@ var bootstrap = function ($, learun) {
             page.bind();
             //page.bindSelect();
         },
+
         loadData: function (param) {
             $.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/ArrangeLessonTerm/GetDataInEducation', param,
                 function (data) {
                     //console.log('res', data);
                     // 数据处理
-                    var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>';
+                    var html = '<tr style="height: 30px;"><td>节次/第几天</td><td>第1天</td><td>第2天</td><td>第3天</td><td>第4天</td><td>第5天</td><td>第6天</td><td>第7天</td><td>第8天</td><td>第9天</td><td>第10天</td><td>第11天</td><td>第12天</td><td>第13天</td><td>第14天</td></tr>';
                     var weekLists = data.weekList;
                     //十节课
                     for (var i = 1; i < 12; i++) {
@@ -60,7 +61,7 @@ var bootstrap = function ($, learun) {
                     //某节课空
                     function tdHandle() {
                         var html = '';
-                        for (var j = 0; j < 11; j++) {
+                        for (var j = 0; j < 15; j++) {
                             html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>';
                         }
                         return html;
@@ -69,7 +70,7 @@ var bootstrap = function ($, learun) {
                     //某节课不空
                     function tdHandles(lists) {
                         var html = '';
-                        for (var k = 1; k < 12; k++) {
+                        for (var k = 1; k < 16; k++) {
                             (function (arg) {
                                 var args = arg - 1;
                                 var datas = flogs2(arg, lists, 'day');

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermTeach.cshtml

@@ -82,7 +82,7 @@
             border-left: 1px solid #333;
             border-top: 1px solid #333;
             padding: 1px;
-            width: 9%;
+            width: 6.6%;
             font-size: 12px;
         }
 
@@ -132,7 +132,7 @@
 
     .perFestivalsBox td {
         padding: 1px;
-        width: 9%;
+        width: 6.6%;
     }
 
     .WeekTimes {
@@ -146,6 +146,11 @@
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
             </div>
             <div class="lr-layout-body" style="overflow: auto;">
                 <div class="warpper">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermTeach.js

@@ -13,7 +13,7 @@ var bootstrap = function ($, learun) {
                 function (data) {
                     //console.log('res', data);
                     // 数据处理
-                    var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>';
+                    var html = '<tr style="height: 30px;"><td>节次/第几天</td><td>第1天</td><td>第2天</td><td>第3天</td><td>第4天</td><td>第5天</td><td>第6天</td><td>第7天</td><td>第8天</td><td>第9天</td><td>第10天</td><td>第11天</td><td>第12天</td><td>第13天</td><td>第14天</td></tr>';
                     var weekLists = data.weekList;
                     //十节课
                     for (var i = 1; i < 12; i++) {
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
                     //某节课空
                     function tdHandle() {
                         var html = '';
-                        for (var j = 0; j < 11; j++) {
+                        for (var j = 0; j < 15; j++) {
                             html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>';
                         }
                         return html;
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) {
                     //某节课不空
                     function tdHandles(lists) {
                         var html = '';
-                        for (var k = 1; k < 12; k++) {
+                        for (var k = 1; k < 16; k++) {
                             (function (arg) {
                                 var args = arg - 1;
                                 var datas = flogs2(arg, lists, 'day');
@@ -150,10 +150,10 @@ var bootstrap = function ($, learun) {
                 curWeek = $('#WeekTimes input[name="WeekTimes"]:checked ').val();
                 page.search();
             });
-            // 刷新
-            //$('#lr_refresh').on('click', function () {
-            //    location.reload();
-            //});
+            //刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
             //查询
             $('#lr_search').on('click', function () {
                 var p = {};

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

@@ -20,10 +20,11 @@
   <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="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="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=139.196.217.128;Database=cypaike;User ID=root;Password=123456;" providerName="MySql.Data.MySqlClient" /><!--金隅-->
+  <add name="paikeDbString" connectionString="Data Source=139.196.217.128;Database=cypaike;User ID=root;Password=123456;" providerName="MySql.Data.MySqlClient" />
+  <!--金隅-->
   <!--<add name="BaseDb" connectionString="Server=192.168.100.224;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.100.224;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=192.168.100.224;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->

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

@@ -18,8 +18,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="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_长阳;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" />
 
 </connectionStrings>