Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js

@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList',
                 headData: [
                     { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js

@@ -2203,6 +2203,7 @@
                 dfop.rows = 1000000;
                 data = data || dfop.param || {};
                 dfop.param = data.param || data;
+                dfop.running.pageparam.page = 1;
                 _jfgrid.reload($self, dfop);
                 break;
             case 'refresh':

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js

@@ -61,6 +61,12 @@
                                         callBack: function (id) {
                                             return top[id].acceptClick();
                                         },
+                                        end: function () {
+                                            if (learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows == 1000000) {
+                                                learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows = 30;
+                                                learun.frameTab.currentIframe().$('#' + item.F_GridId).jfGridSet('reload');
+                                            }
+                                        },
                                         btn: ['导出Excel', '关闭']
                                     });
                                 });