Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -55,6 +55,7 @@ U.MD.D.I.easyDeskIcon = [
     { "Name": "课程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/easy/study.png)", "width": '114px', 'height': '114px' } },
     { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/easy/evaluate.png)", "width": '114px', 'height': '114px' } },
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/easy/class.png)", "width": '114px', 'height': '114px' } },
+    { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)", "width": '114px', 'height': '114px' } },
 ];
 
 //教师桌面图标的全局变量
@@ -369,12 +370,12 @@ U.MD.D.I.szscOrganizerDeskIcon = [
     { "Name": "消息通知", "Url": "tcNotice", "style": { "cssText": "background-image:url(/img/icon/news.png)" } },
 ];
 
-U.MD.D.I.wankeTeacherDeskIcon = [
+U.MD.D.I.wankeTeacherDeskIcon = [//1c3b9def-8fbe-11ed-b13d-005056b86db5
     { "Name": "课程管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
     { "Name": "课程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
-    { "Name": "项目管理", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "PBL项目", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     { "Name": "我的资料", "Url": "my", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
@@ -389,7 +390,7 @@ U.MD.D.I.wankeAdminDeskIcon = [
     { "Name": "课程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
-    { "Name": "项目管理", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "PBL项目", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     { "Name": "我的资料", "Url": "my", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
@@ -619,6 +620,15 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
         )
     }
+    if(_oid == '1c3b9def-8fbe-11ed-b13d-005056b86db5'){
+        _studentDesktopIconInfo3 = _studentDesktopIconInfo3.filter((el) => {
+            if(el.Name == '项目管理'){
+                el.Name = 'PBL项目'
+            }
+            return el
+        })
+
+    }
     if (_oid != '4c686762-1d0a-11ed-8c78-005056b86db5' && _oid != '45facc0a-1211-11ec-80ad-005056b86db5') {
         _teacherDesktopIconInfo = _teacherDesktopIconInfo.filter((el) => {
             return el.Name != '魔盒识字' && el.Name != '24点'
@@ -3415,12 +3425,8 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
     let _lspan = document.createElement('span')
     _lspan.innerHTML = "上传中..."
     _lchild.appendChild(_lspan)
-    _lchild.style = "color: #fff;padding: 15px;background: #00000070;font-size: 18px;display:flex;align-items:center;"
+    _lchild.style = "color: rgb(255, 255, 255);padding: 15px;background: rgba(0, 0, 0, 0.44);font-size: 18px;display: flex;align-items: center;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"
     _loading.appendChild(_lchild)
-    _loading.addEventListener("click", function (event) {
-        event.stopPropagation();
-        event.target.style.display = 'flex'
-    });
     var _box = $$('div', {
         "style": {
             "position": "relative",
@@ -3878,12 +3884,8 @@ U.MD.D.I.openApplicationJieTeacher = function (str, cid, stage, task, tool, stud
     let _lspan = document.createElement('span')
     _lspan.innerHTML = "上传中..."
     _lchild.appendChild(_lspan)
-    _lchild.style = "color: #fff;padding: 15px;background: #00000070;font-size: 18px;display:flex;align-items:center;"
+    _lchild.style = "color: rgb(255, 255, 255);padding: 15px;background: rgba(0, 0, 0, 0.44);font-size: 18px;display: flex;align-items: center;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"
     _loading.appendChild(_lchild)
-    _loading.addEventListener("click", function (event) {
-        event.stopPropagation();
-        event.target.style.display = 'flex'
-    });
     var _box = $$('div', {
         "style": {
             "position": "relative",
@@ -4385,12 +4387,8 @@ U.MD.D.I.openApplicationJieS = function (str, cid, stage, task, tool) {
     let _lspan = document.createElement('span')
     _lspan.innerHTML = "上传中..."
     _lchild.appendChild(_lspan)
-    _lchild.style = "color: #fff;padding: 15px;background: #00000070;font-size: 18px;display:flex;align-items:center;"
+    _lchild.style = "color: rgb(255, 255, 255);padding: 15px;background: rgba(0, 0, 0, 0.44);font-size: 18px;display: flex;align-items: center;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"
     _loading.appendChild(_lchild)
-    _loading.addEventListener("click", function (event) {
-        event.stopPropagation();
-        event.target.style.display = 'flex'
-    });
     var _box = $$('div', {
         "style": {
             "position": "relative",
@@ -4694,12 +4692,8 @@ U.MD.D.I.openApplicationJieStudio = function (str, cid, stage, task, tool) {
     let _lspan = document.createElement('span')
     _lspan.innerHTML = "上传中..."
     _lchild.appendChild(_lspan)
-    _lchild.style = "color: #fff;padding: 15px;background: #00000070;font-size: 18px;display:flex;align-items:center;"
+    _lchild.style = "color: rgb(255, 255, 255);padding: 15px;background: rgba(0, 0, 0, 0.44);font-size: 18px;display: flex;align-items: center;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"
     _loading.appendChild(_lchild)
-    _loading.addEventListener("click", function (event) {
-        event.stopPropagation();
-        event.target.style.display = 'flex'
-    });
     var _box = $$('div', {
         "style": {
             "position": "relative",
@@ -5003,12 +4997,8 @@ U.MD.D.I.openApplicationYu = function (str, cid, stage, task, tool) {
     let _lspan = document.createElement('span')
     _lspan.innerHTML = "上传中..."
     _lchild.appendChild(_lspan)
-    _lchild.style = "color: #fff;padding: 15px;background: #00000070;font-size: 18px;display:flex;align-items:center;"
+    _lchild.style = "color: rgb(255, 255, 255);padding: 15px;background: rgba(0, 0, 0, 0.44);font-size: 18px;display: flex;align-items: center;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"
     _loading.appendChild(_lchild)
-    _loading.addEventListener("click", function (event) {
-        event.stopPropagation();
-        event.target.style.display = 'flex'
-    });
     var _box = $$('div', {
         "style": {
             "position": "relative",

js/Desktop/Onload.js

@@ -425,7 +425,11 @@ U.MD.D.getuser = function () {
                                 $(".userName")[0].style.display = "block";
                                 $(".userName")[0].innerHTML = US.userInfo.username || US.userInfo.alias;
                                 $(".exit")[0].style.display = "block";
-                                U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
+                                if(res.value[0][0].org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
+                                    U.MD.D.I.ModeCheck(2)
+                                }else{
+                                    U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
+                                }
                                 U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                             }, [], { "type": "GET", "withCredentials": true });
                         }
@@ -607,7 +611,11 @@ U.MD.D.getuser2 = function (userid, cid) {
         $(".userName")[0].style.display = "block";
         $(".userName")[0].innerHTML = US.userInfo.username || US.userInfo.alias;
         $(".exit")[0].style.display = "block";
-        U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
+        if(res.value[0][0].org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
+            U.MD.D.I.ModeCheck(2)
+        }else{
+            U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
+        }
         U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
         U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
     }, [], { "type": "GET", "withCredentials": true });