Browse Source

Merge branch 'beta' into alpha

lsc 6 months ago
parent
commit
d1b6fe6994
8 changed files with 500 additions and 30 deletions
  1. 49 0
      css/Desktop/Desktop.css
  2. BIN
      img/icon/vip_box.png
  3. BIN
      img/icon/vip_img.png
  4. 12 0
      index.html
  5. 332 21
      js/Desktop/DeskTop.js
  6. 102 4
      js/Desktop/Onload.js
  7. 4 4
      node/message.js
  8. 1 1
      uform.js

+ 49 - 0
css/Desktop/Desktop.css

@@ -1123,4 +1123,53 @@ body div ::-webkit-scrollbar-resizer:vertical {
 
 .U_PBL_Check>.active{
     opacity: 1;
+}
+
+
+.U_MD_D_BD_vip_box {
+    display: none;
+    /* background-color: #586e86;
+    border: 1px solid #344558; */
+    position: absolute;
+    right: 100px;
+    top: 0;
+    border-radius: 10px;
+    width: 270px;
+    /* height: 100px; */
+    padding: 10px 10px;
+    box-sizing: border-box;
+    box-shadow: 0px 3px 6px 0px #0000003b;
+    background-image: url(../../img/icon/vip_box.png);
+    background-size: 100% 100%;
+}
+
+.vip_info{
+    display: flex;
+    align-items: center;
+}
+.vip_info > img{
+    width: 45px;
+    height: 45px;
+    object-fit: cover;
+}
+.vip_info > div {
+    margin-left: 10px;
+    display: flex;
+    flex-direction: column;
+    font-size: 14px;
+}
+.vip_info > div > span{}
+
+.vip_info > div > span + span{
+    margin-top: 8px;
+}
+
+.vip_school{
+    font-size: 14px;
+    margin-top: 8px;
+    color: #9baabd;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 100%;
 }

BIN
img/icon/vip_box.png


BIN
img/icon/vip_img.png


+ 12 - 0
index.html

@@ -90,6 +90,18 @@
                 </div>
                 <div class="U_MD_D_BD" __top__="false">
                     <!-- style="max-width: 165px;" -->
+                    <div class="U_MD_D_BD_vip_box">
+                        <div class="vip_info">
+                            <img src="./img/icon/vip_img.png" alt="">
+                            <div>
+                                <span>VIP会员 授权有效</span>
+                                <span>使用期限至:<span class="vip_time"></span></span>
+                            </div>
+                        </div>
+                        <div class="vip_school">
+                            <!-- 深圳明德实验学校 -->
+                        </div>
+                    </div>
                     <div class="U_MD_D_BDA">
                         <!-- <div class="U_MD_D_BDI U_Img" id="U_MD_D_BDI" title="登录">
                         </div> -->

+ 332 - 21
js/Desktop/DeskTop.js

@@ -388,7 +388,7 @@ U.MD.D.I.szscOrganizerDeskIcon = [
     { "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": "tcSchool", "style": { "cssText": "background-image:url(/img/icon/school.png)" } },
-    { "Name": "教师管理", "Url": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+    { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.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": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
@@ -714,11 +714,11 @@ U.MD.D.I.hkteacherDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.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": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
-    { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.png)" } },
-    { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
+    // { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    // { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.png)" } },
+    // { "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": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.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": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
@@ -747,11 +747,11 @@ U.MD.D.I.hkaceteacherDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.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": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
-    { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.png)" } },
-    { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
+    // { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    // { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.png)" } },
+    // { "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": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.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": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
@@ -981,10 +981,11 @@ U.MD.D.I.szjkyTeacherDeskIcon = [
     // { "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": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+    // { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.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": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
-    { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.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)" } },
@@ -995,8 +996,8 @@ U.MD.D.I.szjkyTeacherDeskIcon = [
     { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.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": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
-    { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    // { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+    // { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
     { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
 ];
 
@@ -1008,11 +1009,12 @@ U.MD.D.I.szjkyAdminDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.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": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+    // { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.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": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
-    { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.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)" } },
@@ -1023,8 +1025,8 @@ U.MD.D.I.szjkyAdminDeskIcon = [
     { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.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": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
-    { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    // { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+    // { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
     { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
 ];
 
@@ -1289,6 +1291,7 @@ U.MD.D.I.ytyTeacherDeskIcon = [
     { "Name": "素材库", "Url": "library", "style": { "cssText": "background-image:url(/img/icon/library.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
     { "Name": "观察记录", "Url": "Record", "style": { "cssText": "background-image:url(/img/icon/Record.png)" } },
+    { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
 ];
 
 //盐田区幼儿园
@@ -1592,7 +1595,7 @@ U.MD.D.I.CUHKEDUTeacherDeskIcon = [
     { "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": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.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)" } },
@@ -1671,6 +1674,141 @@ U.MD.D.I.trailStudentDeskIcon = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     // { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
+
+//010504
+U.MD.D.I.x010504TeacherDeskIcon = [
+    { "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": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+];
+
+//010504
+U.MD.D.I.x010504StudentDeskIcon = [
+    { "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)" } },
+];
+
+//SCNUET
+U.MD.D.I.SCNUETTeacherDeskIcon = [
+    { "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": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.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": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+    { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.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": "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": "协同建构", "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)" } },
+    { "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": "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": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+    { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
+];
+
+//SCNUET
+U.MD.D.I.SCNUETAdminDeskIcon = [
+    { "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": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.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": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.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": "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": "协同建构", "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)" } },
+    { "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": "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": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+    { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
+];
+
+//SCNUET
+U.MD.D.I.SCNUETStudentDeskIcon = [
+    { "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)" } },
+];
+
+//x020201
+U.MD.D.I.x020201TeacherDeskIcon = [
+    { "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": "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": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
+    { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.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": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
+];
+
+//x020201
+U.MD.D.I.x020201AdminDeskIcon = [
+    { "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": "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": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.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": "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": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
+];
+
+//020201
+U.MD.D.I.x020201StudentDeskIcon = [
+    { "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)" } },
+];
+
+
 //#region 桌面初始化a
 
 /**
@@ -1851,17 +1989,25 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _CUHKEDUTeacherDeskIconInfo = U.MD.D.I.CUHKEDUTeacherDeskIcon, //CUHK_EDU
         _x010503StudentDeskIconInfo = U.MD.D.I.x010503StudentDeskIcon, //010503
         _x010503TeacherDeskIconInfo = U.MD.D.I.x010503TeacherDeskIcon, //010503
+        _x010504StudentDeskIconInfo = U.MD.D.I.x010504StudentDeskIcon, //010504
+        _x010504TeacherDeskIconInfo = U.MD.D.I.x010504TeacherDeskIcon, //010504
         _x010204StudentDeskIconInfo = U.MD.D.I.x010204StudentDeskIcon, //010204
         _x010204TeacherDeskIconInfo = U.MD.D.I.x010204TeacherDeskIcon, //010204
         _trailStudentDeskIconInfo = U.MD.D.I.trailStudentDeskIcon, //trail
         _trailTeacherDeskIconInfo = U.MD.D.I.trailTeacherDeskIcon, //trail
+        _SCNUETTeacherDeskIconInfo = U.MD.D.I.SCNUETTeacherDeskIcon, //SCNUET
+        _SCNUETAdminDeskIconInfo = U.MD.D.I.SCNUETAdminDeskIcon, //SCNUET
+        _SCNUETStudentDeskIconInfo = U.MD.D.I.SCNUETStudentDeskIcon, //SCNUET
         _SPROUTLabTeacherDeskIconInfo = U.MD.D.I.SPROUTLabTeacherDeskIcon, //SPROUT Lab
         _SPROUTLabStudentDeskIconInfo = U.MD.D.I.SPROUTLabStudentDeskIcon, //SPROUT Lab
-        _scnuaiTeacherDeskIconInfo = U.MD.D.I.scnuaiTeacherDeskIcon, //未来教育基地
+        _x020201TeacherDeskIconInfo = U.MD.D.I.x020201TeacherDeskIcon, //x020201
+        _x020201AdminDeskIconInfo = U.MD.D.I.x020201AdminDeskIcon, //x020201
+        _x020201StudentDeskIconInfo = U.MD.D.I.x020201StudentDeskIcon, //x020201
+        _scnuaiTeacherDeskIconInfo = U.MD.D.I.scnuaiTeacherDeskIcon, //scnuai
         _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','9b46a3c9-7657-11ef-9b30-005056b86db5','857af1c7-c8ee-4b04-85b5-fd182903adb7','876030db-7a49-11ef-9b30-005056b86db5','b97fc213-86a9-11ef-9b30-005056b86db5', 'c636f63e-86f4-11ef-9b30-005056b86db5'];
+        _szscOrganizerDeskIconInfo = U.MD.D.I.szscOrganizerDeskIcon; //szsc
+    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','9b46a3c9-7657-11ef-9b30-005056b86db5','857af1c7-c8ee-4b04-85b5-fd182903adb7','876030db-7a49-11ef-9b30-005056b86db5','b97fc213-86a9-11ef-9b30-005056b86db5', 'c636f63e-86f4-11ef-9b30-005056b86db5','6c16df93-8849-11ef-9b30-005056b86db5','72c16ee0-89fe-11ef-9b30-005056b86db5','369222a8-cddd-11ed-9546-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','16ace517-b5c7-4168-a9bb-a9e0035df840','2fe1a080-4425-4620-b7a0-be2f3750ffd4','a5efd078-20f6-4185-bef9-6d1c688bee70','23bbe712-e35a-4888-9b4e-8d9e5a4fa2f6','ec84034b-8ea4-4d27-9cba-1adcb4720bb3'];
     //清楚桌面图标
     el.innerHTML = "";
@@ -1890,6 +2036,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
             { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
             { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
+            { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
         )
     }
 
@@ -1935,7 +2082,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
     }
 
     //010606 组织
-    if (_oid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
+    if (_oid == 'f297fbdc-f0a0-11ee-b534-005056b86db5' || _oid == '4eb38bbd-90ee-11ef-9b30-005056b86db5') {
         _teacherDesktopIconInfo.push(
             { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
         )
@@ -1957,6 +2104,12 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         )
     }
 
+    if(_org == 'b50cf65a-001c-11ee-91d8-005056b86db5' && _role == '1'){
+        _hkTeacherDeskIconInfo.push(
+            { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+        )
+    }
+
     //北师大附中(010601)
     // if(_oid == "857af1c7-c8ee-4b04-85b5-fd182903adb7"){
     //     _teacherDesktopIconInfo.push(
@@ -2199,6 +2352,40 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _szjkyStudentDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _szjkyStudentDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if (_type == 2 && (_oid == "369222a8-cddd-11ed-9546-005056b86db5")) {
+            for (i = 0; i < _x020201StudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x020201StudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x020201StudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x020201StudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x020201StudentDeskIconInfo[i].Name }, _iconcontent);
+            }
+        } else if (_type == 2 && (_oid == "72c16ee0-89fe-11ef-9b30-005056b86db5")) {
+            for (i = 0; i < _SCNUETStudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_SCNUETStudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_SCNUETStudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _SCNUETStudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _SCNUETStudentDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if (_type == 2 && (_org == "7b016f69-0f4f-11ee-91d8-005056b86db5")) {
             for (i = 0; i < _dseiStudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -2352,6 +2539,23 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010503StudentDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010503StudentDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if (_type == 2 && (_oid == "6c16df93-8849-11ef-9b30-005056b86db5")) {
+            for (i = 0; i < _x010504StudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010504StudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010504StudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010504StudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010504StudentDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if (_type == 2 && (_oid == "b97fc213-86a9-11ef-9b30-005056b86db5")) {
             for (i = 0; i < _x010204StudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -3280,6 +3484,80 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _szjkyTeacherDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _szjkyTeacherDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if ((_type == 1 || _type == 4) && (_oid == "369222a8-cddd-11ed-9546-005056b86db5") && _role == 1) {
+            for (i = 0; i < _x020201AdminDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x020201AdminDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x020201AdminDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x020201AdminDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x020201AdminDeskIconInfo[i].Name }, _iconcontent);
+            }//
+        } else if ((_type == 1 || _type == 4) && (_oid == "369222a8-cddd-11ed-9546-005056b86db5") && _role == 0) {
+            for (i = 0; i < _x020201TeacherDeskIconInfo.length; i++) {
+                if(_role === 0 && _x020201TeacherDeskIconInfo[i].Url == 'testTeacher'){
+                    continue
+                }
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x020201TeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x020201TeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x020201TeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x020201TeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
+        } else if ((_type == 1 || _type == 4) && (_oid == "72c16ee0-89fe-11ef-9b30-005056b86db5") && _role == 1) {
+            for (i = 0; i < _SCNUETAdminDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_SCNUETAdminDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_SCNUETAdminDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _SCNUETAdminDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _SCNUETAdminDeskIconInfo[i].Name }, _iconcontent);
+            }//
+        } else if ((_type == 1 || _type == 4) && (_oid == "72c16ee0-89fe-11ef-9b30-005056b86db5") && _role == 0) {
+            for (i = 0; i < _SCNUETTeacherDeskIconInfo.length; i++) {
+                if(_role === 0 && _SCNUETTeacherDeskIconInfo[i].Url == 'testTeacher'){
+                    continue
+                }
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_SCNUETTeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_SCNUETTeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _SCNUETTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _SCNUETTeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if ((_type == 1 || _type == 4) && (_org == "ec0af97a-7c10-4259-a7eb-db9cc8174cdc") && _role == 1) {
             for (i = 0; i < _futianAdminDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -3771,6 +4049,26 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010503TeacherDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010503TeacherDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if ((_type == 1 || _type == 4) && _oid == "6c16df93-8849-11ef-9b30-005056b86db5") {
+            for (i = 0; i < _x010504TeacherDeskIconInfo.length; i++) {
+                if(_role === 0 && _x010504TeacherDeskIconInfo[i].Url == 'testTeacher'){
+                    continue
+                }
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010504TeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_x010504TeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _x010504TeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _x010504TeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if ((_type == 1 || _type == 4) && _oid == "b97fc213-86a9-11ef-9b30-005056b86db5") {
             for (i = 0; i < _x010204TeacherDeskIconInfo.length; i++) {
                 if(_role === 0 && _x010204TeacherDeskIconInfo[i].Url == 'testTeacher'){
@@ -6309,6 +6607,18 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, { "style": { "height": "36px" } }).form; //创建窗体
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/teacher.png)" }, "name": "教师管理", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
             break;
+        case "teacher":
+            _formdiv = new U.UF.UI.form(
+                "教师管理",
+                $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/teacher?userid=" + _userid + "&oid=" + _oid + "&org=" + _org }), {
+                "id": "teacher",
+                "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/teacher.png)" }, "name": "教师管理", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+            break;
         case "tcData": //腾讯我的资料
             _formdiv = new U.UF.UI.form(
                 "我的资料",
@@ -6707,6 +7017,7 @@ 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/classroomObservation.png)" }, "name": "课堂观察", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+            $("iframe", _formdiv)[0].contentWindow.location.reload()
             break;
         case "pblCourse":
                 _formdiv = new U.UF.UI.form(

+ 102 - 4
js/Desktop/Onload.js

@@ -342,10 +342,37 @@ 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){
+                                    const currentDate = new Date();
+                                    
+                                    // 判断 isLogin1 和 isLogin2 是否为 2 或者是否过期(且过期时间是有效的日期格式)
+                                    if ((res.value[0][0].isLogin1 == 2 || (res.value[0][0].isLogin1 && res.value[0][0].isLogin1 != 1 && res.value[0][0].isLogin1 != 2 && new Date(res.value[0][0].isLogin1) < currentDate)) ||
+                                        (res.value[0][0].isLogin2 == 2 || (res.value[0][0].isLogin2 != 1 && res.value[0][0].isLogin2 != 2 && new Date(res.value[0][0].isLogin2) < currentDate))) {
                                         U.MD.U.LO.logoutSystem2();
                                         return;
                                     }
+
+                                    let vipbox = $('.U_MD_D_BD_vip_box')[0]
+                                    vipbox && (vipbox.style.display = 'block')
+                                    let vip_time = $('.vip_time')[0]
+                                    let vtime = ''
+                                    // 获取 isLogin1 和 isLogin2 的值
+                                    let isLogin1 = res.value[0][0].isLogin1;
+                                    let isLogin2 = res.value[0][0].isLogin2;
+
+                                    if (isLogin2 != 1 && isLogin2 != null){
+                                        vtime = formatDate(isLogin2);
+                                    }else if(isLogin1 != 1 && isLogin1 != null){
+                                        vtime = formatDate(isLogin1);
+                                    }else if ((isLogin1 == 1 && isLogin2 == 1) || (isLogin1 == null && isLogin2 == 1)) {
+                                        vtime = "无限制";
+                                    }
+                                    vip_time && (vip_time.innerHTML = vtime)
+                                    let orgName = res.value[0][0].orgName;
+                                    let schoolName = res.value[0][0].schoolName;
+                                    let vip_school = $('.vip_school')[0]
+                                    vip_school && (vip_school.innerHTML = orgName ? orgName : schoolName)
+                                    
+
                                     U.A.Request(US.Config.pbl + "addLoginOperation", [_user.userid], function (res) {
                                     }, [], { "type": "POST", "withCredentials": true });
 
@@ -471,6 +498,8 @@ U.MD.D.getuser = function () {
                                 $(".userName")[0].style.display = "block";
                                 $(".userName")[0].innerHTML = US.userInfo.username || US.userInfo.alias;
                                 $(".exit")[0].style.display = "block";
+                                let _vipbox = $('.U_MD_D_BD_vip_box')[0]
+                                _vipbox && (_vipbox.style.right = $(".U_MD_D_BD")[0].offsetWidth + 20 + 'px')
                                 if(res.value[0][0].type === 1 && res.value[0][0].org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
                                     U.MD.D.I.ModeCheck(2)
                                 }else{
@@ -561,10 +590,36 @@ 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){
+                                        const currentDate = new Date();
+
+                                        // 判断 isLogin1 和 isLogin2 是否为 2 或者是否过期(且过期时间是有效的日期格式)
+                                        if ((res.value[0][0].isLogin1 == 2 || (res.value[0][0].isLogin1 && res.value[0][0].isLogin1 != 1 && res.value[0][0].isLogin1 != 2 && new Date(res.value[0][0].isLogin1) < currentDate)) ||
+                                            (res.value[0][0].isLogin2 == 2 || (res.value[0][0].isLogin2 != 1 && res.value[0][0].isLogin2 != 2 && new Date(res.value[0][0].isLogin2) < currentDate))) {
                                             U.MD.U.LO.logoutSystem2();
                                             return;
                                         }
+
+                                        let vipbox = $('.U_MD_D_BD_vip_box')[0]
+                                        vipbox && (vipbox.style.display = 'block')
+                                        let vip_time = $('.vip_time')[0]
+                                        let vtime = ''
+                                        // 获取 isLogin1 和 isLogin2 的值
+                                        let isLogin1 = res.value[0][0].isLogin1;
+                                        let isLogin2 = res.value[0][0].isLogin2;
+
+                                        if (isLogin2 != 1 && isLogin2 != null){
+                                            vtime = formatDate(isLogin2);
+                                        }else if(isLogin1 != 1 && isLogin1 != null){
+                                            vtime = formatDate(isLogin1);
+                                        }else if ((isLogin1 == 1 && isLogin2 == 1) || (isLogin1 == null && isLogin2 == 1)) {
+                                            vtime = "无限制";
+                                        }
+                                        vip_time && (vip_time.innerHTML = vtime)
+                                        let orgName = res.value[0][0].orgName;
+                                        let schoolName = res.value[0][0].schoolName;
+                                        let vip_school = $('.vip_school')[0]
+                                        vip_school && (vip_school.innerHTML = orgName ? orgName : schoolName)
+                                        
                                         U.A.Request(US.Config.pbl + "addLoginOperation", [userId], function (res) {
                                         }, [], { "type": "POST", "withCredentials": true });
     
@@ -690,6 +745,8 @@ U.MD.D.getuser = function () {
                                     $(".userName")[0].style.display = "block";
                                     $(".userName")[0].innerHTML = US.userInfo.username || US.userInfo.alias;
                                     $(".exit")[0].style.display = "block";
+                                    let _vipbox = $('.U_MD_D_BD_vip_box')[0]
+                                    _vipbox && (_vipbox.style.right = $(".U_MD_D_BD")[0].offsetWidth + 20 + 'px')
                                     if(res.value[0][0].type === 1 && res.value[0][0].org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
                                         U.MD.D.I.ModeCheck(2)
                                     }else{
@@ -845,10 +902,36 @@ 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){
+        const currentDate = new Date();
+
+        // 判断 isLogin1 和 isLogin2 是否为 2 或者是否过期(且过期时间是有效的日期格式)
+        if ((res.value[0][0].isLogin1 == 2 || (res.value[0][0].isLogin1 && res.value[0][0].isLogin1 != 1 && res.value[0][0].isLogin1 != 2 && new Date(res.value[0][0].isLogin1) < currentDate)) ||
+            (res.value[0][0].isLogin2 == 2 || (res.value[0][0].isLogin2 != 1 && res.value[0][0].isLogin2 != 2 && new Date(res.value[0][0].isLogin2) < currentDate))) {
             U.MD.U.LO.logoutSystem2();
             return;
         }
+
+        
+        let vipbox = $('.U_MD_D_BD_vip_box')[0]
+        vipbox && (vipbox.style.display = 'block')
+        let vip_time = $('.vip_time')[0]
+        let vtime = ''
+        // 获取 isLogin1 和 isLogin2 的值
+        let isLogin1 = res.value[0][0].isLogin1;
+        let isLogin2 = res.value[0][0].isLogin2;
+
+        if (isLogin2 != 1 && isLogin2 != null){
+            vtime = formatDate(isLogin2);
+        }else if(isLogin1 != 1 && isLogin1 != null){
+            vtime = formatDate(isLogin1);
+        }else if ((isLogin1 == 1 && isLogin2 == 1) || (isLogin1 == null && isLogin2 == 1)) {
+            vtime = "无限制";
+        }
+        vip_time && (vip_time.innerHTML = vtime)
+        let orgName = res.value[0][0].orgName;
+        let schoolName = res.value[0][0].schoolName;
+        let vip_school = $('.vip_school')[0]
+        vip_school && (vip_school.innerHTML = orgName ? orgName : schoolName)
         U.A.Request(US.Config.pbl + "addLoginOperation", [userid], function (res) {
         }, [], { "type": "POST", "withCredentials": true });
 
@@ -967,6 +1050,8 @@ 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";
+        let _vipbox = $('.U_MD_D_BD_vip_box')[0]
+        _vipbox && (_vipbox.style.right = $(".U_MD_D_BD")[0].offsetWidth + 20 + 'px')
         if(res.value[0][0].type === 1 && res.value[0][0].org == 'c95e0a56-c205-11ed-8d51-005056b86db5'){
             U.MD.D.I.ModeCheck(2)
         }else{
@@ -1106,4 +1191,17 @@ U.MD.D.getNotice = function () {
 //  // 在视频播放完成后删除 video 元素
 //  video.addEventListener("ended", () => {
 //    document.body.removeChild(video);
-//  });
+//  });
+
+
+function formatDate(_date) {
+    let date = new Date(_date)
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, "0");
+    const day = date.getDate().toString().padStart(2, "0");
+    const hours = date.getHours().toString().padStart(2, "0");
+    const minutes = date.getMinutes().toString().padStart(2, "0");
+    const seconds = date.getSeconds().toString().padStart(2, "0");
+
+    return `${year}年${month}月${day}日`;
+}

+ 4 - 4
node/message.js

@@ -957,11 +957,11 @@ us.updatecscl = function (messageInfo, classId, ty) {
         catch (e) {
 
         }
-        //每次修改每隔五秒保存一次数据,防止数据操作频繁导致数据库太卡
-        us.savecscltime = setTimeout(function () {
-            us.mysql.usselect(['172.16.12.5', 'pbl', 'updateRoomData', JSON.stringify(_obj), classId], function (ret) { });
-        }, 5000)
     }
+    //每次修改每隔五秒保存一次数据,防止数据操作频繁导致数据库太卡
+    us.savecscltime = setTimeout(function () {
+        us.mysql.usselect(['172.16.12.5', 'pbl', 'updateRoomData', JSON.stringify(_obj), classId], function (ret) { });
+    }, 5000)
 }
 
 /**

+ 1 - 1
uform.js

@@ -11980,7 +11980,7 @@ U.MD.U.LO.logoutSystem2 = function (callback) {
     if (US.userInfo.userid) {
         //弹出退出登录的提示
         // U.UF.UI.confirm("是否退出" + US.userInfo.username + "账号", function () {
-        U.alert("您的账号已禁止登陆!")
+        U.alert("您的账号已超过使用期限!")
         U.A.Request(US.Config.server + "logout", [], function (res) {
             U.A.Request(US.SCOKET, ["logout", US.userInfo.userid, US.pageId], function () {
                 setTimeout(() => {