Merge branch 'beta' into alpha

ai.html

@@ -70,7 +70,7 @@
                 <div class="U_MD_D_K" id="U_MD_D_K" __top__="false">
                 </div>
                 <div class="U_MD_D_RW" onmouseover="U.MD.D.I.displayTaskbar(this)"
-                    onmouseout="U.MD.D.I.hiddenTaskbarout(this)">
+                    onmouseout="U.MD.D.I.hiddenTaskbarout(this)" style="display: none;">
                     <div class="U_MD_D_RW_L">
                         <div class="U_MD_D_RW_I">
                             <div class="U_MD_D_RW_IO" title="点击隐藏" onclick="U.MD.D.I.hiddenTaskbar(this);">

js/Desktop/DeskTop.js

@@ -664,7 +664,7 @@ U.MD.D.I.siesteacherDeskIcon = [
     { "Name": "数据融合", "Url": "dataBoardSies", "style": { "cssText": "background-image:url(/img/icon/dataBoardSies.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
     { "Name": "评测看板", "Url": "dataBoardTest", "style": { "cssText": "background-image:url(/img/icon/databoardTest.png)" } },
-    { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
+    // { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
     { "Name": "教师管理", "Url": "testTeacherSies", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
     { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
@@ -676,7 +676,7 @@ U.MD.D.I.siesStudentDeskIcon = [
     { "Name": "项目管理", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-    { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
+    // { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
@@ -1490,6 +1490,7 @@ U.MD.D.I.nsfxTeacherDeskIcon = [
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
     { "Name": "教师管理", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
     { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
+    { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
 ];
 
 //nsfx
@@ -1525,6 +1526,47 @@ U.MD.D.I.stiaStudentDeskIcon = [
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
+//szdjg
+U.MD.D.I.szdjgTeacherDeskIcon = [
+    { "Name": "课程管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
+    { "Name": "课程中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+];
+
+//szdjg
+U.MD.D.I.szdjgStudentDeskIcon = [
+    // { "Name": "项目管理", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    // { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    // { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+];
+
+//010607
+U.MD.D.I.x010607TeacherDeskIcon = [
+    { "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": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    { "Name": "目标管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/evalua.png)" } },
+    { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "教师管理", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
+    { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+    { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
+];
+
+//010607
+U.MD.D.I.x010607StudentDeskIcon = [
+    { "Name": "项目管理", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+];
+
 //#region 桌面初始化a
 
 /**
@@ -1690,14 +1732,18 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _szscTeacherDeskIconInfo = U.MD.D.I.szscTeacherDeskIcon, //网络夏令营
         _nsfxStudentDeskIconInfo = U.MD.D.I.nsfxStudentDeskIcon, //nsfx
         _nsfxTeacherDeskIconInfo = U.MD.D.I.nsfxTeacherDeskIcon, //nsfx
-        _stiaStudentDeskIconInfo = U.MD.D.I.stiaStudentDeskIcon, //nsfx
-        _stiaTeacherDeskIconInfo = U.MD.D.I.stiaTeacherDeskIcon, //nsfx
+        _stiaStudentDeskIconInfo = U.MD.D.I.stiaStudentDeskIcon, //stia
+        _stiaTeacherDeskIconInfo = U.MD.D.I.stiaTeacherDeskIcon, //stia
+        _szdjgStudentDeskIconInfo = U.MD.D.I.szdjgStudentDeskIcon, //szdjg
+        _szdjgTeacherDeskIconInfo = U.MD.D.I.szdjgTeacherDeskIcon, //szdjg
+        _x010607StudentDeskIconInfo = U.MD.D.I.x010607StudentDeskIcon, //010607
+        _x010607TeacherDeskIconInfo = U.MD.D.I.x010607TeacherDeskIcon, //010607
         _scnuaiTeacherDeskIconInfo = U.MD.D.I.scnuaiTeacherDeskIcon, //未来教育基地
         _scnuaiAdminDeskIconInfo = U.MD.D.I.scnuaiAdminDeskIcon, //scnuai
         _scnuaiStudentDeskIconInfo = U.MD.D.I.scnuaiStudentDeskIcon, //scnuai
         _szscOrganizerDeskIconInfo = U.MD.D.I.szscOrganizerDeskIcon; //scnuai
     var _oidA = ['69893dca-1d47-11ed-8c78-005056b86db5', "91305d49-01ba-11ed-8c78-005056b86db5", "d9db3320-503a-11ed-8c78-005056b86db5", "05b62310-8cda-11ed-b13d-005056b86db5", '1c3b9def-8fbe-11ed-b13d-005056b86db5', '91305d49-01ba-11ed-8c78-005056b86db4', 'ea2a8c65-f38c-11ed-91d8-005056b86db5', '4c686762-1d0a-11ed-8c78-005056b86db5', 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41', '206c38d2-0cbe-11ee-91d8-005056b86db5', '2f30fe58-a94f-11ee-b534-005056b86db5', 'eaba9110-d1eb-11ee-b534-005056b86db5','c7df0bd4-6e75-401a-a137-4e163aa62263','8a352da2-56e1-11ef-b873-005056b86db5'];
-    var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956', 'fbb00cc1-380b-4173-add4-59b3cf7682b5', '63060b4a-89dc-4f0c-bf04-a1de22d479ff', '777559d2-7239-11ee-b98c-005056b86db5', '03d24cf9-4fbc-4aeb-bb02-6f84f66e6344','884c5665-a453-46f3-b7b6-01d575290aa9','c9a6de59-8b4f-4be1-8565-a08081f649d3','7f280060-665e-4868-b68f-1eec9e1b4a07','f3b243b2-75e2-4b00-8f66-7644946a2a25'];
+    var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956', 'fbb00cc1-380b-4173-add4-59b3cf7682b5', '63060b4a-89dc-4f0c-bf04-a1de22d479ff', '777559d2-7239-11ee-b98c-005056b86db5', '03d24cf9-4fbc-4aeb-bb02-6f84f66e6344','884c5665-a453-46f3-b7b6-01d575290aa9','c9a6de59-8b4f-4be1-8565-a08081f649d3','7f280060-665e-4868-b68f-1eec9e1b4a07','f3b243b2-75e2-4b00-8f66-7644946a2a25','16ace517-b5c7-4168-a9bb-a9e0035df840','2fe1a080-4425-4620-b7a0-be2f3750ffd4'];
     //清楚桌面图标
     el.innerHTML = "";
     if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5' || _oid == "16d397f3-b192-11ed-9211-005056b86db5" || _org == "0fec3a8a-ad04-11ed-b13d-005056b86db5") {
@@ -2102,6 +2148,40 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _stiaStudentDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _stiaStudentDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if (_type == 2 && (_org == "16ace517-b5c7-4168-a9bb-a9e0035df840")) {
+            for (i = 0; i < _szdjgStudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_szdjgStudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_szdjgStudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _szdjgStudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _szdjgStudentDeskIconInfo[i].Name }, _iconcontent);
+            }
+        } else if (_type == 2 && (_org == "2fe1a080-4425-4620-b7a0-be2f3750ffd4")) {
+            for (i = 0; i < _x010607StudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010607StudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010607StudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010607StudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010607StudentDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if (_type == 2 && (_oid == "4c686762-1d0a-11ed-8c78-005056b86db5")) {
             for (i = 0; i < _siesStudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -3316,6 +3396,46 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _stiaTeacherDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _stiaTeacherDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if ((_type == 1 || _type == 4) && _org == "16ace517-b5c7-4168-a9bb-a9e0035df840") {
+            for (i = 0; i < _szdjgTeacherDeskIconInfo.length; i++) {
+                if(_role === 0 && _szdjgTeacherDeskIconInfo[i].Url == 'testTeacher'){
+                    continue
+                }
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_szdjgTeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_szdjgTeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _szdjgTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _szdjgTeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
+        } else if ((_type == 1 || _type == 4) && _org == "2fe1a080-4425-4620-b7a0-be2f3750ffd4") {
+            for (i = 0; i < _x010607TeacherDeskIconInfo.length; i++) {
+                if(_role === 0 && _x010607TeacherDeskIconInfo[i].Url == 'testTeacher'){
+                    continue
+                }
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010607TeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010607TeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010607TeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010607TeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else {
             for (i = 0; i < _teacherDesktopIconInfo.length; i++) {
                 if(_role === 0 && _teacherDesktopIconInfo[i].Url == 'testTeacher' && _oid != '45facc0a-1211-11ec-80ad-005056b86db5'){

js/Desktop/Onload.js

@@ -475,6 +475,15 @@ U.MD.D.getuser = function () {
                                     console.log(shareCourseId);
                                     U.MD.D.I.openInApplication("studyDetail", shareCourseId, 5, 1)
                                 }
+                                if(res.value[0][0].type === 1 && window.location.hash.indexOf('project') != -1){
+                                    U.MD.D.I.openApplication("project")
+                                }
+                                if(res.value[0][0].type === 1 && window.location.hash.indexOf('study') != -1){
+                                    U.MD.D.I.openApplication("study")
+                                }
+                                if(res.value[0][0].type === 2 && window.location.hash.indexOf('study') != -1){
+                                    U.MD.D.I.openApplication("studentStudy")
+                                }
                                 U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                             }, [], { "type": "GET", "withCredentials": true });
                         }
@@ -679,6 +688,15 @@ U.MD.D.getuser = function () {
                                         console.log(shareCourseId);
                                         U.MD.D.I.openInApplication("studyDetail", shareCourseId, 5, 1)
                                     }
+                                    if(res.value[0][0].type === 1 && window.location.hash.indexOf('project') != -1){
+                                        U.MD.D.I.openApplication("project")
+                                    }
+                                    if(res.value[0][0].type === 1 && window.location.hash.indexOf('study') != -1){
+                                        U.MD.D.I.openApplication("study")
+                                    }
+                                    if(res.value[0][0].type === 2 && window.location.hash.indexOf('study') != -1){
+                                        U.MD.D.I.openApplication("studentStudy")
+                                    }
                                     U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                                 }, [], { "type": "GET", "withCredentials": true });
                             }
@@ -932,6 +950,15 @@ U.MD.D.getuser2 = function (userid, cid) {
         }else{
             U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
         }
+        if(res.value[0][0].type === 1 && window.location.hash.indexOf('project') != -1){
+            U.MD.D.I.openApplication("project")
+        }
+        if(res.value[0][0].type === 1 && window.location.hash.indexOf('study') != -1){
+            U.MD.D.I.openApplication("study")
+        }
+        if(res.value[0][0].type === 2 && window.location.hash.indexOf('study') != -1){
+            U.MD.D.I.openApplication("studentStudy")
+        }
         U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
         U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
     }, [], { "type": "GET", "withCredentials": true });