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

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js

@@ -165,7 +165,7 @@
                             if (res.data.pwd == true) {
                                 window.location.href = "/Home/Index?pwd=true";
                             } else if (res.data.pwdtip == true) {
-                                window.location.href = "/Home/Index?pwdtip=true";
+                                window.location.href = "/Home/Index?pwd=true";
                             }
                             else
                                 window.location.href = "/Home/Index";

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ExcelExportForm.js

@@ -17,9 +17,21 @@ var bootstrap = function ($, learun) {
             var columnModel;
             if (iframeIndex) {
                 var currentWin = top.frames['layui-layer-iframe' + iframeIndex];
+                if (currentWin.$('#' + gridId).jfGrid()[0].dfop.rowdatas.length == 0) {
+                    learun.alert.warning("暂无数据！");
+                    var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                    parent.layer.close(index); //再执行关闭 
+                    return;
+                }
                 currentWin.$('#' + gridId).jfGridSet('reloadall');
                 columnModel = currentWin.$('#' + gridId).jfGridGet('settingInfo').headData;
             } else {
+                if (learun.frameTab.currentIframe().$('#' + gridId).jfGrid()[0].dfop.rowdatas.length == 0) {
+                    learun.alert.warning("暂无数据！");
+                    var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                    parent.layer.close(index); //再执行关闭 
+                    return;
+                }
                 learun.frameTab.currentIframe().$('#' + gridId).jfGridSet('reloadall');
                 columnModel = learun.frameTab.currentIframe().$('#' + gridId).jfGridGet('settingInfo').headData;
             }