From 9bc89f95cc773b15013ec210c030d201aec96822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sat, 25 Mar 2023 14:02:46 +0800
Subject: [PATCH] 1

---
 .../src/main/resources/templates/index.html   | 34 +++++++++++++------
 .../resources/templates/teacherIndex.html     |  9 +++--
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/admin-core/src/main/resources/templates/index.html b/admin-core/src/main/resources/templates/index.html
index 6cdcae74..39c82ea7 100644
--- a/admin-core/src/main/resources/templates/index.html
+++ b/admin-core/src/main/resources/templates/index.html
@@ -336,20 +336,14 @@
         var form = layui.form;
         var element = layui.element;
 
-        var ret = Common.getAjax("/getAuthResourcesAndSystemInfo.json");//图标显示data
 
 
-        layer.msg('XXXX学校到期，请点击', {
-            time: 20000, //20s后自动关闭
-            offset: 'rb',
-            btn: ['查看', '知道了']
-        });
-
 
         $(".menu_three").on("click", function () {
             $(this).next().toggle(500);
             $(".three_this").removeClass("three_this");
         });
+
         $("ol").on("click", "li a", function () {
             $.each($(this).parent().siblings(), function (i, e) {
                 $(e).find("a").removeClass('three_this');
@@ -413,8 +407,9 @@
                 //element.tabChange('fsTab', "1_1_1"); //切换到：用户管理
                 $("#indexUrl").attr('href',Common.ctxPath+'/index.do?_role_tag='+getHeadTag())
             } else {
-                $("#fsLeftMenu .menuClass").removeClass("layui-this");
-                $("#fsLeftMenu .menuClass a[menuId=" + layId + "]").parent().addClass('layui-this');
+                $("#fsLeftMenu .menu_three").parent().removeClass("layui-this");
+                $("#fsLeftMenu a[menuId=" + layId + "]").parent().addClass('layui-this');
+                console.log(layId, url, title)
                 openNewPage(layId, url, title);
             }
         };
@@ -483,6 +478,7 @@
 
     //打开新的title
     function openNewPage(layId, url, title) {
+
         var layId = layId;//来电管理ID
         var dataUrl = Common.ctxPath + url;
         var title = title;
@@ -513,7 +509,6 @@
         layui.element.tabChange('fsTab', layId);
     }
 
-
     //打开订单管理页面 立即查看
     function orderPage(orderId) {
         window.localStorage.setItem($.getKeyInfo("indexOrderId"), orderId);
@@ -546,7 +541,24 @@
         }
         Lib.closeOrder();
         layui.element.tabChange('fsTab', layId); //切换到：用户管理
-    }
+    };
+
+
+    var ret = Common.getAjax("/getAuthResourcesAndSystemInfo.json");//图标显示data
 
 
+    layer.msg('XXXX学校到期，请点击', {
+        time: 20000, //20s后自动关闭
+        offset: 'rb',
+        btn: ['查看'],
+        yes: function(index, layero){
+           var url = "/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.do";
+             /*$("#indexUrl").attr('href',Common.ctxPath+'/index.do?_role_tag='+getHeadTag())*/
+            var layId = 178;
+            //layui.element.tabChange('fsTab', 178);
+            console.log($("#fsLeftMenu a[menuId=" + layId + "]").parent().html())
+            $("#fsLeftMenu a[menuId=" + layId + "]").parent().addClass('layui-this');
+            openNewPage(layId, url, "院系权限管理");
+        }
+    });
 </script>
diff --git a/admin-core/src/main/resources/templates/teacherIndex.html b/admin-core/src/main/resources/templates/teacherIndex.html
index 7296e162..a8e92663 100644
--- a/admin-core/src/main/resources/templates/teacherIndex.html
+++ b/admin-core/src/main/resources/templates/teacherIndex.html
@@ -361,7 +361,7 @@
         }
 
         function locadInfo(sTime, eTime) {
-            layer.load();
+           var index =  layer.load();
             setTimeout(function () {
                 var ret = Common.getAjax("/api/statisticalAnalysis/adminIndexDetail.do", {stime: sTime, etime: eTime});//图标显示data
                 var retChart = Common.getAjax("/api/statisticalAnalysis/adminIndexBarchart.do", {
@@ -373,6 +373,10 @@
                 }
                 if (ret.code == 0) {
                     adminIndexDetailData = ret.data;
+                    layer.close(index);
+                }else {
+                    Common.info(ret.msg)
+                    layer.close(index);
                 }
                 $("#universitiesCollegesAuthCode").text(adminIndexDetailData.universitiesCollegesAuthCode.toString());
                 laytpl(getTpl).render(adminIndexDetailData, function (html) {
@@ -381,8 +385,9 @@
                 if ("${isSignRole.get()!''}" == 1) {
                     localTB()
                 }
-                layer.closeAll()
+
             }, 50);
+
         }
 
         /*