Ver código fonte

Merge branch 'beta'

lsc 1 ano atrás
pai
commit
d0147ed2d3
5 arquivos alterados com 77 adições e 11 exclusões
  1. BIN
      img/icon/dataBoardNew.png
  2. BIN
      img/icon/gm/gpbl.png
  3. BIN
      img/icon/gpbl.png
  4. 60 10
      js/Desktop/DeskTop.js
  5. 17 1
      js/gm/DeskTop.js

BIN
img/icon/dataBoardNew.png


BIN
img/icon/gm/gpbl.png


BIN
img/icon/gpbl.png


+ 60 - 10
js/Desktop/DeskTop.js

@@ -50,6 +50,7 @@ U.MD.D.I.teacherDeskIcon = [
     // { "Name": "赛诺梵", "Url": "snf", "style": { "cssText": "background-image:url(/img/icon/snf.png)" } },
     // { "Name": "汉字宫", "Url": "han", "style": { "cssText": "background-image:url(/img/icon/han.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //极简模式
@@ -103,6 +104,7 @@ U.MD.D.I.teacherDeskIcon2 = [
     // { "Name": "汉字宫", "Url": "han", "style": { "cssText": "background-image:url(/img/icon/han.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
     { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.studentDeskIcon = [
@@ -136,6 +138,7 @@ U.MD.D.I.studentDeskIcon = [
     // { "Name": "国家教育", "Url": "resources", "style": { "cssText": "background-image:url(/img/icon/resources.png)" } },
     // { "Name": "汉字宫", "Url": "han", "style": { "cssText": "background-image:url(/img/icon/han.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.studentDeskIcon2 = [
@@ -143,12 +146,14 @@ U.MD.D.I.studentDeskIcon2 = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     // { "Name": "实时课堂", "Url": "studentClassRoom", "style": { "cssText": "background-image:url(/img/icon/classRoom.png)" } },
     // { "Name": "汉字宫", "Url": "han", "style": { "cssText": "background-image:url(/img/icon/han.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ]
 
 U.MD.D.I.studentDeskIcon3 = [
     { "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)" } },
 ]
 
 U.MD.D.I.schoolDeskIcon = [
@@ -174,6 +179,7 @@ U.MD.D.I.schoolDeskIcon = [
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     // { "Name": "国家教育", "Url": "resources", "style": { "cssText": "background-image:url(/img/icon/resources.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.orgDeskIcon = [
@@ -184,6 +190,7 @@ U.MD.D.I.orgDeskIcon = [
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.orgStemDeskIcon = [
@@ -219,6 +226,7 @@ U.MD.D.I.szulsDeskIcon = [
     { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 
@@ -234,6 +242,7 @@ U.MD.D.I.hanDeskIcon = [
     // { "Name": "汉字宫", "Url": "han", "style": { "cssText": "background-image:url(/img/icon/han.png)" } },
     // { "Name": "魔盒识字", "Url": "mohe", "style": { "cssText": "background-image:url(/img/icon/mohe.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.GMteacherDeskIcon = [
@@ -249,6 +258,7 @@ U.MD.D.I.GMteacherDeskIcon = [
     { "Name": "素材库", "Url": "meterialGM", "style": { "cssText": "background-image:url(/img/icon/gm/material.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.GMstudentDeskIcon = [
@@ -257,6 +267,7 @@ U.MD.D.I.GMstudentDeskIcon = [
     { "Name": "我的资料", "Url": "dataGM", "style": { "cssText": "background-image:url(/img/icon/gm/data.png)" } },
     { "Name": "素材库", "Url": "meterialGM", "style": { "cssText": "background-image:url(/img/icon/gm/material.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //北师大
@@ -298,6 +309,7 @@ U.MD.D.I.BSDNSteacherDeskIcon = [
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
     { "Name": "数字实验室", "Url": "number", "style": { "cssText": "background-image:url(/img/icon/number.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)" } },
 ];
 //松山湖
 U.MD.D.I.SONGteacherDeskIcon = [
@@ -336,6 +348,7 @@ U.MD.D.I.SONGteacherDeskIcon = [
     // { "Name": "赛诺梵", "Url": "snf", "style": { "cssText": "background-image:url(/img/icon/snf.png)" } },
     // { "Name": "汉字宫", "Url": "han", "style": { "cssText": "background-image:url(/img/icon/han.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 
@@ -343,6 +356,7 @@ U.MD.D.I.tcStudentDeskIcon = [
     { "Name": "师生项目", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
     { "Name": "我的资料", "Url": "tcData", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
     { "Name": "消息通知", "Url": "tcNotice", "style": { "cssText": "background-image:url(/img/icon/news.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.tcTeacherDeskIcon = [
@@ -377,6 +391,7 @@ U.MD.D.I.szscStudentDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     { "Name": "我的资料", "Url": "tcData", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
     { "Name": "消息通知", "Url": "tcNotice", "style": { "cssText": "background-image:url(/img/icon/news.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.szscTeacherDeskIcon = [
@@ -390,6 +405,7 @@ U.MD.D.I.szscTeacherDeskIcon = [
     { "Name": "学生管理", "Url": "tcStudent", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     { "Name": "我的资料", "Url": "tcData", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
     { "Name": "消息通知", "Url": "tcNotice", "style": { "cssText": "background-image:url(/img/icon/news.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.szscOrganizerDeskIcon = [
@@ -402,6 +418,7 @@ U.MD.D.I.szscOrganizerDeskIcon = [
     { "Name": "我的资料", "Url": "tcData", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
     { "Name": "消息通知", "Url": "tcNotice", "style": { "cssText": "background-image:url(/img/icon/news.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)" } },
 ];
 
 U.MD.D.I.wankeTeacherDeskIcon = [ //1c3b9def-8fbe-11ed-b13d-005056b86db5
@@ -458,6 +475,7 @@ U.MD.D.I.lhsTeacherDeskIcon = [ //未来小学
     { "Name": "项目设计", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 U.MD.D.I.lhsAdminDeskIcon = [ //未来小学admin
@@ -474,6 +492,7 @@ U.MD.D.I.lhsAdminDeskIcon = [ //未来小学admin
     { "Name": "项目设计", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 
@@ -509,6 +528,7 @@ U.MD.D.I.MingdeTeacherDeskIcon = [
     // { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //97c4ee8b-d010-4042-986d-e9d3c217264f
@@ -524,6 +544,7 @@ U.MD.D.I.zhoujiaTeacherDeskIcon = [
     { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.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": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //福田
@@ -538,6 +559,7 @@ U.MD.D.I.futianTeacherDeskIcon = [
     // { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     // { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
     { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //福田
@@ -551,6 +573,7 @@ U.MD.D.I.futianAdminDeskIcon = [
     { "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": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //lotech
@@ -586,6 +609,7 @@ U.MD.D.I.longhuateacherDeskIcon = [
     { "Name": "我的资料", "Url": "my", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
     { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.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)" } },
 ];
 
 //教科院实小教师桌面图标的全局变量
@@ -609,7 +633,7 @@ U.MD.D.I.siesteacherDeskIcon = [
     { "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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
-    { "Name": "数据看板", "Url": "dataBoardSies", "style": { "cssText": "background-image:url(/img/icon/dataBoardSies.png)" } },
+    { "Name": "数据融合", "Url": "dataBoardSies", "style": { "cssText": "background-image:url(/img/icon/dataBoardSies.png)" } },
 ];
 
 //教科院实小教师桌面图标的全局变量
@@ -617,6 +641,7 @@ U.MD.D.I.siesStudentDeskIcon = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "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)" } },
 ];
 
 //福田
@@ -631,6 +656,7 @@ U.MD.D.I.gdjgTeacherDeskIcon = [
     // { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     // { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
     { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //gdjg
@@ -644,6 +670,7 @@ U.MD.D.I.gdjgAdminDeskIcon = [
     { "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": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //hk
@@ -674,6 +701,7 @@ U.MD.D.I.hkStudentDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.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)" } },
 ];
 
 //香海正覺蓮社佛教正覺中學
@@ -692,6 +720,7 @@ U.MD.D.I.hkZJLSteacherDeskIcon = [
     // { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
     { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //香海正覺蓮社佛教正覺中學
@@ -699,6 +728,7 @@ U.MD.D.I.hkZJLSStudentDeskIcon = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "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)" } },
 ];
 
 
@@ -720,6 +750,7 @@ U.MD.D.I.yunhaiTeacherDeskIcon = [
     { "Name": "项目设计", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //福田
@@ -734,6 +765,7 @@ U.MD.D.I.heyuanTeacherDeskIcon = [
     // { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     // { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
     { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //福田
@@ -747,6 +779,7 @@ U.MD.D.I.heyuanAdminDeskIcon = [
     { "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": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //szjylh 54f09f1e-09f0-11ee-91d8-005056b86db5
@@ -760,6 +793,7 @@ U.MD.D.I.szherTeacherDeskIcon = [
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.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)" } },
 ];
 
 //dsei
@@ -859,6 +893,7 @@ U.MD.D.I.dseiStudentDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.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)" } },
 ];
 
 
@@ -905,6 +940,7 @@ U.MD.D.I.szjkyStudentDeskIcon = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "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)" } },
 ];
 
 //成华教育局
@@ -921,6 +957,7 @@ U.MD.D.I.chjyjTeacherDeskIcon = [
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.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)" } },
 ];
 
 //成华教育局chjyj
@@ -938,6 +975,7 @@ U.MD.D.I.chjyjAdminDeskIcon = [
     { "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": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 //成华教育局chjyj
@@ -945,6 +983,7 @@ U.MD.D.I.chjyjStudentDeskIcon = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "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)" } },
 ];
 
 
@@ -953,6 +992,7 @@ U.MD.D.I.tpcStudentDeskIcon = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "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)" } },
 ];
 
 //tpc
@@ -1023,6 +1063,7 @@ U.MD.D.I.thuioeStudentDeskIcon = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "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)" } },
 ];
 
 
@@ -1224,10 +1265,10 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
             { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
             { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.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": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
             { "Name": "评测中心", "Url": "testStudent", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
+            { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
         )
     }
 
@@ -1235,24 +1276,22 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _teacherDesktopIconInfo.push(
             { "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)" } },
         )
     }
 
     if (_org == '03d24cf9-4fbc-4aeb-bb02-6f84f66e6344') {
         _teacherDesktopIconInfo.push(
-            { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
         )
     }
 
 
     if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5') {
         _teacherDesktopIconInfo.push(
+            { "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)" } },
         )
         _studentDesktopIconInfo.push(
-            { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
         )
 
     }
@@ -1260,7 +1299,6 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
     //麒麟二中 和 民新小学
     if (_oid == 'cf8841e8-c7c0-11ed-9546-005056b86db5' || _oid == "d67940a5-510c-40ea-9c9a-2631ab03013a") {
         _teacherDesktopIconInfo.push(
-            { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
         )
     }
 
@@ -1274,7 +1312,6 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
     //麒麟二中
     if (_oid == 'cf8841e8-c7c0-11ed-9546-005056b86db5') {
         _studentDesktopIconInfo.push(
-            { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
             { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
         )
     }
@@ -4609,9 +4646,9 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/dataBoard.png)" }, "name": "数据看板", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
             break;
-        case "dataBoardSies": //数据看板
+        case "dataBoardSies": //数据融合
             _formdiv = new U.UF.UI.form(
-                "数据看板",
+                "数据融合",
                 $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/dataBoardSies?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                 "id": "dataBoardSies",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
@@ -4619,7 +4656,20 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, {
                 closecallback: function () { }
             }, { "style": { "height": "36px" } }).form; //创建窗体
-            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/dataBoardSies.png)" }, "name": "数据看板", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/dataBoardSies.png)" }, "name": "数据融合", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
+            break;
+        case "dataBoardNew": //数据看板
+            _formdiv = new U.UF.UI.form(
+                "综合看板",
+                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/dataBoardNew?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "dataBoardNew",
+                "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //创建窗体
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/dataBoardNew.png)" }, "name": "综合看板", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
             break;
         case "AIAnalyse": //AI共创

+ 17 - 1
js/gm/DeskTop.js

@@ -153,6 +153,7 @@ U.MD.D.I.GMorganizerDeskIcon = [
     { "Name": "素材库", "Url": "meterialGM", "style": { "cssText": "background-image:url(/img/icon/gm/material.png)" } },
     { "Name": "项目审核", "Url": "examineGM", "style": { "cssText": "background-image:url(/img/icon/gm/examine.png)" } },
     { "Name": "消息通知", "Url": "messageGM", "style": { "cssText": "background-image:url(/img/icon/gm/message.png)" } },
+    { "Name": "案例征集", "Url": "gpbl", "style": { "cssText": "background-image:url(/img/icon/gm/gpbl.png)" } },
 ];
 
 U.MD.D.I.GMstudentDeskIcon = [
@@ -2130,7 +2131,22 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             window.open("https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/noticeGM?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role, "消息通知", "height=" + US.height + ", width=" + US.width + ", top=100, left=100, toolbar=no, menubar=0,  resizable=0, location=0, status=no");
 
             break;
-            
+        case "gpbl": //消息通知
+            // _formdiv = new U.UF.UI.form(
+            //     "消息通知",
+            //     $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/noticeGM?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+            //     "id": "messageGM",
+            //     "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
+            //     "onresize": function () { }
+            // }, {
+            //     closecallback: function () { }
+            // }, { "style": { "height": "36px" } }).form; //创建窗体
+            // _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/gm/examine.png)" }, "name": "消息通知", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
+
+            window.open("https://gdpbl.cocorobo.cn/#/login", "案例征集", "height=" + US.height + ", width=" + US.width + ", top=100, left=100, toolbar=no, menubar=0,  resizable=0, location=0, status=no");
+
+            break;    
     }