Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -993,8 +993,8 @@ U.MD.D.I.szjkyTeacherDeskIcon = [
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
-    { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
-    { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    // { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    // { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     // { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
@@ -1018,8 +1018,8 @@ U.MD.D.I.szjkyAdminDeskIcon = [
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
-    { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
-    { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    // { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    // { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     // { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },

js/Desktop/Onload.js

@@ -341,6 +341,10 @@ U.MD.D.getuser = function () {
                                         window.location.reload();
                                     }, [], { "type": "POST", "withCredentials": true });
                                 } else {
+                                    if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
+                                        U.MD.U.LO.logoutSystem2();
+                                        return;
+                                    }
                                     U.A.Request(US.Config.pbl + "addLoginOperation", [_user.userid], function (res) {
                                     }, [], { "type": "POST", "withCredentials": true });
 
@@ -435,8 +439,8 @@ U.MD.D.getuser = function () {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
                                         US.Config.background = 'url("/img/icon/dseiBg.png")'
                                     } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg.png")'
-                                        US.Config.background = 'url("/img/icon/szjkyBg.png")'
+                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
+                                        US.Config.background = 'url("/img/icon/szjkyBg2.png")'
                                     } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
                                         US.Config.background = 'url("/img/icon/chjyjBg.png")'
@@ -558,7 +562,7 @@ U.MD.D.getuser = function () {
             } else if (userInfo.org == '7b016f69-0f4f-11ee-91d8-005056b86db5') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
             } else if (userInfo.org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg.png")'
+                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
             } else if (userInfo.org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
             } else if (userInfo.org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
@@ -581,6 +585,10 @@ U.MD.D.getuser2 = function (userid, cid) {
         if ($("#U_MD_HomeC_Pop")[0]) {
             $("#U_MD_HomeC_Pop")[0].close(); //关闭登陆
         }
+        if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
+            U.MD.U.LO.logoutSystem2();
+            return;
+        }
         U.A.Request(US.Config.pbl + "addLoginOperation", [userid], function (res) {
         }, [], { "type": "POST", "withCredentials": true });
 
@@ -670,8 +678,8 @@ U.MD.D.getuser2 = function (userid, cid) {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/dseiBg.png")'
             US.Config.background = 'url("/img/icon/dseiBg.png")'
         } else if (res.value[0][0].org == '1973f6c7-1561-11ee-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg.png")'
-            US.Config.background = 'url("/img/icon/szjkyBg.png")'
+            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/szjkyBg2.png")'
+            US.Config.background = 'url("/img/icon/szjkyBg2.png")'
         } else if (res.value[0][0].org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
             US.Config.background = 'url("/img/icon/chjyjBg.png")'

uform.js

@@ -11970,6 +11970,29 @@ U.MD.U.LO.logoutSystem = function (callback) {
     }
 }
 
+/**
+* 禁止登录 执行推出
+*
+* @param callback {function} 登出回调函数
+*/
+U.MD.U.LO.logoutSystem2 = function (callback) {
+    //如果用户登录的情况
+    if (US.userInfo.userid) {
+        //弹出退出登录的提示
+        // U.UF.UI.confirm("是否退出" + US.userInfo.username + "账号", function () {
+        U.alert("您的账号已禁止登陆!")
+        U.A.Request(US.Config.server + "logout", [], function (res) {
+            U.A.Request(US.SCOKET, ["logout", US.userInfo.userid, US.pageId], function () {
+                setTimeout(() => {
+                    window.location.reload();
+                }, 2000);
+            }, [], { "type": "POST", "withCredentials": true }); //在状态服务退出
+        }, [], { "type": "POST", "withCredentials": true });
+        // });
+    }
+}
+
+
 //确定注销
 //b为是否清除cookie的参数。如果传递false，则清除cookie。